Replace hardware_constants.asm with hardware.inc (#511)

2026-09-30 21:18:14 -05:00 · 2025-06-30 16:49:32 +00:00
parent 1a353dcd61
commit 961b5ad7be
10 changed files with 924 additions and 924 deletions
--- a/pokeblue.map
+++ b/pokeblue.map
@@ -362,8 +362,8 @@ ROM0 bank #0:
 	         $1765 = Forest_Coll
 	         $1775 = House_Coll
 	         $177f = Gate_Coll
-	         $177f = ForestGate_Coll
 	         $177f = Museum_Coll
+	         $177f = ForestGate_Coll
 	         $178a = Ship_Coll
 	         $1795 = ShipPort_Coll
 	         $179a = Cemetery_Coll
@@ -9223,8 +9223,8 @@ ROMX bank #19:
 	         $5e76 = BlackbeltPic
 	         $6049 = Rival1Pic
 	         $615f = ProfOakPic
-	         $627d = ScientistPic
 	         $627d = ChiefPic
+	         $627d = ScientistPic
 	         $63be = GiovanniPic
 	         $649f = RocketPic
 	         $6635 = CooltrainerMPic
@@ -12363,9 +12363,9 @@ ROMX bank #26:
 	         $55ff = Gate_GFX
 	         $55ff = Museum_GFX
 	         $55ff = ForestGate_GFX
+	         $5bef = ForestGate_Block
 	         $5bef = Gate_Block
 	         $5bef = Museum_Block
-	         $5bef = ForestGate_Block
 	         $63ef = Forest_GFX
 	         $69ef = Forest_Block
 	         $71ef = Facility_GFX
@@ -17753,8 +17753,8 @@ VRAM bank #0:
 	         $8000 = vChars0
 	         $8000 = vSprites
 	         $8000 = vNPCSprites
-	         $8800 = vTitleLogo
 	         $8800 = vFont
+	         $8800 = vTitleLogo
 	         $8800 = vChars1
 	         $8800 = vNPCSprites2
 	         $9000 = vFrontPic
@@ -17907,8 +17907,8 @@ WRAM0 bank #0:
 	         $c12b = wSprite02StateData1XAdjusted
 	         $c12c = wSprite02StateData1CollisionData
 	         $c130 = wSprite02StateData1End
-	         $c130 = wSprite03StateData1
 	         $c130 = wSprite03StateData1PictureID
+	         $c130 = wSprite03StateData1
 	         $c131 = wSprite03StateData1MovementStatus
 	         $c132 = wSprite03StateData1ImageIndex
 	         $c133 = wSprite03StateData1YStepVector
@@ -17937,8 +17937,8 @@ WRAM0 bank #0:
 	         $c14b = wSprite04StateData1XAdjusted
 	         $c14c = wSprite04StateData1CollisionData
 	         $c150 = wSprite05StateData1PictureID
-	         $c150 = wSprite04StateData1End
 	         $c150 = wSprite05StateData1
+	         $c150 = wSprite04StateData1End
 	         $c151 = wSprite05StateData1MovementStatus
 	         $c152 = wSprite05StateData1ImageIndex
 	         $c153 = wSprite05StateData1YStepVector
@@ -18056,9 +18056,9 @@ WRAM0 bank #0:
 	         $c1ca = wSprite12StateData1YAdjusted
 	         $c1cb = wSprite12StateData1XAdjusted
 	         $c1cc = wSprite12StateData1CollisionData
+	         $c1d0 = wSprite13StateData1PictureID
 	         $c1d0 = wSprite12StateData1End
 	         $c1d0 = wSprite13StateData1
-	         $c1d0 = wSprite13StateData1PictureID
 	         $c1d1 = wSprite13StateData1MovementStatus
 	         $c1d2 = wSprite13StateData1ImageIndex
 	         $c1d3 = wSprite13StateData1YStepVector
@@ -18071,9 +18071,9 @@ WRAM0 bank #0:
 	         $c1da = wSprite13StateData1YAdjusted
 	         $c1db = wSprite13StateData1XAdjusted
 	         $c1dc = wSprite13StateData1CollisionData
+	         $c1e0 = wSprite13StateData1End
 	         $c1e0 = wSprite14StateData1
 	         $c1e0 = wSprite14StateData1PictureID
-	         $c1e0 = wSprite13StateData1End
 	         $c1e1 = wSprite14StateData1MovementStatus
 	         $c1e2 = wSprite14StateData1ImageIndex
 	         $c1e3 = wSprite14StateData1YStepVector
@@ -18087,8 +18087,8 @@ WRAM0 bank #0:
 	         $c1eb = wSprite14StateData1XAdjusted
 	         $c1ec = wSprite14StateData1CollisionData
 	         $c1f0 = wSprite15StateData1PictureID
-	         $c1f0 = wSprite14StateData1End
 	         $c1f0 = wSprite15StateData1
+	         $c1f0 = wSprite14StateData1End
 	         $c1f1 = wSprite15StateData1MovementStatus
 	         $c1f2 = wSprite15StateData1ImageIndex
 	         $c1f3 = wSprite15StateData1YStepVector
@@ -18102,9 +18102,9 @@ WRAM0 bank #0:
 	         $c1fb = wSprite15StateData1XAdjusted
 	         $c1fc = wSprite15StateData1CollisionData
 	         $c200 = wSpriteStateData2
-	         $c200 = wSprite15StateData1End
 	         $c200 = wSpritePlayerStateData2WalkAnimationCounter
 	         $c200 = wSpritePlayerStateData2
+	         $c200 = wSprite15StateData1End
 	         $c202 = wSpritePlayerStateData2YDisplacement
 	         $c203 = wSpritePlayerStateData2XDisplacement
 	         $c204 = wSpritePlayerStateData2MapY
@@ -18115,9 +18115,9 @@ WRAM0 bank #0:
 	         $c209 = wSpritePlayerStateData2OrigFacingDirection
 	         $c20d = wSpritePlayerStateData2PictureID
 	         $c20e = wSpritePlayerStateData2ImageBaseOffset
+	         $c210 = wSprite01StateData2
 	         $c210 = wSpritePlayerStateData2End
 	         $c210 = wSprite01StateData2WalkAnimationCounter
-	         $c210 = wSprite01StateData2
 	         $c212 = wSprite01StateData2YDisplacement
 	         $c213 = wSprite01StateData2XDisplacement
 	         $c214 = wSprite01StateData2MapY
@@ -18129,8 +18129,8 @@ WRAM0 bank #0:
 	         $c21d = wSprite01StateData2PictureID
 	         $c21e = wSprite01StateData2ImageBaseOffset
 	         $c220 = wSprite02StateData2WalkAnimationCounter
-	         $c220 = wSprite01StateData2End
 	         $c220 = wSprite02StateData2
+	         $c220 = wSprite01StateData2End
 	         $c222 = wSprite02StateData2YDisplacement
 	         $c223 = wSprite02StateData2XDisplacement
 	         $c224 = wSprite02StateData2MapY
@@ -18142,8 +18142,8 @@ WRAM0 bank #0:
 	         $c22d = wSprite02StateData2PictureID
 	         $c22e = wSprite02StateData2ImageBaseOffset
 	         $c230 = wSprite03StateData2
-	         $c230 = wSprite03StateData2WalkAnimationCounter
 	         $c230 = wSprite02StateData2End
+	         $c230 = wSprite03StateData2WalkAnimationCounter
 	         $c232 = wSprite03StateData2YDisplacement
 	         $c233 = wSprite03StateData2XDisplacement
 	         $c234 = wSprite03StateData2MapY
@@ -18154,9 +18154,9 @@ WRAM0 bank #0:
 	         $c239 = wSprite03StateData2OrigFacingDirection
 	         $c23d = wSprite03StateData2PictureID
 	         $c23e = wSprite03StateData2ImageBaseOffset
-	         $c240 = wSprite04StateData2WalkAnimationCounter
 	         $c240 = wSprite04StateData2
 	         $c240 = wSprite03StateData2End
+	         $c240 = wSprite04StateData2WalkAnimationCounter
 	         $c242 = wSprite04StateData2YDisplacement
 	         $c243 = wSprite04StateData2XDisplacement
 	         $c244 = wSprite04StateData2MapY
@@ -18167,9 +18167,9 @@ WRAM0 bank #0:
 	         $c249 = wSprite04StateData2OrigFacingDirection
 	         $c24d = wSprite04StateData2PictureID
 	         $c24e = wSprite04StateData2ImageBaseOffset
-	         $c250 = wSprite04StateData2End
 	         $c250 = wSprite05StateData2WalkAnimationCounter
 	         $c250 = wSprite05StateData2
+	         $c250 = wSprite04StateData2End
 	         $c252 = wSprite05StateData2YDisplacement
 	         $c253 = wSprite05StateData2XDisplacement
 	         $c254 = wSprite05StateData2MapY
@@ -18180,9 +18180,9 @@ WRAM0 bank #0:
 	         $c259 = wSprite05StateData2OrigFacingDirection
 	         $c25d = wSprite05StateData2PictureID
 	         $c25e = wSprite05StateData2ImageBaseOffset
-	         $c260 = wSprite06StateData2
-	         $c260 = wSprite05StateData2End
 	         $c260 = wSprite06StateData2WalkAnimationCounter
+	         $c260 = wSprite05StateData2End
+	         $c260 = wSprite06StateData2
 	         $c262 = wSprite06StateData2YDisplacement
 	         $c263 = wSprite06StateData2XDisplacement
 	         $c264 = wSprite06StateData2MapY
@@ -18193,8 +18193,8 @@ WRAM0 bank #0:
 	         $c269 = wSprite06StateData2OrigFacingDirection
 	         $c26d = wSprite06StateData2PictureID
 	         $c26e = wSprite06StateData2ImageBaseOffset
-	         $c270 = wSprite06StateData2End
 	         $c270 = wSprite07StateData2
+	         $c270 = wSprite06StateData2End
 	         $c270 = wSprite07StateData2WalkAnimationCounter
 	         $c272 = wSprite07StateData2YDisplacement
 	         $c273 = wSprite07StateData2XDisplacement
@@ -18206,9 +18206,9 @@ WRAM0 bank #0:
 	         $c279 = wSprite07StateData2OrigFacingDirection
 	         $c27d = wSprite07StateData2PictureID
 	         $c27e = wSprite07StateData2ImageBaseOffset
-	         $c280 = wSprite07StateData2End
-	         $c280 = wSprite08StateData2
 	         $c280 = wSprite08StateData2WalkAnimationCounter
+	         $c280 = wSprite08StateData2
+	         $c280 = wSprite07StateData2End
 	         $c282 = wSprite08StateData2YDisplacement
 	         $c283 = wSprite08StateData2XDisplacement
 	         $c284 = wSprite08StateData2MapY
@@ -18219,9 +18219,9 @@ WRAM0 bank #0:
 	         $c289 = wSprite08StateData2OrigFacingDirection
 	         $c28d = wSprite08StateData2PictureID
 	         $c28e = wSprite08StateData2ImageBaseOffset
+	         $c290 = wSprite09StateData2WalkAnimationCounter
 	         $c290 = wSprite09StateData2
 	         $c290 = wSprite08StateData2End
-	         $c290 = wSprite09StateData2WalkAnimationCounter
 	         $c292 = wSprite09StateData2YDisplacement
 	         $c293 = wSprite09StateData2XDisplacement
 	         $c294 = wSprite09StateData2MapY
@@ -18232,9 +18232,9 @@ WRAM0 bank #0:
 	         $c299 = wSprite09StateData2OrigFacingDirection
 	         $c29d = wSprite09StateData2PictureID
 	         $c29e = wSprite09StateData2ImageBaseOffset
-	         $c2a0 = wSprite10StateData2WalkAnimationCounter
-	         $c2a0 = wSprite09StateData2End
 	         $c2a0 = wSprite10StateData2
+	         $c2a0 = wSprite09StateData2End
+	         $c2a0 = wSprite10StateData2WalkAnimationCounter
 	         $c2a2 = wSprite10StateData2YDisplacement
 	         $c2a3 = wSprite10StateData2XDisplacement
 	         $c2a4 = wSprite10StateData2MapY
@@ -18245,8 +18245,8 @@ WRAM0 bank #0:
 	         $c2a9 = wSprite10StateData2OrigFacingDirection
 	         $c2ad = wSprite10StateData2PictureID
 	         $c2ae = wSprite10StateData2ImageBaseOffset
-	         $c2b0 = wSprite11StateData2
 	         $c2b0 = wSprite11StateData2WalkAnimationCounter
+	         $c2b0 = wSprite11StateData2
 	         $c2b0 = wSprite10StateData2End
 	         $c2b2 = wSprite11StateData2YDisplacement
 	         $c2b3 = wSprite11StateData2XDisplacement
@@ -18271,8 +18271,8 @@ WRAM0 bank #0:
 	         $c2c9 = wSprite12StateData2OrigFacingDirection
 	         $c2cd = wSprite12StateData2PictureID
 	         $c2ce = wSprite12StateData2ImageBaseOffset
-	         $c2d0 = wSprite13StateData2
 	         $c2d0 = wSprite13StateData2WalkAnimationCounter
+	         $c2d0 = wSprite13StateData2
 	         $c2d0 = wSprite12StateData2End
 	         $c2d2 = wSprite13StateData2YDisplacement
 	         $c2d3 = wSprite13StateData2XDisplacement
@@ -18297,9 +18297,9 @@ WRAM0 bank #0:
 	         $c2e9 = wSprite14StateData2OrigFacingDirection
 	         $c2ed = wSprite14StateData2PictureID
 	         $c2ee = wSprite14StateData2ImageBaseOffset
+	         $c2f0 = wSprite14StateData2End
 	         $c2f0 = wSprite15StateData2WalkAnimationCounter
 	         $c2f0 = wSprite15StateData2
-	         $c2f0 = wSprite14StateData2End
 	         $c2f2 = wSprite15StateData2YDisplacement
 	         $c2f3 = wSprite15StateData2XDisplacement
 	         $c2f4 = wSprite15StateData2MapY
@@ -18310,22 +18310,22 @@ WRAM0 bank #0:
 	         $c2f9 = wSprite15StateData2OrigFacingDirection
 	         $c2fd = wSprite15StateData2PictureID
 	         $c2fe = wSprite15StateData2ImageBaseOffset
-	         $c300 = wSprite15StateData2End
 	         $c300 = wSpriteDataEnd
+	         $c300 = wSprite15StateData2End
 	SECTION: $c300-$c39f ($00a0 bytes) ["OAM Buffer"]
+	         $c300 = wShadowOAMSprite00YCoord
 	         $c300 = wShadowOAM
 	         $c300 = wShadowOAMSprite00
-	         $c300 = wShadowOAMSprite00YCoord
 	         $c301 = wShadowOAMSprite00XCoord
 	         $c302 = wShadowOAMSprite00TileID
 	         $c303 = wShadowOAMSprite00Attributes
-	         $c304 = wShadowOAMSprite01YCoord
 	         $c304 = wShadowOAMSprite01
+	         $c304 = wShadowOAMSprite01YCoord
 	         $c305 = wShadowOAMSprite01XCoord
 	         $c306 = wShadowOAMSprite01TileID
 	         $c307 = wShadowOAMSprite01Attributes
-	         $c308 = wShadowOAMSprite02
 	         $c308 = wShadowOAMSprite02YCoord
+	         $c308 = wShadowOAMSprite02
 	         $c309 = wShadowOAMSprite02XCoord
 	         $c30a = wShadowOAMSprite02TileID
 	         $c30b = wShadowOAMSprite02Attributes
@@ -18344,18 +18344,18 @@ WRAM0 bank #0:
 	         $c315 = wShadowOAMSprite05XCoord
 	         $c316 = wShadowOAMSprite05TileID
 	         $c317 = wShadowOAMSprite05Attributes
-	         $c318 = wShadowOAMSprite06
 	         $c318 = wShadowOAMSprite06YCoord
+	         $c318 = wShadowOAMSprite06
 	         $c319 = wShadowOAMSprite06XCoord
 	         $c31a = wShadowOAMSprite06TileID
 	         $c31b = wShadowOAMSprite06Attributes
-	         $c31c = wShadowOAMSprite07
 	         $c31c = wShadowOAMSprite07YCoord
+	         $c31c = wShadowOAMSprite07
 	         $c31d = wShadowOAMSprite07XCoord
 	         $c31e = wShadowOAMSprite07TileID
 	         $c31f = wShadowOAMSprite07Attributes
-	         $c320 = wShadowOAMSprite08
 	         $c320 = wShadowOAMSprite08YCoord
+	         $c320 = wShadowOAMSprite08
 	         $c321 = wShadowOAMSprite08XCoord
 	         $c322 = wShadowOAMSprite08TileID
 	         $c323 = wShadowOAMSprite08Attributes
@@ -18364,8 +18364,8 @@ WRAM0 bank #0:
 	         $c325 = wShadowOAMSprite09XCoord
 	         $c326 = wShadowOAMSprite09TileID
 	         $c327 = wShadowOAMSprite09Attributes
-	         $c328 = wShadowOAMSprite10
 	         $c328 = wShadowOAMSprite10YCoord
+	         $c328 = wShadowOAMSprite10
 	         $c329 = wShadowOAMSprite10XCoord
 	         $c32a = wShadowOAMSprite10TileID
 	         $c32b = wShadowOAMSprite10Attributes
@@ -18374,13 +18374,13 @@ WRAM0 bank #0:
 	         $c32d = wShadowOAMSprite11XCoord
 	         $c32e = wShadowOAMSprite11TileID
 	         $c32f = wShadowOAMSprite11Attributes
-	         $c330 = wShadowOAMSprite12
 	         $c330 = wShadowOAMSprite12YCoord
+	         $c330 = wShadowOAMSprite12
 	         $c331 = wShadowOAMSprite12XCoord
 	         $c332 = wShadowOAMSprite12TileID
 	         $c333 = wShadowOAMSprite12Attributes
-	         $c334 = wShadowOAMSprite13
 	         $c334 = wShadowOAMSprite13YCoord
+	         $c334 = wShadowOAMSprite13
 	         $c335 = wShadowOAMSprite13XCoord
 	         $c336 = wShadowOAMSprite13TileID
 	         $c337 = wShadowOAMSprite13Attributes
@@ -18404,8 +18404,8 @@ WRAM0 bank #0:
 	         $c345 = wShadowOAMSprite17XCoord
 	         $c346 = wShadowOAMSprite17TileID
 	         $c347 = wShadowOAMSprite17Attributes
-	         $c348 = wShadowOAMSprite18
 	         $c348 = wShadowOAMSprite18YCoord
+	         $c348 = wShadowOAMSprite18
 	         $c349 = wShadowOAMSprite18XCoord
 	         $c34a = wShadowOAMSprite18TileID
 	         $c34b = wShadowOAMSprite18Attributes
@@ -18414,13 +18414,13 @@ WRAM0 bank #0:
 	         $c34d = wShadowOAMSprite19XCoord
 	         $c34e = wShadowOAMSprite19TileID
 	         $c34f = wShadowOAMSprite19Attributes
-	         $c350 = wShadowOAMSprite20
 	         $c350 = wShadowOAMSprite20YCoord
+	         $c350 = wShadowOAMSprite20
 	         $c351 = wShadowOAMSprite20XCoord
 	         $c352 = wShadowOAMSprite20TileID
 	         $c353 = wShadowOAMSprite20Attributes
-	         $c354 = wShadowOAMSprite21
 	         $c354 = wShadowOAMSprite21YCoord
+	         $c354 = wShadowOAMSprite21
 	         $c355 = wShadowOAMSprite21XCoord
 	         $c356 = wShadowOAMSprite21TileID
 	         $c357 = wShadowOAMSprite21Attributes
@@ -18429,8 +18429,8 @@ WRAM0 bank #0:
 	         $c359 = wShadowOAMSprite22XCoord
 	         $c35a = wShadowOAMSprite22TileID
 	         $c35b = wShadowOAMSprite22Attributes
-	         $c35c = wShadowOAMSprite23
 	         $c35c = wShadowOAMSprite23YCoord
+	         $c35c = wShadowOAMSprite23
 	         $c35d = wShadowOAMSprite23XCoord
 	         $c35e = wShadowOAMSprite23TileID
 	         $c35f = wShadowOAMSprite23Attributes
@@ -18449,18 +18449,18 @@ WRAM0 bank #0:
 	         $c369 = wShadowOAMSprite26XCoord
 	         $c36a = wShadowOAMSprite26TileID
 	         $c36b = wShadowOAMSprite26Attributes
-	         $c36c = wShadowOAMSprite27
 	         $c36c = wShadowOAMSprite27YCoord
+	         $c36c = wShadowOAMSprite27
 	         $c36d = wShadowOAMSprite27XCoord
 	         $c36e = wShadowOAMSprite27TileID
 	         $c36f = wShadowOAMSprite27Attributes
-	         $c370 = wShadowOAMSprite28
 	         $c370 = wShadowOAMSprite28YCoord
+	         $c370 = wShadowOAMSprite28
 	         $c371 = wShadowOAMSprite28XCoord
 	         $c372 = wShadowOAMSprite28TileID
 	         $c373 = wShadowOAMSprite28Attributes
-	         $c374 = wShadowOAMSprite29
 	         $c374 = wShadowOAMSprite29YCoord
+	         $c374 = wShadowOAMSprite29
 	         $c375 = wShadowOAMSprite29XCoord
 	         $c376 = wShadowOAMSprite29TileID
 	         $c377 = wShadowOAMSprite29Attributes
@@ -18484,18 +18484,18 @@ WRAM0 bank #0:
 	         $c385 = wShadowOAMSprite33XCoord
 	         $c386 = wShadowOAMSprite33TileID
 	         $c387 = wShadowOAMSprite33Attributes
-	         $c388 = wShadowOAMSprite34
 	         $c388 = wShadowOAMSprite34YCoord
+	         $c388 = wShadowOAMSprite34
 	         $c389 = wShadowOAMSprite34XCoord
 	         $c38a = wShadowOAMSprite34TileID
 	         $c38b = wShadowOAMSprite34Attributes
-	         $c38c = wShadowOAMSprite35
 	         $c38c = wShadowOAMSprite35YCoord
+	         $c38c = wShadowOAMSprite35
 	         $c38d = wShadowOAMSprite35XCoord
 	         $c38e = wShadowOAMSprite35TileID
 	         $c38f = wShadowOAMSprite35Attributes
-	         $c390 = wShadowOAMSprite36YCoord
 	         $c390 = wShadowOAMSprite36
+	         $c390 = wShadowOAMSprite36YCoord
 	         $c391 = wShadowOAMSprite36XCoord
 	         $c392 = wShadowOAMSprite36TileID
 	         $c393 = wShadowOAMSprite36Attributes
@@ -18571,8 +18571,8 @@ WRAM0 bank #0:
 	         $c52d = wShadowOAMBackupSprite09XCoord
 	         $c52e = wShadowOAMBackupSprite09TileID
 	         $c52f = wShadowOAMBackupSprite09Attributes
-	         $c530 = wShadowOAMBackupSprite10YCoord
 	         $c530 = wShadowOAMBackupSprite10
+	         $c530 = wShadowOAMBackupSprite10YCoord
 	         $c531 = wShadowOAMBackupSprite10XCoord
 	         $c532 = wShadowOAMBackupSprite10TileID
 	         $c533 = wShadowOAMBackupSprite10Attributes
@@ -18601,8 +18601,8 @@ WRAM0 bank #0:
 	         $c545 = wShadowOAMBackupSprite15XCoord
 	         $c546 = wShadowOAMBackupSprite15TileID
 	         $c547 = wShadowOAMBackupSprite15Attributes
-	         $c548 = wShadowOAMBackupSprite16
 	         $c548 = wShadowOAMBackupSprite16YCoord
+	         $c548 = wShadowOAMBackupSprite16
 	         $c549 = wShadowOAMBackupSprite16XCoord
 	         $c54a = wShadowOAMBackupSprite16TileID
 	         $c54b = wShadowOAMBackupSprite16Attributes
@@ -18777,10 +18777,10 @@ WRAM0 bank #0:
 	         $cc5b = wMonPartySpritesSavedOAM
 	         $cc5b = wElevatorWarpMaps
 	         $cc5b = wVermilionDockTileMapBuffer
-	         $cc5b = wSlotMachineSevenAndBarModeChance
-	         $cc5b = wOaksAideRewardItemName
 	         $cc5b = wHallOfFame
+	         $cc5b = wOaksAideRewardItemName
 	         $cc5b = wDexRatingNumMonsSeen
+	         $cc5b = wSlotMachineSevenAndBarModeChance
 	         $cc5b = wUnusedFlag
 	         $cc5b = wFilteredBagItems
 	         $cc5c = wDexRatingNumMonsOwned
@@ -18826,10 +18826,10 @@ WRAM0 bank #0:
 	         $cd05 = wEnemyNumHits
 	         $cd05 = wLuckySlotHiddenObjectIndex
 	         $cd05 = wEnemyBideAccumulatedDamage
-	         $cd0f = wPlayerMonUnmodifiedLevel
 	         $cd0f = wVermilionDockTileMapBufferEnd
-	         $cd0f = wMiscBattleDataEnd
 	         $cd0f = wInGameTradeGiveMonSpecies
+	         $cd0f = wPlayerMonUnmodifiedLevel
+	         $cd0f = wMiscBattleDataEnd
 	         $cd10 = wPlayerMonUnmodifiedMaxHP
 	         $cd10 = wInGameTradeTextPointerTablePointer
 	         $cd12 = wPlayerMonUnmodifiedAttack
@@ -18878,6 +18878,7 @@ WRAM0 bank #0:
 	         $cd3d = wNumShakes
 	         $cd3d = wPPRestoreItem
 	         $cd3d = wDexMaxSeenMon
+	         $cd3d = wWhichTrade
 	         $cd3d = wChangeBoxSavedMapTextPointer
 	         $cd3d = wBadgeNumberTile
 	         $cd3d = wOptionsTextSpeedCursorX
@@ -18899,22 +18900,21 @@ WRAM0 bank #0:
 	         $cd3d = wChargeMoveNum
 	         $cd3d = wPriceTemp
 	         $cd3d = wTitleMonSpecies
-	         $cd3d = wFieldMoves
-	         $cd3d = wPlayerCharacterOAMTile
-	         $cd3d = wCoordIndex
-	         $cd3d = wTempSCX
-	         $cd3d = wUnusedCreditsByte
-	         $cd3d = wBoxMonCounts
-	         $cd3d = wHoFTeamIndex
-	         $cd3d = wWhichTrade
-	         $cd3d = wSavedY
-	         $cd3d = wDayCareStartLevel
+	         $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 	         $cd3d = wMoveDownSmallStarsOAMCount
+	         $cd3d = wUnusedCreditsByte
+	         $cd3d = wFieldMoves
+	         $cd3d = wHoFTeamIndex
+	         $cd3d = wTempSCX
+	         $cd3d = wCoordIndex
+	         $cd3d = wDayCareStartLevel
+	         $cd3d = wBoxMonCounts
+	         $cd3d = wSavedY
+	         $cd3d = wPlayerCharacterOAMTile
+	         $cd3d = wStoppingWhichSlotMachineWheel
 	         $cd3d = wWereAnyMonsAsleep
 	         $cd3d = wFallingObjectsMovementData
 	         $cd3d = wTrainerSpriteOffset
-	         $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
-	         $cd3d = wStoppingWhichSlotMachineWheel
 	         $cd3e = wNumCreditsMonsDisplayed
 	         $cd3e = wTrainerInfoTextBoxWidth
 	         $cd3e = wTrainerEngageDistance
@@ -18930,8 +18930,8 @@ WRAM0 bank #0:
 	         $cd3e = wBattleTransitionCircleScreenQuadrantX
 	         $cd3e = wTradingWhichEnemyMon
 	         $cd3e = wTradedEnemyMonSpecies
-	         $cd3e = wBadgeNameTile
 	         $cd3e = wRivalStarterBallSpriteIndex
+	         $cd3e = wBadgeNameTile
 	         $cd3e = wHoFPartyMonIndex
 	         $cd3e = wOptionsBattleAnimCursorX
 	         $cd3f = wJigglypuffFacingDirections
@@ -18942,27 +18942,27 @@ WRAM0 bank #0:
 	         $cd3f = wSlotMachineWheel2Offset
 	         $cd3f = wFlyAnimBirdSpriteImageIndex
 	         $cd3f = wNameOfPlayerMonToBeTraded
+	         $cd3f = wDayCareTotalCost
 	         $cd3f = wHoFMonLevel
 	         $cd3f = wTrainerFacingDirection
 	         $cd3f = wHiddenObjectIndex
-	         $cd3f = wDayCareTotalCost
-	         $cd3f = wHUDGraphicsTiles
 	         $cd3f = wOptionsBattleStyleCursorX
+	         $cd3f = wHUDGraphicsTiles
 	         $cd40 = wOptionsCancelCursorX
 	         $cd40 = wTrainerScreenY
+	         $cd40 = wSlotMachineWheel3Offset
 	         $cd40 = wPlayerSpinInPlaceAnimSoundID
 	         $cd40 = wHiddenObjectY
-	         $cd40 = wSlotMachineWheel3Offset
 	         $cd40 = wHoFMonOrPlayer
 	         $cd41 = wSlotMachineWheel1BottomTile
 	         $cd41 = wSlotMachineWinningSymbol
 	         $cd41 = wHoFTeamIndex2
 	         $cd41 = wNumFieldMoves
+	         $cd41 = wDayCarePerLevelCost
 	         $cd41 = wTradedPlayerMonOT
-	         $cd41 = wHiddenItemOrCoinsIndex
 	         $cd41 = wHiddenObjectX
 	         $cd41 = wTrainerScreenX
-	         $cd41 = wDayCarePerLevelCost
+	         $cd41 = wHiddenItemOrCoinsIndex
 	         $cd42 = wSlotMachineWheel1MiddleTile
 	         $cd42 = wHoFTeamNo
 	         $cd42 = wFieldMovesLeftmostXCoord
@@ -18972,8 +18972,8 @@ WRAM0 bank #0:
 	         $cd45 = wSlotMachineWheel2MiddleTile
 	         $cd46 = wTempCoins1
 	         $cd46 = wSlotMachineWheel2TopTile
-	         $cd47 = wBattleTransitionSpiralDirection
 	         $cd47 = wSlotMachineWheel3BottomTile
+	         $cd47 = wBattleTransitionSpiralDirection
 	         $cd48 = wFacingDirectionList
 	         $cd48 = wSlotMachineWheel3MiddleTile
 	         $cd49 = wTempObtainedBadgesBooleans
@@ -18995,8 +18995,8 @@ WRAM0 bank #0:
 	         $cd50 = wWhichEmotionBubble
 	         $cd59 = wTradedEnemyMonOTID
 	         $cd5b = wGymTrashCanIndex
-	         $cd5b = wOAMBaseTile
 	         $cd5b = wStandingOnWarpPadOrHole
+	         $cd5b = wOAMBaseTile
 	         $cd5c = wSymmetricSpriteOAMAttributes
 	         $cd5d = wMonPartySpriteSpecies
 	         $cd5e = wLeftGBMonSpecies
@@ -19004,8 +19004,8 @@ WRAM0 bank #0:
 	         $cd60 = wMiscFlags
 	         $cd6a = wActionResultOrTookBattleTurn
 	         $cd6b = wJoyIgnore
-	         $cd6c = wNumMovesMinusOne
 	         $cd6c = wDownscaledMonSize
+	         $cd6c = wNumMovesMinusOne
 	         $cd6d = wNameBuffer
 	         $cd6d = wMoveData
 	         $cd6d = wPayDayMoney
@@ -19243,10 +19243,10 @@ WRAM0 bank #0:
 	         $d08a = wFlashScreenLongCounter
 	         $d08a = wSpiralBallsBaseY
 	         $d08a = wFallingObjectMovementByte
-	         $d08a = wTradedMonMovingRight
 	         $d08a = wOptionsInitialized
-	         $d08a = wUnusedWaterDropletsByte
+	         $d08a = wTradedMonMovingRight
 	         $d08a = wNewSlotMachineBallTile
+	         $d08a = wUnusedWaterDropletsByte
 	         $d08b = wNumFallingObjects
 	         $d08b = wSubAnimTransform
 	         $d08b = wSpiralBallsBaseX
@@ -19332,8 +19332,8 @@ WRAM0 bank #0:
 	         $d11e = wUsingPPUp
 	         $d11e = wMoveGrammar
 	         $d11e = wTempTMHM
-	         $d11e = wTypeEffectiveness
 	         $d11e = wNumSetBits
+	         $d11e = wTypeEffectiveness
 	         $d11e = wNamedObjectIndex
 	         $d11e = wCalculateWhoseStats
 	         $d11f = wForcePlayerToChooseMon
@@ -19454,8 +19454,8 @@ WRAM0 bank #0:
 	         $d1de = wPartyMon3DVs
 	         $d1e0 = wPartyMon3PP
 	         $d1e4 = wPartyMon3Level
-	         $d1e5 = wPartyMon3Stats
 	         $d1e5 = wPartyMon3MaxHP
+	         $d1e5 = wPartyMon3Stats
 	         $d1e7 = wPartyMon3Attack
 	         $d1e9 = wPartyMon3Defense
 	         $d1eb = wPartyMon3Speed
@@ -19512,8 +19512,8 @@ WRAM0 bank #0:
 	         $d241 = wPartyMon5Defense
 	         $d243 = wPartyMon5Speed
 	         $d245 = wPartyMon5Special
-	         $d247 = wPartyMon6Species
 	         $d247 = wPartyMon6
+	         $d247 = wPartyMon6Species
 	         $d248 = wPartyMon6HP
 	         $d24a = wPartyMon6BoxLevel
 	         $d24b = wPartyMon6Status
@@ -19913,8 +19913,8 @@ WRAM0 bank #0:
 	         $d94e = wEnemyMon4Defense
 	         $d950 = wEnemyMon4Speed
 	         $d952 = wEnemyMon4Special
-	         $d954 = wEnemyMon5Species
 	         $d954 = wEnemyMon5
+	         $d954 = wEnemyMon5Species
 	         $d955 = wEnemyMon5HP
 	         $d957 = wEnemyMon5BoxLevel
 	         $d958 = wEnemyMon5Status
@@ -19944,8 +19944,8 @@ WRAM0 bank #0:
 	         $d981 = wEnemyMon6HP
 	         $d983 = wEnemyMon6BoxLevel
 	         $d984 = wEnemyMon6Status
-	         $d985 = wEnemyMon6Type1
 	         $d985 = wEnemyMon6Type
+	         $d985 = wEnemyMon6Type1
 	         $d986 = wEnemyMon6Type2
 	         $d987 = wEnemyMon6CatchRate
 	         $d988 = wEnemyMon6Moves
@@ -20093,8 +20093,8 @@ WRAM0 bank #0:
 	         $db12 = wBoxMon4SpecialExp
 	         $db14 = wBoxMon4DVs
 	         $db16 = wBoxMon4PP
-	         $db1a = wBoxMon5Species
 	         $db1a = wBoxMon5
+	         $db1a = wBoxMon5Species
 	         $db1b = wBoxMon5HP
 	         $db1d = wBoxMon5BoxLevel
 	         $db1e = wBoxMon5Status
@@ -20174,8 +20174,8 @@ WRAM0 bank #0:
 	         $db9f = wBoxMon9HP
 	         $dba1 = wBoxMon9BoxLevel
 	         $dba2 = wBoxMon9Status
-	         $dba3 = wBoxMon9Type
 	         $dba3 = wBoxMon9Type1
+	         $dba3 = wBoxMon9Type
 	         $dba4 = wBoxMon9Type2
 	         $dba5 = wBoxMon9CatchRate
 	         $dba6 = wBoxMon9Moves
@@ -20283,8 +20283,8 @@ WRAM0 bank #0:
 	         $dc5c = wBoxMon14SpecialExp
 	         $dc5e = wBoxMon14DVs
 	         $dc60 = wBoxMon14PP
-	         $dc64 = wBoxMon15Species
 	         $dc64 = wBoxMon15
+	         $dc64 = wBoxMon15Species
 	         $dc65 = wBoxMon15HP
 	         $dc67 = wBoxMon15BoxLevel
 	         $dc68 = wBoxMon15Status
@@ -20326,8 +20326,8 @@ WRAM0 bank #0:
 	         $dca7 = wBoxMon17HP
 	         $dca9 = wBoxMon17BoxLevel
 	         $dcaa = wBoxMon17Status
-	         $dcab = wBoxMon17Type1
 	         $dcab = wBoxMon17Type
+	         $dcab = wBoxMon17Type1
 	         $dcac = wBoxMon17Type2
 	         $dcad = wBoxMon17CatchRate
 	         $dcae = wBoxMon17Moves
@@ -20359,8 +20359,8 @@ WRAM0 bank #0:
 	         $dce0 = wBoxMon18SpecialExp
 	         $dce2 = wBoxMon18DVs
 	         $dce4 = wBoxMon18PP
-	         $dce8 = wBoxMon19
 	         $dce8 = wBoxMon19Species
+	         $dce8 = wBoxMon19
 	         $dce9 = wBoxMon19HP
 	         $dceb = wBoxMon19BoxLevel
 	         $dcec = wBoxMon19Status
@@ -20463,18 +20463,18 @@ HRAM bank #0:
 	         $ff8b = hPreviousTileset
 	         $ff8b = hOAMTile
 	         $ff8b = hBaseTileID
+	         $ff8b = hEastWestConnectedMapWidth
 	         $ff8b = hItemPrice
 	         $ff8b = hDexWeight
-	         $ff8b = hEastWestConnectedMapWidth
 	         $ff8b = hSpriteInterlaceCounter
 	         $ff8b = hRLEByteValue
 	         $ff8c = hNorthSouthConnectedMapWidth
 	         $ff8c = hMapWidth
 	         $ff8c = hSpriteHeight
 	         $ff8c = hPartyMonIndex
-	         $ff8c = hSpriteIndex
-	         $ff8c = hTextID
 	         $ff8c = hSlidingRegionSize
+	         $ff8c = hTextID
+	         $ff8c = hSpriteIndex
 	         $ff8c = hDownArrowBlinkCount2
 	         $ff8d = hEnemySpeed
 	         $ff8d = hLoadSpriteTemp1
@@ -20499,13 +20499,13 @@ HRAM bank #0:
 	         $ff94 = hSpritePriority
 	         $ff95 = hSwapItemID
 	         $ff95 = hNPCPlayerYDistance
-	         $ff95 = hNPCSpriteOffset
 	         $ff95 = hDividend
 	         $ff95 = hSignCoordPointer
-	         $ff95 = hQuotient
-	         $ff95 = hNPCMovementDirections2Index
 	         $ff95 = hPastLeadingZeros
+	         $ff95 = hQuotient
 	         $ff95 = hProduct
+	         $ff95 = hNPCMovementDirections2Index
+	         $ff95 = hNPCSpriteOffset
 	         $ff95 = hSwapTemp
 	         $ff96 = hMutateWY
 	         $ff96 = hSwapItemQuantity
@@ -20589,12 +20589,12 @@ HRAM bank #0:
 	         $ffdc = hVendingMachinePrice
 	         $ffdc = hPlayerYCoord
 	         $ffdc = hOaksAideRewardItem
-	         $ffdc = hItemToRemoveIndex
 	         $ffdc = hGymGateAnswer
+	         $ffdc = hItemToRemoveIndex
 	         $ffdd = hPlayerXCoord
 	         $ffdd = hOaksAideNumMonsOwned
-	         $ffe0 = hUnlockedSilphCoDoors
 	         $ffe0 = hBackupGymGateIndex
+	         $ffe0 = hUnlockedSilphCoDoors
 	         $ffe1 = hStartTileID
 	         $ffe4 = hNewPartyLength
 	         $ffe5 = hDividend2
--- a/pokeblue.sym
+++ b/pokeblue.sym
@@ -337,8 +337,8 @@
 00:1765 Forest_Coll
 00:1775 House_Coll
 00:177f Gate_Coll
-00:177f ForestGate_Coll
 00:177f Museum_Coll
+00:177f ForestGate_Coll
 00:178a Ship_Coll
 00:1795 ShipPort_Coll
 00:179a Cemetery_Coll
@@ -9074,8 +9074,8 @@
 13:5e76 BlackbeltPic
 13:6049 Rival1Pic
 13:615f ProfOakPic
-13:627d ScientistPic
 13:627d ChiefPic
+13:627d ScientistPic
 13:63be GiovanniPic
 13:649f RocketPic
 13:6635 CooltrainerMPic
@@ -12161,9 +12161,9 @@
 1a:55ff Gate_GFX
 1a:55ff Museum_GFX
 1a:55ff ForestGate_GFX
+1a:5bef ForestGate_Block
 1a:5bef Gate_Block
 1a:5bef Museum_Block
-1a:5bef ForestGate_Block
 1a:63ef Forest_GFX
 1a:69ef Forest_Block
 1a:71ef Facility_GFX
@@ -17448,8 +17448,8 @@
 00:8000 vChars0
 00:8000 vSprites
 00:8000 vNPCSprites
-00:8800 vTitleLogo
 00:8800 vFont
+00:8800 vTitleLogo
 00:8800 vChars1
 00:8800 vNPCSprites2
 00:9000 vFrontPic
@@ -17577,8 +17577,8 @@
 00:c12b wSprite02StateData1XAdjusted
 00:c12c wSprite02StateData1CollisionData
 00:c130 wSprite02StateData1End
-00:c130 wSprite03StateData1
 00:c130 wSprite03StateData1PictureID
+00:c130 wSprite03StateData1
 00:c131 wSprite03StateData1MovementStatus
 00:c132 wSprite03StateData1ImageIndex
 00:c133 wSprite03StateData1YStepVector
@@ -17607,8 +17607,8 @@
 00:c14b wSprite04StateData1XAdjusted
 00:c14c wSprite04StateData1CollisionData
 00:c150 wSprite05StateData1PictureID
-00:c150 wSprite04StateData1End
 00:c150 wSprite05StateData1
+00:c150 wSprite04StateData1End
 00:c151 wSprite05StateData1MovementStatus
 00:c152 wSprite05StateData1ImageIndex
 00:c153 wSprite05StateData1YStepVector
@@ -17726,9 +17726,9 @@
 00:c1ca wSprite12StateData1YAdjusted
 00:c1cb wSprite12StateData1XAdjusted
 00:c1cc wSprite12StateData1CollisionData
+00:c1d0 wSprite13StateData1PictureID
 00:c1d0 wSprite12StateData1End
 00:c1d0 wSprite13StateData1
-00:c1d0 wSprite13StateData1PictureID
 00:c1d1 wSprite13StateData1MovementStatus
 00:c1d2 wSprite13StateData1ImageIndex
 00:c1d3 wSprite13StateData1YStepVector
@@ -17741,9 +17741,9 @@
 00:c1da wSprite13StateData1YAdjusted
 00:c1db wSprite13StateData1XAdjusted
 00:c1dc wSprite13StateData1CollisionData
+00:c1e0 wSprite13StateData1End
 00:c1e0 wSprite14StateData1
 00:c1e0 wSprite14StateData1PictureID
-00:c1e0 wSprite13StateData1End
 00:c1e1 wSprite14StateData1MovementStatus
 00:c1e2 wSprite14StateData1ImageIndex
 00:c1e3 wSprite14StateData1YStepVector
@@ -17757,8 +17757,8 @@
 00:c1eb wSprite14StateData1XAdjusted
 00:c1ec wSprite14StateData1CollisionData
 00:c1f0 wSprite15StateData1PictureID
-00:c1f0 wSprite14StateData1End
 00:c1f0 wSprite15StateData1
+00:c1f0 wSprite14StateData1End
 00:c1f1 wSprite15StateData1MovementStatus
 00:c1f2 wSprite15StateData1ImageIndex
 00:c1f3 wSprite15StateData1YStepVector
@@ -17772,9 +17772,9 @@
 00:c1fb wSprite15StateData1XAdjusted
 00:c1fc wSprite15StateData1CollisionData
 00:c200 wSpriteStateData2
-00:c200 wSprite15StateData1End
 00:c200 wSpritePlayerStateData2WalkAnimationCounter
 00:c200 wSpritePlayerStateData2
+00:c200 wSprite15StateData1End
 00:c202 wSpritePlayerStateData2YDisplacement
 00:c203 wSpritePlayerStateData2XDisplacement
 00:c204 wSpritePlayerStateData2MapY
@@ -17785,9 +17785,9 @@
 00:c209 wSpritePlayerStateData2OrigFacingDirection
 00:c20d wSpritePlayerStateData2PictureID
 00:c20e wSpritePlayerStateData2ImageBaseOffset
+00:c210 wSprite01StateData2
 00:c210 wSpritePlayerStateData2End
 00:c210 wSprite01StateData2WalkAnimationCounter
-00:c210 wSprite01StateData2
 00:c212 wSprite01StateData2YDisplacement
 00:c213 wSprite01StateData2XDisplacement
 00:c214 wSprite01StateData2MapY
@@ -17799,8 +17799,8 @@
 00:c21d wSprite01StateData2PictureID
 00:c21e wSprite01StateData2ImageBaseOffset
 00:c220 wSprite02StateData2WalkAnimationCounter
-00:c220 wSprite01StateData2End
 00:c220 wSprite02StateData2
+00:c220 wSprite01StateData2End
 00:c222 wSprite02StateData2YDisplacement
 00:c223 wSprite02StateData2XDisplacement
 00:c224 wSprite02StateData2MapY
@@ -17812,8 +17812,8 @@
 00:c22d wSprite02StateData2PictureID
 00:c22e wSprite02StateData2ImageBaseOffset
 00:c230 wSprite03StateData2
-00:c230 wSprite03StateData2WalkAnimationCounter
 00:c230 wSprite02StateData2End
+00:c230 wSprite03StateData2WalkAnimationCounter
 00:c232 wSprite03StateData2YDisplacement
 00:c233 wSprite03StateData2XDisplacement
 00:c234 wSprite03StateData2MapY
@@ -17824,9 +17824,9 @@
 00:c239 wSprite03StateData2OrigFacingDirection
 00:c23d wSprite03StateData2PictureID
 00:c23e wSprite03StateData2ImageBaseOffset
-00:c240 wSprite04StateData2WalkAnimationCounter
 00:c240 wSprite04StateData2
 00:c240 wSprite03StateData2End
+00:c240 wSprite04StateData2WalkAnimationCounter
 00:c242 wSprite04StateData2YDisplacement
 00:c243 wSprite04StateData2XDisplacement
 00:c244 wSprite04StateData2MapY
@@ -17837,9 +17837,9 @@
 00:c249 wSprite04StateData2OrigFacingDirection
 00:c24d wSprite04StateData2PictureID
 00:c24e wSprite04StateData2ImageBaseOffset
-00:c250 wSprite04StateData2End
 00:c250 wSprite05StateData2WalkAnimationCounter
 00:c250 wSprite05StateData2
+00:c250 wSprite04StateData2End
 00:c252 wSprite05StateData2YDisplacement
 00:c253 wSprite05StateData2XDisplacement
 00:c254 wSprite05StateData2MapY
@@ -17850,9 +17850,9 @@
 00:c259 wSprite05StateData2OrigFacingDirection
 00:c25d wSprite05StateData2PictureID
 00:c25e wSprite05StateData2ImageBaseOffset
-00:c260 wSprite06StateData2
-00:c260 wSprite05StateData2End
 00:c260 wSprite06StateData2WalkAnimationCounter
+00:c260 wSprite05StateData2End
+00:c260 wSprite06StateData2
 00:c262 wSprite06StateData2YDisplacement
 00:c263 wSprite06StateData2XDisplacement
 00:c264 wSprite06StateData2MapY
@@ -17863,8 +17863,8 @@
 00:c269 wSprite06StateData2OrigFacingDirection
 00:c26d wSprite06StateData2PictureID
 00:c26e wSprite06StateData2ImageBaseOffset
-00:c270 wSprite06StateData2End
 00:c270 wSprite07StateData2
+00:c270 wSprite06StateData2End
 00:c270 wSprite07StateData2WalkAnimationCounter
 00:c272 wSprite07StateData2YDisplacement
 00:c273 wSprite07StateData2XDisplacement
@@ -17876,9 +17876,9 @@
 00:c279 wSprite07StateData2OrigFacingDirection
 00:c27d wSprite07StateData2PictureID
 00:c27e wSprite07StateData2ImageBaseOffset
-00:c280 wSprite07StateData2End
-00:c280 wSprite08StateData2
 00:c280 wSprite08StateData2WalkAnimationCounter
+00:c280 wSprite08StateData2
+00:c280 wSprite07StateData2End
 00:c282 wSprite08StateData2YDisplacement
 00:c283 wSprite08StateData2XDisplacement
 00:c284 wSprite08StateData2MapY
@@ -17889,9 +17889,9 @@
 00:c289 wSprite08StateData2OrigFacingDirection
 00:c28d wSprite08StateData2PictureID
 00:c28e wSprite08StateData2ImageBaseOffset
+00:c290 wSprite09StateData2WalkAnimationCounter
 00:c290 wSprite09StateData2
 00:c290 wSprite08StateData2End
-00:c290 wSprite09StateData2WalkAnimationCounter
 00:c292 wSprite09StateData2YDisplacement
 00:c293 wSprite09StateData2XDisplacement
 00:c294 wSprite09StateData2MapY
@@ -17902,9 +17902,9 @@
 00:c299 wSprite09StateData2OrigFacingDirection
 00:c29d wSprite09StateData2PictureID
 00:c29e wSprite09StateData2ImageBaseOffset
-00:c2a0 wSprite10StateData2WalkAnimationCounter
-00:c2a0 wSprite09StateData2End
 00:c2a0 wSprite10StateData2
+00:c2a0 wSprite09StateData2End
+00:c2a0 wSprite10StateData2WalkAnimationCounter
 00:c2a2 wSprite10StateData2YDisplacement
 00:c2a3 wSprite10StateData2XDisplacement
 00:c2a4 wSprite10StateData2MapY
@@ -17915,8 +17915,8 @@
 00:c2a9 wSprite10StateData2OrigFacingDirection
 00:c2ad wSprite10StateData2PictureID
 00:c2ae wSprite10StateData2ImageBaseOffset
-00:c2b0 wSprite11StateData2
 00:c2b0 wSprite11StateData2WalkAnimationCounter
+00:c2b0 wSprite11StateData2
 00:c2b0 wSprite10StateData2End
 00:c2b2 wSprite11StateData2YDisplacement
 00:c2b3 wSprite11StateData2XDisplacement
@@ -17941,8 +17941,8 @@
 00:c2c9 wSprite12StateData2OrigFacingDirection
 00:c2cd wSprite12StateData2PictureID
 00:c2ce wSprite12StateData2ImageBaseOffset
-00:c2d0 wSprite13StateData2
 00:c2d0 wSprite13StateData2WalkAnimationCounter
+00:c2d0 wSprite13StateData2
 00:c2d0 wSprite12StateData2End
 00:c2d2 wSprite13StateData2YDisplacement
 00:c2d3 wSprite13StateData2XDisplacement
@@ -17967,9 +17967,9 @@
 00:c2e9 wSprite14StateData2OrigFacingDirection
 00:c2ed wSprite14StateData2PictureID
 00:c2ee wSprite14StateData2ImageBaseOffset
+00:c2f0 wSprite14StateData2End
 00:c2f0 wSprite15StateData2WalkAnimationCounter
 00:c2f0 wSprite15StateData2
-00:c2f0 wSprite14StateData2End
 00:c2f2 wSprite15StateData2YDisplacement
 00:c2f3 wSprite15StateData2XDisplacement
 00:c2f4 wSprite15StateData2MapY
@@ -17980,21 +17980,21 @@
 00:c2f9 wSprite15StateData2OrigFacingDirection
 00:c2fd wSprite15StateData2PictureID
 00:c2fe wSprite15StateData2ImageBaseOffset
-00:c300 wSprite15StateData2End
 00:c300 wSpriteDataEnd
+00:c300 wSprite15StateData2End
+00:c300 wShadowOAMSprite00YCoord
 00:c300 wShadowOAM
 00:c300 wShadowOAMSprite00
-00:c300 wShadowOAMSprite00YCoord
 00:c301 wShadowOAMSprite00XCoord
 00:c302 wShadowOAMSprite00TileID
 00:c303 wShadowOAMSprite00Attributes
-00:c304 wShadowOAMSprite01YCoord
 00:c304 wShadowOAMSprite01
+00:c304 wShadowOAMSprite01YCoord
 00:c305 wShadowOAMSprite01XCoord
 00:c306 wShadowOAMSprite01TileID
 00:c307 wShadowOAMSprite01Attributes
-00:c308 wShadowOAMSprite02
 00:c308 wShadowOAMSprite02YCoord
+00:c308 wShadowOAMSprite02
 00:c309 wShadowOAMSprite02XCoord
 00:c30a wShadowOAMSprite02TileID
 00:c30b wShadowOAMSprite02Attributes
@@ -18013,18 +18013,18 @@
 00:c315 wShadowOAMSprite05XCoord
 00:c316 wShadowOAMSprite05TileID
 00:c317 wShadowOAMSprite05Attributes
-00:c318 wShadowOAMSprite06
 00:c318 wShadowOAMSprite06YCoord
+00:c318 wShadowOAMSprite06
 00:c319 wShadowOAMSprite06XCoord
 00:c31a wShadowOAMSprite06TileID
 00:c31b wShadowOAMSprite06Attributes
-00:c31c wShadowOAMSprite07
 00:c31c wShadowOAMSprite07YCoord
+00:c31c wShadowOAMSprite07
 00:c31d wShadowOAMSprite07XCoord
 00:c31e wShadowOAMSprite07TileID
 00:c31f wShadowOAMSprite07Attributes
-00:c320 wShadowOAMSprite08
 00:c320 wShadowOAMSprite08YCoord
+00:c320 wShadowOAMSprite08
 00:c321 wShadowOAMSprite08XCoord
 00:c322 wShadowOAMSprite08TileID
 00:c323 wShadowOAMSprite08Attributes
@@ -18033,8 +18033,8 @@
 00:c325 wShadowOAMSprite09XCoord
 00:c326 wShadowOAMSprite09TileID
 00:c327 wShadowOAMSprite09Attributes
-00:c328 wShadowOAMSprite10
 00:c328 wShadowOAMSprite10YCoord
+00:c328 wShadowOAMSprite10
 00:c329 wShadowOAMSprite10XCoord
 00:c32a wShadowOAMSprite10TileID
 00:c32b wShadowOAMSprite10Attributes
@@ -18043,13 +18043,13 @@
 00:c32d wShadowOAMSprite11XCoord
 00:c32e wShadowOAMSprite11TileID
 00:c32f wShadowOAMSprite11Attributes
-00:c330 wShadowOAMSprite12
 00:c330 wShadowOAMSprite12YCoord
+00:c330 wShadowOAMSprite12
 00:c331 wShadowOAMSprite12XCoord
 00:c332 wShadowOAMSprite12TileID
 00:c333 wShadowOAMSprite12Attributes
-00:c334 wShadowOAMSprite13
 00:c334 wShadowOAMSprite13YCoord
+00:c334 wShadowOAMSprite13
 00:c335 wShadowOAMSprite13XCoord
 00:c336 wShadowOAMSprite13TileID
 00:c337 wShadowOAMSprite13Attributes
@@ -18073,8 +18073,8 @@
 00:c345 wShadowOAMSprite17XCoord
 00:c346 wShadowOAMSprite17TileID
 00:c347 wShadowOAMSprite17Attributes
-00:c348 wShadowOAMSprite18
 00:c348 wShadowOAMSprite18YCoord
+00:c348 wShadowOAMSprite18
 00:c349 wShadowOAMSprite18XCoord
 00:c34a wShadowOAMSprite18TileID
 00:c34b wShadowOAMSprite18Attributes
@@ -18083,13 +18083,13 @@
 00:c34d wShadowOAMSprite19XCoord
 00:c34e wShadowOAMSprite19TileID
 00:c34f wShadowOAMSprite19Attributes
-00:c350 wShadowOAMSprite20
 00:c350 wShadowOAMSprite20YCoord
+00:c350 wShadowOAMSprite20
 00:c351 wShadowOAMSprite20XCoord
 00:c352 wShadowOAMSprite20TileID
 00:c353 wShadowOAMSprite20Attributes
-00:c354 wShadowOAMSprite21
 00:c354 wShadowOAMSprite21YCoord
+00:c354 wShadowOAMSprite21
 00:c355 wShadowOAMSprite21XCoord
 00:c356 wShadowOAMSprite21TileID
 00:c357 wShadowOAMSprite21Attributes
@@ -18098,8 +18098,8 @@
 00:c359 wShadowOAMSprite22XCoord
 00:c35a wShadowOAMSprite22TileID
 00:c35b wShadowOAMSprite22Attributes
-00:c35c wShadowOAMSprite23
 00:c35c wShadowOAMSprite23YCoord
+00:c35c wShadowOAMSprite23
 00:c35d wShadowOAMSprite23XCoord
 00:c35e wShadowOAMSprite23TileID
 00:c35f wShadowOAMSprite23Attributes
@@ -18118,18 +18118,18 @@
 00:c369 wShadowOAMSprite26XCoord
 00:c36a wShadowOAMSprite26TileID
 00:c36b wShadowOAMSprite26Attributes
-00:c36c wShadowOAMSprite27
 00:c36c wShadowOAMSprite27YCoord
+00:c36c wShadowOAMSprite27
 00:c36d wShadowOAMSprite27XCoord
 00:c36e wShadowOAMSprite27TileID
 00:c36f wShadowOAMSprite27Attributes
-00:c370 wShadowOAMSprite28
 00:c370 wShadowOAMSprite28YCoord
+00:c370 wShadowOAMSprite28
 00:c371 wShadowOAMSprite28XCoord
 00:c372 wShadowOAMSprite28TileID
 00:c373 wShadowOAMSprite28Attributes
-00:c374 wShadowOAMSprite29
 00:c374 wShadowOAMSprite29YCoord
+00:c374 wShadowOAMSprite29
 00:c375 wShadowOAMSprite29XCoord
 00:c376 wShadowOAMSprite29TileID
 00:c377 wShadowOAMSprite29Attributes
@@ -18153,18 +18153,18 @@
 00:c385 wShadowOAMSprite33XCoord
 00:c386 wShadowOAMSprite33TileID
 00:c387 wShadowOAMSprite33Attributes
-00:c388 wShadowOAMSprite34
 00:c388 wShadowOAMSprite34YCoord
+00:c388 wShadowOAMSprite34
 00:c389 wShadowOAMSprite34XCoord
 00:c38a wShadowOAMSprite34TileID
 00:c38b wShadowOAMSprite34Attributes
-00:c38c wShadowOAMSprite35
 00:c38c wShadowOAMSprite35YCoord
+00:c38c wShadowOAMSprite35
 00:c38d wShadowOAMSprite35XCoord
 00:c38e wShadowOAMSprite35TileID
 00:c38f wShadowOAMSprite35Attributes
-00:c390 wShadowOAMSprite36YCoord
 00:c390 wShadowOAMSprite36
+00:c390 wShadowOAMSprite36YCoord
 00:c391 wShadowOAMSprite36XCoord
 00:c392 wShadowOAMSprite36TileID
 00:c393 wShadowOAMSprite36Attributes
@@ -18239,8 +18239,8 @@
 00:c52d wShadowOAMBackupSprite09XCoord
 00:c52e wShadowOAMBackupSprite09TileID
 00:c52f wShadowOAMBackupSprite09Attributes
-00:c530 wShadowOAMBackupSprite10YCoord
 00:c530 wShadowOAMBackupSprite10
+00:c530 wShadowOAMBackupSprite10YCoord
 00:c531 wShadowOAMBackupSprite10XCoord
 00:c532 wShadowOAMBackupSprite10TileID
 00:c533 wShadowOAMBackupSprite10Attributes
@@ -18269,8 +18269,8 @@
 00:c545 wShadowOAMBackupSprite15XCoord
 00:c546 wShadowOAMBackupSprite15TileID
 00:c547 wShadowOAMBackupSprite15Attributes
-00:c548 wShadowOAMBackupSprite16
 00:c548 wShadowOAMBackupSprite16YCoord
+00:c548 wShadowOAMBackupSprite16
 00:c549 wShadowOAMBackupSprite16XCoord
 00:c54a wShadowOAMBackupSprite16TileID
 00:c54b wShadowOAMBackupSprite16Attributes
@@ -18443,10 +18443,10 @@
 00:cc5b wMonPartySpritesSavedOAM
 00:cc5b wElevatorWarpMaps
 00:cc5b wVermilionDockTileMapBuffer
-00:cc5b wSlotMachineSevenAndBarModeChance
-00:cc5b wOaksAideRewardItemName
 00:cc5b wHallOfFame
+00:cc5b wOaksAideRewardItemName
 00:cc5b wDexRatingNumMonsSeen
+00:cc5b wSlotMachineSevenAndBarModeChance
 00:cc5b wUnusedFlag
 00:cc5b wFilteredBagItems
 00:cc5c wDexRatingNumMonsOwned
@@ -18492,10 +18492,10 @@
 00:cd05 wEnemyNumHits
 00:cd05 wLuckySlotHiddenObjectIndex
 00:cd05 wEnemyBideAccumulatedDamage
-00:cd0f wPlayerMonUnmodifiedLevel
 00:cd0f wVermilionDockTileMapBufferEnd
-00:cd0f wMiscBattleDataEnd
 00:cd0f wInGameTradeGiveMonSpecies
+00:cd0f wPlayerMonUnmodifiedLevel
+00:cd0f wMiscBattleDataEnd
 00:cd10 wPlayerMonUnmodifiedMaxHP
 00:cd10 wInGameTradeTextPointerTablePointer
 00:cd12 wPlayerMonUnmodifiedAttack
@@ -18544,6 +18544,7 @@
 00:cd3d wNumShakes
 00:cd3d wPPRestoreItem
 00:cd3d wDexMaxSeenMon
+00:cd3d wWhichTrade
 00:cd3d wChangeBoxSavedMapTextPointer
 00:cd3d wBadgeNumberTile
 00:cd3d wOptionsTextSpeedCursorX
@@ -18565,22 +18566,21 @@
 00:cd3d wChargeMoveNum
 00:cd3d wPriceTemp
 00:cd3d wTitleMonSpecies
-00:cd3d wFieldMoves
-00:cd3d wPlayerCharacterOAMTile
-00:cd3d wCoordIndex
-00:cd3d wTempSCX
-00:cd3d wUnusedCreditsByte
-00:cd3d wBoxMonCounts
-00:cd3d wHoFTeamIndex
-00:cd3d wWhichTrade
-00:cd3d wSavedY
-00:cd3d wDayCareStartLevel
+00:cd3d wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 00:cd3d wMoveDownSmallStarsOAMCount
+00:cd3d wUnusedCreditsByte
+00:cd3d wFieldMoves
+00:cd3d wHoFTeamIndex
+00:cd3d wTempSCX
+00:cd3d wCoordIndex
+00:cd3d wDayCareStartLevel
+00:cd3d wBoxMonCounts
+00:cd3d wSavedY
+00:cd3d wPlayerCharacterOAMTile
+00:cd3d wStoppingWhichSlotMachineWheel
 00:cd3d wWereAnyMonsAsleep
 00:cd3d wFallingObjectsMovementData
 00:cd3d wTrainerSpriteOffset
-00:cd3d wPlayerSpinWhileMovingUpOrDownAnimDeltaY
-00:cd3d wStoppingWhichSlotMachineWheel
 00:cd3e wNumCreditsMonsDisplayed
 00:cd3e wTrainerInfoTextBoxWidth
 00:cd3e wTrainerEngageDistance
@@ -18596,8 +18596,8 @@
 00:cd3e wBattleTransitionCircleScreenQuadrantX
 00:cd3e wTradingWhichEnemyMon
 00:cd3e wTradedEnemyMonSpecies
-00:cd3e wBadgeNameTile
 00:cd3e wRivalStarterBallSpriteIndex
+00:cd3e wBadgeNameTile
 00:cd3e wHoFPartyMonIndex
 00:cd3e wOptionsBattleAnimCursorX
 00:cd3f wJigglypuffFacingDirections
@@ -18608,27 +18608,27 @@
 00:cd3f wSlotMachineWheel2Offset
 00:cd3f wFlyAnimBirdSpriteImageIndex
 00:cd3f wNameOfPlayerMonToBeTraded
+00:cd3f wDayCareTotalCost
 00:cd3f wHoFMonLevel
 00:cd3f wTrainerFacingDirection
 00:cd3f wHiddenObjectIndex
-00:cd3f wDayCareTotalCost
-00:cd3f wHUDGraphicsTiles
 00:cd3f wOptionsBattleStyleCursorX
+00:cd3f wHUDGraphicsTiles
 00:cd40 wOptionsCancelCursorX
 00:cd40 wTrainerScreenY
+00:cd40 wSlotMachineWheel3Offset
 00:cd40 wPlayerSpinInPlaceAnimSoundID
 00:cd40 wHiddenObjectY
-00:cd40 wSlotMachineWheel3Offset
 00:cd40 wHoFMonOrPlayer
 00:cd41 wSlotMachineWheel1BottomTile
 00:cd41 wSlotMachineWinningSymbol
 00:cd41 wHoFTeamIndex2
 00:cd41 wNumFieldMoves
+00:cd41 wDayCarePerLevelCost
 00:cd41 wTradedPlayerMonOT
-00:cd41 wHiddenItemOrCoinsIndex
 00:cd41 wHiddenObjectX
 00:cd41 wTrainerScreenX
-00:cd41 wDayCarePerLevelCost
+00:cd41 wHiddenItemOrCoinsIndex
 00:cd42 wSlotMachineWheel1MiddleTile
 00:cd42 wHoFTeamNo
 00:cd42 wFieldMovesLeftmostXCoord
@@ -18638,8 +18638,8 @@
 00:cd45 wSlotMachineWheel2MiddleTile
 00:cd46 wTempCoins1
 00:cd46 wSlotMachineWheel2TopTile
-00:cd47 wBattleTransitionSpiralDirection
 00:cd47 wSlotMachineWheel3BottomTile
+00:cd47 wBattleTransitionSpiralDirection
 00:cd48 wFacingDirectionList
 00:cd48 wSlotMachineWheel3MiddleTile
 00:cd49 wTempObtainedBadgesBooleans
@@ -18661,8 +18661,8 @@
 00:cd50 wWhichEmotionBubble
 00:cd59 wTradedEnemyMonOTID
 00:cd5b wGymTrashCanIndex
-00:cd5b wOAMBaseTile
 00:cd5b wStandingOnWarpPadOrHole
+00:cd5b wOAMBaseTile
 00:cd5c wSymmetricSpriteOAMAttributes
 00:cd5d wMonPartySpriteSpecies
 00:cd5e wLeftGBMonSpecies
@@ -18670,8 +18670,8 @@
 00:cd60 wMiscFlags
 00:cd6a wActionResultOrTookBattleTurn
 00:cd6b wJoyIgnore
-00:cd6c wNumMovesMinusOne
 00:cd6c wDownscaledMonSize
+00:cd6c wNumMovesMinusOne
 00:cd6d wNameBuffer
 00:cd6d wMoveData
 00:cd6d wPayDayMoney
@@ -18909,10 +18909,10 @@
 00:d08a wFlashScreenLongCounter
 00:d08a wSpiralBallsBaseY
 00:d08a wFallingObjectMovementByte
-00:d08a wTradedMonMovingRight
 00:d08a wOptionsInitialized
-00:d08a wUnusedWaterDropletsByte
+00:d08a wTradedMonMovingRight
 00:d08a wNewSlotMachineBallTile
+00:d08a wUnusedWaterDropletsByte
 00:d08b wNumFallingObjects
 00:d08b wSubAnimTransform
 00:d08b wSpiralBallsBaseX
@@ -18998,8 +18998,8 @@
 00:d11e wUsingPPUp
 00:d11e wMoveGrammar
 00:d11e wTempTMHM
-00:d11e wTypeEffectiveness
 00:d11e wNumSetBits
+00:d11e wTypeEffectiveness
 00:d11e wNamedObjectIndex
 00:d11e wCalculateWhoseStats
 00:d11f wForcePlayerToChooseMon
@@ -19119,8 +19119,8 @@
 00:d1de wPartyMon3DVs
 00:d1e0 wPartyMon3PP
 00:d1e4 wPartyMon3Level
-00:d1e5 wPartyMon3Stats
 00:d1e5 wPartyMon3MaxHP
+00:d1e5 wPartyMon3Stats
 00:d1e7 wPartyMon3Attack
 00:d1e9 wPartyMon3Defense
 00:d1eb wPartyMon3Speed
@@ -19177,8 +19177,8 @@
 00:d241 wPartyMon5Defense
 00:d243 wPartyMon5Speed
 00:d245 wPartyMon5Special
-00:d247 wPartyMon6Species
 00:d247 wPartyMon6
+00:d247 wPartyMon6Species
 00:d248 wPartyMon6HP
 00:d24a wPartyMon6BoxLevel
 00:d24b wPartyMon6Status
@@ -19577,8 +19577,8 @@
 00:d94e wEnemyMon4Defense
 00:d950 wEnemyMon4Speed
 00:d952 wEnemyMon4Special
-00:d954 wEnemyMon5Species
 00:d954 wEnemyMon5
+00:d954 wEnemyMon5Species
 00:d955 wEnemyMon5HP
 00:d957 wEnemyMon5BoxLevel
 00:d958 wEnemyMon5Status
@@ -19608,8 +19608,8 @@
 00:d981 wEnemyMon6HP
 00:d983 wEnemyMon6BoxLevel
 00:d984 wEnemyMon6Status
-00:d985 wEnemyMon6Type1
 00:d985 wEnemyMon6Type
+00:d985 wEnemyMon6Type1
 00:d986 wEnemyMon6Type2
 00:d987 wEnemyMon6CatchRate
 00:d988 wEnemyMon6Moves
@@ -19756,8 +19756,8 @@
 00:db12 wBoxMon4SpecialExp
 00:db14 wBoxMon4DVs
 00:db16 wBoxMon4PP
-00:db1a wBoxMon5Species
 00:db1a wBoxMon5
+00:db1a wBoxMon5Species
 00:db1b wBoxMon5HP
 00:db1d wBoxMon5BoxLevel
 00:db1e wBoxMon5Status
@@ -19837,8 +19837,8 @@
 00:db9f wBoxMon9HP
 00:dba1 wBoxMon9BoxLevel
 00:dba2 wBoxMon9Status
-00:dba3 wBoxMon9Type
 00:dba3 wBoxMon9Type1
+00:dba3 wBoxMon9Type
 00:dba4 wBoxMon9Type2
 00:dba5 wBoxMon9CatchRate
 00:dba6 wBoxMon9Moves
@@ -19946,8 +19946,8 @@
 00:dc5c wBoxMon14SpecialExp
 00:dc5e wBoxMon14DVs
 00:dc60 wBoxMon14PP
-00:dc64 wBoxMon15Species
 00:dc64 wBoxMon15
+00:dc64 wBoxMon15Species
 00:dc65 wBoxMon15HP
 00:dc67 wBoxMon15BoxLevel
 00:dc68 wBoxMon15Status
@@ -19989,8 +19989,8 @@
 00:dca7 wBoxMon17HP
 00:dca9 wBoxMon17BoxLevel
 00:dcaa wBoxMon17Status
-00:dcab wBoxMon17Type1
 00:dcab wBoxMon17Type
+00:dcab wBoxMon17Type1
 00:dcac wBoxMon17Type2
 00:dcad wBoxMon17CatchRate
 00:dcae wBoxMon17Moves
@@ -20022,8 +20022,8 @@
 00:dce0 wBoxMon18SpecialExp
 00:dce2 wBoxMon18DVs
 00:dce4 wBoxMon18PP
-00:dce8 wBoxMon19
 00:dce8 wBoxMon19Species
+00:dce8 wBoxMon19
 00:dce9 wBoxMon19HP
 00:dceb wBoxMon19BoxLevel
 00:dcec wBoxMon19Status
@@ -20119,18 +20119,18 @@
 00:ff8b hPreviousTileset
 00:ff8b hOAMTile
 00:ff8b hBaseTileID
+00:ff8b hEastWestConnectedMapWidth
 00:ff8b hItemPrice
 00:ff8b hDexWeight
-00:ff8b hEastWestConnectedMapWidth
 00:ff8b hSpriteInterlaceCounter
 00:ff8b hRLEByteValue
 00:ff8c hNorthSouthConnectedMapWidth
 00:ff8c hMapWidth
 00:ff8c hSpriteHeight
 00:ff8c hPartyMonIndex
-00:ff8c hSpriteIndex
-00:ff8c hTextID
 00:ff8c hSlidingRegionSize
+00:ff8c hTextID
+00:ff8c hSpriteIndex
 00:ff8c hDownArrowBlinkCount2
 00:ff8d hEnemySpeed
 00:ff8d hLoadSpriteTemp1
@@ -20155,13 +20155,13 @@
 00:ff94 hSpritePriority
 00:ff95 hSwapItemID
 00:ff95 hNPCPlayerYDistance
-00:ff95 hNPCSpriteOffset
 00:ff95 hDividend
 00:ff95 hSignCoordPointer
-00:ff95 hQuotient
-00:ff95 hNPCMovementDirections2Index
 00:ff95 hPastLeadingZeros
+00:ff95 hQuotient
 00:ff95 hProduct
+00:ff95 hNPCMovementDirections2Index
+00:ff95 hNPCSpriteOffset
 00:ff95 hSwapTemp
 00:ff96 hMutateWY
 00:ff96 hSwapItemQuantity
@@ -20245,12 +20245,12 @@
 00:ffdc hVendingMachinePrice
 00:ffdc hPlayerYCoord
 00:ffdc hOaksAideRewardItem
-00:ffdc hItemToRemoveIndex
 00:ffdc hGymGateAnswer
+00:ffdc hItemToRemoveIndex
 00:ffdd hPlayerXCoord
 00:ffdd hOaksAideNumMonsOwned
-00:ffe0 hUnlockedSilphCoDoors
 00:ffe0 hBackupGymGateIndex
+00:ffe0 hUnlockedSilphCoDoors
 00:ffe1 hStartTileID
 00:ffe4 hNewPartyLength
 00:ffe5 hDividend2
--- a/pokeblue_debug.map
+++ b/pokeblue_debug.map
@@ -362,8 +362,8 @@ ROM0 bank #0:
 	         $1765 = Forest_Coll
 	         $1775 = House_Coll
 	         $177f = Gate_Coll
-	         $177f = ForestGate_Coll
 	         $177f = Museum_Coll
+	         $177f = ForestGate_Coll
 	         $178a = Ship_Coll
 	         $1795 = ShipPort_Coll
 	         $179a = Cemetery_Coll
@@ -9233,8 +9233,8 @@ ROMX bank #19:
 	         $5e76 = BlackbeltPic
 	         $6049 = Rival1Pic
 	         $615f = ProfOakPic
-	         $627d = ScientistPic
 	         $627d = ChiefPic
+	         $627d = ScientistPic
 	         $63be = GiovanniPic
 	         $649f = RocketPic
 	         $6635 = CooltrainerMPic
@@ -12373,9 +12373,9 @@ ROMX bank #26:
 	         $55ff = Gate_GFX
 	         $55ff = Museum_GFX
 	         $55ff = ForestGate_GFX
+	         $5bef = ForestGate_Block
 	         $5bef = Gate_Block
 	         $5bef = Museum_Block
-	         $5bef = ForestGate_Block
 	         $63ef = Forest_GFX
 	         $69ef = Forest_Block
 	         $71ef = Facility_GFX
@@ -17763,8 +17763,8 @@ VRAM bank #0:
 	         $8000 = vChars0
 	         $8000 = vSprites
 	         $8000 = vNPCSprites
-	         $8800 = vTitleLogo
 	         $8800 = vFont
+	         $8800 = vTitleLogo
 	         $8800 = vChars1
 	         $8800 = vNPCSprites2
 	         $9000 = vFrontPic
@@ -17917,8 +17917,8 @@ WRAM0 bank #0:
 	         $c12b = wSprite02StateData1XAdjusted
 	         $c12c = wSprite02StateData1CollisionData
 	         $c130 = wSprite02StateData1End
-	         $c130 = wSprite03StateData1
 	         $c130 = wSprite03StateData1PictureID
+	         $c130 = wSprite03StateData1
 	         $c131 = wSprite03StateData1MovementStatus
 	         $c132 = wSprite03StateData1ImageIndex
 	         $c133 = wSprite03StateData1YStepVector
@@ -17947,8 +17947,8 @@ WRAM0 bank #0:
 	         $c14b = wSprite04StateData1XAdjusted
 	         $c14c = wSprite04StateData1CollisionData
 	         $c150 = wSprite05StateData1PictureID
-	         $c150 = wSprite04StateData1End
 	         $c150 = wSprite05StateData1
+	         $c150 = wSprite04StateData1End
 	         $c151 = wSprite05StateData1MovementStatus
 	         $c152 = wSprite05StateData1ImageIndex
 	         $c153 = wSprite05StateData1YStepVector
@@ -18066,9 +18066,9 @@ WRAM0 bank #0:
 	         $c1ca = wSprite12StateData1YAdjusted
 	         $c1cb = wSprite12StateData1XAdjusted
 	         $c1cc = wSprite12StateData1CollisionData
+	         $c1d0 = wSprite13StateData1PictureID
 	         $c1d0 = wSprite12StateData1End
 	         $c1d0 = wSprite13StateData1
-	         $c1d0 = wSprite13StateData1PictureID
 	         $c1d1 = wSprite13StateData1MovementStatus
 	         $c1d2 = wSprite13StateData1ImageIndex
 	         $c1d3 = wSprite13StateData1YStepVector
@@ -18081,9 +18081,9 @@ WRAM0 bank #0:
 	         $c1da = wSprite13StateData1YAdjusted
 	         $c1db = wSprite13StateData1XAdjusted
 	         $c1dc = wSprite13StateData1CollisionData
+	         $c1e0 = wSprite13StateData1End
 	         $c1e0 = wSprite14StateData1
 	         $c1e0 = wSprite14StateData1PictureID
-	         $c1e0 = wSprite13StateData1End
 	         $c1e1 = wSprite14StateData1MovementStatus
 	         $c1e2 = wSprite14StateData1ImageIndex
 	         $c1e3 = wSprite14StateData1YStepVector
@@ -18097,8 +18097,8 @@ WRAM0 bank #0:
 	         $c1eb = wSprite14StateData1XAdjusted
 	         $c1ec = wSprite14StateData1CollisionData
 	         $c1f0 = wSprite15StateData1PictureID
-	         $c1f0 = wSprite14StateData1End
 	         $c1f0 = wSprite15StateData1
+	         $c1f0 = wSprite14StateData1End
 	         $c1f1 = wSprite15StateData1MovementStatus
 	         $c1f2 = wSprite15StateData1ImageIndex
 	         $c1f3 = wSprite15StateData1YStepVector
@@ -18112,9 +18112,9 @@ WRAM0 bank #0:
 	         $c1fb = wSprite15StateData1XAdjusted
 	         $c1fc = wSprite15StateData1CollisionData
 	         $c200 = wSpriteStateData2
-	         $c200 = wSprite15StateData1End
 	         $c200 = wSpritePlayerStateData2WalkAnimationCounter
 	         $c200 = wSpritePlayerStateData2
+	         $c200 = wSprite15StateData1End
 	         $c202 = wSpritePlayerStateData2YDisplacement
 	         $c203 = wSpritePlayerStateData2XDisplacement
 	         $c204 = wSpritePlayerStateData2MapY
@@ -18125,9 +18125,9 @@ WRAM0 bank #0:
 	         $c209 = wSpritePlayerStateData2OrigFacingDirection
 	         $c20d = wSpritePlayerStateData2PictureID
 	         $c20e = wSpritePlayerStateData2ImageBaseOffset
+	         $c210 = wSprite01StateData2
 	         $c210 = wSpritePlayerStateData2End
 	         $c210 = wSprite01StateData2WalkAnimationCounter
-	         $c210 = wSprite01StateData2
 	         $c212 = wSprite01StateData2YDisplacement
 	         $c213 = wSprite01StateData2XDisplacement
 	         $c214 = wSprite01StateData2MapY
@@ -18139,8 +18139,8 @@ WRAM0 bank #0:
 	         $c21d = wSprite01StateData2PictureID
 	         $c21e = wSprite01StateData2ImageBaseOffset
 	         $c220 = wSprite02StateData2WalkAnimationCounter
-	         $c220 = wSprite01StateData2End
 	         $c220 = wSprite02StateData2
+	         $c220 = wSprite01StateData2End
 	         $c222 = wSprite02StateData2YDisplacement
 	         $c223 = wSprite02StateData2XDisplacement
 	         $c224 = wSprite02StateData2MapY
@@ -18152,8 +18152,8 @@ WRAM0 bank #0:
 	         $c22d = wSprite02StateData2PictureID
 	         $c22e = wSprite02StateData2ImageBaseOffset
 	         $c230 = wSprite03StateData2
-	         $c230 = wSprite03StateData2WalkAnimationCounter
 	         $c230 = wSprite02StateData2End
+	         $c230 = wSprite03StateData2WalkAnimationCounter
 	         $c232 = wSprite03StateData2YDisplacement
 	         $c233 = wSprite03StateData2XDisplacement
 	         $c234 = wSprite03StateData2MapY
@@ -18164,9 +18164,9 @@ WRAM0 bank #0:
 	         $c239 = wSprite03StateData2OrigFacingDirection
 	         $c23d = wSprite03StateData2PictureID
 	         $c23e = wSprite03StateData2ImageBaseOffset
-	         $c240 = wSprite04StateData2WalkAnimationCounter
 	         $c240 = wSprite04StateData2
 	         $c240 = wSprite03StateData2End
+	         $c240 = wSprite04StateData2WalkAnimationCounter
 	         $c242 = wSprite04StateData2YDisplacement
 	         $c243 = wSprite04StateData2XDisplacement
 	         $c244 = wSprite04StateData2MapY
@@ -18177,9 +18177,9 @@ WRAM0 bank #0:
 	         $c249 = wSprite04StateData2OrigFacingDirection
 	         $c24d = wSprite04StateData2PictureID
 	         $c24e = wSprite04StateData2ImageBaseOffset
-	         $c250 = wSprite04StateData2End
 	         $c250 = wSprite05StateData2WalkAnimationCounter
 	         $c250 = wSprite05StateData2
+	         $c250 = wSprite04StateData2End
 	         $c252 = wSprite05StateData2YDisplacement
 	         $c253 = wSprite05StateData2XDisplacement
 	         $c254 = wSprite05StateData2MapY
@@ -18190,9 +18190,9 @@ WRAM0 bank #0:
 	         $c259 = wSprite05StateData2OrigFacingDirection
 	         $c25d = wSprite05StateData2PictureID
 	         $c25e = wSprite05StateData2ImageBaseOffset
-	         $c260 = wSprite06StateData2
-	         $c260 = wSprite05StateData2End
 	         $c260 = wSprite06StateData2WalkAnimationCounter
+	         $c260 = wSprite05StateData2End
+	         $c260 = wSprite06StateData2
 	         $c262 = wSprite06StateData2YDisplacement
 	         $c263 = wSprite06StateData2XDisplacement
 	         $c264 = wSprite06StateData2MapY
@@ -18203,8 +18203,8 @@ WRAM0 bank #0:
 	         $c269 = wSprite06StateData2OrigFacingDirection
 	         $c26d = wSprite06StateData2PictureID
 	         $c26e = wSprite06StateData2ImageBaseOffset
-	         $c270 = wSprite06StateData2End
 	         $c270 = wSprite07StateData2
+	         $c270 = wSprite06StateData2End
 	         $c270 = wSprite07StateData2WalkAnimationCounter
 	         $c272 = wSprite07StateData2YDisplacement
 	         $c273 = wSprite07StateData2XDisplacement
@@ -18216,9 +18216,9 @@ WRAM0 bank #0:
 	         $c279 = wSprite07StateData2OrigFacingDirection
 	         $c27d = wSprite07StateData2PictureID
 	         $c27e = wSprite07StateData2ImageBaseOffset
-	         $c280 = wSprite07StateData2End
-	         $c280 = wSprite08StateData2
 	         $c280 = wSprite08StateData2WalkAnimationCounter
+	         $c280 = wSprite08StateData2
+	         $c280 = wSprite07StateData2End
 	         $c282 = wSprite08StateData2YDisplacement
 	         $c283 = wSprite08StateData2XDisplacement
 	         $c284 = wSprite08StateData2MapY
@@ -18229,9 +18229,9 @@ WRAM0 bank #0:
 	         $c289 = wSprite08StateData2OrigFacingDirection
 	         $c28d = wSprite08StateData2PictureID
 	         $c28e = wSprite08StateData2ImageBaseOffset
+	         $c290 = wSprite09StateData2WalkAnimationCounter
 	         $c290 = wSprite09StateData2
 	         $c290 = wSprite08StateData2End
-	         $c290 = wSprite09StateData2WalkAnimationCounter
 	         $c292 = wSprite09StateData2YDisplacement
 	         $c293 = wSprite09StateData2XDisplacement
 	         $c294 = wSprite09StateData2MapY
@@ -18242,9 +18242,9 @@ WRAM0 bank #0:
 	         $c299 = wSprite09StateData2OrigFacingDirection
 	         $c29d = wSprite09StateData2PictureID
 	         $c29e = wSprite09StateData2ImageBaseOffset
-	         $c2a0 = wSprite10StateData2WalkAnimationCounter
-	         $c2a0 = wSprite09StateData2End
 	         $c2a0 = wSprite10StateData2
+	         $c2a0 = wSprite09StateData2End
+	         $c2a0 = wSprite10StateData2WalkAnimationCounter
 	         $c2a2 = wSprite10StateData2YDisplacement
 	         $c2a3 = wSprite10StateData2XDisplacement
 	         $c2a4 = wSprite10StateData2MapY
@@ -18255,8 +18255,8 @@ WRAM0 bank #0:
 	         $c2a9 = wSprite10StateData2OrigFacingDirection
 	         $c2ad = wSprite10StateData2PictureID
 	         $c2ae = wSprite10StateData2ImageBaseOffset
-	         $c2b0 = wSprite11StateData2
 	         $c2b0 = wSprite11StateData2WalkAnimationCounter
+	         $c2b0 = wSprite11StateData2
 	         $c2b0 = wSprite10StateData2End
 	         $c2b2 = wSprite11StateData2YDisplacement
 	         $c2b3 = wSprite11StateData2XDisplacement
@@ -18281,8 +18281,8 @@ WRAM0 bank #0:
 	         $c2c9 = wSprite12StateData2OrigFacingDirection
 	         $c2cd = wSprite12StateData2PictureID
 	         $c2ce = wSprite12StateData2ImageBaseOffset
-	         $c2d0 = wSprite13StateData2
 	         $c2d0 = wSprite13StateData2WalkAnimationCounter
+	         $c2d0 = wSprite13StateData2
 	         $c2d0 = wSprite12StateData2End
 	         $c2d2 = wSprite13StateData2YDisplacement
 	         $c2d3 = wSprite13StateData2XDisplacement
@@ -18307,9 +18307,9 @@ WRAM0 bank #0:
 	         $c2e9 = wSprite14StateData2OrigFacingDirection
 	         $c2ed = wSprite14StateData2PictureID
 	         $c2ee = wSprite14StateData2ImageBaseOffset
+	         $c2f0 = wSprite14StateData2End
 	         $c2f0 = wSprite15StateData2WalkAnimationCounter
 	         $c2f0 = wSprite15StateData2
-	         $c2f0 = wSprite14StateData2End
 	         $c2f2 = wSprite15StateData2YDisplacement
 	         $c2f3 = wSprite15StateData2XDisplacement
 	         $c2f4 = wSprite15StateData2MapY
@@ -18320,22 +18320,22 @@ WRAM0 bank #0:
 	         $c2f9 = wSprite15StateData2OrigFacingDirection
 	         $c2fd = wSprite15StateData2PictureID
 	         $c2fe = wSprite15StateData2ImageBaseOffset
-	         $c300 = wSprite15StateData2End
 	         $c300 = wSpriteDataEnd
+	         $c300 = wSprite15StateData2End
 	SECTION: $c300-$c39f ($00a0 bytes) ["OAM Buffer"]
+	         $c300 = wShadowOAMSprite00YCoord
 	         $c300 = wShadowOAM
 	         $c300 = wShadowOAMSprite00
-	         $c300 = wShadowOAMSprite00YCoord
 	         $c301 = wShadowOAMSprite00XCoord
 	         $c302 = wShadowOAMSprite00TileID
 	         $c303 = wShadowOAMSprite00Attributes
-	         $c304 = wShadowOAMSprite01YCoord
 	         $c304 = wShadowOAMSprite01
+	         $c304 = wShadowOAMSprite01YCoord
 	         $c305 = wShadowOAMSprite01XCoord
 	         $c306 = wShadowOAMSprite01TileID
 	         $c307 = wShadowOAMSprite01Attributes
-	         $c308 = wShadowOAMSprite02
 	         $c308 = wShadowOAMSprite02YCoord
+	         $c308 = wShadowOAMSprite02
 	         $c309 = wShadowOAMSprite02XCoord
 	         $c30a = wShadowOAMSprite02TileID
 	         $c30b = wShadowOAMSprite02Attributes
@@ -18354,18 +18354,18 @@ WRAM0 bank #0:
 	         $c315 = wShadowOAMSprite05XCoord
 	         $c316 = wShadowOAMSprite05TileID
 	         $c317 = wShadowOAMSprite05Attributes
-	         $c318 = wShadowOAMSprite06
 	         $c318 = wShadowOAMSprite06YCoord
+	         $c318 = wShadowOAMSprite06
 	         $c319 = wShadowOAMSprite06XCoord
 	         $c31a = wShadowOAMSprite06TileID
 	         $c31b = wShadowOAMSprite06Attributes
-	         $c31c = wShadowOAMSprite07
 	         $c31c = wShadowOAMSprite07YCoord
+	         $c31c = wShadowOAMSprite07
 	         $c31d = wShadowOAMSprite07XCoord
 	         $c31e = wShadowOAMSprite07TileID
 	         $c31f = wShadowOAMSprite07Attributes
-	         $c320 = wShadowOAMSprite08
 	         $c320 = wShadowOAMSprite08YCoord
+	         $c320 = wShadowOAMSprite08
 	         $c321 = wShadowOAMSprite08XCoord
 	         $c322 = wShadowOAMSprite08TileID
 	         $c323 = wShadowOAMSprite08Attributes
@@ -18374,8 +18374,8 @@ WRAM0 bank #0:
 	         $c325 = wShadowOAMSprite09XCoord
 	         $c326 = wShadowOAMSprite09TileID
 	         $c327 = wShadowOAMSprite09Attributes
-	         $c328 = wShadowOAMSprite10
 	         $c328 = wShadowOAMSprite10YCoord
+	         $c328 = wShadowOAMSprite10
 	         $c329 = wShadowOAMSprite10XCoord
 	         $c32a = wShadowOAMSprite10TileID
 	         $c32b = wShadowOAMSprite10Attributes
@@ -18384,13 +18384,13 @@ WRAM0 bank #0:
 	         $c32d = wShadowOAMSprite11XCoord
 	         $c32e = wShadowOAMSprite11TileID
 	         $c32f = wShadowOAMSprite11Attributes
-	         $c330 = wShadowOAMSprite12
 	         $c330 = wShadowOAMSprite12YCoord
+	         $c330 = wShadowOAMSprite12
 	         $c331 = wShadowOAMSprite12XCoord
 	         $c332 = wShadowOAMSprite12TileID
 	         $c333 = wShadowOAMSprite12Attributes
-	         $c334 = wShadowOAMSprite13
 	         $c334 = wShadowOAMSprite13YCoord
+	         $c334 = wShadowOAMSprite13
 	         $c335 = wShadowOAMSprite13XCoord
 	         $c336 = wShadowOAMSprite13TileID
 	         $c337 = wShadowOAMSprite13Attributes
@@ -18414,8 +18414,8 @@ WRAM0 bank #0:
 	         $c345 = wShadowOAMSprite17XCoord
 	         $c346 = wShadowOAMSprite17TileID
 	         $c347 = wShadowOAMSprite17Attributes
-	         $c348 = wShadowOAMSprite18
 	         $c348 = wShadowOAMSprite18YCoord
+	         $c348 = wShadowOAMSprite18
 	         $c349 = wShadowOAMSprite18XCoord
 	         $c34a = wShadowOAMSprite18TileID
 	         $c34b = wShadowOAMSprite18Attributes
@@ -18424,13 +18424,13 @@ WRAM0 bank #0:
 	         $c34d = wShadowOAMSprite19XCoord
 	         $c34e = wShadowOAMSprite19TileID
 	         $c34f = wShadowOAMSprite19Attributes
-	         $c350 = wShadowOAMSprite20
 	         $c350 = wShadowOAMSprite20YCoord
+	         $c350 = wShadowOAMSprite20
 	         $c351 = wShadowOAMSprite20XCoord
 	         $c352 = wShadowOAMSprite20TileID
 	         $c353 = wShadowOAMSprite20Attributes
-	         $c354 = wShadowOAMSprite21
 	         $c354 = wShadowOAMSprite21YCoord
+	         $c354 = wShadowOAMSprite21
 	         $c355 = wShadowOAMSprite21XCoord
 	         $c356 = wShadowOAMSprite21TileID
 	         $c357 = wShadowOAMSprite21Attributes
@@ -18439,8 +18439,8 @@ WRAM0 bank #0:
 	         $c359 = wShadowOAMSprite22XCoord
 	         $c35a = wShadowOAMSprite22TileID
 	         $c35b = wShadowOAMSprite22Attributes
-	         $c35c = wShadowOAMSprite23
 	         $c35c = wShadowOAMSprite23YCoord
+	         $c35c = wShadowOAMSprite23
 	         $c35d = wShadowOAMSprite23XCoord
 	         $c35e = wShadowOAMSprite23TileID
 	         $c35f = wShadowOAMSprite23Attributes
@@ -18459,8 +18459,8 @@ WRAM0 bank #0:
 	         $c369 = wShadowOAMSprite26XCoord
 	         $c36a = wShadowOAMSprite26TileID
 	         $c36b = wShadowOAMSprite26Attributes
-	         $c36c = wShadowOAMSprite27
 	         $c36c = wShadowOAMSprite27YCoord
+	         $c36c = wShadowOAMSprite27
 	         $c36d = wShadowOAMSprite27XCoord
 	         $c36e = wShadowOAMSprite27TileID
 	         $c36f = wShadowOAMSprite27Attributes
@@ -18469,8 +18469,8 @@ WRAM0 bank #0:
 	         $c371 = wShadowOAMSprite28XCoord
 	         $c372 = wShadowOAMSprite28TileID
 	         $c373 = wShadowOAMSprite28Attributes
-	         $c374 = wShadowOAMSprite29
 	         $c374 = wShadowOAMSprite29YCoord
+	         $c374 = wShadowOAMSprite29
 	         $c375 = wShadowOAMSprite29XCoord
 	         $c376 = wShadowOAMSprite29TileID
 	         $c377 = wShadowOAMSprite29Attributes
@@ -18494,18 +18494,18 @@ WRAM0 bank #0:
 	         $c385 = wShadowOAMSprite33XCoord
 	         $c386 = wShadowOAMSprite33TileID
 	         $c387 = wShadowOAMSprite33Attributes
-	         $c388 = wShadowOAMSprite34
 	         $c388 = wShadowOAMSprite34YCoord
+	         $c388 = wShadowOAMSprite34
 	         $c389 = wShadowOAMSprite34XCoord
 	         $c38a = wShadowOAMSprite34TileID
 	         $c38b = wShadowOAMSprite34Attributes
-	         $c38c = wShadowOAMSprite35
 	         $c38c = wShadowOAMSprite35YCoord
+	         $c38c = wShadowOAMSprite35
 	         $c38d = wShadowOAMSprite35XCoord
 	         $c38e = wShadowOAMSprite35TileID
 	         $c38f = wShadowOAMSprite35Attributes
-	         $c390 = wShadowOAMSprite36YCoord
 	         $c390 = wShadowOAMSprite36
+	         $c390 = wShadowOAMSprite36YCoord
 	         $c391 = wShadowOAMSprite36XCoord
 	         $c392 = wShadowOAMSprite36TileID
 	         $c393 = wShadowOAMSprite36Attributes
@@ -18581,8 +18581,8 @@ WRAM0 bank #0:
 	         $c52d = wShadowOAMBackupSprite09XCoord
 	         $c52e = wShadowOAMBackupSprite09TileID
 	         $c52f = wShadowOAMBackupSprite09Attributes
-	         $c530 = wShadowOAMBackupSprite10YCoord
 	         $c530 = wShadowOAMBackupSprite10
+	         $c530 = wShadowOAMBackupSprite10YCoord
 	         $c531 = wShadowOAMBackupSprite10XCoord
 	         $c532 = wShadowOAMBackupSprite10TileID
 	         $c533 = wShadowOAMBackupSprite10Attributes
@@ -18611,8 +18611,8 @@ WRAM0 bank #0:
 	         $c545 = wShadowOAMBackupSprite15XCoord
 	         $c546 = wShadowOAMBackupSprite15TileID
 	         $c547 = wShadowOAMBackupSprite15Attributes
-	         $c548 = wShadowOAMBackupSprite16
 	         $c548 = wShadowOAMBackupSprite16YCoord
+	         $c548 = wShadowOAMBackupSprite16
 	         $c549 = wShadowOAMBackupSprite16XCoord
 	         $c54a = wShadowOAMBackupSprite16TileID
 	         $c54b = wShadowOAMBackupSprite16Attributes
@@ -18787,10 +18787,10 @@ WRAM0 bank #0:
 	         $cc5b = wMonPartySpritesSavedOAM
 	         $cc5b = wElevatorWarpMaps
 	         $cc5b = wVermilionDockTileMapBuffer
-	         $cc5b = wSlotMachineSevenAndBarModeChance
-	         $cc5b = wOaksAideRewardItemName
 	         $cc5b = wHallOfFame
+	         $cc5b = wOaksAideRewardItemName
 	         $cc5b = wDexRatingNumMonsSeen
+	         $cc5b = wSlotMachineSevenAndBarModeChance
 	         $cc5b = wUnusedFlag
 	         $cc5b = wFilteredBagItems
 	         $cc5c = wDexRatingNumMonsOwned
@@ -18836,10 +18836,10 @@ WRAM0 bank #0:
 	         $cd05 = wEnemyNumHits
 	         $cd05 = wLuckySlotHiddenObjectIndex
 	         $cd05 = wEnemyBideAccumulatedDamage
-	         $cd0f = wPlayerMonUnmodifiedLevel
 	         $cd0f = wVermilionDockTileMapBufferEnd
-	         $cd0f = wMiscBattleDataEnd
 	         $cd0f = wInGameTradeGiveMonSpecies
+	         $cd0f = wPlayerMonUnmodifiedLevel
+	         $cd0f = wMiscBattleDataEnd
 	         $cd10 = wPlayerMonUnmodifiedMaxHP
 	         $cd10 = wInGameTradeTextPointerTablePointer
 	         $cd12 = wPlayerMonUnmodifiedAttack
@@ -18888,6 +18888,7 @@ WRAM0 bank #0:
 	         $cd3d = wNumShakes
 	         $cd3d = wPPRestoreItem
 	         $cd3d = wDexMaxSeenMon
+	         $cd3d = wWhichTrade
 	         $cd3d = wChangeBoxSavedMapTextPointer
 	         $cd3d = wBadgeNumberTile
 	         $cd3d = wOptionsTextSpeedCursorX
@@ -18909,22 +18910,21 @@ WRAM0 bank #0:
 	         $cd3d = wChargeMoveNum
 	         $cd3d = wPriceTemp
 	         $cd3d = wTitleMonSpecies
-	         $cd3d = wFieldMoves
-	         $cd3d = wPlayerCharacterOAMTile
-	         $cd3d = wCoordIndex
-	         $cd3d = wTempSCX
-	         $cd3d = wUnusedCreditsByte
-	         $cd3d = wBoxMonCounts
-	         $cd3d = wHoFTeamIndex
-	         $cd3d = wWhichTrade
-	         $cd3d = wSavedY
-	         $cd3d = wDayCareStartLevel
+	         $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 	         $cd3d = wMoveDownSmallStarsOAMCount
+	         $cd3d = wUnusedCreditsByte
+	         $cd3d = wFieldMoves
+	         $cd3d = wCoordIndex
+	         $cd3d = wHoFTeamIndex
+	         $cd3d = wTempSCX
+	         $cd3d = wDayCareStartLevel
+	         $cd3d = wBoxMonCounts
+	         $cd3d = wSavedY
+	         $cd3d = wPlayerCharacterOAMTile
+	         $cd3d = wStoppingWhichSlotMachineWheel
 	         $cd3d = wWereAnyMonsAsleep
 	         $cd3d = wFallingObjectsMovementData
 	         $cd3d = wTrainerSpriteOffset
-	         $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
-	         $cd3d = wStoppingWhichSlotMachineWheel
 	         $cd3e = wNumCreditsMonsDisplayed
 	         $cd3e = wTrainerInfoTextBoxWidth
 	         $cd3e = wTrainerEngageDistance
@@ -18940,8 +18940,8 @@ WRAM0 bank #0:
 	         $cd3e = wBattleTransitionCircleScreenQuadrantX
 	         $cd3e = wTradingWhichEnemyMon
 	         $cd3e = wTradedEnemyMonSpecies
-	         $cd3e = wBadgeNameTile
 	         $cd3e = wRivalStarterBallSpriteIndex
+	         $cd3e = wBadgeNameTile
 	         $cd3e = wHoFPartyMonIndex
 	         $cd3e = wOptionsBattleAnimCursorX
 	         $cd3f = wJigglypuffFacingDirections
@@ -18952,27 +18952,27 @@ WRAM0 bank #0:
 	         $cd3f = wSlotMachineWheel2Offset
 	         $cd3f = wFlyAnimBirdSpriteImageIndex
 	         $cd3f = wNameOfPlayerMonToBeTraded
+	         $cd3f = wDayCareTotalCost
 	         $cd3f = wHoFMonLevel
 	         $cd3f = wTrainerFacingDirection
 	         $cd3f = wHiddenObjectIndex
-	         $cd3f = wDayCareTotalCost
-	         $cd3f = wHUDGraphicsTiles
 	         $cd3f = wOptionsBattleStyleCursorX
+	         $cd3f = wHUDGraphicsTiles
 	         $cd40 = wOptionsCancelCursorX
 	         $cd40 = wTrainerScreenY
+	         $cd40 = wSlotMachineWheel3Offset
 	         $cd40 = wPlayerSpinInPlaceAnimSoundID
 	         $cd40 = wHiddenObjectY
-	         $cd40 = wSlotMachineWheel3Offset
 	         $cd40 = wHoFMonOrPlayer
 	         $cd41 = wSlotMachineWheel1BottomTile
 	         $cd41 = wSlotMachineWinningSymbol
 	         $cd41 = wHoFTeamIndex2
 	         $cd41 = wNumFieldMoves
+	         $cd41 = wDayCarePerLevelCost
 	         $cd41 = wTradedPlayerMonOT
-	         $cd41 = wHiddenItemOrCoinsIndex
 	         $cd41 = wHiddenObjectX
 	         $cd41 = wTrainerScreenX
-	         $cd41 = wDayCarePerLevelCost
+	         $cd41 = wHiddenItemOrCoinsIndex
 	         $cd42 = wSlotMachineWheel1MiddleTile
 	         $cd42 = wHoFTeamNo
 	         $cd42 = wFieldMovesLeftmostXCoord
@@ -18982,8 +18982,8 @@ WRAM0 bank #0:
 	         $cd45 = wSlotMachineWheel2MiddleTile
 	         $cd46 = wTempCoins1
 	         $cd46 = wSlotMachineWheel2TopTile
-	         $cd47 = wBattleTransitionSpiralDirection
 	         $cd47 = wSlotMachineWheel3BottomTile
+	         $cd47 = wBattleTransitionSpiralDirection
 	         $cd48 = wFacingDirectionList
 	         $cd48 = wSlotMachineWheel3MiddleTile
 	         $cd49 = wTempObtainedBadgesBooleans
@@ -19005,8 +19005,8 @@ WRAM0 bank #0:
 	         $cd50 = wWhichEmotionBubble
 	         $cd59 = wTradedEnemyMonOTID
 	         $cd5b = wGymTrashCanIndex
-	         $cd5b = wOAMBaseTile
 	         $cd5b = wStandingOnWarpPadOrHole
+	         $cd5b = wOAMBaseTile
 	         $cd5c = wSymmetricSpriteOAMAttributes
 	         $cd5d = wMonPartySpriteSpecies
 	         $cd5e = wLeftGBMonSpecies
@@ -19014,8 +19014,8 @@ WRAM0 bank #0:
 	         $cd60 = wMiscFlags
 	         $cd6a = wActionResultOrTookBattleTurn
 	         $cd6b = wJoyIgnore
-	         $cd6c = wNumMovesMinusOne
 	         $cd6c = wDownscaledMonSize
+	         $cd6c = wNumMovesMinusOne
 	         $cd6d = wNameBuffer
 	         $cd6d = wMoveData
 	         $cd6d = wPayDayMoney
@@ -19253,10 +19253,10 @@ WRAM0 bank #0:
 	         $d08a = wFlashScreenLongCounter
 	         $d08a = wSpiralBallsBaseY
 	         $d08a = wFallingObjectMovementByte
-	         $d08a = wTradedMonMovingRight
 	         $d08a = wOptionsInitialized
-	         $d08a = wUnusedWaterDropletsByte
+	         $d08a = wTradedMonMovingRight
 	         $d08a = wNewSlotMachineBallTile
+	         $d08a = wUnusedWaterDropletsByte
 	         $d08b = wNumFallingObjects
 	         $d08b = wSubAnimTransform
 	         $d08b = wSpiralBallsBaseX
@@ -19342,8 +19342,8 @@ WRAM0 bank #0:
 	         $d11e = wUsingPPUp
 	         $d11e = wMoveGrammar
 	         $d11e = wTempTMHM
-	         $d11e = wTypeEffectiveness
 	         $d11e = wNumSetBits
+	         $d11e = wTypeEffectiveness
 	         $d11e = wNamedObjectIndex
 	         $d11e = wCalculateWhoseStats
 	         $d11f = wForcePlayerToChooseMon
@@ -19464,8 +19464,8 @@ WRAM0 bank #0:
 	         $d1de = wPartyMon3DVs
 	         $d1e0 = wPartyMon3PP
 	         $d1e4 = wPartyMon3Level
-	         $d1e5 = wPartyMon3Stats
 	         $d1e5 = wPartyMon3MaxHP
+	         $d1e5 = wPartyMon3Stats
 	         $d1e7 = wPartyMon3Attack
 	         $d1e9 = wPartyMon3Defense
 	         $d1eb = wPartyMon3Speed
@@ -19522,8 +19522,8 @@ WRAM0 bank #0:
 	         $d241 = wPartyMon5Defense
 	         $d243 = wPartyMon5Speed
 	         $d245 = wPartyMon5Special
-	         $d247 = wPartyMon6Species
 	         $d247 = wPartyMon6
+	         $d247 = wPartyMon6Species
 	         $d248 = wPartyMon6HP
 	         $d24a = wPartyMon6BoxLevel
 	         $d24b = wPartyMon6Status
@@ -19923,8 +19923,8 @@ WRAM0 bank #0:
 	         $d94e = wEnemyMon4Defense
 	         $d950 = wEnemyMon4Speed
 	         $d952 = wEnemyMon4Special
-	         $d954 = wEnemyMon5Species
 	         $d954 = wEnemyMon5
+	         $d954 = wEnemyMon5Species
 	         $d955 = wEnemyMon5HP
 	         $d957 = wEnemyMon5BoxLevel
 	         $d958 = wEnemyMon5Status
@@ -19954,8 +19954,8 @@ WRAM0 bank #0:
 	         $d981 = wEnemyMon6HP
 	         $d983 = wEnemyMon6BoxLevel
 	         $d984 = wEnemyMon6Status
-	         $d985 = wEnemyMon6Type1
 	         $d985 = wEnemyMon6Type
+	         $d985 = wEnemyMon6Type1
 	         $d986 = wEnemyMon6Type2
 	         $d987 = wEnemyMon6CatchRate
 	         $d988 = wEnemyMon6Moves
@@ -20103,8 +20103,8 @@ WRAM0 bank #0:
 	         $db12 = wBoxMon4SpecialExp
 	         $db14 = wBoxMon4DVs
 	         $db16 = wBoxMon4PP
-	         $db1a = wBoxMon5Species
 	         $db1a = wBoxMon5
+	         $db1a = wBoxMon5Species
 	         $db1b = wBoxMon5HP
 	         $db1d = wBoxMon5BoxLevel
 	         $db1e = wBoxMon5Status
@@ -20184,8 +20184,8 @@ WRAM0 bank #0:
 	         $db9f = wBoxMon9HP
 	         $dba1 = wBoxMon9BoxLevel
 	         $dba2 = wBoxMon9Status
-	         $dba3 = wBoxMon9Type
 	         $dba3 = wBoxMon9Type1
+	         $dba3 = wBoxMon9Type
 	         $dba4 = wBoxMon9Type2
 	         $dba5 = wBoxMon9CatchRate
 	         $dba6 = wBoxMon9Moves
@@ -20293,8 +20293,8 @@ WRAM0 bank #0:
 	         $dc5c = wBoxMon14SpecialExp
 	         $dc5e = wBoxMon14DVs
 	         $dc60 = wBoxMon14PP
-	         $dc64 = wBoxMon15Species
 	         $dc64 = wBoxMon15
+	         $dc64 = wBoxMon15Species
 	         $dc65 = wBoxMon15HP
 	         $dc67 = wBoxMon15BoxLevel
 	         $dc68 = wBoxMon15Status
@@ -20336,8 +20336,8 @@ WRAM0 bank #0:
 	         $dca7 = wBoxMon17HP
 	         $dca9 = wBoxMon17BoxLevel
 	         $dcaa = wBoxMon17Status
-	         $dcab = wBoxMon17Type1
 	         $dcab = wBoxMon17Type
+	         $dcab = wBoxMon17Type1
 	         $dcac = wBoxMon17Type2
 	         $dcad = wBoxMon17CatchRate
 	         $dcae = wBoxMon17Moves
@@ -20369,8 +20369,8 @@ WRAM0 bank #0:
 	         $dce0 = wBoxMon18SpecialExp
 	         $dce2 = wBoxMon18DVs
 	         $dce4 = wBoxMon18PP
-	         $dce8 = wBoxMon19
 	         $dce8 = wBoxMon19Species
+	         $dce8 = wBoxMon19
 	         $dce9 = wBoxMon19HP
 	         $dceb = wBoxMon19BoxLevel
 	         $dcec = wBoxMon19Status
@@ -20473,18 +20473,18 @@ HRAM bank #0:
 	         $ff8b = hPreviousTileset
 	         $ff8b = hOAMTile
 	         $ff8b = hBaseTileID
+	         $ff8b = hEastWestConnectedMapWidth
 	         $ff8b = hItemPrice
 	         $ff8b = hDexWeight
-	         $ff8b = hEastWestConnectedMapWidth
 	         $ff8b = hSpriteInterlaceCounter
 	         $ff8b = hRLEByteValue
 	         $ff8c = hNorthSouthConnectedMapWidth
 	         $ff8c = hMapWidth
 	         $ff8c = hSpriteHeight
 	         $ff8c = hPartyMonIndex
-	         $ff8c = hSpriteIndex
-	         $ff8c = hTextID
 	         $ff8c = hSlidingRegionSize
+	         $ff8c = hTextID
+	         $ff8c = hSpriteIndex
 	         $ff8c = hDownArrowBlinkCount2
 	         $ff8d = hEnemySpeed
 	         $ff8d = hLoadSpriteTemp1
@@ -20509,13 +20509,13 @@ HRAM bank #0:
 	         $ff94 = hSpritePriority
 	         $ff95 = hSwapItemID
 	         $ff95 = hNPCPlayerYDistance
-	         $ff95 = hNPCSpriteOffset
 	         $ff95 = hDividend
 	         $ff95 = hSignCoordPointer
-	         $ff95 = hQuotient
-	         $ff95 = hNPCMovementDirections2Index
 	         $ff95 = hPastLeadingZeros
+	         $ff95 = hQuotient
 	         $ff95 = hProduct
+	         $ff95 = hNPCMovementDirections2Index
+	         $ff95 = hNPCSpriteOffset
 	         $ff95 = hSwapTemp
 	         $ff96 = hMutateWY
 	         $ff96 = hSwapItemQuantity
@@ -20599,12 +20599,12 @@ HRAM bank #0:
 	         $ffdc = hVendingMachinePrice
 	         $ffdc = hPlayerYCoord
 	         $ffdc = hOaksAideRewardItem
-	         $ffdc = hItemToRemoveIndex
 	         $ffdc = hGymGateAnswer
+	         $ffdc = hItemToRemoveIndex
 	         $ffdd = hPlayerXCoord
 	         $ffdd = hOaksAideNumMonsOwned
-	         $ffe0 = hUnlockedSilphCoDoors
 	         $ffe0 = hBackupGymGateIndex
+	         $ffe0 = hUnlockedSilphCoDoors
 	         $ffe1 = hStartTileID
 	         $ffe4 = hNewPartyLength
 	         $ffe5 = hDividend2
--- a/pokeblue_debug.sym
+++ b/pokeblue_debug.sym
@@ -337,8 +337,8 @@
 00:1765 Forest_Coll
 00:1775 House_Coll
 00:177f Gate_Coll
-00:177f ForestGate_Coll
 00:177f Museum_Coll
+00:177f ForestGate_Coll
 00:178a Ship_Coll
 00:1795 ShipPort_Coll
 00:179a Cemetery_Coll
@@ -9084,8 +9084,8 @@
 13:5e76 BlackbeltPic
 13:6049 Rival1Pic
 13:615f ProfOakPic
-13:627d ScientistPic
 13:627d ChiefPic
+13:627d ScientistPic
 13:63be GiovanniPic
 13:649f RocketPic
 13:6635 CooltrainerMPic
@@ -12171,9 +12171,9 @@
 1a:55ff Gate_GFX
 1a:55ff Museum_GFX
 1a:55ff ForestGate_GFX
+1a:5bef ForestGate_Block
 1a:5bef Gate_Block
 1a:5bef Museum_Block
-1a:5bef ForestGate_Block
 1a:63ef Forest_GFX
 1a:69ef Forest_Block
 1a:71ef Facility_GFX
@@ -17458,8 +17458,8 @@
 00:8000 vChars0
 00:8000 vSprites
 00:8000 vNPCSprites
-00:8800 vTitleLogo
 00:8800 vFont
+00:8800 vTitleLogo
 00:8800 vChars1
 00:8800 vNPCSprites2
 00:9000 vFrontPic
@@ -17587,8 +17587,8 @@
 00:c12b wSprite02StateData1XAdjusted
 00:c12c wSprite02StateData1CollisionData
 00:c130 wSprite02StateData1End
-00:c130 wSprite03StateData1
 00:c130 wSprite03StateData1PictureID
+00:c130 wSprite03StateData1
 00:c131 wSprite03StateData1MovementStatus
 00:c132 wSprite03StateData1ImageIndex
 00:c133 wSprite03StateData1YStepVector
@@ -17617,8 +17617,8 @@
 00:c14b wSprite04StateData1XAdjusted
 00:c14c wSprite04StateData1CollisionData
 00:c150 wSprite05StateData1PictureID
-00:c150 wSprite04StateData1End
 00:c150 wSprite05StateData1
+00:c150 wSprite04StateData1End
 00:c151 wSprite05StateData1MovementStatus
 00:c152 wSprite05StateData1ImageIndex
 00:c153 wSprite05StateData1YStepVector
@@ -17736,9 +17736,9 @@
 00:c1ca wSprite12StateData1YAdjusted
 00:c1cb wSprite12StateData1XAdjusted
 00:c1cc wSprite12StateData1CollisionData
+00:c1d0 wSprite13StateData1PictureID
 00:c1d0 wSprite12StateData1End
 00:c1d0 wSprite13StateData1
-00:c1d0 wSprite13StateData1PictureID
 00:c1d1 wSprite13StateData1MovementStatus
 00:c1d2 wSprite13StateData1ImageIndex
 00:c1d3 wSprite13StateData1YStepVector
@@ -17751,9 +17751,9 @@
 00:c1da wSprite13StateData1YAdjusted
 00:c1db wSprite13StateData1XAdjusted
 00:c1dc wSprite13StateData1CollisionData
+00:c1e0 wSprite13StateData1End
 00:c1e0 wSprite14StateData1
 00:c1e0 wSprite14StateData1PictureID
-00:c1e0 wSprite13StateData1End
 00:c1e1 wSprite14StateData1MovementStatus
 00:c1e2 wSprite14StateData1ImageIndex
 00:c1e3 wSprite14StateData1YStepVector
@@ -17767,8 +17767,8 @@
 00:c1eb wSprite14StateData1XAdjusted
 00:c1ec wSprite14StateData1CollisionData
 00:c1f0 wSprite15StateData1PictureID
-00:c1f0 wSprite14StateData1End
 00:c1f0 wSprite15StateData1
+00:c1f0 wSprite14StateData1End
 00:c1f1 wSprite15StateData1MovementStatus
 00:c1f2 wSprite15StateData1ImageIndex
 00:c1f3 wSprite15StateData1YStepVector
@@ -17782,9 +17782,9 @@
 00:c1fb wSprite15StateData1XAdjusted
 00:c1fc wSprite15StateData1CollisionData
 00:c200 wSpriteStateData2
-00:c200 wSprite15StateData1End
 00:c200 wSpritePlayerStateData2WalkAnimationCounter
 00:c200 wSpritePlayerStateData2
+00:c200 wSprite15StateData1End
 00:c202 wSpritePlayerStateData2YDisplacement
 00:c203 wSpritePlayerStateData2XDisplacement
 00:c204 wSpritePlayerStateData2MapY
@@ -17795,9 +17795,9 @@
 00:c209 wSpritePlayerStateData2OrigFacingDirection
 00:c20d wSpritePlayerStateData2PictureID
 00:c20e wSpritePlayerStateData2ImageBaseOffset
+00:c210 wSprite01StateData2
 00:c210 wSpritePlayerStateData2End
 00:c210 wSprite01StateData2WalkAnimationCounter
-00:c210 wSprite01StateData2
 00:c212 wSprite01StateData2YDisplacement
 00:c213 wSprite01StateData2XDisplacement
 00:c214 wSprite01StateData2MapY
@@ -17809,8 +17809,8 @@
 00:c21d wSprite01StateData2PictureID
 00:c21e wSprite01StateData2ImageBaseOffset
 00:c220 wSprite02StateData2WalkAnimationCounter
-00:c220 wSprite01StateData2End
 00:c220 wSprite02StateData2
+00:c220 wSprite01StateData2End
 00:c222 wSprite02StateData2YDisplacement
 00:c223 wSprite02StateData2XDisplacement
 00:c224 wSprite02StateData2MapY
@@ -17822,8 +17822,8 @@
 00:c22d wSprite02StateData2PictureID
 00:c22e wSprite02StateData2ImageBaseOffset
 00:c230 wSprite03StateData2
-00:c230 wSprite03StateData2WalkAnimationCounter
 00:c230 wSprite02StateData2End
+00:c230 wSprite03StateData2WalkAnimationCounter
 00:c232 wSprite03StateData2YDisplacement
 00:c233 wSprite03StateData2XDisplacement
 00:c234 wSprite03StateData2MapY
@@ -17834,9 +17834,9 @@
 00:c239 wSprite03StateData2OrigFacingDirection
 00:c23d wSprite03StateData2PictureID
 00:c23e wSprite03StateData2ImageBaseOffset
-00:c240 wSprite04StateData2WalkAnimationCounter
 00:c240 wSprite04StateData2
 00:c240 wSprite03StateData2End
+00:c240 wSprite04StateData2WalkAnimationCounter
 00:c242 wSprite04StateData2YDisplacement
 00:c243 wSprite04StateData2XDisplacement
 00:c244 wSprite04StateData2MapY
@@ -17847,9 +17847,9 @@
 00:c249 wSprite04StateData2OrigFacingDirection
 00:c24d wSprite04StateData2PictureID
 00:c24e wSprite04StateData2ImageBaseOffset
-00:c250 wSprite04StateData2End
 00:c250 wSprite05StateData2WalkAnimationCounter
 00:c250 wSprite05StateData2
+00:c250 wSprite04StateData2End
 00:c252 wSprite05StateData2YDisplacement
 00:c253 wSprite05StateData2XDisplacement
 00:c254 wSprite05StateData2MapY
@@ -17860,9 +17860,9 @@
 00:c259 wSprite05StateData2OrigFacingDirection
 00:c25d wSprite05StateData2PictureID
 00:c25e wSprite05StateData2ImageBaseOffset
-00:c260 wSprite06StateData2
-00:c260 wSprite05StateData2End
 00:c260 wSprite06StateData2WalkAnimationCounter
+00:c260 wSprite05StateData2End
+00:c260 wSprite06StateData2
 00:c262 wSprite06StateData2YDisplacement
 00:c263 wSprite06StateData2XDisplacement
 00:c264 wSprite06StateData2MapY
@@ -17873,8 +17873,8 @@
 00:c269 wSprite06StateData2OrigFacingDirection
 00:c26d wSprite06StateData2PictureID
 00:c26e wSprite06StateData2ImageBaseOffset
-00:c270 wSprite06StateData2End
 00:c270 wSprite07StateData2
+00:c270 wSprite06StateData2End
 00:c270 wSprite07StateData2WalkAnimationCounter
 00:c272 wSprite07StateData2YDisplacement
 00:c273 wSprite07StateData2XDisplacement
@@ -17886,9 +17886,9 @@
 00:c279 wSprite07StateData2OrigFacingDirection
 00:c27d wSprite07StateData2PictureID
 00:c27e wSprite07StateData2ImageBaseOffset
-00:c280 wSprite07StateData2End
-00:c280 wSprite08StateData2
 00:c280 wSprite08StateData2WalkAnimationCounter
+00:c280 wSprite08StateData2
+00:c280 wSprite07StateData2End
 00:c282 wSprite08StateData2YDisplacement
 00:c283 wSprite08StateData2XDisplacement
 00:c284 wSprite08StateData2MapY
@@ -17899,9 +17899,9 @@
 00:c289 wSprite08StateData2OrigFacingDirection
 00:c28d wSprite08StateData2PictureID
 00:c28e wSprite08StateData2ImageBaseOffset
+00:c290 wSprite09StateData2WalkAnimationCounter
 00:c290 wSprite09StateData2
 00:c290 wSprite08StateData2End
-00:c290 wSprite09StateData2WalkAnimationCounter
 00:c292 wSprite09StateData2YDisplacement
 00:c293 wSprite09StateData2XDisplacement
 00:c294 wSprite09StateData2MapY
@@ -17912,9 +17912,9 @@
 00:c299 wSprite09StateData2OrigFacingDirection
 00:c29d wSprite09StateData2PictureID
 00:c29e wSprite09StateData2ImageBaseOffset
-00:c2a0 wSprite10StateData2WalkAnimationCounter
-00:c2a0 wSprite09StateData2End
 00:c2a0 wSprite10StateData2
+00:c2a0 wSprite09StateData2End
+00:c2a0 wSprite10StateData2WalkAnimationCounter
 00:c2a2 wSprite10StateData2YDisplacement
 00:c2a3 wSprite10StateData2XDisplacement
 00:c2a4 wSprite10StateData2MapY
@@ -17925,8 +17925,8 @@
 00:c2a9 wSprite10StateData2OrigFacingDirection
 00:c2ad wSprite10StateData2PictureID
 00:c2ae wSprite10StateData2ImageBaseOffset
-00:c2b0 wSprite11StateData2
 00:c2b0 wSprite11StateData2WalkAnimationCounter
+00:c2b0 wSprite11StateData2
 00:c2b0 wSprite10StateData2End
 00:c2b2 wSprite11StateData2YDisplacement
 00:c2b3 wSprite11StateData2XDisplacement
@@ -17951,8 +17951,8 @@
 00:c2c9 wSprite12StateData2OrigFacingDirection
 00:c2cd wSprite12StateData2PictureID
 00:c2ce wSprite12StateData2ImageBaseOffset
-00:c2d0 wSprite13StateData2
 00:c2d0 wSprite13StateData2WalkAnimationCounter
+00:c2d0 wSprite13StateData2
 00:c2d0 wSprite12StateData2End
 00:c2d2 wSprite13StateData2YDisplacement
 00:c2d3 wSprite13StateData2XDisplacement
@@ -17977,9 +17977,9 @@
 00:c2e9 wSprite14StateData2OrigFacingDirection
 00:c2ed wSprite14StateData2PictureID
 00:c2ee wSprite14StateData2ImageBaseOffset
+00:c2f0 wSprite14StateData2End
 00:c2f0 wSprite15StateData2WalkAnimationCounter
 00:c2f0 wSprite15StateData2
-00:c2f0 wSprite14StateData2End
 00:c2f2 wSprite15StateData2YDisplacement
 00:c2f3 wSprite15StateData2XDisplacement
 00:c2f4 wSprite15StateData2MapY
@@ -17990,21 +17990,21 @@
 00:c2f9 wSprite15StateData2OrigFacingDirection
 00:c2fd wSprite15StateData2PictureID
 00:c2fe wSprite15StateData2ImageBaseOffset
-00:c300 wSprite15StateData2End
 00:c300 wSpriteDataEnd
+00:c300 wSprite15StateData2End
+00:c300 wShadowOAMSprite00YCoord
 00:c300 wShadowOAM
 00:c300 wShadowOAMSprite00
-00:c300 wShadowOAMSprite00YCoord
 00:c301 wShadowOAMSprite00XCoord
 00:c302 wShadowOAMSprite00TileID
 00:c303 wShadowOAMSprite00Attributes
-00:c304 wShadowOAMSprite01YCoord
 00:c304 wShadowOAMSprite01
+00:c304 wShadowOAMSprite01YCoord
 00:c305 wShadowOAMSprite01XCoord
 00:c306 wShadowOAMSprite01TileID
 00:c307 wShadowOAMSprite01Attributes
-00:c308 wShadowOAMSprite02
 00:c308 wShadowOAMSprite02YCoord
+00:c308 wShadowOAMSprite02
 00:c309 wShadowOAMSprite02XCoord
 00:c30a wShadowOAMSprite02TileID
 00:c30b wShadowOAMSprite02Attributes
@@ -18023,18 +18023,18 @@
 00:c315 wShadowOAMSprite05XCoord
 00:c316 wShadowOAMSprite05TileID
 00:c317 wShadowOAMSprite05Attributes
-00:c318 wShadowOAMSprite06
 00:c318 wShadowOAMSprite06YCoord
+00:c318 wShadowOAMSprite06
 00:c319 wShadowOAMSprite06XCoord
 00:c31a wShadowOAMSprite06TileID
 00:c31b wShadowOAMSprite06Attributes
-00:c31c wShadowOAMSprite07
 00:c31c wShadowOAMSprite07YCoord
+00:c31c wShadowOAMSprite07
 00:c31d wShadowOAMSprite07XCoord
 00:c31e wShadowOAMSprite07TileID
 00:c31f wShadowOAMSprite07Attributes
-00:c320 wShadowOAMSprite08
 00:c320 wShadowOAMSprite08YCoord
+00:c320 wShadowOAMSprite08
 00:c321 wShadowOAMSprite08XCoord
 00:c322 wShadowOAMSprite08TileID
 00:c323 wShadowOAMSprite08Attributes
@@ -18043,8 +18043,8 @@
 00:c325 wShadowOAMSprite09XCoord
 00:c326 wShadowOAMSprite09TileID
 00:c327 wShadowOAMSprite09Attributes
-00:c328 wShadowOAMSprite10
 00:c328 wShadowOAMSprite10YCoord
+00:c328 wShadowOAMSprite10
 00:c329 wShadowOAMSprite10XCoord
 00:c32a wShadowOAMSprite10TileID
 00:c32b wShadowOAMSprite10Attributes
@@ -18053,13 +18053,13 @@
 00:c32d wShadowOAMSprite11XCoord
 00:c32e wShadowOAMSprite11TileID
 00:c32f wShadowOAMSprite11Attributes
-00:c330 wShadowOAMSprite12
 00:c330 wShadowOAMSprite12YCoord
+00:c330 wShadowOAMSprite12
 00:c331 wShadowOAMSprite12XCoord
 00:c332 wShadowOAMSprite12TileID
 00:c333 wShadowOAMSprite12Attributes
-00:c334 wShadowOAMSprite13
 00:c334 wShadowOAMSprite13YCoord
+00:c334 wShadowOAMSprite13
 00:c335 wShadowOAMSprite13XCoord
 00:c336 wShadowOAMSprite13TileID
 00:c337 wShadowOAMSprite13Attributes
@@ -18083,8 +18083,8 @@
 00:c345 wShadowOAMSprite17XCoord
 00:c346 wShadowOAMSprite17TileID
 00:c347 wShadowOAMSprite17Attributes
-00:c348 wShadowOAMSprite18
 00:c348 wShadowOAMSprite18YCoord
+00:c348 wShadowOAMSprite18
 00:c349 wShadowOAMSprite18XCoord
 00:c34a wShadowOAMSprite18TileID
 00:c34b wShadowOAMSprite18Attributes
@@ -18093,13 +18093,13 @@
 00:c34d wShadowOAMSprite19XCoord
 00:c34e wShadowOAMSprite19TileID
 00:c34f wShadowOAMSprite19Attributes
-00:c350 wShadowOAMSprite20
 00:c350 wShadowOAMSprite20YCoord
+00:c350 wShadowOAMSprite20
 00:c351 wShadowOAMSprite20XCoord
 00:c352 wShadowOAMSprite20TileID
 00:c353 wShadowOAMSprite20Attributes
-00:c354 wShadowOAMSprite21
 00:c354 wShadowOAMSprite21YCoord
+00:c354 wShadowOAMSprite21
 00:c355 wShadowOAMSprite21XCoord
 00:c356 wShadowOAMSprite21TileID
 00:c357 wShadowOAMSprite21Attributes
@@ -18108,8 +18108,8 @@
 00:c359 wShadowOAMSprite22XCoord
 00:c35a wShadowOAMSprite22TileID
 00:c35b wShadowOAMSprite22Attributes
-00:c35c wShadowOAMSprite23
 00:c35c wShadowOAMSprite23YCoord
+00:c35c wShadowOAMSprite23
 00:c35d wShadowOAMSprite23XCoord
 00:c35e wShadowOAMSprite23TileID
 00:c35f wShadowOAMSprite23Attributes
@@ -18128,8 +18128,8 @@
 00:c369 wShadowOAMSprite26XCoord
 00:c36a wShadowOAMSprite26TileID
 00:c36b wShadowOAMSprite26Attributes
-00:c36c wShadowOAMSprite27
 00:c36c wShadowOAMSprite27YCoord
+00:c36c wShadowOAMSprite27
 00:c36d wShadowOAMSprite27XCoord
 00:c36e wShadowOAMSprite27TileID
 00:c36f wShadowOAMSprite27Attributes
@@ -18138,8 +18138,8 @@
 00:c371 wShadowOAMSprite28XCoord
 00:c372 wShadowOAMSprite28TileID
 00:c373 wShadowOAMSprite28Attributes
-00:c374 wShadowOAMSprite29
 00:c374 wShadowOAMSprite29YCoord
+00:c374 wShadowOAMSprite29
 00:c375 wShadowOAMSprite29XCoord
 00:c376 wShadowOAMSprite29TileID
 00:c377 wShadowOAMSprite29Attributes
@@ -18163,18 +18163,18 @@
 00:c385 wShadowOAMSprite33XCoord
 00:c386 wShadowOAMSprite33TileID
 00:c387 wShadowOAMSprite33Attributes
-00:c388 wShadowOAMSprite34
 00:c388 wShadowOAMSprite34YCoord
+00:c388 wShadowOAMSprite34
 00:c389 wShadowOAMSprite34XCoord
 00:c38a wShadowOAMSprite34TileID
 00:c38b wShadowOAMSprite34Attributes
-00:c38c wShadowOAMSprite35
 00:c38c wShadowOAMSprite35YCoord
+00:c38c wShadowOAMSprite35
 00:c38d wShadowOAMSprite35XCoord
 00:c38e wShadowOAMSprite35TileID
 00:c38f wShadowOAMSprite35Attributes
-00:c390 wShadowOAMSprite36YCoord
 00:c390 wShadowOAMSprite36
+00:c390 wShadowOAMSprite36YCoord
 00:c391 wShadowOAMSprite36XCoord
 00:c392 wShadowOAMSprite36TileID
 00:c393 wShadowOAMSprite36Attributes
@@ -18249,8 +18249,8 @@
 00:c52d wShadowOAMBackupSprite09XCoord
 00:c52e wShadowOAMBackupSprite09TileID
 00:c52f wShadowOAMBackupSprite09Attributes
-00:c530 wShadowOAMBackupSprite10YCoord
 00:c530 wShadowOAMBackupSprite10
+00:c530 wShadowOAMBackupSprite10YCoord
 00:c531 wShadowOAMBackupSprite10XCoord
 00:c532 wShadowOAMBackupSprite10TileID
 00:c533 wShadowOAMBackupSprite10Attributes
@@ -18279,8 +18279,8 @@
 00:c545 wShadowOAMBackupSprite15XCoord
 00:c546 wShadowOAMBackupSprite15TileID
 00:c547 wShadowOAMBackupSprite15Attributes
-00:c548 wShadowOAMBackupSprite16
 00:c548 wShadowOAMBackupSprite16YCoord
+00:c548 wShadowOAMBackupSprite16
 00:c549 wShadowOAMBackupSprite16XCoord
 00:c54a wShadowOAMBackupSprite16TileID
 00:c54b wShadowOAMBackupSprite16Attributes
@@ -18453,10 +18453,10 @@
 00:cc5b wMonPartySpritesSavedOAM
 00:cc5b wElevatorWarpMaps
 00:cc5b wVermilionDockTileMapBuffer
-00:cc5b wSlotMachineSevenAndBarModeChance
-00:cc5b wOaksAideRewardItemName
 00:cc5b wHallOfFame
+00:cc5b wOaksAideRewardItemName
 00:cc5b wDexRatingNumMonsSeen
+00:cc5b wSlotMachineSevenAndBarModeChance
 00:cc5b wUnusedFlag
 00:cc5b wFilteredBagItems
 00:cc5c wDexRatingNumMonsOwned
@@ -18502,10 +18502,10 @@
 00:cd05 wEnemyNumHits
 00:cd05 wLuckySlotHiddenObjectIndex
 00:cd05 wEnemyBideAccumulatedDamage
-00:cd0f wPlayerMonUnmodifiedLevel
 00:cd0f wVermilionDockTileMapBufferEnd
-00:cd0f wMiscBattleDataEnd
 00:cd0f wInGameTradeGiveMonSpecies
+00:cd0f wPlayerMonUnmodifiedLevel
+00:cd0f wMiscBattleDataEnd
 00:cd10 wPlayerMonUnmodifiedMaxHP
 00:cd10 wInGameTradeTextPointerTablePointer
 00:cd12 wPlayerMonUnmodifiedAttack
@@ -18554,6 +18554,7 @@
 00:cd3d wNumShakes
 00:cd3d wPPRestoreItem
 00:cd3d wDexMaxSeenMon
+00:cd3d wWhichTrade
 00:cd3d wChangeBoxSavedMapTextPointer
 00:cd3d wBadgeNumberTile
 00:cd3d wOptionsTextSpeedCursorX
@@ -18575,22 +18576,21 @@
 00:cd3d wChargeMoveNum
 00:cd3d wPriceTemp
 00:cd3d wTitleMonSpecies
-00:cd3d wFieldMoves
-00:cd3d wPlayerCharacterOAMTile
-00:cd3d wCoordIndex
-00:cd3d wTempSCX
-00:cd3d wUnusedCreditsByte
-00:cd3d wBoxMonCounts
-00:cd3d wHoFTeamIndex
-00:cd3d wWhichTrade
-00:cd3d wSavedY
-00:cd3d wDayCareStartLevel
+00:cd3d wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 00:cd3d wMoveDownSmallStarsOAMCount
+00:cd3d wUnusedCreditsByte
+00:cd3d wFieldMoves
+00:cd3d wCoordIndex
+00:cd3d wHoFTeamIndex
+00:cd3d wTempSCX
+00:cd3d wDayCareStartLevel
+00:cd3d wBoxMonCounts
+00:cd3d wSavedY
+00:cd3d wPlayerCharacterOAMTile
+00:cd3d wStoppingWhichSlotMachineWheel
 00:cd3d wWereAnyMonsAsleep
 00:cd3d wFallingObjectsMovementData
 00:cd3d wTrainerSpriteOffset
-00:cd3d wPlayerSpinWhileMovingUpOrDownAnimDeltaY
-00:cd3d wStoppingWhichSlotMachineWheel
 00:cd3e wNumCreditsMonsDisplayed
 00:cd3e wTrainerInfoTextBoxWidth
 00:cd3e wTrainerEngageDistance
@@ -18606,8 +18606,8 @@
 00:cd3e wBattleTransitionCircleScreenQuadrantX
 00:cd3e wTradingWhichEnemyMon
 00:cd3e wTradedEnemyMonSpecies
-00:cd3e wBadgeNameTile
 00:cd3e wRivalStarterBallSpriteIndex
+00:cd3e wBadgeNameTile
 00:cd3e wHoFPartyMonIndex
 00:cd3e wOptionsBattleAnimCursorX
 00:cd3f wJigglypuffFacingDirections
@@ -18618,27 +18618,27 @@
 00:cd3f wSlotMachineWheel2Offset
 00:cd3f wFlyAnimBirdSpriteImageIndex
 00:cd3f wNameOfPlayerMonToBeTraded
+00:cd3f wDayCareTotalCost
 00:cd3f wHoFMonLevel
 00:cd3f wTrainerFacingDirection
 00:cd3f wHiddenObjectIndex
-00:cd3f wDayCareTotalCost
-00:cd3f wHUDGraphicsTiles
 00:cd3f wOptionsBattleStyleCursorX
+00:cd3f wHUDGraphicsTiles
 00:cd40 wOptionsCancelCursorX
 00:cd40 wTrainerScreenY
+00:cd40 wSlotMachineWheel3Offset
 00:cd40 wPlayerSpinInPlaceAnimSoundID
 00:cd40 wHiddenObjectY
-00:cd40 wSlotMachineWheel3Offset
 00:cd40 wHoFMonOrPlayer
 00:cd41 wSlotMachineWheel1BottomTile
 00:cd41 wSlotMachineWinningSymbol
 00:cd41 wHoFTeamIndex2
 00:cd41 wNumFieldMoves
+00:cd41 wDayCarePerLevelCost
 00:cd41 wTradedPlayerMonOT
-00:cd41 wHiddenItemOrCoinsIndex
 00:cd41 wHiddenObjectX
 00:cd41 wTrainerScreenX
-00:cd41 wDayCarePerLevelCost
+00:cd41 wHiddenItemOrCoinsIndex
 00:cd42 wSlotMachineWheel1MiddleTile
 00:cd42 wHoFTeamNo
 00:cd42 wFieldMovesLeftmostXCoord
@@ -18648,8 +18648,8 @@
 00:cd45 wSlotMachineWheel2MiddleTile
 00:cd46 wTempCoins1
 00:cd46 wSlotMachineWheel2TopTile
-00:cd47 wBattleTransitionSpiralDirection
 00:cd47 wSlotMachineWheel3BottomTile
+00:cd47 wBattleTransitionSpiralDirection
 00:cd48 wFacingDirectionList
 00:cd48 wSlotMachineWheel3MiddleTile
 00:cd49 wTempObtainedBadgesBooleans
@@ -18671,8 +18671,8 @@
 00:cd50 wWhichEmotionBubble
 00:cd59 wTradedEnemyMonOTID
 00:cd5b wGymTrashCanIndex
-00:cd5b wOAMBaseTile
 00:cd5b wStandingOnWarpPadOrHole
+00:cd5b wOAMBaseTile
 00:cd5c wSymmetricSpriteOAMAttributes
 00:cd5d wMonPartySpriteSpecies
 00:cd5e wLeftGBMonSpecies
@@ -18680,8 +18680,8 @@
 00:cd60 wMiscFlags
 00:cd6a wActionResultOrTookBattleTurn
 00:cd6b wJoyIgnore
-00:cd6c wNumMovesMinusOne
 00:cd6c wDownscaledMonSize
+00:cd6c wNumMovesMinusOne
 00:cd6d wNameBuffer
 00:cd6d wMoveData
 00:cd6d wPayDayMoney
@@ -18919,10 +18919,10 @@
 00:d08a wFlashScreenLongCounter
 00:d08a wSpiralBallsBaseY
 00:d08a wFallingObjectMovementByte
-00:d08a wTradedMonMovingRight
 00:d08a wOptionsInitialized
-00:d08a wUnusedWaterDropletsByte
+00:d08a wTradedMonMovingRight
 00:d08a wNewSlotMachineBallTile
+00:d08a wUnusedWaterDropletsByte
 00:d08b wNumFallingObjects
 00:d08b wSubAnimTransform
 00:d08b wSpiralBallsBaseX
@@ -19008,8 +19008,8 @@
 00:d11e wUsingPPUp
 00:d11e wMoveGrammar
 00:d11e wTempTMHM
-00:d11e wTypeEffectiveness
 00:d11e wNumSetBits
+00:d11e wTypeEffectiveness
 00:d11e wNamedObjectIndex
 00:d11e wCalculateWhoseStats
 00:d11f wForcePlayerToChooseMon
@@ -19129,8 +19129,8 @@
 00:d1de wPartyMon3DVs
 00:d1e0 wPartyMon3PP
 00:d1e4 wPartyMon3Level
-00:d1e5 wPartyMon3Stats
 00:d1e5 wPartyMon3MaxHP
+00:d1e5 wPartyMon3Stats
 00:d1e7 wPartyMon3Attack
 00:d1e9 wPartyMon3Defense
 00:d1eb wPartyMon3Speed
@@ -19187,8 +19187,8 @@
 00:d241 wPartyMon5Defense
 00:d243 wPartyMon5Speed
 00:d245 wPartyMon5Special
-00:d247 wPartyMon6Species
 00:d247 wPartyMon6
+00:d247 wPartyMon6Species
 00:d248 wPartyMon6HP
 00:d24a wPartyMon6BoxLevel
 00:d24b wPartyMon6Status
@@ -19587,8 +19587,8 @@
 00:d94e wEnemyMon4Defense
 00:d950 wEnemyMon4Speed
 00:d952 wEnemyMon4Special
-00:d954 wEnemyMon5Species
 00:d954 wEnemyMon5
+00:d954 wEnemyMon5Species
 00:d955 wEnemyMon5HP
 00:d957 wEnemyMon5BoxLevel
 00:d958 wEnemyMon5Status
@@ -19618,8 +19618,8 @@
 00:d981 wEnemyMon6HP
 00:d983 wEnemyMon6BoxLevel
 00:d984 wEnemyMon6Status
-00:d985 wEnemyMon6Type1
 00:d985 wEnemyMon6Type
+00:d985 wEnemyMon6Type1
 00:d986 wEnemyMon6Type2
 00:d987 wEnemyMon6CatchRate
 00:d988 wEnemyMon6Moves
@@ -19766,8 +19766,8 @@
 00:db12 wBoxMon4SpecialExp
 00:db14 wBoxMon4DVs
 00:db16 wBoxMon4PP
-00:db1a wBoxMon5Species
 00:db1a wBoxMon5
+00:db1a wBoxMon5Species
 00:db1b wBoxMon5HP
 00:db1d wBoxMon5BoxLevel
 00:db1e wBoxMon5Status
@@ -19847,8 +19847,8 @@
 00:db9f wBoxMon9HP
 00:dba1 wBoxMon9BoxLevel
 00:dba2 wBoxMon9Status
-00:dba3 wBoxMon9Type
 00:dba3 wBoxMon9Type1
+00:dba3 wBoxMon9Type
 00:dba4 wBoxMon9Type2
 00:dba5 wBoxMon9CatchRate
 00:dba6 wBoxMon9Moves
@@ -19956,8 +19956,8 @@
 00:dc5c wBoxMon14SpecialExp
 00:dc5e wBoxMon14DVs
 00:dc60 wBoxMon14PP
-00:dc64 wBoxMon15Species
 00:dc64 wBoxMon15
+00:dc64 wBoxMon15Species
 00:dc65 wBoxMon15HP
 00:dc67 wBoxMon15BoxLevel
 00:dc68 wBoxMon15Status
@@ -19999,8 +19999,8 @@
 00:dca7 wBoxMon17HP
 00:dca9 wBoxMon17BoxLevel
 00:dcaa wBoxMon17Status
-00:dcab wBoxMon17Type1
 00:dcab wBoxMon17Type
+00:dcab wBoxMon17Type1
 00:dcac wBoxMon17Type2
 00:dcad wBoxMon17CatchRate
 00:dcae wBoxMon17Moves
@@ -20032,8 +20032,8 @@
 00:dce0 wBoxMon18SpecialExp
 00:dce2 wBoxMon18DVs
 00:dce4 wBoxMon18PP
-00:dce8 wBoxMon19
 00:dce8 wBoxMon19Species
+00:dce8 wBoxMon19
 00:dce9 wBoxMon19HP
 00:dceb wBoxMon19BoxLevel
 00:dcec wBoxMon19Status
@@ -20129,18 +20129,18 @@
 00:ff8b hPreviousTileset
 00:ff8b hOAMTile
 00:ff8b hBaseTileID
+00:ff8b hEastWestConnectedMapWidth
 00:ff8b hItemPrice
 00:ff8b hDexWeight
-00:ff8b hEastWestConnectedMapWidth
 00:ff8b hSpriteInterlaceCounter
 00:ff8b hRLEByteValue
 00:ff8c hNorthSouthConnectedMapWidth
 00:ff8c hMapWidth
 00:ff8c hSpriteHeight
 00:ff8c hPartyMonIndex
-00:ff8c hSpriteIndex
-00:ff8c hTextID
 00:ff8c hSlidingRegionSize
+00:ff8c hTextID
+00:ff8c hSpriteIndex
 00:ff8c hDownArrowBlinkCount2
 00:ff8d hEnemySpeed
 00:ff8d hLoadSpriteTemp1
@@ -20165,13 +20165,13 @@
 00:ff94 hSpritePriority
 00:ff95 hSwapItemID
 00:ff95 hNPCPlayerYDistance
-00:ff95 hNPCSpriteOffset
 00:ff95 hDividend
 00:ff95 hSignCoordPointer
-00:ff95 hQuotient
-00:ff95 hNPCMovementDirections2Index
 00:ff95 hPastLeadingZeros
+00:ff95 hQuotient
 00:ff95 hProduct
+00:ff95 hNPCMovementDirections2Index
+00:ff95 hNPCSpriteOffset
 00:ff95 hSwapTemp
 00:ff96 hMutateWY
 00:ff96 hSwapItemQuantity
@@ -20255,12 +20255,12 @@
 00:ffdc hVendingMachinePrice
 00:ffdc hPlayerYCoord
 00:ffdc hOaksAideRewardItem
-00:ffdc hItemToRemoveIndex
 00:ffdc hGymGateAnswer
+00:ffdc hItemToRemoveIndex
 00:ffdd hPlayerXCoord
 00:ffdd hOaksAideNumMonsOwned
-00:ffe0 hUnlockedSilphCoDoors
 00:ffe0 hBackupGymGateIndex
+00:ffe0 hUnlockedSilphCoDoors
 00:ffe1 hStartTileID
 00:ffe4 hNewPartyLength
 00:ffe5 hDividend2
--- a/pokeblue_vc.map
+++ b/pokeblue_vc.map
@@ -362,8 +362,8 @@ ROM0 bank #0:
 	         $1765 = Forest_Coll
 	         $1775 = House_Coll
 	         $177f = Gate_Coll
-	         $177f = ForestGate_Coll
 	         $177f = Museum_Coll
+	         $177f = ForestGate_Coll
 	         $178a = Ship_Coll
 	         $1795 = ShipPort_Coll
 	         $179a = Cemetery_Coll
@@ -7024,8 +7024,8 @@ ROMX bank #15:
 	         $5647 = LinkBattleExchangeData.VC_Wireless_end_exchange
 	         $5649 = LinkBattleExchangeData.syncLoop2
 	         $5649 = LinkBattleExchangeData.VC_Wireless_net_delay_1_End
-	         $5652 = LinkBattleExchangeData.VC_Wireless_start_send_zero_bytes
 	         $5652 = LinkBattleExchangeData.VC_Wireless_net_delay_2
+	         $5652 = LinkBattleExchangeData.VC_Wireless_start_send_zero_bytes
 	         $5654 = LinkBattleExchangeData.syncLoop3
 	         $5654 = LinkBattleExchangeData.VC_Wireless_net_delay_2_End
 	         $565d = LinkBattleExchangeData.VC_Wireless_end_send_zero_bytes
@@ -9250,8 +9250,8 @@ ROMX bank #19:
 	         $5e76 = BlackbeltPic
 	         $6049 = Rival1Pic
 	         $615f = ProfOakPic
-	         $627d = ScientistPic
 	         $627d = ChiefPic
+	         $627d = ScientistPic
 	         $63be = GiovanniPic
 	         $649f = RocketPic
 	         $6635 = CooltrainerMPic
@@ -12390,9 +12390,9 @@ ROMX bank #26:
 	         $55ff = Gate_GFX
 	         $55ff = Museum_GFX
 	         $55ff = ForestGate_GFX
+	         $5bef = ForestGate_Block
 	         $5bef = Gate_Block
 	         $5bef = Museum_Block
-	         $5bef = ForestGate_Block
 	         $63ef = Forest_GFX
 	         $69ef = Forest_Block
 	         $71ef = Facility_GFX
@@ -17805,8 +17805,8 @@ VRAM bank #0:
 	         $8000 = vChars0
 	         $8000 = vSprites
 	         $8000 = vNPCSprites
-	         $8800 = vTitleLogo
 	         $8800 = vFont
+	         $8800 = vTitleLogo
 	         $8800 = vChars1
 	         $8800 = vNPCSprites2
 	         $9000 = vFrontPic
@@ -17959,8 +17959,8 @@ WRAM0 bank #0:
 	         $c12b = wSprite02StateData1XAdjusted
 	         $c12c = wSprite02StateData1CollisionData
 	         $c130 = wSprite02StateData1End
-	         $c130 = wSprite03StateData1
 	         $c130 = wSprite03StateData1PictureID
+	         $c130 = wSprite03StateData1
 	         $c131 = wSprite03StateData1MovementStatus
 	         $c132 = wSprite03StateData1ImageIndex
 	         $c133 = wSprite03StateData1YStepVector
@@ -17989,8 +17989,8 @@ WRAM0 bank #0:
 	         $c14b = wSprite04StateData1XAdjusted
 	         $c14c = wSprite04StateData1CollisionData
 	         $c150 = wSprite05StateData1PictureID
-	         $c150 = wSprite04StateData1End
 	         $c150 = wSprite05StateData1
+	         $c150 = wSprite04StateData1End
 	         $c151 = wSprite05StateData1MovementStatus
 	         $c152 = wSprite05StateData1ImageIndex
 	         $c153 = wSprite05StateData1YStepVector
@@ -18108,9 +18108,9 @@ WRAM0 bank #0:
 	         $c1ca = wSprite12StateData1YAdjusted
 	         $c1cb = wSprite12StateData1XAdjusted
 	         $c1cc = wSprite12StateData1CollisionData
+	         $c1d0 = wSprite13StateData1PictureID
 	         $c1d0 = wSprite12StateData1End
 	         $c1d0 = wSprite13StateData1
-	         $c1d0 = wSprite13StateData1PictureID
 	         $c1d1 = wSprite13StateData1MovementStatus
 	         $c1d2 = wSprite13StateData1ImageIndex
 	         $c1d3 = wSprite13StateData1YStepVector
@@ -18123,8 +18123,8 @@ WRAM0 bank #0:
 	         $c1da = wSprite13StateData1YAdjusted
 	         $c1db = wSprite13StateData1XAdjusted
 	         $c1dc = wSprite13StateData1CollisionData
-	         $c1e0 = wSprite14StateData1
 	         $c1e0 = wSprite14StateData1PictureID
+	         $c1e0 = wSprite14StateData1
 	         $c1e0 = wSprite13StateData1End
 	         $c1e1 = wSprite14StateData1MovementStatus
 	         $c1e2 = wSprite14StateData1ImageIndex
@@ -18139,8 +18139,8 @@ WRAM0 bank #0:
 	         $c1eb = wSprite14StateData1XAdjusted
 	         $c1ec = wSprite14StateData1CollisionData
 	         $c1f0 = wSprite15StateData1PictureID
-	         $c1f0 = wSprite14StateData1End
 	         $c1f0 = wSprite15StateData1
+	         $c1f0 = wSprite14StateData1End
 	         $c1f1 = wSprite15StateData1MovementStatus
 	         $c1f2 = wSprite15StateData1ImageIndex
 	         $c1f3 = wSprite15StateData1YStepVector
@@ -18154,9 +18154,9 @@ WRAM0 bank #0:
 	         $c1fb = wSprite15StateData1XAdjusted
 	         $c1fc = wSprite15StateData1CollisionData
 	         $c200 = wSpriteStateData2
-	         $c200 = wSprite15StateData1End
 	         $c200 = wSpritePlayerStateData2WalkAnimationCounter
 	         $c200 = wSpritePlayerStateData2
+	         $c200 = wSprite15StateData1End
 	         $c202 = wSpritePlayerStateData2YDisplacement
 	         $c203 = wSpritePlayerStateData2XDisplacement
 	         $c204 = wSpritePlayerStateData2MapY
@@ -18167,9 +18167,9 @@ WRAM0 bank #0:
 	         $c209 = wSpritePlayerStateData2OrigFacingDirection
 	         $c20d = wSpritePlayerStateData2PictureID
 	         $c20e = wSpritePlayerStateData2ImageBaseOffset
+	         $c210 = wSprite01StateData2
 	         $c210 = wSpritePlayerStateData2End
 	         $c210 = wSprite01StateData2WalkAnimationCounter
-	         $c210 = wSprite01StateData2
 	         $c212 = wSprite01StateData2YDisplacement
 	         $c213 = wSprite01StateData2XDisplacement
 	         $c214 = wSprite01StateData2MapY
@@ -18181,8 +18181,8 @@ WRAM0 bank #0:
 	         $c21d = wSprite01StateData2PictureID
 	         $c21e = wSprite01StateData2ImageBaseOffset
 	         $c220 = wSprite02StateData2WalkAnimationCounter
-	         $c220 = wSprite01StateData2End
 	         $c220 = wSprite02StateData2
+	         $c220 = wSprite01StateData2End
 	         $c222 = wSprite02StateData2YDisplacement
 	         $c223 = wSprite02StateData2XDisplacement
 	         $c224 = wSprite02StateData2MapY
@@ -18194,8 +18194,8 @@ WRAM0 bank #0:
 	         $c22d = wSprite02StateData2PictureID
 	         $c22e = wSprite02StateData2ImageBaseOffset
 	         $c230 = wSprite03StateData2
-	         $c230 = wSprite03StateData2WalkAnimationCounter
 	         $c230 = wSprite02StateData2End
+	         $c230 = wSprite03StateData2WalkAnimationCounter
 	         $c232 = wSprite03StateData2YDisplacement
 	         $c233 = wSprite03StateData2XDisplacement
 	         $c234 = wSprite03StateData2MapY
@@ -18206,9 +18206,9 @@ WRAM0 bank #0:
 	         $c239 = wSprite03StateData2OrigFacingDirection
 	         $c23d = wSprite03StateData2PictureID
 	         $c23e = wSprite03StateData2ImageBaseOffset
-	         $c240 = wSprite04StateData2WalkAnimationCounter
 	         $c240 = wSprite04StateData2
 	         $c240 = wSprite03StateData2End
+	         $c240 = wSprite04StateData2WalkAnimationCounter
 	         $c242 = wSprite04StateData2YDisplacement
 	         $c243 = wSprite04StateData2XDisplacement
 	         $c244 = wSprite04StateData2MapY
@@ -18219,9 +18219,9 @@ WRAM0 bank #0:
 	         $c249 = wSprite04StateData2OrigFacingDirection
 	         $c24d = wSprite04StateData2PictureID
 	         $c24e = wSprite04StateData2ImageBaseOffset
-	         $c250 = wSprite04StateData2End
 	         $c250 = wSprite05StateData2WalkAnimationCounter
 	         $c250 = wSprite05StateData2
+	         $c250 = wSprite04StateData2End
 	         $c252 = wSprite05StateData2YDisplacement
 	         $c253 = wSprite05StateData2XDisplacement
 	         $c254 = wSprite05StateData2MapY
@@ -18232,9 +18232,9 @@ WRAM0 bank #0:
 	         $c259 = wSprite05StateData2OrigFacingDirection
 	         $c25d = wSprite05StateData2PictureID
 	         $c25e = wSprite05StateData2ImageBaseOffset
-	         $c260 = wSprite06StateData2
-	         $c260 = wSprite05StateData2End
 	         $c260 = wSprite06StateData2WalkAnimationCounter
+	         $c260 = wSprite05StateData2End
+	         $c260 = wSprite06StateData2
 	         $c262 = wSprite06StateData2YDisplacement
 	         $c263 = wSprite06StateData2XDisplacement
 	         $c264 = wSprite06StateData2MapY
@@ -18245,8 +18245,8 @@ WRAM0 bank #0:
 	         $c269 = wSprite06StateData2OrigFacingDirection
 	         $c26d = wSprite06StateData2PictureID
 	         $c26e = wSprite06StateData2ImageBaseOffset
-	         $c270 = wSprite06StateData2End
 	         $c270 = wSprite07StateData2
+	         $c270 = wSprite06StateData2End
 	         $c270 = wSprite07StateData2WalkAnimationCounter
 	         $c272 = wSprite07StateData2YDisplacement
 	         $c273 = wSprite07StateData2XDisplacement
@@ -18258,9 +18258,9 @@ WRAM0 bank #0:
 	         $c279 = wSprite07StateData2OrigFacingDirection
 	         $c27d = wSprite07StateData2PictureID
 	         $c27e = wSprite07StateData2ImageBaseOffset
-	         $c280 = wSprite07StateData2End
-	         $c280 = wSprite08StateData2
 	         $c280 = wSprite08StateData2WalkAnimationCounter
+	         $c280 = wSprite08StateData2
+	         $c280 = wSprite07StateData2End
 	         $c282 = wSprite08StateData2YDisplacement
 	         $c283 = wSprite08StateData2XDisplacement
 	         $c284 = wSprite08StateData2MapY
@@ -18271,9 +18271,9 @@ WRAM0 bank #0:
 	         $c289 = wSprite08StateData2OrigFacingDirection
 	         $c28d = wSprite08StateData2PictureID
 	         $c28e = wSprite08StateData2ImageBaseOffset
+	         $c290 = wSprite09StateData2WalkAnimationCounter
 	         $c290 = wSprite09StateData2
 	         $c290 = wSprite08StateData2End
-	         $c290 = wSprite09StateData2WalkAnimationCounter
 	         $c292 = wSprite09StateData2YDisplacement
 	         $c293 = wSprite09StateData2XDisplacement
 	         $c294 = wSprite09StateData2MapY
@@ -18284,9 +18284,9 @@ WRAM0 bank #0:
 	         $c299 = wSprite09StateData2OrigFacingDirection
 	         $c29d = wSprite09StateData2PictureID
 	         $c29e = wSprite09StateData2ImageBaseOffset
-	         $c2a0 = wSprite10StateData2WalkAnimationCounter
-	         $c2a0 = wSprite09StateData2End
 	         $c2a0 = wSprite10StateData2
+	         $c2a0 = wSprite09StateData2End
+	         $c2a0 = wSprite10StateData2WalkAnimationCounter
 	         $c2a2 = wSprite10StateData2YDisplacement
 	         $c2a3 = wSprite10StateData2XDisplacement
 	         $c2a4 = wSprite10StateData2MapY
@@ -18297,8 +18297,8 @@ WRAM0 bank #0:
 	         $c2a9 = wSprite10StateData2OrigFacingDirection
 	         $c2ad = wSprite10StateData2PictureID
 	         $c2ae = wSprite10StateData2ImageBaseOffset
-	         $c2b0 = wSprite11StateData2
 	         $c2b0 = wSprite11StateData2WalkAnimationCounter
+	         $c2b0 = wSprite11StateData2
 	         $c2b0 = wSprite10StateData2End
 	         $c2b2 = wSprite11StateData2YDisplacement
 	         $c2b3 = wSprite11StateData2XDisplacement
@@ -18323,8 +18323,8 @@ WRAM0 bank #0:
 	         $c2c9 = wSprite12StateData2OrigFacingDirection
 	         $c2cd = wSprite12StateData2PictureID
 	         $c2ce = wSprite12StateData2ImageBaseOffset
-	         $c2d0 = wSprite13StateData2
 	         $c2d0 = wSprite13StateData2WalkAnimationCounter
+	         $c2d0 = wSprite13StateData2
 	         $c2d0 = wSprite12StateData2End
 	         $c2d2 = wSprite13StateData2YDisplacement
 	         $c2d3 = wSprite13StateData2XDisplacement
@@ -18349,9 +18349,9 @@ WRAM0 bank #0:
 	         $c2e9 = wSprite14StateData2OrigFacingDirection
 	         $c2ed = wSprite14StateData2PictureID
 	         $c2ee = wSprite14StateData2ImageBaseOffset
+	         $c2f0 = wSprite14StateData2End
 	         $c2f0 = wSprite15StateData2WalkAnimationCounter
 	         $c2f0 = wSprite15StateData2
-	         $c2f0 = wSprite14StateData2End
 	         $c2f2 = wSprite15StateData2YDisplacement
 	         $c2f3 = wSprite15StateData2XDisplacement
 	         $c2f4 = wSprite15StateData2MapY
@@ -18362,22 +18362,22 @@ WRAM0 bank #0:
 	         $c2f9 = wSprite15StateData2OrigFacingDirection
 	         $c2fd = wSprite15StateData2PictureID
 	         $c2fe = wSprite15StateData2ImageBaseOffset
-	         $c300 = wSprite15StateData2End
 	         $c300 = wSpriteDataEnd
+	         $c300 = wSprite15StateData2End
 	SECTION: $c300-$c39f ($00a0 bytes) ["OAM Buffer"]
+	         $c300 = wShadowOAMSprite00YCoord
 	         $c300 = wShadowOAM
 	         $c300 = wShadowOAMSprite00
-	         $c300 = wShadowOAMSprite00YCoord
 	         $c301 = wShadowOAMSprite00XCoord
 	         $c302 = wShadowOAMSprite00TileID
 	         $c303 = wShadowOAMSprite00Attributes
-	         $c304 = wShadowOAMSprite01YCoord
 	         $c304 = wShadowOAMSprite01
+	         $c304 = wShadowOAMSprite01YCoord
 	         $c305 = wShadowOAMSprite01XCoord
 	         $c306 = wShadowOAMSprite01TileID
 	         $c307 = wShadowOAMSprite01Attributes
-	         $c308 = wShadowOAMSprite02
 	         $c308 = wShadowOAMSprite02YCoord
+	         $c308 = wShadowOAMSprite02
 	         $c309 = wShadowOAMSprite02XCoord
 	         $c30a = wShadowOAMSprite02TileID
 	         $c30b = wShadowOAMSprite02Attributes
@@ -18396,18 +18396,18 @@ WRAM0 bank #0:
 	         $c315 = wShadowOAMSprite05XCoord
 	         $c316 = wShadowOAMSprite05TileID
 	         $c317 = wShadowOAMSprite05Attributes
-	         $c318 = wShadowOAMSprite06
 	         $c318 = wShadowOAMSprite06YCoord
+	         $c318 = wShadowOAMSprite06
 	         $c319 = wShadowOAMSprite06XCoord
 	         $c31a = wShadowOAMSprite06TileID
 	         $c31b = wShadowOAMSprite06Attributes
-	         $c31c = wShadowOAMSprite07
 	         $c31c = wShadowOAMSprite07YCoord
+	         $c31c = wShadowOAMSprite07
 	         $c31d = wShadowOAMSprite07XCoord
 	         $c31e = wShadowOAMSprite07TileID
 	         $c31f = wShadowOAMSprite07Attributes
-	         $c320 = wShadowOAMSprite08
 	         $c320 = wShadowOAMSprite08YCoord
+	         $c320 = wShadowOAMSprite08
 	         $c321 = wShadowOAMSprite08XCoord
 	         $c322 = wShadowOAMSprite08TileID
 	         $c323 = wShadowOAMSprite08Attributes
@@ -18416,8 +18416,8 @@ WRAM0 bank #0:
 	         $c325 = wShadowOAMSprite09XCoord
 	         $c326 = wShadowOAMSprite09TileID
 	         $c327 = wShadowOAMSprite09Attributes
-	         $c328 = wShadowOAMSprite10
 	         $c328 = wShadowOAMSprite10YCoord
+	         $c328 = wShadowOAMSprite10
 	         $c329 = wShadowOAMSprite10XCoord
 	         $c32a = wShadowOAMSprite10TileID
 	         $c32b = wShadowOAMSprite10Attributes
@@ -18426,13 +18426,13 @@ WRAM0 bank #0:
 	         $c32d = wShadowOAMSprite11XCoord
 	         $c32e = wShadowOAMSprite11TileID
 	         $c32f = wShadowOAMSprite11Attributes
-	         $c330 = wShadowOAMSprite12
 	         $c330 = wShadowOAMSprite12YCoord
+	         $c330 = wShadowOAMSprite12
 	         $c331 = wShadowOAMSprite12XCoord
 	         $c332 = wShadowOAMSprite12TileID
 	         $c333 = wShadowOAMSprite12Attributes
-	         $c334 = wShadowOAMSprite13
 	         $c334 = wShadowOAMSprite13YCoord
+	         $c334 = wShadowOAMSprite13
 	         $c335 = wShadowOAMSprite13XCoord
 	         $c336 = wShadowOAMSprite13TileID
 	         $c337 = wShadowOAMSprite13Attributes
@@ -18456,8 +18456,8 @@ WRAM0 bank #0:
 	         $c345 = wShadowOAMSprite17XCoord
 	         $c346 = wShadowOAMSprite17TileID
 	         $c347 = wShadowOAMSprite17Attributes
-	         $c348 = wShadowOAMSprite18
 	         $c348 = wShadowOAMSprite18YCoord
+	         $c348 = wShadowOAMSprite18
 	         $c349 = wShadowOAMSprite18XCoord
 	         $c34a = wShadowOAMSprite18TileID
 	         $c34b = wShadowOAMSprite18Attributes
@@ -18466,13 +18466,13 @@ WRAM0 bank #0:
 	         $c34d = wShadowOAMSprite19XCoord
 	         $c34e = wShadowOAMSprite19TileID
 	         $c34f = wShadowOAMSprite19Attributes
-	         $c350 = wShadowOAMSprite20
 	         $c350 = wShadowOAMSprite20YCoord
+	         $c350 = wShadowOAMSprite20
 	         $c351 = wShadowOAMSprite20XCoord
 	         $c352 = wShadowOAMSprite20TileID
 	         $c353 = wShadowOAMSprite20Attributes
-	         $c354 = wShadowOAMSprite21
 	         $c354 = wShadowOAMSprite21YCoord
+	         $c354 = wShadowOAMSprite21
 	         $c355 = wShadowOAMSprite21XCoord
 	         $c356 = wShadowOAMSprite21TileID
 	         $c357 = wShadowOAMSprite21Attributes
@@ -18481,8 +18481,8 @@ WRAM0 bank #0:
 	         $c359 = wShadowOAMSprite22XCoord
 	         $c35a = wShadowOAMSprite22TileID
 	         $c35b = wShadowOAMSprite22Attributes
-	         $c35c = wShadowOAMSprite23
 	         $c35c = wShadowOAMSprite23YCoord
+	         $c35c = wShadowOAMSprite23
 	         $c35d = wShadowOAMSprite23XCoord
 	         $c35e = wShadowOAMSprite23TileID
 	         $c35f = wShadowOAMSprite23Attributes
@@ -18501,18 +18501,18 @@ WRAM0 bank #0:
 	         $c369 = wShadowOAMSprite26XCoord
 	         $c36a = wShadowOAMSprite26TileID
 	         $c36b = wShadowOAMSprite26Attributes
-	         $c36c = wShadowOAMSprite27
 	         $c36c = wShadowOAMSprite27YCoord
+	         $c36c = wShadowOAMSprite27
 	         $c36d = wShadowOAMSprite27XCoord
 	         $c36e = wShadowOAMSprite27TileID
 	         $c36f = wShadowOAMSprite27Attributes
-	         $c370 = wShadowOAMSprite28
 	         $c370 = wShadowOAMSprite28YCoord
+	         $c370 = wShadowOAMSprite28
 	         $c371 = wShadowOAMSprite28XCoord
 	         $c372 = wShadowOAMSprite28TileID
 	         $c373 = wShadowOAMSprite28Attributes
-	         $c374 = wShadowOAMSprite29
 	         $c374 = wShadowOAMSprite29YCoord
+	         $c374 = wShadowOAMSprite29
 	         $c375 = wShadowOAMSprite29XCoord
 	         $c376 = wShadowOAMSprite29TileID
 	         $c377 = wShadowOAMSprite29Attributes
@@ -18526,8 +18526,8 @@ WRAM0 bank #0:
 	         $c37d = wShadowOAMSprite31XCoord
 	         $c37e = wShadowOAMSprite31TileID
 	         $c37f = wShadowOAMSprite31Attributes
-	         $c380 = wShadowOAMSprite32YCoord
 	         $c380 = wShadowOAMSprite32
+	         $c380 = wShadowOAMSprite32YCoord
 	         $c381 = wShadowOAMSprite32XCoord
 	         $c382 = wShadowOAMSprite32TileID
 	         $c383 = wShadowOAMSprite32Attributes
@@ -18623,8 +18623,8 @@ WRAM0 bank #0:
 	         $c52d = wShadowOAMBackupSprite09XCoord
 	         $c52e = wShadowOAMBackupSprite09TileID
 	         $c52f = wShadowOAMBackupSprite09Attributes
-	         $c530 = wShadowOAMBackupSprite10YCoord
 	         $c530 = wShadowOAMBackupSprite10
+	         $c530 = wShadowOAMBackupSprite10YCoord
 	         $c531 = wShadowOAMBackupSprite10XCoord
 	         $c532 = wShadowOAMBackupSprite10TileID
 	         $c533 = wShadowOAMBackupSprite10Attributes
@@ -18653,8 +18653,8 @@ WRAM0 bank #0:
 	         $c545 = wShadowOAMBackupSprite15XCoord
 	         $c546 = wShadowOAMBackupSprite15TileID
 	         $c547 = wShadowOAMBackupSprite15Attributes
-	         $c548 = wShadowOAMBackupSprite16
 	         $c548 = wShadowOAMBackupSprite16YCoord
+	         $c548 = wShadowOAMBackupSprite16
 	         $c549 = wShadowOAMBackupSprite16XCoord
 	         $c54a = wShadowOAMBackupSprite16TileID
 	         $c54b = wShadowOAMBackupSprite16Attributes
@@ -18829,10 +18829,10 @@ WRAM0 bank #0:
 	         $cc5b = wMonPartySpritesSavedOAM
 	         $cc5b = wElevatorWarpMaps
 	         $cc5b = wVermilionDockTileMapBuffer
-	         $cc5b = wSlotMachineSevenAndBarModeChance
-	         $cc5b = wOaksAideRewardItemName
 	         $cc5b = wHallOfFame
+	         $cc5b = wOaksAideRewardItemName
 	         $cc5b = wDexRatingNumMonsSeen
+	         $cc5b = wSlotMachineSevenAndBarModeChance
 	         $cc5b = wUnusedFlag
 	         $cc5b = wFilteredBagItems
 	         $cc5c = wDexRatingNumMonsOwned
@@ -18878,10 +18878,10 @@ WRAM0 bank #0:
 	         $cd05 = wEnemyNumHits
 	         $cd05 = wLuckySlotHiddenObjectIndex
 	         $cd05 = wEnemyBideAccumulatedDamage
-	         $cd0f = wPlayerMonUnmodifiedLevel
 	         $cd0f = wVermilionDockTileMapBufferEnd
-	         $cd0f = wMiscBattleDataEnd
 	         $cd0f = wInGameTradeGiveMonSpecies
+	         $cd0f = wPlayerMonUnmodifiedLevel
+	         $cd0f = wMiscBattleDataEnd
 	         $cd10 = wPlayerMonUnmodifiedMaxHP
 	         $cd10 = wInGameTradeTextPointerTablePointer
 	         $cd12 = wPlayerMonUnmodifiedAttack
@@ -18930,6 +18930,7 @@ WRAM0 bank #0:
 	         $cd3d = wNumShakes
 	         $cd3d = wPPRestoreItem
 	         $cd3d = wDexMaxSeenMon
+	         $cd3d = wWhichTrade
 	         $cd3d = wChangeBoxSavedMapTextPointer
 	         $cd3d = wBadgeNumberTile
 	         $cd3d = wOptionsTextSpeedCursorX
@@ -18951,22 +18952,21 @@ WRAM0 bank #0:
 	         $cd3d = wChargeMoveNum
 	         $cd3d = wPriceTemp
 	         $cd3d = wTitleMonSpecies
-	         $cd3d = wFieldMoves
-	         $cd3d = wPlayerCharacterOAMTile
-	         $cd3d = wCoordIndex
+	         $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 	         $cd3d = wTempSCX
-	         $cd3d = wUnusedCreditsByte
-	         $cd3d = wBoxMonCounts
-	         $cd3d = wHoFTeamIndex
-	         $cd3d = wWhichTrade
-	         $cd3d = wSavedY
-	         $cd3d = wDayCareStartLevel
 	         $cd3d = wMoveDownSmallStarsOAMCount
+	         $cd3d = wStoppingWhichSlotMachineWheel
+	         $cd3d = wUnusedCreditsByte
+	         $cd3d = wFieldMoves
+	         $cd3d = wCoordIndex
+	         $cd3d = wHoFTeamIndex
+	         $cd3d = wDayCareStartLevel
+	         $cd3d = wBoxMonCounts
+	         $cd3d = wSavedY
+	         $cd3d = wPlayerCharacterOAMTile
 	         $cd3d = wWereAnyMonsAsleep
 	         $cd3d = wFallingObjectsMovementData
 	         $cd3d = wTrainerSpriteOffset
-	         $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
-	         $cd3d = wStoppingWhichSlotMachineWheel
 	         $cd3e = wNumCreditsMonsDisplayed
 	         $cd3e = wTrainerInfoTextBoxWidth
 	         $cd3e = wTrainerEngageDistance
@@ -18982,8 +18982,8 @@ WRAM0 bank #0:
 	         $cd3e = wBattleTransitionCircleScreenQuadrantX
 	         $cd3e = wTradingWhichEnemyMon
 	         $cd3e = wTradedEnemyMonSpecies
-	         $cd3e = wBadgeNameTile
 	         $cd3e = wRivalStarterBallSpriteIndex
+	         $cd3e = wBadgeNameTile
 	         $cd3e = wHoFPartyMonIndex
 	         $cd3e = wOptionsBattleAnimCursorX
 	         $cd3f = wJigglypuffFacingDirections
@@ -18994,27 +18994,27 @@ WRAM0 bank #0:
 	         $cd3f = wSlotMachineWheel2Offset
 	         $cd3f = wFlyAnimBirdSpriteImageIndex
 	         $cd3f = wNameOfPlayerMonToBeTraded
+	         $cd3f = wDayCareTotalCost
 	         $cd3f = wHoFMonLevel
 	         $cd3f = wTrainerFacingDirection
 	         $cd3f = wHiddenObjectIndex
-	         $cd3f = wDayCareTotalCost
-	         $cd3f = wHUDGraphicsTiles
 	         $cd3f = wOptionsBattleStyleCursorX
+	         $cd3f = wHUDGraphicsTiles
 	         $cd40 = wOptionsCancelCursorX
 	         $cd40 = wTrainerScreenY
+	         $cd40 = wSlotMachineWheel3Offset
 	         $cd40 = wPlayerSpinInPlaceAnimSoundID
 	         $cd40 = wHiddenObjectY
-	         $cd40 = wSlotMachineWheel3Offset
 	         $cd40 = wHoFMonOrPlayer
 	         $cd41 = wSlotMachineWheel1BottomTile
 	         $cd41 = wSlotMachineWinningSymbol
 	         $cd41 = wHoFTeamIndex2
 	         $cd41 = wNumFieldMoves
+	         $cd41 = wDayCarePerLevelCost
 	         $cd41 = wTradedPlayerMonOT
-	         $cd41 = wHiddenItemOrCoinsIndex
 	         $cd41 = wHiddenObjectX
 	         $cd41 = wTrainerScreenX
-	         $cd41 = wDayCarePerLevelCost
+	         $cd41 = wHiddenItemOrCoinsIndex
 	         $cd42 = wSlotMachineWheel1MiddleTile
 	         $cd42 = wHoFTeamNo
 	         $cd42 = wFieldMovesLeftmostXCoord
@@ -19024,8 +19024,8 @@ WRAM0 bank #0:
 	         $cd45 = wSlotMachineWheel2MiddleTile
 	         $cd46 = wTempCoins1
 	         $cd46 = wSlotMachineWheel2TopTile
-	         $cd47 = wBattleTransitionSpiralDirection
 	         $cd47 = wSlotMachineWheel3BottomTile
+	         $cd47 = wBattleTransitionSpiralDirection
 	         $cd48 = wFacingDirectionList
 	         $cd48 = wSlotMachineWheel3MiddleTile
 	         $cd49 = wTempObtainedBadgesBooleans
@@ -19047,8 +19047,8 @@ WRAM0 bank #0:
 	         $cd50 = wWhichEmotionBubble
 	         $cd59 = wTradedEnemyMonOTID
 	         $cd5b = wGymTrashCanIndex
-	         $cd5b = wOAMBaseTile
 	         $cd5b = wStandingOnWarpPadOrHole
+	         $cd5b = wOAMBaseTile
 	         $cd5c = wSymmetricSpriteOAMAttributes
 	         $cd5d = wMonPartySpriteSpecies
 	         $cd5e = wLeftGBMonSpecies
@@ -19056,12 +19056,12 @@ WRAM0 bank #0:
 	         $cd60 = wMiscFlags
 	         $cd6a = wActionResultOrTookBattleTurn
 	         $cd6b = wJoyIgnore
-	         $cd6c = wNumMovesMinusOne
 	         $cd6c = wDownscaledMonSize
+	         $cd6c = wNumMovesMinusOne
 	         $cd6d = wNameBuffer
 	         $cd6d = wMoveData
-	         $cd6d = wPayDayMoney
 	         $cd6d = wBattleMenuCurrentPP
+	         $cd6d = wPayDayMoney
 	         $cd6d = wEvoDataBuffer
 	         $cd71 = wStatusScreenCurrentPP
 	         $cd73 = wPPUpCountAndMaxPP
@@ -19295,10 +19295,10 @@ WRAM0 bank #0:
 	         $d08a = wFlashScreenLongCounter
 	         $d08a = wSpiralBallsBaseY
 	         $d08a = wFallingObjectMovementByte
-	         $d08a = wTradedMonMovingRight
 	         $d08a = wOptionsInitialized
-	         $d08a = wUnusedWaterDropletsByte
+	         $d08a = wTradedMonMovingRight
 	         $d08a = wNewSlotMachineBallTile
+	         $d08a = wUnusedWaterDropletsByte
 	         $d08b = wNumFallingObjects
 	         $d08b = wSubAnimTransform
 	         $d08b = wSpiralBallsBaseX
@@ -19384,8 +19384,8 @@ WRAM0 bank #0:
 	         $d11e = wUsingPPUp
 	         $d11e = wMoveGrammar
 	         $d11e = wTempTMHM
-	         $d11e = wTypeEffectiveness
 	         $d11e = wNumSetBits
+	         $d11e = wTypeEffectiveness
 	         $d11e = wNamedObjectIndex
 	         $d11e = wCalculateWhoseStats
 	         $d11f = wForcePlayerToChooseMon
@@ -19506,8 +19506,8 @@ WRAM0 bank #0:
 	         $d1de = wPartyMon3DVs
 	         $d1e0 = wPartyMon3PP
 	         $d1e4 = wPartyMon3Level
-	         $d1e5 = wPartyMon3Stats
 	         $d1e5 = wPartyMon3MaxHP
+	         $d1e5 = wPartyMon3Stats
 	         $d1e7 = wPartyMon3Attack
 	         $d1e9 = wPartyMon3Defense
 	         $d1eb = wPartyMon3Speed
@@ -19564,8 +19564,8 @@ WRAM0 bank #0:
 	         $d241 = wPartyMon5Defense
 	         $d243 = wPartyMon5Speed
 	         $d245 = wPartyMon5Special
-	         $d247 = wPartyMon6Species
 	         $d247 = wPartyMon6
+	         $d247 = wPartyMon6Species
 	         $d248 = wPartyMon6HP
 	         $d24a = wPartyMon6BoxLevel
 	         $d24b = wPartyMon6Status
@@ -19965,8 +19965,8 @@ WRAM0 bank #0:
 	         $d94e = wEnemyMon4Defense
 	         $d950 = wEnemyMon4Speed
 	         $d952 = wEnemyMon4Special
-	         $d954 = wEnemyMon5Species
 	         $d954 = wEnemyMon5
+	         $d954 = wEnemyMon5Species
 	         $d955 = wEnemyMon5HP
 	         $d957 = wEnemyMon5BoxLevel
 	         $d958 = wEnemyMon5Status
@@ -19996,8 +19996,8 @@ WRAM0 bank #0:
 	         $d981 = wEnemyMon6HP
 	         $d983 = wEnemyMon6BoxLevel
 	         $d984 = wEnemyMon6Status
-	         $d985 = wEnemyMon6Type1
 	         $d985 = wEnemyMon6Type
+	         $d985 = wEnemyMon6Type1
 	         $d986 = wEnemyMon6Type2
 	         $d987 = wEnemyMon6CatchRate
 	         $d988 = wEnemyMon6Moves
@@ -20145,8 +20145,8 @@ WRAM0 bank #0:
 	         $db12 = wBoxMon4SpecialExp
 	         $db14 = wBoxMon4DVs
 	         $db16 = wBoxMon4PP
-	         $db1a = wBoxMon5Species
 	         $db1a = wBoxMon5
+	         $db1a = wBoxMon5Species
 	         $db1b = wBoxMon5HP
 	         $db1d = wBoxMon5BoxLevel
 	         $db1e = wBoxMon5Status
@@ -20226,8 +20226,8 @@ WRAM0 bank #0:
 	         $db9f = wBoxMon9HP
 	         $dba1 = wBoxMon9BoxLevel
 	         $dba2 = wBoxMon9Status
-	         $dba3 = wBoxMon9Type
 	         $dba3 = wBoxMon9Type1
+	         $dba3 = wBoxMon9Type
 	         $dba4 = wBoxMon9Type2
 	         $dba5 = wBoxMon9CatchRate
 	         $dba6 = wBoxMon9Moves
@@ -20335,8 +20335,8 @@ WRAM0 bank #0:
 	         $dc5c = wBoxMon14SpecialExp
 	         $dc5e = wBoxMon14DVs
 	         $dc60 = wBoxMon14PP
-	         $dc64 = wBoxMon15Species
 	         $dc64 = wBoxMon15
+	         $dc64 = wBoxMon15Species
 	         $dc65 = wBoxMon15HP
 	         $dc67 = wBoxMon15BoxLevel
 	         $dc68 = wBoxMon15Status
@@ -20378,8 +20378,8 @@ WRAM0 bank #0:
 	         $dca7 = wBoxMon17HP
 	         $dca9 = wBoxMon17BoxLevel
 	         $dcaa = wBoxMon17Status
-	         $dcab = wBoxMon17Type1
 	         $dcab = wBoxMon17Type
+	         $dcab = wBoxMon17Type1
 	         $dcac = wBoxMon17Type2
 	         $dcad = wBoxMon17CatchRate
 	         $dcae = wBoxMon17Moves
@@ -20411,8 +20411,8 @@ WRAM0 bank #0:
 	         $dce0 = wBoxMon18SpecialExp
 	         $dce2 = wBoxMon18DVs
 	         $dce4 = wBoxMon18PP
-	         $dce8 = wBoxMon19
 	         $dce8 = wBoxMon19Species
+	         $dce8 = wBoxMon19
 	         $dce9 = wBoxMon19HP
 	         $dceb = wBoxMon19BoxLevel
 	         $dcec = wBoxMon19Status
@@ -20515,18 +20515,18 @@ HRAM bank #0:
 	         $ff8b = hPreviousTileset
 	         $ff8b = hOAMTile
 	         $ff8b = hBaseTileID
+	         $ff8b = hEastWestConnectedMapWidth
 	         $ff8b = hItemPrice
 	         $ff8b = hDexWeight
-	         $ff8b = hEastWestConnectedMapWidth
 	         $ff8b = hSpriteInterlaceCounter
 	         $ff8b = hRLEByteValue
 	         $ff8c = hNorthSouthConnectedMapWidth
 	         $ff8c = hMapWidth
 	         $ff8c = hSpriteHeight
 	         $ff8c = hPartyMonIndex
-	         $ff8c = hSpriteIndex
-	         $ff8c = hTextID
 	         $ff8c = hSlidingRegionSize
+	         $ff8c = hTextID
+	         $ff8c = hSpriteIndex
 	         $ff8c = hDownArrowBlinkCount2
 	         $ff8d = hEnemySpeed
 	         $ff8d = hLoadSpriteTemp1
@@ -20551,13 +20551,13 @@ HRAM bank #0:
 	         $ff94 = hSpritePriority
 	         $ff95 = hSwapItemID
 	         $ff95 = hNPCPlayerYDistance
-	         $ff95 = hNPCSpriteOffset
 	         $ff95 = hDividend
 	         $ff95 = hSignCoordPointer
-	         $ff95 = hQuotient
-	         $ff95 = hNPCMovementDirections2Index
 	         $ff95 = hPastLeadingZeros
+	         $ff95 = hQuotient
 	         $ff95 = hProduct
+	         $ff95 = hNPCMovementDirections2Index
+	         $ff95 = hNPCSpriteOffset
 	         $ff95 = hSwapTemp
 	         $ff96 = hMutateWY
 	         $ff96 = hSwapItemQuantity
@@ -20641,12 +20641,12 @@ HRAM bank #0:
 	         $ffdc = hVendingMachinePrice
 	         $ffdc = hPlayerYCoord
 	         $ffdc = hOaksAideRewardItem
-	         $ffdc = hItemToRemoveIndex
 	         $ffdc = hGymGateAnswer
+	         $ffdc = hItemToRemoveIndex
 	         $ffdd = hPlayerXCoord
 	         $ffdd = hOaksAideNumMonsOwned
-	         $ffe0 = hUnlockedSilphCoDoors
 	         $ffe0 = hBackupGymGateIndex
+	         $ffe0 = hUnlockedSilphCoDoors
 	         $ffe1 = hStartTileID
 	         $ffe4 = hNewPartyLength
 	         $ffe5 = hDividend2
--- a/pokeblue_vc.sym
+++ b/pokeblue_vc.sym
@@ -337,8 +337,8 @@
 00:1765 Forest_Coll
 00:1775 House_Coll
 00:177f Gate_Coll
-00:177f ForestGate_Coll
 00:177f Museum_Coll
+00:177f ForestGate_Coll
 00:178a Ship_Coll
 00:1795 ShipPort_Coll
 00:179a Cemetery_Coll
@@ -6900,8 +6900,8 @@
 0f:5647 LinkBattleExchangeData.VC_Wireless_end_exchange
 0f:5649 LinkBattleExchangeData.syncLoop2
 0f:5649 LinkBattleExchangeData.VC_Wireless_net_delay_1_End
-0f:5652 LinkBattleExchangeData.VC_Wireless_start_send_zero_bytes
 0f:5652 LinkBattleExchangeData.VC_Wireless_net_delay_2
+0f:5652 LinkBattleExchangeData.VC_Wireless_start_send_zero_bytes
 0f:5654 LinkBattleExchangeData.syncLoop3
 0f:5654 LinkBattleExchangeData.VC_Wireless_net_delay_2_End
 0f:565d LinkBattleExchangeData.VC_Wireless_end_send_zero_bytes
@@ -9101,8 +9101,8 @@
 13:5e76 BlackbeltPic
 13:6049 Rival1Pic
 13:615f ProfOakPic
-13:627d ScientistPic
 13:627d ChiefPic
+13:627d ScientistPic
 13:63be GiovanniPic
 13:649f RocketPic
 13:6635 CooltrainerMPic
@@ -12188,9 +12188,9 @@
 1a:55ff Gate_GFX
 1a:55ff Museum_GFX
 1a:55ff ForestGate_GFX
+1a:5bef ForestGate_Block
 1a:5bef Gate_Block
 1a:5bef Museum_Block
-1a:5bef ForestGate_Block
 1a:63ef Forest_GFX
 1a:69ef Forest_Block
 1a:71ef Facility_GFX
@@ -17500,8 +17500,8 @@
 00:8000 vChars0
 00:8000 vSprites
 00:8000 vNPCSprites
-00:8800 vTitleLogo
 00:8800 vFont
+00:8800 vTitleLogo
 00:8800 vChars1
 00:8800 vNPCSprites2
 00:9000 vFrontPic
@@ -17629,8 +17629,8 @@
 00:c12b wSprite02StateData1XAdjusted
 00:c12c wSprite02StateData1CollisionData
 00:c130 wSprite02StateData1End
-00:c130 wSprite03StateData1
 00:c130 wSprite03StateData1PictureID
+00:c130 wSprite03StateData1
 00:c131 wSprite03StateData1MovementStatus
 00:c132 wSprite03StateData1ImageIndex
 00:c133 wSprite03StateData1YStepVector
@@ -17659,8 +17659,8 @@
 00:c14b wSprite04StateData1XAdjusted
 00:c14c wSprite04StateData1CollisionData
 00:c150 wSprite05StateData1PictureID
-00:c150 wSprite04StateData1End
 00:c150 wSprite05StateData1
+00:c150 wSprite04StateData1End
 00:c151 wSprite05StateData1MovementStatus
 00:c152 wSprite05StateData1ImageIndex
 00:c153 wSprite05StateData1YStepVector
@@ -17778,9 +17778,9 @@
 00:c1ca wSprite12StateData1YAdjusted
 00:c1cb wSprite12StateData1XAdjusted
 00:c1cc wSprite12StateData1CollisionData
+00:c1d0 wSprite13StateData1PictureID
 00:c1d0 wSprite12StateData1End
 00:c1d0 wSprite13StateData1
-00:c1d0 wSprite13StateData1PictureID
 00:c1d1 wSprite13StateData1MovementStatus
 00:c1d2 wSprite13StateData1ImageIndex
 00:c1d3 wSprite13StateData1YStepVector
@@ -17793,8 +17793,8 @@
 00:c1da wSprite13StateData1YAdjusted
 00:c1db wSprite13StateData1XAdjusted
 00:c1dc wSprite13StateData1CollisionData
-00:c1e0 wSprite14StateData1
 00:c1e0 wSprite14StateData1PictureID
+00:c1e0 wSprite14StateData1
 00:c1e0 wSprite13StateData1End
 00:c1e1 wSprite14StateData1MovementStatus
 00:c1e2 wSprite14StateData1ImageIndex
@@ -17809,8 +17809,8 @@
 00:c1eb wSprite14StateData1XAdjusted
 00:c1ec wSprite14StateData1CollisionData
 00:c1f0 wSprite15StateData1PictureID
-00:c1f0 wSprite14StateData1End
 00:c1f0 wSprite15StateData1
+00:c1f0 wSprite14StateData1End
 00:c1f1 wSprite15StateData1MovementStatus
 00:c1f2 wSprite15StateData1ImageIndex
 00:c1f3 wSprite15StateData1YStepVector
@@ -17824,9 +17824,9 @@
 00:c1fb wSprite15StateData1XAdjusted
 00:c1fc wSprite15StateData1CollisionData
 00:c200 wSpriteStateData2
-00:c200 wSprite15StateData1End
 00:c200 wSpritePlayerStateData2WalkAnimationCounter
 00:c200 wSpritePlayerStateData2
+00:c200 wSprite15StateData1End
 00:c202 wSpritePlayerStateData2YDisplacement
 00:c203 wSpritePlayerStateData2XDisplacement
 00:c204 wSpritePlayerStateData2MapY
@@ -17837,9 +17837,9 @@
 00:c209 wSpritePlayerStateData2OrigFacingDirection
 00:c20d wSpritePlayerStateData2PictureID
 00:c20e wSpritePlayerStateData2ImageBaseOffset
+00:c210 wSprite01StateData2
 00:c210 wSpritePlayerStateData2End
 00:c210 wSprite01StateData2WalkAnimationCounter
-00:c210 wSprite01StateData2
 00:c212 wSprite01StateData2YDisplacement
 00:c213 wSprite01StateData2XDisplacement
 00:c214 wSprite01StateData2MapY
@@ -17851,8 +17851,8 @@
 00:c21d wSprite01StateData2PictureID
 00:c21e wSprite01StateData2ImageBaseOffset
 00:c220 wSprite02StateData2WalkAnimationCounter
-00:c220 wSprite01StateData2End
 00:c220 wSprite02StateData2
+00:c220 wSprite01StateData2End
 00:c222 wSprite02StateData2YDisplacement
 00:c223 wSprite02StateData2XDisplacement
 00:c224 wSprite02StateData2MapY
@@ -17864,8 +17864,8 @@
 00:c22d wSprite02StateData2PictureID
 00:c22e wSprite02StateData2ImageBaseOffset
 00:c230 wSprite03StateData2
-00:c230 wSprite03StateData2WalkAnimationCounter
 00:c230 wSprite02StateData2End
+00:c230 wSprite03StateData2WalkAnimationCounter
 00:c232 wSprite03StateData2YDisplacement
 00:c233 wSprite03StateData2XDisplacement
 00:c234 wSprite03StateData2MapY
@@ -17876,9 +17876,9 @@
 00:c239 wSprite03StateData2OrigFacingDirection
 00:c23d wSprite03StateData2PictureID
 00:c23e wSprite03StateData2ImageBaseOffset
-00:c240 wSprite04StateData2WalkAnimationCounter
 00:c240 wSprite04StateData2
 00:c240 wSprite03StateData2End
+00:c240 wSprite04StateData2WalkAnimationCounter
 00:c242 wSprite04StateData2YDisplacement
 00:c243 wSprite04StateData2XDisplacement
 00:c244 wSprite04StateData2MapY
@@ -17889,9 +17889,9 @@
 00:c249 wSprite04StateData2OrigFacingDirection
 00:c24d wSprite04StateData2PictureID
 00:c24e wSprite04StateData2ImageBaseOffset
-00:c250 wSprite04StateData2End
 00:c250 wSprite05StateData2WalkAnimationCounter
 00:c250 wSprite05StateData2
+00:c250 wSprite04StateData2End
 00:c252 wSprite05StateData2YDisplacement
 00:c253 wSprite05StateData2XDisplacement
 00:c254 wSprite05StateData2MapY
@@ -17902,9 +17902,9 @@
 00:c259 wSprite05StateData2OrigFacingDirection
 00:c25d wSprite05StateData2PictureID
 00:c25e wSprite05StateData2ImageBaseOffset
-00:c260 wSprite06StateData2
-00:c260 wSprite05StateData2End
 00:c260 wSprite06StateData2WalkAnimationCounter
+00:c260 wSprite05StateData2End
+00:c260 wSprite06StateData2
 00:c262 wSprite06StateData2YDisplacement
 00:c263 wSprite06StateData2XDisplacement
 00:c264 wSprite06StateData2MapY
@@ -17915,8 +17915,8 @@
 00:c269 wSprite06StateData2OrigFacingDirection
 00:c26d wSprite06StateData2PictureID
 00:c26e wSprite06StateData2ImageBaseOffset
-00:c270 wSprite06StateData2End
 00:c270 wSprite07StateData2
+00:c270 wSprite06StateData2End
 00:c270 wSprite07StateData2WalkAnimationCounter
 00:c272 wSprite07StateData2YDisplacement
 00:c273 wSprite07StateData2XDisplacement
@@ -17928,9 +17928,9 @@
 00:c279 wSprite07StateData2OrigFacingDirection
 00:c27d wSprite07StateData2PictureID
 00:c27e wSprite07StateData2ImageBaseOffset
-00:c280 wSprite07StateData2End
-00:c280 wSprite08StateData2
 00:c280 wSprite08StateData2WalkAnimationCounter
+00:c280 wSprite08StateData2
+00:c280 wSprite07StateData2End
 00:c282 wSprite08StateData2YDisplacement
 00:c283 wSprite08StateData2XDisplacement
 00:c284 wSprite08StateData2MapY
@@ -17941,9 +17941,9 @@
 00:c289 wSprite08StateData2OrigFacingDirection
 00:c28d wSprite08StateData2PictureID
 00:c28e wSprite08StateData2ImageBaseOffset
+00:c290 wSprite09StateData2WalkAnimationCounter
 00:c290 wSprite09StateData2
 00:c290 wSprite08StateData2End
-00:c290 wSprite09StateData2WalkAnimationCounter
 00:c292 wSprite09StateData2YDisplacement
 00:c293 wSprite09StateData2XDisplacement
 00:c294 wSprite09StateData2MapY
@@ -17954,9 +17954,9 @@
 00:c299 wSprite09StateData2OrigFacingDirection
 00:c29d wSprite09StateData2PictureID
 00:c29e wSprite09StateData2ImageBaseOffset
-00:c2a0 wSprite10StateData2WalkAnimationCounter
-00:c2a0 wSprite09StateData2End
 00:c2a0 wSprite10StateData2
+00:c2a0 wSprite09StateData2End
+00:c2a0 wSprite10StateData2WalkAnimationCounter
 00:c2a2 wSprite10StateData2YDisplacement
 00:c2a3 wSprite10StateData2XDisplacement
 00:c2a4 wSprite10StateData2MapY
@@ -17967,8 +17967,8 @@
 00:c2a9 wSprite10StateData2OrigFacingDirection
 00:c2ad wSprite10StateData2PictureID
 00:c2ae wSprite10StateData2ImageBaseOffset
-00:c2b0 wSprite11StateData2
 00:c2b0 wSprite11StateData2WalkAnimationCounter
+00:c2b0 wSprite11StateData2
 00:c2b0 wSprite10StateData2End
 00:c2b2 wSprite11StateData2YDisplacement
 00:c2b3 wSprite11StateData2XDisplacement
@@ -17993,8 +17993,8 @@
 00:c2c9 wSprite12StateData2OrigFacingDirection
 00:c2cd wSprite12StateData2PictureID
 00:c2ce wSprite12StateData2ImageBaseOffset
-00:c2d0 wSprite13StateData2
 00:c2d0 wSprite13StateData2WalkAnimationCounter
+00:c2d0 wSprite13StateData2
 00:c2d0 wSprite12StateData2End
 00:c2d2 wSprite13StateData2YDisplacement
 00:c2d3 wSprite13StateData2XDisplacement
@@ -18019,9 +18019,9 @@
 00:c2e9 wSprite14StateData2OrigFacingDirection
 00:c2ed wSprite14StateData2PictureID
 00:c2ee wSprite14StateData2ImageBaseOffset
+00:c2f0 wSprite14StateData2End
 00:c2f0 wSprite15StateData2WalkAnimationCounter
 00:c2f0 wSprite15StateData2
-00:c2f0 wSprite14StateData2End
 00:c2f2 wSprite15StateData2YDisplacement
 00:c2f3 wSprite15StateData2XDisplacement
 00:c2f4 wSprite15StateData2MapY
@@ -18032,21 +18032,21 @@
 00:c2f9 wSprite15StateData2OrigFacingDirection
 00:c2fd wSprite15StateData2PictureID
 00:c2fe wSprite15StateData2ImageBaseOffset
-00:c300 wSprite15StateData2End
 00:c300 wSpriteDataEnd
+00:c300 wSprite15StateData2End
+00:c300 wShadowOAMSprite00YCoord
 00:c300 wShadowOAM
 00:c300 wShadowOAMSprite00
-00:c300 wShadowOAMSprite00YCoord
 00:c301 wShadowOAMSprite00XCoord
 00:c302 wShadowOAMSprite00TileID
 00:c303 wShadowOAMSprite00Attributes
-00:c304 wShadowOAMSprite01YCoord
 00:c304 wShadowOAMSprite01
+00:c304 wShadowOAMSprite01YCoord
 00:c305 wShadowOAMSprite01XCoord
 00:c306 wShadowOAMSprite01TileID
 00:c307 wShadowOAMSprite01Attributes
-00:c308 wShadowOAMSprite02
 00:c308 wShadowOAMSprite02YCoord
+00:c308 wShadowOAMSprite02
 00:c309 wShadowOAMSprite02XCoord
 00:c30a wShadowOAMSprite02TileID
 00:c30b wShadowOAMSprite02Attributes
@@ -18065,18 +18065,18 @@
 00:c315 wShadowOAMSprite05XCoord
 00:c316 wShadowOAMSprite05TileID
 00:c317 wShadowOAMSprite05Attributes
-00:c318 wShadowOAMSprite06
 00:c318 wShadowOAMSprite06YCoord
+00:c318 wShadowOAMSprite06
 00:c319 wShadowOAMSprite06XCoord
 00:c31a wShadowOAMSprite06TileID
 00:c31b wShadowOAMSprite06Attributes
-00:c31c wShadowOAMSprite07
 00:c31c wShadowOAMSprite07YCoord
+00:c31c wShadowOAMSprite07
 00:c31d wShadowOAMSprite07XCoord
 00:c31e wShadowOAMSprite07TileID
 00:c31f wShadowOAMSprite07Attributes
-00:c320 wShadowOAMSprite08
 00:c320 wShadowOAMSprite08YCoord
+00:c320 wShadowOAMSprite08
 00:c321 wShadowOAMSprite08XCoord
 00:c322 wShadowOAMSprite08TileID
 00:c323 wShadowOAMSprite08Attributes
@@ -18085,8 +18085,8 @@
 00:c325 wShadowOAMSprite09XCoord
 00:c326 wShadowOAMSprite09TileID
 00:c327 wShadowOAMSprite09Attributes
-00:c328 wShadowOAMSprite10
 00:c328 wShadowOAMSprite10YCoord
+00:c328 wShadowOAMSprite10
 00:c329 wShadowOAMSprite10XCoord
 00:c32a wShadowOAMSprite10TileID
 00:c32b wShadowOAMSprite10Attributes
@@ -18095,13 +18095,13 @@
 00:c32d wShadowOAMSprite11XCoord
 00:c32e wShadowOAMSprite11TileID
 00:c32f wShadowOAMSprite11Attributes
-00:c330 wShadowOAMSprite12
 00:c330 wShadowOAMSprite12YCoord
+00:c330 wShadowOAMSprite12
 00:c331 wShadowOAMSprite12XCoord
 00:c332 wShadowOAMSprite12TileID
 00:c333 wShadowOAMSprite12Attributes
-00:c334 wShadowOAMSprite13
 00:c334 wShadowOAMSprite13YCoord
+00:c334 wShadowOAMSprite13
 00:c335 wShadowOAMSprite13XCoord
 00:c336 wShadowOAMSprite13TileID
 00:c337 wShadowOAMSprite13Attributes
@@ -18125,8 +18125,8 @@
 00:c345 wShadowOAMSprite17XCoord
 00:c346 wShadowOAMSprite17TileID
 00:c347 wShadowOAMSprite17Attributes
-00:c348 wShadowOAMSprite18
 00:c348 wShadowOAMSprite18YCoord
+00:c348 wShadowOAMSprite18
 00:c349 wShadowOAMSprite18XCoord
 00:c34a wShadowOAMSprite18TileID
 00:c34b wShadowOAMSprite18Attributes
@@ -18135,13 +18135,13 @@
 00:c34d wShadowOAMSprite19XCoord
 00:c34e wShadowOAMSprite19TileID
 00:c34f wShadowOAMSprite19Attributes
-00:c350 wShadowOAMSprite20
 00:c350 wShadowOAMSprite20YCoord
+00:c350 wShadowOAMSprite20
 00:c351 wShadowOAMSprite20XCoord
 00:c352 wShadowOAMSprite20TileID
 00:c353 wShadowOAMSprite20Attributes
-00:c354 wShadowOAMSprite21
 00:c354 wShadowOAMSprite21YCoord
+00:c354 wShadowOAMSprite21
 00:c355 wShadowOAMSprite21XCoord
 00:c356 wShadowOAMSprite21TileID
 00:c357 wShadowOAMSprite21Attributes
@@ -18150,8 +18150,8 @@
 00:c359 wShadowOAMSprite22XCoord
 00:c35a wShadowOAMSprite22TileID
 00:c35b wShadowOAMSprite22Attributes
-00:c35c wShadowOAMSprite23
 00:c35c wShadowOAMSprite23YCoord
+00:c35c wShadowOAMSprite23
 00:c35d wShadowOAMSprite23XCoord
 00:c35e wShadowOAMSprite23TileID
 00:c35f wShadowOAMSprite23Attributes
@@ -18170,18 +18170,18 @@
 00:c369 wShadowOAMSprite26XCoord
 00:c36a wShadowOAMSprite26TileID
 00:c36b wShadowOAMSprite26Attributes
-00:c36c wShadowOAMSprite27
 00:c36c wShadowOAMSprite27YCoord
+00:c36c wShadowOAMSprite27
 00:c36d wShadowOAMSprite27XCoord
 00:c36e wShadowOAMSprite27TileID
 00:c36f wShadowOAMSprite27Attributes
-00:c370 wShadowOAMSprite28
 00:c370 wShadowOAMSprite28YCoord
+00:c370 wShadowOAMSprite28
 00:c371 wShadowOAMSprite28XCoord
 00:c372 wShadowOAMSprite28TileID
 00:c373 wShadowOAMSprite28Attributes
-00:c374 wShadowOAMSprite29
 00:c374 wShadowOAMSprite29YCoord
+00:c374 wShadowOAMSprite29
 00:c375 wShadowOAMSprite29XCoord
 00:c376 wShadowOAMSprite29TileID
 00:c377 wShadowOAMSprite29Attributes
@@ -18195,8 +18195,8 @@
 00:c37d wShadowOAMSprite31XCoord
 00:c37e wShadowOAMSprite31TileID
 00:c37f wShadowOAMSprite31Attributes
-00:c380 wShadowOAMSprite32YCoord
 00:c380 wShadowOAMSprite32
+00:c380 wShadowOAMSprite32YCoord
 00:c381 wShadowOAMSprite32XCoord
 00:c382 wShadowOAMSprite32TileID
 00:c383 wShadowOAMSprite32Attributes
@@ -18291,8 +18291,8 @@
 00:c52d wShadowOAMBackupSprite09XCoord
 00:c52e wShadowOAMBackupSprite09TileID
 00:c52f wShadowOAMBackupSprite09Attributes
-00:c530 wShadowOAMBackupSprite10YCoord
 00:c530 wShadowOAMBackupSprite10
+00:c530 wShadowOAMBackupSprite10YCoord
 00:c531 wShadowOAMBackupSprite10XCoord
 00:c532 wShadowOAMBackupSprite10TileID
 00:c533 wShadowOAMBackupSprite10Attributes
@@ -18321,8 +18321,8 @@
 00:c545 wShadowOAMBackupSprite15XCoord
 00:c546 wShadowOAMBackupSprite15TileID
 00:c547 wShadowOAMBackupSprite15Attributes
-00:c548 wShadowOAMBackupSprite16
 00:c548 wShadowOAMBackupSprite16YCoord
+00:c548 wShadowOAMBackupSprite16
 00:c549 wShadowOAMBackupSprite16XCoord
 00:c54a wShadowOAMBackupSprite16TileID
 00:c54b wShadowOAMBackupSprite16Attributes
@@ -18495,10 +18495,10 @@
 00:cc5b wMonPartySpritesSavedOAM
 00:cc5b wElevatorWarpMaps
 00:cc5b wVermilionDockTileMapBuffer
-00:cc5b wSlotMachineSevenAndBarModeChance
-00:cc5b wOaksAideRewardItemName
 00:cc5b wHallOfFame
+00:cc5b wOaksAideRewardItemName
 00:cc5b wDexRatingNumMonsSeen
+00:cc5b wSlotMachineSevenAndBarModeChance
 00:cc5b wUnusedFlag
 00:cc5b wFilteredBagItems
 00:cc5c wDexRatingNumMonsOwned
@@ -18544,10 +18544,10 @@
 00:cd05 wEnemyNumHits
 00:cd05 wLuckySlotHiddenObjectIndex
 00:cd05 wEnemyBideAccumulatedDamage
-00:cd0f wPlayerMonUnmodifiedLevel
 00:cd0f wVermilionDockTileMapBufferEnd
-00:cd0f wMiscBattleDataEnd
 00:cd0f wInGameTradeGiveMonSpecies
+00:cd0f wPlayerMonUnmodifiedLevel
+00:cd0f wMiscBattleDataEnd
 00:cd10 wPlayerMonUnmodifiedMaxHP
 00:cd10 wInGameTradeTextPointerTablePointer
 00:cd12 wPlayerMonUnmodifiedAttack
@@ -18596,6 +18596,7 @@
 00:cd3d wNumShakes
 00:cd3d wPPRestoreItem
 00:cd3d wDexMaxSeenMon
+00:cd3d wWhichTrade
 00:cd3d wChangeBoxSavedMapTextPointer
 00:cd3d wBadgeNumberTile
 00:cd3d wOptionsTextSpeedCursorX
@@ -18617,22 +18618,21 @@
 00:cd3d wChargeMoveNum
 00:cd3d wPriceTemp
 00:cd3d wTitleMonSpecies
-00:cd3d wFieldMoves
-00:cd3d wPlayerCharacterOAMTile
-00:cd3d wCoordIndex
+00:cd3d wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 00:cd3d wTempSCX
-00:cd3d wUnusedCreditsByte
-00:cd3d wBoxMonCounts
-00:cd3d wHoFTeamIndex
-00:cd3d wWhichTrade
-00:cd3d wSavedY
-00:cd3d wDayCareStartLevel
 00:cd3d wMoveDownSmallStarsOAMCount
+00:cd3d wStoppingWhichSlotMachineWheel
+00:cd3d wUnusedCreditsByte
+00:cd3d wFieldMoves
+00:cd3d wCoordIndex
+00:cd3d wHoFTeamIndex
+00:cd3d wDayCareStartLevel
+00:cd3d wBoxMonCounts
+00:cd3d wSavedY
+00:cd3d wPlayerCharacterOAMTile
 00:cd3d wWereAnyMonsAsleep
 00:cd3d wFallingObjectsMovementData
 00:cd3d wTrainerSpriteOffset
-00:cd3d wPlayerSpinWhileMovingUpOrDownAnimDeltaY
-00:cd3d wStoppingWhichSlotMachineWheel
 00:cd3e wNumCreditsMonsDisplayed
 00:cd3e wTrainerInfoTextBoxWidth
 00:cd3e wTrainerEngageDistance
@@ -18648,8 +18648,8 @@
 00:cd3e wBattleTransitionCircleScreenQuadrantX
 00:cd3e wTradingWhichEnemyMon
 00:cd3e wTradedEnemyMonSpecies
-00:cd3e wBadgeNameTile
 00:cd3e wRivalStarterBallSpriteIndex
+00:cd3e wBadgeNameTile
 00:cd3e wHoFPartyMonIndex
 00:cd3e wOptionsBattleAnimCursorX
 00:cd3f wJigglypuffFacingDirections
@@ -18660,27 +18660,27 @@
 00:cd3f wSlotMachineWheel2Offset
 00:cd3f wFlyAnimBirdSpriteImageIndex
 00:cd3f wNameOfPlayerMonToBeTraded
+00:cd3f wDayCareTotalCost
 00:cd3f wHoFMonLevel
 00:cd3f wTrainerFacingDirection
 00:cd3f wHiddenObjectIndex
-00:cd3f wDayCareTotalCost
-00:cd3f wHUDGraphicsTiles
 00:cd3f wOptionsBattleStyleCursorX
+00:cd3f wHUDGraphicsTiles
 00:cd40 wOptionsCancelCursorX
 00:cd40 wTrainerScreenY
+00:cd40 wSlotMachineWheel3Offset
 00:cd40 wPlayerSpinInPlaceAnimSoundID
 00:cd40 wHiddenObjectY
-00:cd40 wSlotMachineWheel3Offset
 00:cd40 wHoFMonOrPlayer
 00:cd41 wSlotMachineWheel1BottomTile
 00:cd41 wSlotMachineWinningSymbol
 00:cd41 wHoFTeamIndex2
 00:cd41 wNumFieldMoves
+00:cd41 wDayCarePerLevelCost
 00:cd41 wTradedPlayerMonOT
-00:cd41 wHiddenItemOrCoinsIndex
 00:cd41 wHiddenObjectX
 00:cd41 wTrainerScreenX
-00:cd41 wDayCarePerLevelCost
+00:cd41 wHiddenItemOrCoinsIndex
 00:cd42 wSlotMachineWheel1MiddleTile
 00:cd42 wHoFTeamNo
 00:cd42 wFieldMovesLeftmostXCoord
@@ -18690,8 +18690,8 @@
 00:cd45 wSlotMachineWheel2MiddleTile
 00:cd46 wTempCoins1
 00:cd46 wSlotMachineWheel2TopTile
-00:cd47 wBattleTransitionSpiralDirection
 00:cd47 wSlotMachineWheel3BottomTile
+00:cd47 wBattleTransitionSpiralDirection
 00:cd48 wFacingDirectionList
 00:cd48 wSlotMachineWheel3MiddleTile
 00:cd49 wTempObtainedBadgesBooleans
@@ -18713,8 +18713,8 @@
 00:cd50 wWhichEmotionBubble
 00:cd59 wTradedEnemyMonOTID
 00:cd5b wGymTrashCanIndex
-00:cd5b wOAMBaseTile
 00:cd5b wStandingOnWarpPadOrHole
+00:cd5b wOAMBaseTile
 00:cd5c wSymmetricSpriteOAMAttributes
 00:cd5d wMonPartySpriteSpecies
 00:cd5e wLeftGBMonSpecies
@@ -18722,12 +18722,12 @@
 00:cd60 wMiscFlags
 00:cd6a wActionResultOrTookBattleTurn
 00:cd6b wJoyIgnore
-00:cd6c wNumMovesMinusOne
 00:cd6c wDownscaledMonSize
+00:cd6c wNumMovesMinusOne
 00:cd6d wNameBuffer
 00:cd6d wMoveData
-00:cd6d wPayDayMoney
 00:cd6d wBattleMenuCurrentPP
+00:cd6d wPayDayMoney
 00:cd6d wEvoDataBuffer
 00:cd71 wStatusScreenCurrentPP
 00:cd73 wPPUpCountAndMaxPP
@@ -18961,10 +18961,10 @@
 00:d08a wFlashScreenLongCounter
 00:d08a wSpiralBallsBaseY
 00:d08a wFallingObjectMovementByte
-00:d08a wTradedMonMovingRight
 00:d08a wOptionsInitialized
-00:d08a wUnusedWaterDropletsByte
+00:d08a wTradedMonMovingRight
 00:d08a wNewSlotMachineBallTile
+00:d08a wUnusedWaterDropletsByte
 00:d08b wNumFallingObjects
 00:d08b wSubAnimTransform
 00:d08b wSpiralBallsBaseX
@@ -19050,8 +19050,8 @@
 00:d11e wUsingPPUp
 00:d11e wMoveGrammar
 00:d11e wTempTMHM
-00:d11e wTypeEffectiveness
 00:d11e wNumSetBits
+00:d11e wTypeEffectiveness
 00:d11e wNamedObjectIndex
 00:d11e wCalculateWhoseStats
 00:d11f wForcePlayerToChooseMon
@@ -19171,8 +19171,8 @@
 00:d1de wPartyMon3DVs
 00:d1e0 wPartyMon3PP
 00:d1e4 wPartyMon3Level
-00:d1e5 wPartyMon3Stats
 00:d1e5 wPartyMon3MaxHP
+00:d1e5 wPartyMon3Stats
 00:d1e7 wPartyMon3Attack
 00:d1e9 wPartyMon3Defense
 00:d1eb wPartyMon3Speed
@@ -19229,8 +19229,8 @@
 00:d241 wPartyMon5Defense
 00:d243 wPartyMon5Speed
 00:d245 wPartyMon5Special
-00:d247 wPartyMon6Species
 00:d247 wPartyMon6
+00:d247 wPartyMon6Species
 00:d248 wPartyMon6HP
 00:d24a wPartyMon6BoxLevel
 00:d24b wPartyMon6Status
@@ -19629,8 +19629,8 @@
 00:d94e wEnemyMon4Defense
 00:d950 wEnemyMon4Speed
 00:d952 wEnemyMon4Special
-00:d954 wEnemyMon5Species
 00:d954 wEnemyMon5
+00:d954 wEnemyMon5Species
 00:d955 wEnemyMon5HP
 00:d957 wEnemyMon5BoxLevel
 00:d958 wEnemyMon5Status
@@ -19660,8 +19660,8 @@
 00:d981 wEnemyMon6HP
 00:d983 wEnemyMon6BoxLevel
 00:d984 wEnemyMon6Status
-00:d985 wEnemyMon6Type1
 00:d985 wEnemyMon6Type
+00:d985 wEnemyMon6Type1
 00:d986 wEnemyMon6Type2
 00:d987 wEnemyMon6CatchRate
 00:d988 wEnemyMon6Moves
@@ -19808,8 +19808,8 @@
 00:db12 wBoxMon4SpecialExp
 00:db14 wBoxMon4DVs
 00:db16 wBoxMon4PP
-00:db1a wBoxMon5Species
 00:db1a wBoxMon5
+00:db1a wBoxMon5Species
 00:db1b wBoxMon5HP
 00:db1d wBoxMon5BoxLevel
 00:db1e wBoxMon5Status
@@ -19889,8 +19889,8 @@
 00:db9f wBoxMon9HP
 00:dba1 wBoxMon9BoxLevel
 00:dba2 wBoxMon9Status
-00:dba3 wBoxMon9Type
 00:dba3 wBoxMon9Type1
+00:dba3 wBoxMon9Type
 00:dba4 wBoxMon9Type2
 00:dba5 wBoxMon9CatchRate
 00:dba6 wBoxMon9Moves
@@ -19998,8 +19998,8 @@
 00:dc5c wBoxMon14SpecialExp
 00:dc5e wBoxMon14DVs
 00:dc60 wBoxMon14PP
-00:dc64 wBoxMon15Species
 00:dc64 wBoxMon15
+00:dc64 wBoxMon15Species
 00:dc65 wBoxMon15HP
 00:dc67 wBoxMon15BoxLevel
 00:dc68 wBoxMon15Status
@@ -20041,8 +20041,8 @@
 00:dca7 wBoxMon17HP
 00:dca9 wBoxMon17BoxLevel
 00:dcaa wBoxMon17Status
-00:dcab wBoxMon17Type1
 00:dcab wBoxMon17Type
+00:dcab wBoxMon17Type1
 00:dcac wBoxMon17Type2
 00:dcad wBoxMon17CatchRate
 00:dcae wBoxMon17Moves
@@ -20074,8 +20074,8 @@
 00:dce0 wBoxMon18SpecialExp
 00:dce2 wBoxMon18DVs
 00:dce4 wBoxMon18PP
-00:dce8 wBoxMon19
 00:dce8 wBoxMon19Species
+00:dce8 wBoxMon19
 00:dce9 wBoxMon19HP
 00:dceb wBoxMon19BoxLevel
 00:dcec wBoxMon19Status
@@ -20171,18 +20171,18 @@
 00:ff8b hPreviousTileset
 00:ff8b hOAMTile
 00:ff8b hBaseTileID
+00:ff8b hEastWestConnectedMapWidth
 00:ff8b hItemPrice
 00:ff8b hDexWeight
-00:ff8b hEastWestConnectedMapWidth
 00:ff8b hSpriteInterlaceCounter
 00:ff8b hRLEByteValue
 00:ff8c hNorthSouthConnectedMapWidth
 00:ff8c hMapWidth
 00:ff8c hSpriteHeight
 00:ff8c hPartyMonIndex
-00:ff8c hSpriteIndex
-00:ff8c hTextID
 00:ff8c hSlidingRegionSize
+00:ff8c hTextID
+00:ff8c hSpriteIndex
 00:ff8c hDownArrowBlinkCount2
 00:ff8d hEnemySpeed
 00:ff8d hLoadSpriteTemp1
@@ -20207,13 +20207,13 @@
 00:ff94 hSpritePriority
 00:ff95 hSwapItemID
 00:ff95 hNPCPlayerYDistance
-00:ff95 hNPCSpriteOffset
 00:ff95 hDividend
 00:ff95 hSignCoordPointer
-00:ff95 hQuotient
-00:ff95 hNPCMovementDirections2Index
 00:ff95 hPastLeadingZeros
+00:ff95 hQuotient
 00:ff95 hProduct
+00:ff95 hNPCMovementDirections2Index
+00:ff95 hNPCSpriteOffset
 00:ff95 hSwapTemp
 00:ff96 hMutateWY
 00:ff96 hSwapItemQuantity
@@ -20297,12 +20297,12 @@
 00:ffdc hVendingMachinePrice
 00:ffdc hPlayerYCoord
 00:ffdc hOaksAideRewardItem
-00:ffdc hItemToRemoveIndex
 00:ffdc hGymGateAnswer
+00:ffdc hItemToRemoveIndex
 00:ffdd hPlayerXCoord
 00:ffdd hOaksAideNumMonsOwned
-00:ffe0 hUnlockedSilphCoDoors
 00:ffe0 hBackupGymGateIndex
+00:ffe0 hUnlockedSilphCoDoors
 00:ffe1 hStartTileID
 00:ffe4 hNewPartyLength
 00:ffe5 hDividend2
--- a/pokered.map
+++ b/pokered.map
@@ -362,8 +362,8 @@ ROM0 bank #0:
 	         $1765 = Forest_Coll
 	         $1775 = House_Coll
 	         $177f = Gate_Coll
-	         $177f = ForestGate_Coll
 	         $177f = Museum_Coll
+	         $177f = ForestGate_Coll
 	         $178a = Ship_Coll
 	         $1795 = ShipPort_Coll
 	         $179a = Cemetery_Coll
@@ -9223,8 +9223,8 @@ ROMX bank #19:
 	         $5e76 = BlackbeltPic
 	         $6049 = Rival1Pic
 	         $615f = ProfOakPic
-	         $627d = ScientistPic
 	         $627d = ChiefPic
+	         $627d = ScientistPic
 	         $63be = GiovanniPic
 	         $649f = RocketPic
 	         $6635 = CooltrainerMPic
@@ -12363,9 +12363,9 @@ ROMX bank #26:
 	         $560f = Gate_GFX
 	         $560f = Museum_GFX
 	         $560f = ForestGate_GFX
+	         $5bff = ForestGate_Block
 	         $5bff = Gate_Block
 	         $5bff = Museum_Block
-	         $5bff = ForestGate_Block
 	         $63ff = Forest_GFX
 	         $69ff = Forest_Block
 	         $71ff = Facility_GFX
@@ -17753,8 +17753,8 @@ VRAM bank #0:
 	         $8000 = vChars0
 	         $8000 = vSprites
 	         $8000 = vNPCSprites
-	         $8800 = vTitleLogo
 	         $8800 = vFont
+	         $8800 = vTitleLogo
 	         $8800 = vChars1
 	         $8800 = vNPCSprites2
 	         $9000 = vFrontPic
@@ -17907,8 +17907,8 @@ WRAM0 bank #0:
 	         $c12b = wSprite02StateData1XAdjusted
 	         $c12c = wSprite02StateData1CollisionData
 	         $c130 = wSprite02StateData1End
-	         $c130 = wSprite03StateData1
 	         $c130 = wSprite03StateData1PictureID
+	         $c130 = wSprite03StateData1
 	         $c131 = wSprite03StateData1MovementStatus
 	         $c132 = wSprite03StateData1ImageIndex
 	         $c133 = wSprite03StateData1YStepVector
@@ -17937,8 +17937,8 @@ WRAM0 bank #0:
 	         $c14b = wSprite04StateData1XAdjusted
 	         $c14c = wSprite04StateData1CollisionData
 	         $c150 = wSprite05StateData1PictureID
-	         $c150 = wSprite04StateData1End
 	         $c150 = wSprite05StateData1
+	         $c150 = wSprite04StateData1End
 	         $c151 = wSprite05StateData1MovementStatus
 	         $c152 = wSprite05StateData1ImageIndex
 	         $c153 = wSprite05StateData1YStepVector
@@ -18056,9 +18056,9 @@ WRAM0 bank #0:
 	         $c1ca = wSprite12StateData1YAdjusted
 	         $c1cb = wSprite12StateData1XAdjusted
 	         $c1cc = wSprite12StateData1CollisionData
+	         $c1d0 = wSprite13StateData1PictureID
 	         $c1d0 = wSprite12StateData1End
 	         $c1d0 = wSprite13StateData1
-	         $c1d0 = wSprite13StateData1PictureID
 	         $c1d1 = wSprite13StateData1MovementStatus
 	         $c1d2 = wSprite13StateData1ImageIndex
 	         $c1d3 = wSprite13StateData1YStepVector
@@ -18071,9 +18071,9 @@ WRAM0 bank #0:
 	         $c1da = wSprite13StateData1YAdjusted
 	         $c1db = wSprite13StateData1XAdjusted
 	         $c1dc = wSprite13StateData1CollisionData
+	         $c1e0 = wSprite13StateData1End
 	         $c1e0 = wSprite14StateData1
 	         $c1e0 = wSprite14StateData1PictureID
-	         $c1e0 = wSprite13StateData1End
 	         $c1e1 = wSprite14StateData1MovementStatus
 	         $c1e2 = wSprite14StateData1ImageIndex
 	         $c1e3 = wSprite14StateData1YStepVector
@@ -18087,8 +18087,8 @@ WRAM0 bank #0:
 	         $c1eb = wSprite14StateData1XAdjusted
 	         $c1ec = wSprite14StateData1CollisionData
 	         $c1f0 = wSprite15StateData1PictureID
-	         $c1f0 = wSprite14StateData1End
 	         $c1f0 = wSprite15StateData1
+	         $c1f0 = wSprite14StateData1End
 	         $c1f1 = wSprite15StateData1MovementStatus
 	         $c1f2 = wSprite15StateData1ImageIndex
 	         $c1f3 = wSprite15StateData1YStepVector
@@ -18102,9 +18102,9 @@ WRAM0 bank #0:
 	         $c1fb = wSprite15StateData1XAdjusted
 	         $c1fc = wSprite15StateData1CollisionData
 	         $c200 = wSpriteStateData2
-	         $c200 = wSprite15StateData1End
 	         $c200 = wSpritePlayerStateData2WalkAnimationCounter
 	         $c200 = wSpritePlayerStateData2
+	         $c200 = wSprite15StateData1End
 	         $c202 = wSpritePlayerStateData2YDisplacement
 	         $c203 = wSpritePlayerStateData2XDisplacement
 	         $c204 = wSpritePlayerStateData2MapY
@@ -18115,9 +18115,9 @@ WRAM0 bank #0:
 	         $c209 = wSpritePlayerStateData2OrigFacingDirection
 	         $c20d = wSpritePlayerStateData2PictureID
 	         $c20e = wSpritePlayerStateData2ImageBaseOffset
+	         $c210 = wSprite01StateData2
 	         $c210 = wSpritePlayerStateData2End
 	         $c210 = wSprite01StateData2WalkAnimationCounter
-	         $c210 = wSprite01StateData2
 	         $c212 = wSprite01StateData2YDisplacement
 	         $c213 = wSprite01StateData2XDisplacement
 	         $c214 = wSprite01StateData2MapY
@@ -18129,8 +18129,8 @@ WRAM0 bank #0:
 	         $c21d = wSprite01StateData2PictureID
 	         $c21e = wSprite01StateData2ImageBaseOffset
 	         $c220 = wSprite02StateData2WalkAnimationCounter
-	         $c220 = wSprite01StateData2End
 	         $c220 = wSprite02StateData2
+	         $c220 = wSprite01StateData2End
 	         $c222 = wSprite02StateData2YDisplacement
 	         $c223 = wSprite02StateData2XDisplacement
 	         $c224 = wSprite02StateData2MapY
@@ -18142,8 +18142,8 @@ WRAM0 bank #0:
 	         $c22d = wSprite02StateData2PictureID
 	         $c22e = wSprite02StateData2ImageBaseOffset
 	         $c230 = wSprite03StateData2
-	         $c230 = wSprite03StateData2WalkAnimationCounter
 	         $c230 = wSprite02StateData2End
+	         $c230 = wSprite03StateData2WalkAnimationCounter
 	         $c232 = wSprite03StateData2YDisplacement
 	         $c233 = wSprite03StateData2XDisplacement
 	         $c234 = wSprite03StateData2MapY
@@ -18154,9 +18154,9 @@ WRAM0 bank #0:
 	         $c239 = wSprite03StateData2OrigFacingDirection
 	         $c23d = wSprite03StateData2PictureID
 	         $c23e = wSprite03StateData2ImageBaseOffset
-	         $c240 = wSprite04StateData2WalkAnimationCounter
 	         $c240 = wSprite04StateData2
 	         $c240 = wSprite03StateData2End
+	         $c240 = wSprite04StateData2WalkAnimationCounter
 	         $c242 = wSprite04StateData2YDisplacement
 	         $c243 = wSprite04StateData2XDisplacement
 	         $c244 = wSprite04StateData2MapY
@@ -18167,9 +18167,9 @@ WRAM0 bank #0:
 	         $c249 = wSprite04StateData2OrigFacingDirection
 	         $c24d = wSprite04StateData2PictureID
 	         $c24e = wSprite04StateData2ImageBaseOffset
-	         $c250 = wSprite04StateData2End
 	         $c250 = wSprite05StateData2WalkAnimationCounter
 	         $c250 = wSprite05StateData2
+	         $c250 = wSprite04StateData2End
 	         $c252 = wSprite05StateData2YDisplacement
 	         $c253 = wSprite05StateData2XDisplacement
 	         $c254 = wSprite05StateData2MapY
@@ -18180,9 +18180,9 @@ WRAM0 bank #0:
 	         $c259 = wSprite05StateData2OrigFacingDirection
 	         $c25d = wSprite05StateData2PictureID
 	         $c25e = wSprite05StateData2ImageBaseOffset
-	         $c260 = wSprite06StateData2
-	         $c260 = wSprite05StateData2End
 	         $c260 = wSprite06StateData2WalkAnimationCounter
+	         $c260 = wSprite05StateData2End
+	         $c260 = wSprite06StateData2
 	         $c262 = wSprite06StateData2YDisplacement
 	         $c263 = wSprite06StateData2XDisplacement
 	         $c264 = wSprite06StateData2MapY
@@ -18193,8 +18193,8 @@ WRAM0 bank #0:
 	         $c269 = wSprite06StateData2OrigFacingDirection
 	         $c26d = wSprite06StateData2PictureID
 	         $c26e = wSprite06StateData2ImageBaseOffset
-	         $c270 = wSprite06StateData2End
 	         $c270 = wSprite07StateData2
+	         $c270 = wSprite06StateData2End
 	         $c270 = wSprite07StateData2WalkAnimationCounter
 	         $c272 = wSprite07StateData2YDisplacement
 	         $c273 = wSprite07StateData2XDisplacement
@@ -18206,9 +18206,9 @@ WRAM0 bank #0:
 	         $c279 = wSprite07StateData2OrigFacingDirection
 	         $c27d = wSprite07StateData2PictureID
 	         $c27e = wSprite07StateData2ImageBaseOffset
-	         $c280 = wSprite07StateData2End
-	         $c280 = wSprite08StateData2
 	         $c280 = wSprite08StateData2WalkAnimationCounter
+	         $c280 = wSprite08StateData2
+	         $c280 = wSprite07StateData2End
 	         $c282 = wSprite08StateData2YDisplacement
 	         $c283 = wSprite08StateData2XDisplacement
 	         $c284 = wSprite08StateData2MapY
@@ -18219,9 +18219,9 @@ WRAM0 bank #0:
 	         $c289 = wSprite08StateData2OrigFacingDirection
 	         $c28d = wSprite08StateData2PictureID
 	         $c28e = wSprite08StateData2ImageBaseOffset
+	         $c290 = wSprite09StateData2WalkAnimationCounter
 	         $c290 = wSprite09StateData2
 	         $c290 = wSprite08StateData2End
-	         $c290 = wSprite09StateData2WalkAnimationCounter
 	         $c292 = wSprite09StateData2YDisplacement
 	         $c293 = wSprite09StateData2XDisplacement
 	         $c294 = wSprite09StateData2MapY
@@ -18232,9 +18232,9 @@ WRAM0 bank #0:
 	         $c299 = wSprite09StateData2OrigFacingDirection
 	         $c29d = wSprite09StateData2PictureID
 	         $c29e = wSprite09StateData2ImageBaseOffset
-	         $c2a0 = wSprite10StateData2WalkAnimationCounter
-	         $c2a0 = wSprite09StateData2End
 	         $c2a0 = wSprite10StateData2
+	         $c2a0 = wSprite09StateData2End
+	         $c2a0 = wSprite10StateData2WalkAnimationCounter
 	         $c2a2 = wSprite10StateData2YDisplacement
 	         $c2a3 = wSprite10StateData2XDisplacement
 	         $c2a4 = wSprite10StateData2MapY
@@ -18245,8 +18245,8 @@ WRAM0 bank #0:
 	         $c2a9 = wSprite10StateData2OrigFacingDirection
 	         $c2ad = wSprite10StateData2PictureID
 	         $c2ae = wSprite10StateData2ImageBaseOffset
-	         $c2b0 = wSprite11StateData2
 	         $c2b0 = wSprite11StateData2WalkAnimationCounter
+	         $c2b0 = wSprite11StateData2
 	         $c2b0 = wSprite10StateData2End
 	         $c2b2 = wSprite11StateData2YDisplacement
 	         $c2b3 = wSprite11StateData2XDisplacement
@@ -18271,8 +18271,8 @@ WRAM0 bank #0:
 	         $c2c9 = wSprite12StateData2OrigFacingDirection
 	         $c2cd = wSprite12StateData2PictureID
 	         $c2ce = wSprite12StateData2ImageBaseOffset
-	         $c2d0 = wSprite13StateData2
 	         $c2d0 = wSprite13StateData2WalkAnimationCounter
+	         $c2d0 = wSprite13StateData2
 	         $c2d0 = wSprite12StateData2End
 	         $c2d2 = wSprite13StateData2YDisplacement
 	         $c2d3 = wSprite13StateData2XDisplacement
@@ -18297,9 +18297,9 @@ WRAM0 bank #0:
 	         $c2e9 = wSprite14StateData2OrigFacingDirection
 	         $c2ed = wSprite14StateData2PictureID
 	         $c2ee = wSprite14StateData2ImageBaseOffset
+	         $c2f0 = wSprite14StateData2End
 	         $c2f0 = wSprite15StateData2WalkAnimationCounter
 	         $c2f0 = wSprite15StateData2
-	         $c2f0 = wSprite14StateData2End
 	         $c2f2 = wSprite15StateData2YDisplacement
 	         $c2f3 = wSprite15StateData2XDisplacement
 	         $c2f4 = wSprite15StateData2MapY
@@ -18310,22 +18310,22 @@ WRAM0 bank #0:
 	         $c2f9 = wSprite15StateData2OrigFacingDirection
 	         $c2fd = wSprite15StateData2PictureID
 	         $c2fe = wSprite15StateData2ImageBaseOffset
-	         $c300 = wSprite15StateData2End
 	         $c300 = wSpriteDataEnd
+	         $c300 = wSprite15StateData2End
 	SECTION: $c300-$c39f ($00a0 bytes) ["OAM Buffer"]
+	         $c300 = wShadowOAMSprite00YCoord
 	         $c300 = wShadowOAM
 	         $c300 = wShadowOAMSprite00
-	         $c300 = wShadowOAMSprite00YCoord
 	         $c301 = wShadowOAMSprite00XCoord
 	         $c302 = wShadowOAMSprite00TileID
 	         $c303 = wShadowOAMSprite00Attributes
-	         $c304 = wShadowOAMSprite01YCoord
 	         $c304 = wShadowOAMSprite01
+	         $c304 = wShadowOAMSprite01YCoord
 	         $c305 = wShadowOAMSprite01XCoord
 	         $c306 = wShadowOAMSprite01TileID
 	         $c307 = wShadowOAMSprite01Attributes
-	         $c308 = wShadowOAMSprite02
 	         $c308 = wShadowOAMSprite02YCoord
+	         $c308 = wShadowOAMSprite02
 	         $c309 = wShadowOAMSprite02XCoord
 	         $c30a = wShadowOAMSprite02TileID
 	         $c30b = wShadowOAMSprite02Attributes
@@ -18344,18 +18344,18 @@ WRAM0 bank #0:
 	         $c315 = wShadowOAMSprite05XCoord
 	         $c316 = wShadowOAMSprite05TileID
 	         $c317 = wShadowOAMSprite05Attributes
-	         $c318 = wShadowOAMSprite06
 	         $c318 = wShadowOAMSprite06YCoord
+	         $c318 = wShadowOAMSprite06
 	         $c319 = wShadowOAMSprite06XCoord
 	         $c31a = wShadowOAMSprite06TileID
 	         $c31b = wShadowOAMSprite06Attributes
-	         $c31c = wShadowOAMSprite07
 	         $c31c = wShadowOAMSprite07YCoord
+	         $c31c = wShadowOAMSprite07
 	         $c31d = wShadowOAMSprite07XCoord
 	         $c31e = wShadowOAMSprite07TileID
 	         $c31f = wShadowOAMSprite07Attributes
-	         $c320 = wShadowOAMSprite08
 	         $c320 = wShadowOAMSprite08YCoord
+	         $c320 = wShadowOAMSprite08
 	         $c321 = wShadowOAMSprite08XCoord
 	         $c322 = wShadowOAMSprite08TileID
 	         $c323 = wShadowOAMSprite08Attributes
@@ -18364,8 +18364,8 @@ WRAM0 bank #0:
 	         $c325 = wShadowOAMSprite09XCoord
 	         $c326 = wShadowOAMSprite09TileID
 	         $c327 = wShadowOAMSprite09Attributes
-	         $c328 = wShadowOAMSprite10
 	         $c328 = wShadowOAMSprite10YCoord
+	         $c328 = wShadowOAMSprite10
 	         $c329 = wShadowOAMSprite10XCoord
 	         $c32a = wShadowOAMSprite10TileID
 	         $c32b = wShadowOAMSprite10Attributes
@@ -18374,13 +18374,13 @@ WRAM0 bank #0:
 	         $c32d = wShadowOAMSprite11XCoord
 	         $c32e = wShadowOAMSprite11TileID
 	         $c32f = wShadowOAMSprite11Attributes
-	         $c330 = wShadowOAMSprite12
 	         $c330 = wShadowOAMSprite12YCoord
+	         $c330 = wShadowOAMSprite12
 	         $c331 = wShadowOAMSprite12XCoord
 	         $c332 = wShadowOAMSprite12TileID
 	         $c333 = wShadowOAMSprite12Attributes
-	         $c334 = wShadowOAMSprite13
 	         $c334 = wShadowOAMSprite13YCoord
+	         $c334 = wShadowOAMSprite13
 	         $c335 = wShadowOAMSprite13XCoord
 	         $c336 = wShadowOAMSprite13TileID
 	         $c337 = wShadowOAMSprite13Attributes
@@ -18404,8 +18404,8 @@ WRAM0 bank #0:
 	         $c345 = wShadowOAMSprite17XCoord
 	         $c346 = wShadowOAMSprite17TileID
 	         $c347 = wShadowOAMSprite17Attributes
-	         $c348 = wShadowOAMSprite18
 	         $c348 = wShadowOAMSprite18YCoord
+	         $c348 = wShadowOAMSprite18
 	         $c349 = wShadowOAMSprite18XCoord
 	         $c34a = wShadowOAMSprite18TileID
 	         $c34b = wShadowOAMSprite18Attributes
@@ -18414,13 +18414,13 @@ WRAM0 bank #0:
 	         $c34d = wShadowOAMSprite19XCoord
 	         $c34e = wShadowOAMSprite19TileID
 	         $c34f = wShadowOAMSprite19Attributes
-	         $c350 = wShadowOAMSprite20
 	         $c350 = wShadowOAMSprite20YCoord
+	         $c350 = wShadowOAMSprite20
 	         $c351 = wShadowOAMSprite20XCoord
 	         $c352 = wShadowOAMSprite20TileID
 	         $c353 = wShadowOAMSprite20Attributes
-	         $c354 = wShadowOAMSprite21
 	         $c354 = wShadowOAMSprite21YCoord
+	         $c354 = wShadowOAMSprite21
 	         $c355 = wShadowOAMSprite21XCoord
 	         $c356 = wShadowOAMSprite21TileID
 	         $c357 = wShadowOAMSprite21Attributes
@@ -18429,8 +18429,8 @@ WRAM0 bank #0:
 	         $c359 = wShadowOAMSprite22XCoord
 	         $c35a = wShadowOAMSprite22TileID
 	         $c35b = wShadowOAMSprite22Attributes
-	         $c35c = wShadowOAMSprite23
 	         $c35c = wShadowOAMSprite23YCoord
+	         $c35c = wShadowOAMSprite23
 	         $c35d = wShadowOAMSprite23XCoord
 	         $c35e = wShadowOAMSprite23TileID
 	         $c35f = wShadowOAMSprite23Attributes
@@ -18449,18 +18449,18 @@ WRAM0 bank #0:
 	         $c369 = wShadowOAMSprite26XCoord
 	         $c36a = wShadowOAMSprite26TileID
 	         $c36b = wShadowOAMSprite26Attributes
-	         $c36c = wShadowOAMSprite27
 	         $c36c = wShadowOAMSprite27YCoord
+	         $c36c = wShadowOAMSprite27
 	         $c36d = wShadowOAMSprite27XCoord
 	         $c36e = wShadowOAMSprite27TileID
 	         $c36f = wShadowOAMSprite27Attributes
-	         $c370 = wShadowOAMSprite28
 	         $c370 = wShadowOAMSprite28YCoord
+	         $c370 = wShadowOAMSprite28
 	         $c371 = wShadowOAMSprite28XCoord
 	         $c372 = wShadowOAMSprite28TileID
 	         $c373 = wShadowOAMSprite28Attributes
-	         $c374 = wShadowOAMSprite29
 	         $c374 = wShadowOAMSprite29YCoord
+	         $c374 = wShadowOAMSprite29
 	         $c375 = wShadowOAMSprite29XCoord
 	         $c376 = wShadowOAMSprite29TileID
 	         $c377 = wShadowOAMSprite29Attributes
@@ -18484,18 +18484,18 @@ WRAM0 bank #0:
 	         $c385 = wShadowOAMSprite33XCoord
 	         $c386 = wShadowOAMSprite33TileID
 	         $c387 = wShadowOAMSprite33Attributes
-	         $c388 = wShadowOAMSprite34
 	         $c388 = wShadowOAMSprite34YCoord
+	         $c388 = wShadowOAMSprite34
 	         $c389 = wShadowOAMSprite34XCoord
 	         $c38a = wShadowOAMSprite34TileID
 	         $c38b = wShadowOAMSprite34Attributes
-	         $c38c = wShadowOAMSprite35
 	         $c38c = wShadowOAMSprite35YCoord
+	         $c38c = wShadowOAMSprite35
 	         $c38d = wShadowOAMSprite35XCoord
 	         $c38e = wShadowOAMSprite35TileID
 	         $c38f = wShadowOAMSprite35Attributes
-	         $c390 = wShadowOAMSprite36YCoord
 	         $c390 = wShadowOAMSprite36
+	         $c390 = wShadowOAMSprite36YCoord
 	         $c391 = wShadowOAMSprite36XCoord
 	         $c392 = wShadowOAMSprite36TileID
 	         $c393 = wShadowOAMSprite36Attributes
@@ -18571,8 +18571,8 @@ WRAM0 bank #0:
 	         $c52d = wShadowOAMBackupSprite09XCoord
 	         $c52e = wShadowOAMBackupSprite09TileID
 	         $c52f = wShadowOAMBackupSprite09Attributes
-	         $c530 = wShadowOAMBackupSprite10YCoord
 	         $c530 = wShadowOAMBackupSprite10
+	         $c530 = wShadowOAMBackupSprite10YCoord
 	         $c531 = wShadowOAMBackupSprite10XCoord
 	         $c532 = wShadowOAMBackupSprite10TileID
 	         $c533 = wShadowOAMBackupSprite10Attributes
@@ -18601,8 +18601,8 @@ WRAM0 bank #0:
 	         $c545 = wShadowOAMBackupSprite15XCoord
 	         $c546 = wShadowOAMBackupSprite15TileID
 	         $c547 = wShadowOAMBackupSprite15Attributes
-	         $c548 = wShadowOAMBackupSprite16
 	         $c548 = wShadowOAMBackupSprite16YCoord
+	         $c548 = wShadowOAMBackupSprite16
 	         $c549 = wShadowOAMBackupSprite16XCoord
 	         $c54a = wShadowOAMBackupSprite16TileID
 	         $c54b = wShadowOAMBackupSprite16Attributes
@@ -18777,10 +18777,10 @@ WRAM0 bank #0:
 	         $cc5b = wMonPartySpritesSavedOAM
 	         $cc5b = wElevatorWarpMaps
 	         $cc5b = wVermilionDockTileMapBuffer
-	         $cc5b = wSlotMachineSevenAndBarModeChance
-	         $cc5b = wOaksAideRewardItemName
 	         $cc5b = wHallOfFame
+	         $cc5b = wOaksAideRewardItemName
 	         $cc5b = wDexRatingNumMonsSeen
+	         $cc5b = wSlotMachineSevenAndBarModeChance
 	         $cc5b = wUnusedFlag
 	         $cc5b = wFilteredBagItems
 	         $cc5c = wDexRatingNumMonsOwned
@@ -18826,10 +18826,10 @@ WRAM0 bank #0:
 	         $cd05 = wEnemyNumHits
 	         $cd05 = wLuckySlotHiddenObjectIndex
 	         $cd05 = wEnemyBideAccumulatedDamage
-	         $cd0f = wPlayerMonUnmodifiedLevel
 	         $cd0f = wVermilionDockTileMapBufferEnd
-	         $cd0f = wMiscBattleDataEnd
 	         $cd0f = wInGameTradeGiveMonSpecies
+	         $cd0f = wPlayerMonUnmodifiedLevel
+	         $cd0f = wMiscBattleDataEnd
 	         $cd10 = wPlayerMonUnmodifiedMaxHP
 	         $cd10 = wInGameTradeTextPointerTablePointer
 	         $cd12 = wPlayerMonUnmodifiedAttack
@@ -18878,6 +18878,7 @@ WRAM0 bank #0:
 	         $cd3d = wNumShakes
 	         $cd3d = wPPRestoreItem
 	         $cd3d = wDexMaxSeenMon
+	         $cd3d = wWhichTrade
 	         $cd3d = wChangeBoxSavedMapTextPointer
 	         $cd3d = wBadgeNumberTile
 	         $cd3d = wOptionsTextSpeedCursorX
@@ -18899,22 +18900,21 @@ WRAM0 bank #0:
 	         $cd3d = wChargeMoveNum
 	         $cd3d = wPriceTemp
 	         $cd3d = wTitleMonSpecies
-	         $cd3d = wFieldMoves
-	         $cd3d = wPlayerCharacterOAMTile
-	         $cd3d = wCoordIndex
-	         $cd3d = wTempSCX
-	         $cd3d = wUnusedCreditsByte
-	         $cd3d = wBoxMonCounts
-	         $cd3d = wHoFTeamIndex
-	         $cd3d = wWhichTrade
-	         $cd3d = wSavedY
-	         $cd3d = wDayCareStartLevel
+	         $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 	         $cd3d = wMoveDownSmallStarsOAMCount
+	         $cd3d = wUnusedCreditsByte
+	         $cd3d = wFieldMoves
+	         $cd3d = wHoFTeamIndex
+	         $cd3d = wTempSCX
+	         $cd3d = wCoordIndex
+	         $cd3d = wDayCareStartLevel
+	         $cd3d = wBoxMonCounts
+	         $cd3d = wSavedY
+	         $cd3d = wPlayerCharacterOAMTile
+	         $cd3d = wStoppingWhichSlotMachineWheel
 	         $cd3d = wWereAnyMonsAsleep
 	         $cd3d = wFallingObjectsMovementData
 	         $cd3d = wTrainerSpriteOffset
-	         $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
-	         $cd3d = wStoppingWhichSlotMachineWheel
 	         $cd3e = wNumCreditsMonsDisplayed
 	         $cd3e = wTrainerInfoTextBoxWidth
 	         $cd3e = wTrainerEngageDistance
@@ -18930,8 +18930,8 @@ WRAM0 bank #0:
 	         $cd3e = wBattleTransitionCircleScreenQuadrantX
 	         $cd3e = wTradingWhichEnemyMon
 	         $cd3e = wTradedEnemyMonSpecies
-	         $cd3e = wBadgeNameTile
 	         $cd3e = wRivalStarterBallSpriteIndex
+	         $cd3e = wBadgeNameTile
 	         $cd3e = wHoFPartyMonIndex
 	         $cd3e = wOptionsBattleAnimCursorX
 	         $cd3f = wJigglypuffFacingDirections
@@ -18942,27 +18942,27 @@ WRAM0 bank #0:
 	         $cd3f = wSlotMachineWheel2Offset
 	         $cd3f = wFlyAnimBirdSpriteImageIndex
 	         $cd3f = wNameOfPlayerMonToBeTraded
+	         $cd3f = wDayCareTotalCost
 	         $cd3f = wHoFMonLevel
 	         $cd3f = wTrainerFacingDirection
 	         $cd3f = wHiddenObjectIndex
-	         $cd3f = wDayCareTotalCost
-	         $cd3f = wHUDGraphicsTiles
 	         $cd3f = wOptionsBattleStyleCursorX
+	         $cd3f = wHUDGraphicsTiles
 	         $cd40 = wOptionsCancelCursorX
 	         $cd40 = wTrainerScreenY
+	         $cd40 = wSlotMachineWheel3Offset
 	         $cd40 = wPlayerSpinInPlaceAnimSoundID
 	         $cd40 = wHiddenObjectY
-	         $cd40 = wSlotMachineWheel3Offset
 	         $cd40 = wHoFMonOrPlayer
 	         $cd41 = wSlotMachineWheel1BottomTile
 	         $cd41 = wSlotMachineWinningSymbol
 	         $cd41 = wHoFTeamIndex2
 	         $cd41 = wNumFieldMoves
+	         $cd41 = wDayCarePerLevelCost
 	         $cd41 = wTradedPlayerMonOT
-	         $cd41 = wHiddenItemOrCoinsIndex
 	         $cd41 = wHiddenObjectX
 	         $cd41 = wTrainerScreenX
-	         $cd41 = wDayCarePerLevelCost
+	         $cd41 = wHiddenItemOrCoinsIndex
 	         $cd42 = wSlotMachineWheel1MiddleTile
 	         $cd42 = wHoFTeamNo
 	         $cd42 = wFieldMovesLeftmostXCoord
@@ -18972,8 +18972,8 @@ WRAM0 bank #0:
 	         $cd45 = wSlotMachineWheel2MiddleTile
 	         $cd46 = wTempCoins1
 	         $cd46 = wSlotMachineWheel2TopTile
-	         $cd47 = wBattleTransitionSpiralDirection
 	         $cd47 = wSlotMachineWheel3BottomTile
+	         $cd47 = wBattleTransitionSpiralDirection
 	         $cd48 = wFacingDirectionList
 	         $cd48 = wSlotMachineWheel3MiddleTile
 	         $cd49 = wTempObtainedBadgesBooleans
@@ -18995,8 +18995,8 @@ WRAM0 bank #0:
 	         $cd50 = wWhichEmotionBubble
 	         $cd59 = wTradedEnemyMonOTID
 	         $cd5b = wGymTrashCanIndex
-	         $cd5b = wOAMBaseTile
 	         $cd5b = wStandingOnWarpPadOrHole
+	         $cd5b = wOAMBaseTile
 	         $cd5c = wSymmetricSpriteOAMAttributes
 	         $cd5d = wMonPartySpriteSpecies
 	         $cd5e = wLeftGBMonSpecies
@@ -19004,8 +19004,8 @@ WRAM0 bank #0:
 	         $cd60 = wMiscFlags
 	         $cd6a = wActionResultOrTookBattleTurn
 	         $cd6b = wJoyIgnore
-	         $cd6c = wNumMovesMinusOne
 	         $cd6c = wDownscaledMonSize
+	         $cd6c = wNumMovesMinusOne
 	         $cd6d = wNameBuffer
 	         $cd6d = wMoveData
 	         $cd6d = wPayDayMoney
@@ -19243,10 +19243,10 @@ WRAM0 bank #0:
 	         $d08a = wFlashScreenLongCounter
 	         $d08a = wSpiralBallsBaseY
 	         $d08a = wFallingObjectMovementByte
-	         $d08a = wTradedMonMovingRight
 	         $d08a = wOptionsInitialized
-	         $d08a = wUnusedWaterDropletsByte
+	         $d08a = wTradedMonMovingRight
 	         $d08a = wNewSlotMachineBallTile
+	         $d08a = wUnusedWaterDropletsByte
 	         $d08b = wNumFallingObjects
 	         $d08b = wSubAnimTransform
 	         $d08b = wSpiralBallsBaseX
@@ -19332,8 +19332,8 @@ WRAM0 bank #0:
 	         $d11e = wUsingPPUp
 	         $d11e = wMoveGrammar
 	         $d11e = wTempTMHM
-	         $d11e = wTypeEffectiveness
 	         $d11e = wNumSetBits
+	         $d11e = wTypeEffectiveness
 	         $d11e = wNamedObjectIndex
 	         $d11e = wCalculateWhoseStats
 	         $d11f = wForcePlayerToChooseMon
@@ -19454,8 +19454,8 @@ WRAM0 bank #0:
 	         $d1de = wPartyMon3DVs
 	         $d1e0 = wPartyMon3PP
 	         $d1e4 = wPartyMon3Level
-	         $d1e5 = wPartyMon3Stats
 	         $d1e5 = wPartyMon3MaxHP
+	         $d1e5 = wPartyMon3Stats
 	         $d1e7 = wPartyMon3Attack
 	         $d1e9 = wPartyMon3Defense
 	         $d1eb = wPartyMon3Speed
@@ -19512,8 +19512,8 @@ WRAM0 bank #0:
 	         $d241 = wPartyMon5Defense
 	         $d243 = wPartyMon5Speed
 	         $d245 = wPartyMon5Special
-	         $d247 = wPartyMon6Species
 	         $d247 = wPartyMon6
+	         $d247 = wPartyMon6Species
 	         $d248 = wPartyMon6HP
 	         $d24a = wPartyMon6BoxLevel
 	         $d24b = wPartyMon6Status
@@ -19913,8 +19913,8 @@ WRAM0 bank #0:
 	         $d94e = wEnemyMon4Defense
 	         $d950 = wEnemyMon4Speed
 	         $d952 = wEnemyMon4Special
-	         $d954 = wEnemyMon5Species
 	         $d954 = wEnemyMon5
+	         $d954 = wEnemyMon5Species
 	         $d955 = wEnemyMon5HP
 	         $d957 = wEnemyMon5BoxLevel
 	         $d958 = wEnemyMon5Status
@@ -19944,8 +19944,8 @@ WRAM0 bank #0:
 	         $d981 = wEnemyMon6HP
 	         $d983 = wEnemyMon6BoxLevel
 	         $d984 = wEnemyMon6Status
-	         $d985 = wEnemyMon6Type1
 	         $d985 = wEnemyMon6Type
+	         $d985 = wEnemyMon6Type1
 	         $d986 = wEnemyMon6Type2
 	         $d987 = wEnemyMon6CatchRate
 	         $d988 = wEnemyMon6Moves
@@ -20093,8 +20093,8 @@ WRAM0 bank #0:
 	         $db12 = wBoxMon4SpecialExp
 	         $db14 = wBoxMon4DVs
 	         $db16 = wBoxMon4PP
-	         $db1a = wBoxMon5Species
 	         $db1a = wBoxMon5
+	         $db1a = wBoxMon5Species
 	         $db1b = wBoxMon5HP
 	         $db1d = wBoxMon5BoxLevel
 	         $db1e = wBoxMon5Status
@@ -20174,8 +20174,8 @@ WRAM0 bank #0:
 	         $db9f = wBoxMon9HP
 	         $dba1 = wBoxMon9BoxLevel
 	         $dba2 = wBoxMon9Status
-	         $dba3 = wBoxMon9Type
 	         $dba3 = wBoxMon9Type1
+	         $dba3 = wBoxMon9Type
 	         $dba4 = wBoxMon9Type2
 	         $dba5 = wBoxMon9CatchRate
 	         $dba6 = wBoxMon9Moves
@@ -20283,8 +20283,8 @@ WRAM0 bank #0:
 	         $dc5c = wBoxMon14SpecialExp
 	         $dc5e = wBoxMon14DVs
 	         $dc60 = wBoxMon14PP
-	         $dc64 = wBoxMon15Species
 	         $dc64 = wBoxMon15
+	         $dc64 = wBoxMon15Species
 	         $dc65 = wBoxMon15HP
 	         $dc67 = wBoxMon15BoxLevel
 	         $dc68 = wBoxMon15Status
@@ -20326,8 +20326,8 @@ WRAM0 bank #0:
 	         $dca7 = wBoxMon17HP
 	         $dca9 = wBoxMon17BoxLevel
 	         $dcaa = wBoxMon17Status
-	         $dcab = wBoxMon17Type1
 	         $dcab = wBoxMon17Type
+	         $dcab = wBoxMon17Type1
 	         $dcac = wBoxMon17Type2
 	         $dcad = wBoxMon17CatchRate
 	         $dcae = wBoxMon17Moves
@@ -20359,8 +20359,8 @@ WRAM0 bank #0:
 	         $dce0 = wBoxMon18SpecialExp
 	         $dce2 = wBoxMon18DVs
 	         $dce4 = wBoxMon18PP
-	         $dce8 = wBoxMon19
 	         $dce8 = wBoxMon19Species
+	         $dce8 = wBoxMon19
 	         $dce9 = wBoxMon19HP
 	         $dceb = wBoxMon19BoxLevel
 	         $dcec = wBoxMon19Status
@@ -20463,18 +20463,18 @@ HRAM bank #0:
 	         $ff8b = hPreviousTileset
 	         $ff8b = hOAMTile
 	         $ff8b = hBaseTileID
+	         $ff8b = hEastWestConnectedMapWidth
 	         $ff8b = hItemPrice
 	         $ff8b = hDexWeight
-	         $ff8b = hEastWestConnectedMapWidth
 	         $ff8b = hSpriteInterlaceCounter
 	         $ff8b = hRLEByteValue
 	         $ff8c = hNorthSouthConnectedMapWidth
 	         $ff8c = hMapWidth
 	         $ff8c = hSpriteHeight
 	         $ff8c = hPartyMonIndex
-	         $ff8c = hSpriteIndex
-	         $ff8c = hTextID
 	         $ff8c = hSlidingRegionSize
+	         $ff8c = hTextID
+	         $ff8c = hSpriteIndex
 	         $ff8c = hDownArrowBlinkCount2
 	         $ff8d = hEnemySpeed
 	         $ff8d = hLoadSpriteTemp1
@@ -20499,13 +20499,13 @@ HRAM bank #0:
 	         $ff94 = hSpritePriority
 	         $ff95 = hSwapItemID
 	         $ff95 = hNPCPlayerYDistance
-	         $ff95 = hNPCSpriteOffset
 	         $ff95 = hDividend
 	         $ff95 = hSignCoordPointer
-	         $ff95 = hQuotient
-	         $ff95 = hNPCMovementDirections2Index
 	         $ff95 = hPastLeadingZeros
+	         $ff95 = hQuotient
 	         $ff95 = hProduct
+	         $ff95 = hNPCMovementDirections2Index
+	         $ff95 = hNPCSpriteOffset
 	         $ff95 = hSwapTemp
 	         $ff96 = hMutateWY
 	         $ff96 = hSwapItemQuantity
@@ -20589,12 +20589,12 @@ HRAM bank #0:
 	         $ffdc = hVendingMachinePrice
 	         $ffdc = hPlayerYCoord
 	         $ffdc = hOaksAideRewardItem
-	         $ffdc = hItemToRemoveIndex
 	         $ffdc = hGymGateAnswer
+	         $ffdc = hItemToRemoveIndex
 	         $ffdd = hPlayerXCoord
 	         $ffdd = hOaksAideNumMonsOwned
-	         $ffe0 = hUnlockedSilphCoDoors
 	         $ffe0 = hBackupGymGateIndex
+	         $ffe0 = hUnlockedSilphCoDoors
 	         $ffe1 = hStartTileID
 	         $ffe4 = hNewPartyLength
 	         $ffe5 = hDividend2
--- a/pokered.sym
+++ b/pokered.sym
@@ -337,8 +337,8 @@
 00:1765 Forest_Coll
 00:1775 House_Coll
 00:177f Gate_Coll
-00:177f ForestGate_Coll
 00:177f Museum_Coll
+00:177f ForestGate_Coll
 00:178a Ship_Coll
 00:1795 ShipPort_Coll
 00:179a Cemetery_Coll
@@ -9074,8 +9074,8 @@
 13:5e76 BlackbeltPic
 13:6049 Rival1Pic
 13:615f ProfOakPic
-13:627d ScientistPic
 13:627d ChiefPic
+13:627d ScientistPic
 13:63be GiovanniPic
 13:649f RocketPic
 13:6635 CooltrainerMPic
@@ -12161,9 +12161,9 @@
 1a:560f Gate_GFX
 1a:560f Museum_GFX
 1a:560f ForestGate_GFX
+1a:5bff ForestGate_Block
 1a:5bff Gate_Block
 1a:5bff Museum_Block
-1a:5bff ForestGate_Block
 1a:63ff Forest_GFX
 1a:69ff Forest_Block
 1a:71ff Facility_GFX
@@ -17448,8 +17448,8 @@
 00:8000 vChars0
 00:8000 vSprites
 00:8000 vNPCSprites
-00:8800 vTitleLogo
 00:8800 vFont
+00:8800 vTitleLogo
 00:8800 vChars1
 00:8800 vNPCSprites2
 00:9000 vFrontPic
@@ -17577,8 +17577,8 @@
 00:c12b wSprite02StateData1XAdjusted
 00:c12c wSprite02StateData1CollisionData
 00:c130 wSprite02StateData1End
-00:c130 wSprite03StateData1
 00:c130 wSprite03StateData1PictureID
+00:c130 wSprite03StateData1
 00:c131 wSprite03StateData1MovementStatus
 00:c132 wSprite03StateData1ImageIndex
 00:c133 wSprite03StateData1YStepVector
@@ -17607,8 +17607,8 @@
 00:c14b wSprite04StateData1XAdjusted
 00:c14c wSprite04StateData1CollisionData
 00:c150 wSprite05StateData1PictureID
-00:c150 wSprite04StateData1End
 00:c150 wSprite05StateData1
+00:c150 wSprite04StateData1End
 00:c151 wSprite05StateData1MovementStatus
 00:c152 wSprite05StateData1ImageIndex
 00:c153 wSprite05StateData1YStepVector
@@ -17726,9 +17726,9 @@
 00:c1ca wSprite12StateData1YAdjusted
 00:c1cb wSprite12StateData1XAdjusted
 00:c1cc wSprite12StateData1CollisionData
+00:c1d0 wSprite13StateData1PictureID
 00:c1d0 wSprite12StateData1End
 00:c1d0 wSprite13StateData1
-00:c1d0 wSprite13StateData1PictureID
 00:c1d1 wSprite13StateData1MovementStatus
 00:c1d2 wSprite13StateData1ImageIndex
 00:c1d3 wSprite13StateData1YStepVector
@@ -17741,9 +17741,9 @@
 00:c1da wSprite13StateData1YAdjusted
 00:c1db wSprite13StateData1XAdjusted
 00:c1dc wSprite13StateData1CollisionData
+00:c1e0 wSprite13StateData1End
 00:c1e0 wSprite14StateData1
 00:c1e0 wSprite14StateData1PictureID
-00:c1e0 wSprite13StateData1End
 00:c1e1 wSprite14StateData1MovementStatus
 00:c1e2 wSprite14StateData1ImageIndex
 00:c1e3 wSprite14StateData1YStepVector
@@ -17757,8 +17757,8 @@
 00:c1eb wSprite14StateData1XAdjusted
 00:c1ec wSprite14StateData1CollisionData
 00:c1f0 wSprite15StateData1PictureID
-00:c1f0 wSprite14StateData1End
 00:c1f0 wSprite15StateData1
+00:c1f0 wSprite14StateData1End
 00:c1f1 wSprite15StateData1MovementStatus
 00:c1f2 wSprite15StateData1ImageIndex
 00:c1f3 wSprite15StateData1YStepVector
@@ -17772,9 +17772,9 @@
 00:c1fb wSprite15StateData1XAdjusted
 00:c1fc wSprite15StateData1CollisionData
 00:c200 wSpriteStateData2
-00:c200 wSprite15StateData1End
 00:c200 wSpritePlayerStateData2WalkAnimationCounter
 00:c200 wSpritePlayerStateData2
+00:c200 wSprite15StateData1End
 00:c202 wSpritePlayerStateData2YDisplacement
 00:c203 wSpritePlayerStateData2XDisplacement
 00:c204 wSpritePlayerStateData2MapY
@@ -17785,9 +17785,9 @@
 00:c209 wSpritePlayerStateData2OrigFacingDirection
 00:c20d wSpritePlayerStateData2PictureID
 00:c20e wSpritePlayerStateData2ImageBaseOffset
+00:c210 wSprite01StateData2
 00:c210 wSpritePlayerStateData2End
 00:c210 wSprite01StateData2WalkAnimationCounter
-00:c210 wSprite01StateData2
 00:c212 wSprite01StateData2YDisplacement
 00:c213 wSprite01StateData2XDisplacement
 00:c214 wSprite01StateData2MapY
@@ -17799,8 +17799,8 @@
 00:c21d wSprite01StateData2PictureID
 00:c21e wSprite01StateData2ImageBaseOffset
 00:c220 wSprite02StateData2WalkAnimationCounter
-00:c220 wSprite01StateData2End
 00:c220 wSprite02StateData2
+00:c220 wSprite01StateData2End
 00:c222 wSprite02StateData2YDisplacement
 00:c223 wSprite02StateData2XDisplacement
 00:c224 wSprite02StateData2MapY
@@ -17812,8 +17812,8 @@
 00:c22d wSprite02StateData2PictureID
 00:c22e wSprite02StateData2ImageBaseOffset
 00:c230 wSprite03StateData2
-00:c230 wSprite03StateData2WalkAnimationCounter
 00:c230 wSprite02StateData2End
+00:c230 wSprite03StateData2WalkAnimationCounter
 00:c232 wSprite03StateData2YDisplacement
 00:c233 wSprite03StateData2XDisplacement
 00:c234 wSprite03StateData2MapY
@@ -17824,9 +17824,9 @@
 00:c239 wSprite03StateData2OrigFacingDirection
 00:c23d wSprite03StateData2PictureID
 00:c23e wSprite03StateData2ImageBaseOffset
-00:c240 wSprite04StateData2WalkAnimationCounter
 00:c240 wSprite04StateData2
 00:c240 wSprite03StateData2End
+00:c240 wSprite04StateData2WalkAnimationCounter
 00:c242 wSprite04StateData2YDisplacement
 00:c243 wSprite04StateData2XDisplacement
 00:c244 wSprite04StateData2MapY
@@ -17837,9 +17837,9 @@
 00:c249 wSprite04StateData2OrigFacingDirection
 00:c24d wSprite04StateData2PictureID
 00:c24e wSprite04StateData2ImageBaseOffset
-00:c250 wSprite04StateData2End
 00:c250 wSprite05StateData2WalkAnimationCounter
 00:c250 wSprite05StateData2
+00:c250 wSprite04StateData2End
 00:c252 wSprite05StateData2YDisplacement
 00:c253 wSprite05StateData2XDisplacement
 00:c254 wSprite05StateData2MapY
@@ -17850,9 +17850,9 @@
 00:c259 wSprite05StateData2OrigFacingDirection
 00:c25d wSprite05StateData2PictureID
 00:c25e wSprite05StateData2ImageBaseOffset
-00:c260 wSprite06StateData2
-00:c260 wSprite05StateData2End
 00:c260 wSprite06StateData2WalkAnimationCounter
+00:c260 wSprite05StateData2End
+00:c260 wSprite06StateData2
 00:c262 wSprite06StateData2YDisplacement
 00:c263 wSprite06StateData2XDisplacement
 00:c264 wSprite06StateData2MapY
@@ -17863,8 +17863,8 @@
 00:c269 wSprite06StateData2OrigFacingDirection
 00:c26d wSprite06StateData2PictureID
 00:c26e wSprite06StateData2ImageBaseOffset
-00:c270 wSprite06StateData2End
 00:c270 wSprite07StateData2
+00:c270 wSprite06StateData2End
 00:c270 wSprite07StateData2WalkAnimationCounter
 00:c272 wSprite07StateData2YDisplacement
 00:c273 wSprite07StateData2XDisplacement
@@ -17876,9 +17876,9 @@
 00:c279 wSprite07StateData2OrigFacingDirection
 00:c27d wSprite07StateData2PictureID
 00:c27e wSprite07StateData2ImageBaseOffset
-00:c280 wSprite07StateData2End
-00:c280 wSprite08StateData2
 00:c280 wSprite08StateData2WalkAnimationCounter
+00:c280 wSprite08StateData2
+00:c280 wSprite07StateData2End
 00:c282 wSprite08StateData2YDisplacement
 00:c283 wSprite08StateData2XDisplacement
 00:c284 wSprite08StateData2MapY
@@ -17889,9 +17889,9 @@
 00:c289 wSprite08StateData2OrigFacingDirection
 00:c28d wSprite08StateData2PictureID
 00:c28e wSprite08StateData2ImageBaseOffset
+00:c290 wSprite09StateData2WalkAnimationCounter
 00:c290 wSprite09StateData2
 00:c290 wSprite08StateData2End
-00:c290 wSprite09StateData2WalkAnimationCounter
 00:c292 wSprite09StateData2YDisplacement
 00:c293 wSprite09StateData2XDisplacement
 00:c294 wSprite09StateData2MapY
@@ -17902,9 +17902,9 @@
 00:c299 wSprite09StateData2OrigFacingDirection
 00:c29d wSprite09StateData2PictureID
 00:c29e wSprite09StateData2ImageBaseOffset
-00:c2a0 wSprite10StateData2WalkAnimationCounter
-00:c2a0 wSprite09StateData2End
 00:c2a0 wSprite10StateData2
+00:c2a0 wSprite09StateData2End
+00:c2a0 wSprite10StateData2WalkAnimationCounter
 00:c2a2 wSprite10StateData2YDisplacement
 00:c2a3 wSprite10StateData2XDisplacement
 00:c2a4 wSprite10StateData2MapY
@@ -17915,8 +17915,8 @@
 00:c2a9 wSprite10StateData2OrigFacingDirection
 00:c2ad wSprite10StateData2PictureID
 00:c2ae wSprite10StateData2ImageBaseOffset
-00:c2b0 wSprite11StateData2
 00:c2b0 wSprite11StateData2WalkAnimationCounter
+00:c2b0 wSprite11StateData2
 00:c2b0 wSprite10StateData2End
 00:c2b2 wSprite11StateData2YDisplacement
 00:c2b3 wSprite11StateData2XDisplacement
@@ -17941,8 +17941,8 @@
 00:c2c9 wSprite12StateData2OrigFacingDirection
 00:c2cd wSprite12StateData2PictureID
 00:c2ce wSprite12StateData2ImageBaseOffset
-00:c2d0 wSprite13StateData2
 00:c2d0 wSprite13StateData2WalkAnimationCounter
+00:c2d0 wSprite13StateData2
 00:c2d0 wSprite12StateData2End
 00:c2d2 wSprite13StateData2YDisplacement
 00:c2d3 wSprite13StateData2XDisplacement
@@ -17967,9 +17967,9 @@
 00:c2e9 wSprite14StateData2OrigFacingDirection
 00:c2ed wSprite14StateData2PictureID
 00:c2ee wSprite14StateData2ImageBaseOffset
+00:c2f0 wSprite14StateData2End
 00:c2f0 wSprite15StateData2WalkAnimationCounter
 00:c2f0 wSprite15StateData2
-00:c2f0 wSprite14StateData2End
 00:c2f2 wSprite15StateData2YDisplacement
 00:c2f3 wSprite15StateData2XDisplacement
 00:c2f4 wSprite15StateData2MapY
@@ -17980,21 +17980,21 @@
 00:c2f9 wSprite15StateData2OrigFacingDirection
 00:c2fd wSprite15StateData2PictureID
 00:c2fe wSprite15StateData2ImageBaseOffset
-00:c300 wSprite15StateData2End
 00:c300 wSpriteDataEnd
+00:c300 wSprite15StateData2End
+00:c300 wShadowOAMSprite00YCoord
 00:c300 wShadowOAM
 00:c300 wShadowOAMSprite00
-00:c300 wShadowOAMSprite00YCoord
 00:c301 wShadowOAMSprite00XCoord
 00:c302 wShadowOAMSprite00TileID
 00:c303 wShadowOAMSprite00Attributes
-00:c304 wShadowOAMSprite01YCoord
 00:c304 wShadowOAMSprite01
+00:c304 wShadowOAMSprite01YCoord
 00:c305 wShadowOAMSprite01XCoord
 00:c306 wShadowOAMSprite01TileID
 00:c307 wShadowOAMSprite01Attributes
-00:c308 wShadowOAMSprite02
 00:c308 wShadowOAMSprite02YCoord
+00:c308 wShadowOAMSprite02
 00:c309 wShadowOAMSprite02XCoord
 00:c30a wShadowOAMSprite02TileID
 00:c30b wShadowOAMSprite02Attributes
@@ -18013,18 +18013,18 @@
 00:c315 wShadowOAMSprite05XCoord
 00:c316 wShadowOAMSprite05TileID
 00:c317 wShadowOAMSprite05Attributes
-00:c318 wShadowOAMSprite06
 00:c318 wShadowOAMSprite06YCoord
+00:c318 wShadowOAMSprite06
 00:c319 wShadowOAMSprite06XCoord
 00:c31a wShadowOAMSprite06TileID
 00:c31b wShadowOAMSprite06Attributes
-00:c31c wShadowOAMSprite07
 00:c31c wShadowOAMSprite07YCoord
+00:c31c wShadowOAMSprite07
 00:c31d wShadowOAMSprite07XCoord
 00:c31e wShadowOAMSprite07TileID
 00:c31f wShadowOAMSprite07Attributes
-00:c320 wShadowOAMSprite08
 00:c320 wShadowOAMSprite08YCoord
+00:c320 wShadowOAMSprite08
 00:c321 wShadowOAMSprite08XCoord
 00:c322 wShadowOAMSprite08TileID
 00:c323 wShadowOAMSprite08Attributes
@@ -18033,8 +18033,8 @@
 00:c325 wShadowOAMSprite09XCoord
 00:c326 wShadowOAMSprite09TileID
 00:c327 wShadowOAMSprite09Attributes
-00:c328 wShadowOAMSprite10
 00:c328 wShadowOAMSprite10YCoord
+00:c328 wShadowOAMSprite10
 00:c329 wShadowOAMSprite10XCoord
 00:c32a wShadowOAMSprite10TileID
 00:c32b wShadowOAMSprite10Attributes
@@ -18043,13 +18043,13 @@
 00:c32d wShadowOAMSprite11XCoord
 00:c32e wShadowOAMSprite11TileID
 00:c32f wShadowOAMSprite11Attributes
-00:c330 wShadowOAMSprite12
 00:c330 wShadowOAMSprite12YCoord
+00:c330 wShadowOAMSprite12
 00:c331 wShadowOAMSprite12XCoord
 00:c332 wShadowOAMSprite12TileID
 00:c333 wShadowOAMSprite12Attributes
-00:c334 wShadowOAMSprite13
 00:c334 wShadowOAMSprite13YCoord
+00:c334 wShadowOAMSprite13
 00:c335 wShadowOAMSprite13XCoord
 00:c336 wShadowOAMSprite13TileID
 00:c337 wShadowOAMSprite13Attributes
@@ -18073,8 +18073,8 @@
 00:c345 wShadowOAMSprite17XCoord
 00:c346 wShadowOAMSprite17TileID
 00:c347 wShadowOAMSprite17Attributes
-00:c348 wShadowOAMSprite18
 00:c348 wShadowOAMSprite18YCoord
+00:c348 wShadowOAMSprite18
 00:c349 wShadowOAMSprite18XCoord
 00:c34a wShadowOAMSprite18TileID
 00:c34b wShadowOAMSprite18Attributes
@@ -18083,13 +18083,13 @@
 00:c34d wShadowOAMSprite19XCoord
 00:c34e wShadowOAMSprite19TileID
 00:c34f wShadowOAMSprite19Attributes
-00:c350 wShadowOAMSprite20
 00:c350 wShadowOAMSprite20YCoord
+00:c350 wShadowOAMSprite20
 00:c351 wShadowOAMSprite20XCoord
 00:c352 wShadowOAMSprite20TileID
 00:c353 wShadowOAMSprite20Attributes
-00:c354 wShadowOAMSprite21
 00:c354 wShadowOAMSprite21YCoord
+00:c354 wShadowOAMSprite21
 00:c355 wShadowOAMSprite21XCoord
 00:c356 wShadowOAMSprite21TileID
 00:c357 wShadowOAMSprite21Attributes
@@ -18098,8 +18098,8 @@
 00:c359 wShadowOAMSprite22XCoord
 00:c35a wShadowOAMSprite22TileID
 00:c35b wShadowOAMSprite22Attributes
-00:c35c wShadowOAMSprite23
 00:c35c wShadowOAMSprite23YCoord
+00:c35c wShadowOAMSprite23
 00:c35d wShadowOAMSprite23XCoord
 00:c35e wShadowOAMSprite23TileID
 00:c35f wShadowOAMSprite23Attributes
@@ -18118,18 +18118,18 @@
 00:c369 wShadowOAMSprite26XCoord
 00:c36a wShadowOAMSprite26TileID
 00:c36b wShadowOAMSprite26Attributes
-00:c36c wShadowOAMSprite27
 00:c36c wShadowOAMSprite27YCoord
+00:c36c wShadowOAMSprite27
 00:c36d wShadowOAMSprite27XCoord
 00:c36e wShadowOAMSprite27TileID
 00:c36f wShadowOAMSprite27Attributes
-00:c370 wShadowOAMSprite28
 00:c370 wShadowOAMSprite28YCoord
+00:c370 wShadowOAMSprite28
 00:c371 wShadowOAMSprite28XCoord
 00:c372 wShadowOAMSprite28TileID
 00:c373 wShadowOAMSprite28Attributes
-00:c374 wShadowOAMSprite29
 00:c374 wShadowOAMSprite29YCoord
+00:c374 wShadowOAMSprite29
 00:c375 wShadowOAMSprite29XCoord
 00:c376 wShadowOAMSprite29TileID
 00:c377 wShadowOAMSprite29Attributes
@@ -18153,18 +18153,18 @@
 00:c385 wShadowOAMSprite33XCoord
 00:c386 wShadowOAMSprite33TileID
 00:c387 wShadowOAMSprite33Attributes
-00:c388 wShadowOAMSprite34
 00:c388 wShadowOAMSprite34YCoord
+00:c388 wShadowOAMSprite34
 00:c389 wShadowOAMSprite34XCoord
 00:c38a wShadowOAMSprite34TileID
 00:c38b wShadowOAMSprite34Attributes
-00:c38c wShadowOAMSprite35
 00:c38c wShadowOAMSprite35YCoord
+00:c38c wShadowOAMSprite35
 00:c38d wShadowOAMSprite35XCoord
 00:c38e wShadowOAMSprite35TileID
 00:c38f wShadowOAMSprite35Attributes
-00:c390 wShadowOAMSprite36YCoord
 00:c390 wShadowOAMSprite36
+00:c390 wShadowOAMSprite36YCoord
 00:c391 wShadowOAMSprite36XCoord
 00:c392 wShadowOAMSprite36TileID
 00:c393 wShadowOAMSprite36Attributes
@@ -18239,8 +18239,8 @@
 00:c52d wShadowOAMBackupSprite09XCoord
 00:c52e wShadowOAMBackupSprite09TileID
 00:c52f wShadowOAMBackupSprite09Attributes
-00:c530 wShadowOAMBackupSprite10YCoord
 00:c530 wShadowOAMBackupSprite10
+00:c530 wShadowOAMBackupSprite10YCoord
 00:c531 wShadowOAMBackupSprite10XCoord
 00:c532 wShadowOAMBackupSprite10TileID
 00:c533 wShadowOAMBackupSprite10Attributes
@@ -18269,8 +18269,8 @@
 00:c545 wShadowOAMBackupSprite15XCoord
 00:c546 wShadowOAMBackupSprite15TileID
 00:c547 wShadowOAMBackupSprite15Attributes
-00:c548 wShadowOAMBackupSprite16
 00:c548 wShadowOAMBackupSprite16YCoord
+00:c548 wShadowOAMBackupSprite16
 00:c549 wShadowOAMBackupSprite16XCoord
 00:c54a wShadowOAMBackupSprite16TileID
 00:c54b wShadowOAMBackupSprite16Attributes
@@ -18443,10 +18443,10 @@
 00:cc5b wMonPartySpritesSavedOAM
 00:cc5b wElevatorWarpMaps
 00:cc5b wVermilionDockTileMapBuffer
-00:cc5b wSlotMachineSevenAndBarModeChance
-00:cc5b wOaksAideRewardItemName
 00:cc5b wHallOfFame
+00:cc5b wOaksAideRewardItemName
 00:cc5b wDexRatingNumMonsSeen
+00:cc5b wSlotMachineSevenAndBarModeChance
 00:cc5b wUnusedFlag
 00:cc5b wFilteredBagItems
 00:cc5c wDexRatingNumMonsOwned
@@ -18492,10 +18492,10 @@
 00:cd05 wEnemyNumHits
 00:cd05 wLuckySlotHiddenObjectIndex
 00:cd05 wEnemyBideAccumulatedDamage
-00:cd0f wPlayerMonUnmodifiedLevel
 00:cd0f wVermilionDockTileMapBufferEnd
-00:cd0f wMiscBattleDataEnd
 00:cd0f wInGameTradeGiveMonSpecies
+00:cd0f wPlayerMonUnmodifiedLevel
+00:cd0f wMiscBattleDataEnd
 00:cd10 wPlayerMonUnmodifiedMaxHP
 00:cd10 wInGameTradeTextPointerTablePointer
 00:cd12 wPlayerMonUnmodifiedAttack
@@ -18544,6 +18544,7 @@
 00:cd3d wNumShakes
 00:cd3d wPPRestoreItem
 00:cd3d wDexMaxSeenMon
+00:cd3d wWhichTrade
 00:cd3d wChangeBoxSavedMapTextPointer
 00:cd3d wBadgeNumberTile
 00:cd3d wOptionsTextSpeedCursorX
@@ -18565,22 +18566,21 @@
 00:cd3d wChargeMoveNum
 00:cd3d wPriceTemp
 00:cd3d wTitleMonSpecies
-00:cd3d wFieldMoves
-00:cd3d wPlayerCharacterOAMTile
-00:cd3d wCoordIndex
-00:cd3d wTempSCX
-00:cd3d wUnusedCreditsByte
-00:cd3d wBoxMonCounts
-00:cd3d wHoFTeamIndex
-00:cd3d wWhichTrade
-00:cd3d wSavedY
-00:cd3d wDayCareStartLevel
+00:cd3d wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 00:cd3d wMoveDownSmallStarsOAMCount
+00:cd3d wUnusedCreditsByte
+00:cd3d wFieldMoves
+00:cd3d wHoFTeamIndex
+00:cd3d wTempSCX
+00:cd3d wCoordIndex
+00:cd3d wDayCareStartLevel
+00:cd3d wBoxMonCounts
+00:cd3d wSavedY
+00:cd3d wPlayerCharacterOAMTile
+00:cd3d wStoppingWhichSlotMachineWheel
 00:cd3d wWereAnyMonsAsleep
 00:cd3d wFallingObjectsMovementData
 00:cd3d wTrainerSpriteOffset
-00:cd3d wPlayerSpinWhileMovingUpOrDownAnimDeltaY
-00:cd3d wStoppingWhichSlotMachineWheel
 00:cd3e wNumCreditsMonsDisplayed
 00:cd3e wTrainerInfoTextBoxWidth
 00:cd3e wTrainerEngageDistance
@@ -18596,8 +18596,8 @@
 00:cd3e wBattleTransitionCircleScreenQuadrantX
 00:cd3e wTradingWhichEnemyMon
 00:cd3e wTradedEnemyMonSpecies
-00:cd3e wBadgeNameTile
 00:cd3e wRivalStarterBallSpriteIndex
+00:cd3e wBadgeNameTile
 00:cd3e wHoFPartyMonIndex
 00:cd3e wOptionsBattleAnimCursorX
 00:cd3f wJigglypuffFacingDirections
@@ -18608,27 +18608,27 @@
 00:cd3f wSlotMachineWheel2Offset
 00:cd3f wFlyAnimBirdSpriteImageIndex
 00:cd3f wNameOfPlayerMonToBeTraded
+00:cd3f wDayCareTotalCost
 00:cd3f wHoFMonLevel
 00:cd3f wTrainerFacingDirection
 00:cd3f wHiddenObjectIndex
-00:cd3f wDayCareTotalCost
-00:cd3f wHUDGraphicsTiles
 00:cd3f wOptionsBattleStyleCursorX
+00:cd3f wHUDGraphicsTiles
 00:cd40 wOptionsCancelCursorX
 00:cd40 wTrainerScreenY
+00:cd40 wSlotMachineWheel3Offset
 00:cd40 wPlayerSpinInPlaceAnimSoundID
 00:cd40 wHiddenObjectY
-00:cd40 wSlotMachineWheel3Offset
 00:cd40 wHoFMonOrPlayer
 00:cd41 wSlotMachineWheel1BottomTile
 00:cd41 wSlotMachineWinningSymbol
 00:cd41 wHoFTeamIndex2
 00:cd41 wNumFieldMoves
+00:cd41 wDayCarePerLevelCost
 00:cd41 wTradedPlayerMonOT
-00:cd41 wHiddenItemOrCoinsIndex
 00:cd41 wHiddenObjectX
 00:cd41 wTrainerScreenX
-00:cd41 wDayCarePerLevelCost
+00:cd41 wHiddenItemOrCoinsIndex
 00:cd42 wSlotMachineWheel1MiddleTile
 00:cd42 wHoFTeamNo
 00:cd42 wFieldMovesLeftmostXCoord
@@ -18638,8 +18638,8 @@
 00:cd45 wSlotMachineWheel2MiddleTile
 00:cd46 wTempCoins1
 00:cd46 wSlotMachineWheel2TopTile
-00:cd47 wBattleTransitionSpiralDirection
 00:cd47 wSlotMachineWheel3BottomTile
+00:cd47 wBattleTransitionSpiralDirection
 00:cd48 wFacingDirectionList
 00:cd48 wSlotMachineWheel3MiddleTile
 00:cd49 wTempObtainedBadgesBooleans
@@ -18661,8 +18661,8 @@
 00:cd50 wWhichEmotionBubble
 00:cd59 wTradedEnemyMonOTID
 00:cd5b wGymTrashCanIndex
-00:cd5b wOAMBaseTile
 00:cd5b wStandingOnWarpPadOrHole
+00:cd5b wOAMBaseTile
 00:cd5c wSymmetricSpriteOAMAttributes
 00:cd5d wMonPartySpriteSpecies
 00:cd5e wLeftGBMonSpecies
@@ -18670,8 +18670,8 @@
 00:cd60 wMiscFlags
 00:cd6a wActionResultOrTookBattleTurn
 00:cd6b wJoyIgnore
-00:cd6c wNumMovesMinusOne
 00:cd6c wDownscaledMonSize
+00:cd6c wNumMovesMinusOne
 00:cd6d wNameBuffer
 00:cd6d wMoveData
 00:cd6d wPayDayMoney
@@ -18909,10 +18909,10 @@
 00:d08a wFlashScreenLongCounter
 00:d08a wSpiralBallsBaseY
 00:d08a wFallingObjectMovementByte
-00:d08a wTradedMonMovingRight
 00:d08a wOptionsInitialized
-00:d08a wUnusedWaterDropletsByte
+00:d08a wTradedMonMovingRight
 00:d08a wNewSlotMachineBallTile
+00:d08a wUnusedWaterDropletsByte
 00:d08b wNumFallingObjects
 00:d08b wSubAnimTransform
 00:d08b wSpiralBallsBaseX
@@ -18998,8 +18998,8 @@
 00:d11e wUsingPPUp
 00:d11e wMoveGrammar
 00:d11e wTempTMHM
-00:d11e wTypeEffectiveness
 00:d11e wNumSetBits
+00:d11e wTypeEffectiveness
 00:d11e wNamedObjectIndex
 00:d11e wCalculateWhoseStats
 00:d11f wForcePlayerToChooseMon
@@ -19119,8 +19119,8 @@
 00:d1de wPartyMon3DVs
 00:d1e0 wPartyMon3PP
 00:d1e4 wPartyMon3Level
-00:d1e5 wPartyMon3Stats
 00:d1e5 wPartyMon3MaxHP
+00:d1e5 wPartyMon3Stats
 00:d1e7 wPartyMon3Attack
 00:d1e9 wPartyMon3Defense
 00:d1eb wPartyMon3Speed
@@ -19177,8 +19177,8 @@
 00:d241 wPartyMon5Defense
 00:d243 wPartyMon5Speed
 00:d245 wPartyMon5Special
-00:d247 wPartyMon6Species
 00:d247 wPartyMon6
+00:d247 wPartyMon6Species
 00:d248 wPartyMon6HP
 00:d24a wPartyMon6BoxLevel
 00:d24b wPartyMon6Status
@@ -19577,8 +19577,8 @@
 00:d94e wEnemyMon4Defense
 00:d950 wEnemyMon4Speed
 00:d952 wEnemyMon4Special
-00:d954 wEnemyMon5Species
 00:d954 wEnemyMon5
+00:d954 wEnemyMon5Species
 00:d955 wEnemyMon5HP
 00:d957 wEnemyMon5BoxLevel
 00:d958 wEnemyMon5Status
@@ -19608,8 +19608,8 @@
 00:d981 wEnemyMon6HP
 00:d983 wEnemyMon6BoxLevel
 00:d984 wEnemyMon6Status
-00:d985 wEnemyMon6Type1
 00:d985 wEnemyMon6Type
+00:d985 wEnemyMon6Type1
 00:d986 wEnemyMon6Type2
 00:d987 wEnemyMon6CatchRate
 00:d988 wEnemyMon6Moves
@@ -19756,8 +19756,8 @@
 00:db12 wBoxMon4SpecialExp
 00:db14 wBoxMon4DVs
 00:db16 wBoxMon4PP
-00:db1a wBoxMon5Species
 00:db1a wBoxMon5
+00:db1a wBoxMon5Species
 00:db1b wBoxMon5HP
 00:db1d wBoxMon5BoxLevel
 00:db1e wBoxMon5Status
@@ -19837,8 +19837,8 @@
 00:db9f wBoxMon9HP
 00:dba1 wBoxMon9BoxLevel
 00:dba2 wBoxMon9Status
-00:dba3 wBoxMon9Type
 00:dba3 wBoxMon9Type1
+00:dba3 wBoxMon9Type
 00:dba4 wBoxMon9Type2
 00:dba5 wBoxMon9CatchRate
 00:dba6 wBoxMon9Moves
@@ -19946,8 +19946,8 @@
 00:dc5c wBoxMon14SpecialExp
 00:dc5e wBoxMon14DVs
 00:dc60 wBoxMon14PP
-00:dc64 wBoxMon15Species
 00:dc64 wBoxMon15
+00:dc64 wBoxMon15Species
 00:dc65 wBoxMon15HP
 00:dc67 wBoxMon15BoxLevel
 00:dc68 wBoxMon15Status
@@ -19989,8 +19989,8 @@
 00:dca7 wBoxMon17HP
 00:dca9 wBoxMon17BoxLevel
 00:dcaa wBoxMon17Status
-00:dcab wBoxMon17Type1
 00:dcab wBoxMon17Type
+00:dcab wBoxMon17Type1
 00:dcac wBoxMon17Type2
 00:dcad wBoxMon17CatchRate
 00:dcae wBoxMon17Moves
@@ -20022,8 +20022,8 @@
 00:dce0 wBoxMon18SpecialExp
 00:dce2 wBoxMon18DVs
 00:dce4 wBoxMon18PP
-00:dce8 wBoxMon19
 00:dce8 wBoxMon19Species
+00:dce8 wBoxMon19
 00:dce9 wBoxMon19HP
 00:dceb wBoxMon19BoxLevel
 00:dcec wBoxMon19Status
@@ -20119,18 +20119,18 @@
 00:ff8b hPreviousTileset
 00:ff8b hOAMTile
 00:ff8b hBaseTileID
+00:ff8b hEastWestConnectedMapWidth
 00:ff8b hItemPrice
 00:ff8b hDexWeight
-00:ff8b hEastWestConnectedMapWidth
 00:ff8b hSpriteInterlaceCounter
 00:ff8b hRLEByteValue
 00:ff8c hNorthSouthConnectedMapWidth
 00:ff8c hMapWidth
 00:ff8c hSpriteHeight
 00:ff8c hPartyMonIndex
-00:ff8c hSpriteIndex
-00:ff8c hTextID
 00:ff8c hSlidingRegionSize
+00:ff8c hTextID
+00:ff8c hSpriteIndex
 00:ff8c hDownArrowBlinkCount2
 00:ff8d hEnemySpeed
 00:ff8d hLoadSpriteTemp1
@@ -20155,13 +20155,13 @@
 00:ff94 hSpritePriority
 00:ff95 hSwapItemID
 00:ff95 hNPCPlayerYDistance
-00:ff95 hNPCSpriteOffset
 00:ff95 hDividend
 00:ff95 hSignCoordPointer
-00:ff95 hQuotient
-00:ff95 hNPCMovementDirections2Index
 00:ff95 hPastLeadingZeros
+00:ff95 hQuotient
 00:ff95 hProduct
+00:ff95 hNPCMovementDirections2Index
+00:ff95 hNPCSpriteOffset
 00:ff95 hSwapTemp
 00:ff96 hMutateWY
 00:ff96 hSwapItemQuantity
@@ -20245,12 +20245,12 @@
 00:ffdc hVendingMachinePrice
 00:ffdc hPlayerYCoord
 00:ffdc hOaksAideRewardItem
-00:ffdc hItemToRemoveIndex
 00:ffdc hGymGateAnswer
+00:ffdc hItemToRemoveIndex
 00:ffdd hPlayerXCoord
 00:ffdd hOaksAideNumMonsOwned
-00:ffe0 hUnlockedSilphCoDoors
 00:ffe0 hBackupGymGateIndex
+00:ffe0 hUnlockedSilphCoDoors
 00:ffe1 hStartTileID
 00:ffe4 hNewPartyLength
 00:ffe5 hDividend2
--- a/pokered_vc.map
+++ b/pokered_vc.map
@@ -362,8 +362,8 @@ ROM0 bank #0:
 	         $1765 = Forest_Coll
 	         $1775 = House_Coll
 	         $177f = Gate_Coll
-	         $177f = ForestGate_Coll
 	         $177f = Museum_Coll
+	         $177f = ForestGate_Coll
 	         $178a = Ship_Coll
 	         $1795 = ShipPort_Coll
 	         $179a = Cemetery_Coll
@@ -7024,8 +7024,8 @@ ROMX bank #15:
 	         $5647 = LinkBattleExchangeData.VC_Wireless_end_exchange
 	         $5649 = LinkBattleExchangeData.syncLoop2
 	         $5649 = LinkBattleExchangeData.VC_Wireless_net_delay_1_End
-	         $5652 = LinkBattleExchangeData.VC_Wireless_start_send_zero_bytes
 	         $5652 = LinkBattleExchangeData.VC_Wireless_net_delay_2
+	         $5652 = LinkBattleExchangeData.VC_Wireless_start_send_zero_bytes
 	         $5654 = LinkBattleExchangeData.syncLoop3
 	         $5654 = LinkBattleExchangeData.VC_Wireless_net_delay_2_End
 	         $565d = LinkBattleExchangeData.VC_Wireless_end_send_zero_bytes
@@ -9252,8 +9252,8 @@ ROMX bank #19:
 	         $5e76 = BlackbeltPic
 	         $6049 = Rival1Pic
 	         $615f = ProfOakPic
-	         $627d = ScientistPic
 	         $627d = ChiefPic
+	         $627d = ScientistPic
 	         $63be = GiovanniPic
 	         $649f = RocketPic
 	         $6635 = CooltrainerMPic
@@ -12392,9 +12392,9 @@ ROMX bank #26:
 	         $560f = Gate_GFX
 	         $560f = Museum_GFX
 	         $560f = ForestGate_GFX
+	         $5bff = ForestGate_Block
 	         $5bff = Gate_Block
 	         $5bff = Museum_Block
-	         $5bff = ForestGate_Block
 	         $63ff = Forest_GFX
 	         $69ff = Forest_Block
 	         $71ff = Facility_GFX
@@ -17808,8 +17808,8 @@ VRAM bank #0:
 	         $8000 = vChars0
 	         $8000 = vSprites
 	         $8000 = vNPCSprites
-	         $8800 = vTitleLogo
 	         $8800 = vFont
+	         $8800 = vTitleLogo
 	         $8800 = vChars1
 	         $8800 = vNPCSprites2
 	         $9000 = vFrontPic
@@ -17962,8 +17962,8 @@ WRAM0 bank #0:
 	         $c12b = wSprite02StateData1XAdjusted
 	         $c12c = wSprite02StateData1CollisionData
 	         $c130 = wSprite02StateData1End
-	         $c130 = wSprite03StateData1
 	         $c130 = wSprite03StateData1PictureID
+	         $c130 = wSprite03StateData1
 	         $c131 = wSprite03StateData1MovementStatus
 	         $c132 = wSprite03StateData1ImageIndex
 	         $c133 = wSprite03StateData1YStepVector
@@ -17992,8 +17992,8 @@ WRAM0 bank #0:
 	         $c14b = wSprite04StateData1XAdjusted
 	         $c14c = wSprite04StateData1CollisionData
 	         $c150 = wSprite05StateData1PictureID
-	         $c150 = wSprite04StateData1End
 	         $c150 = wSprite05StateData1
+	         $c150 = wSprite04StateData1End
 	         $c151 = wSprite05StateData1MovementStatus
 	         $c152 = wSprite05StateData1ImageIndex
 	         $c153 = wSprite05StateData1YStepVector
@@ -18111,9 +18111,9 @@ WRAM0 bank #0:
 	         $c1ca = wSprite12StateData1YAdjusted
 	         $c1cb = wSprite12StateData1XAdjusted
 	         $c1cc = wSprite12StateData1CollisionData
+	         $c1d0 = wSprite13StateData1PictureID
 	         $c1d0 = wSprite12StateData1End
 	         $c1d0 = wSprite13StateData1
-	         $c1d0 = wSprite13StateData1PictureID
 	         $c1d1 = wSprite13StateData1MovementStatus
 	         $c1d2 = wSprite13StateData1ImageIndex
 	         $c1d3 = wSprite13StateData1YStepVector
@@ -18126,8 +18126,8 @@ WRAM0 bank #0:
 	         $c1da = wSprite13StateData1YAdjusted
 	         $c1db = wSprite13StateData1XAdjusted
 	         $c1dc = wSprite13StateData1CollisionData
-	         $c1e0 = wSprite14StateData1
 	         $c1e0 = wSprite14StateData1PictureID
+	         $c1e0 = wSprite14StateData1
 	         $c1e0 = wSprite13StateData1End
 	         $c1e1 = wSprite14StateData1MovementStatus
 	         $c1e2 = wSprite14StateData1ImageIndex
@@ -18142,8 +18142,8 @@ WRAM0 bank #0:
 	         $c1eb = wSprite14StateData1XAdjusted
 	         $c1ec = wSprite14StateData1CollisionData
 	         $c1f0 = wSprite15StateData1PictureID
-	         $c1f0 = wSprite14StateData1End
 	         $c1f0 = wSprite15StateData1
+	         $c1f0 = wSprite14StateData1End
 	         $c1f1 = wSprite15StateData1MovementStatus
 	         $c1f2 = wSprite15StateData1ImageIndex
 	         $c1f3 = wSprite15StateData1YStepVector
@@ -18157,9 +18157,9 @@ WRAM0 bank #0:
 	         $c1fb = wSprite15StateData1XAdjusted
 	         $c1fc = wSprite15StateData1CollisionData
 	         $c200 = wSpriteStateData2
-	         $c200 = wSprite15StateData1End
 	         $c200 = wSpritePlayerStateData2WalkAnimationCounter
 	         $c200 = wSpritePlayerStateData2
+	         $c200 = wSprite15StateData1End
 	         $c202 = wSpritePlayerStateData2YDisplacement
 	         $c203 = wSpritePlayerStateData2XDisplacement
 	         $c204 = wSpritePlayerStateData2MapY
@@ -18170,9 +18170,9 @@ WRAM0 bank #0:
 	         $c209 = wSpritePlayerStateData2OrigFacingDirection
 	         $c20d = wSpritePlayerStateData2PictureID
 	         $c20e = wSpritePlayerStateData2ImageBaseOffset
+	         $c210 = wSprite01StateData2
 	         $c210 = wSpritePlayerStateData2End
 	         $c210 = wSprite01StateData2WalkAnimationCounter
-	         $c210 = wSprite01StateData2
 	         $c212 = wSprite01StateData2YDisplacement
 	         $c213 = wSprite01StateData2XDisplacement
 	         $c214 = wSprite01StateData2MapY
@@ -18184,8 +18184,8 @@ WRAM0 bank #0:
 	         $c21d = wSprite01StateData2PictureID
 	         $c21e = wSprite01StateData2ImageBaseOffset
 	         $c220 = wSprite02StateData2WalkAnimationCounter
-	         $c220 = wSprite01StateData2End
 	         $c220 = wSprite02StateData2
+	         $c220 = wSprite01StateData2End
 	         $c222 = wSprite02StateData2YDisplacement
 	         $c223 = wSprite02StateData2XDisplacement
 	         $c224 = wSprite02StateData2MapY
@@ -18197,8 +18197,8 @@ WRAM0 bank #0:
 	         $c22d = wSprite02StateData2PictureID
 	         $c22e = wSprite02StateData2ImageBaseOffset
 	         $c230 = wSprite03StateData2
-	         $c230 = wSprite03StateData2WalkAnimationCounter
 	         $c230 = wSprite02StateData2End
+	         $c230 = wSprite03StateData2WalkAnimationCounter
 	         $c232 = wSprite03StateData2YDisplacement
 	         $c233 = wSprite03StateData2XDisplacement
 	         $c234 = wSprite03StateData2MapY
@@ -18209,9 +18209,9 @@ WRAM0 bank #0:
 	         $c239 = wSprite03StateData2OrigFacingDirection
 	         $c23d = wSprite03StateData2PictureID
 	         $c23e = wSprite03StateData2ImageBaseOffset
-	         $c240 = wSprite04StateData2WalkAnimationCounter
 	         $c240 = wSprite04StateData2
 	         $c240 = wSprite03StateData2End
+	         $c240 = wSprite04StateData2WalkAnimationCounter
 	         $c242 = wSprite04StateData2YDisplacement
 	         $c243 = wSprite04StateData2XDisplacement
 	         $c244 = wSprite04StateData2MapY
@@ -18222,9 +18222,9 @@ WRAM0 bank #0:
 	         $c249 = wSprite04StateData2OrigFacingDirection
 	         $c24d = wSprite04StateData2PictureID
 	         $c24e = wSprite04StateData2ImageBaseOffset
-	         $c250 = wSprite04StateData2End
 	         $c250 = wSprite05StateData2WalkAnimationCounter
 	         $c250 = wSprite05StateData2
+	         $c250 = wSprite04StateData2End
 	         $c252 = wSprite05StateData2YDisplacement
 	         $c253 = wSprite05StateData2XDisplacement
 	         $c254 = wSprite05StateData2MapY
@@ -18235,9 +18235,9 @@ WRAM0 bank #0:
 	         $c259 = wSprite05StateData2OrigFacingDirection
 	         $c25d = wSprite05StateData2PictureID
 	         $c25e = wSprite05StateData2ImageBaseOffset
-	         $c260 = wSprite06StateData2
-	         $c260 = wSprite05StateData2End
 	         $c260 = wSprite06StateData2WalkAnimationCounter
+	         $c260 = wSprite05StateData2End
+	         $c260 = wSprite06StateData2
 	         $c262 = wSprite06StateData2YDisplacement
 	         $c263 = wSprite06StateData2XDisplacement
 	         $c264 = wSprite06StateData2MapY
@@ -18248,8 +18248,8 @@ WRAM0 bank #0:
 	         $c269 = wSprite06StateData2OrigFacingDirection
 	         $c26d = wSprite06StateData2PictureID
 	         $c26e = wSprite06StateData2ImageBaseOffset
-	         $c270 = wSprite06StateData2End
 	         $c270 = wSprite07StateData2
+	         $c270 = wSprite06StateData2End
 	         $c270 = wSprite07StateData2WalkAnimationCounter
 	         $c272 = wSprite07StateData2YDisplacement
 	         $c273 = wSprite07StateData2XDisplacement
@@ -18261,9 +18261,9 @@ WRAM0 bank #0:
 	         $c279 = wSprite07StateData2OrigFacingDirection
 	         $c27d = wSprite07StateData2PictureID
 	         $c27e = wSprite07StateData2ImageBaseOffset
-	         $c280 = wSprite07StateData2End
-	         $c280 = wSprite08StateData2
 	         $c280 = wSprite08StateData2WalkAnimationCounter
+	         $c280 = wSprite08StateData2
+	         $c280 = wSprite07StateData2End
 	         $c282 = wSprite08StateData2YDisplacement
 	         $c283 = wSprite08StateData2XDisplacement
 	         $c284 = wSprite08StateData2MapY
@@ -18274,9 +18274,9 @@ WRAM0 bank #0:
 	         $c289 = wSprite08StateData2OrigFacingDirection
 	         $c28d = wSprite08StateData2PictureID
 	         $c28e = wSprite08StateData2ImageBaseOffset
+	         $c290 = wSprite09StateData2WalkAnimationCounter
 	         $c290 = wSprite09StateData2
 	         $c290 = wSprite08StateData2End
-	         $c290 = wSprite09StateData2WalkAnimationCounter
 	         $c292 = wSprite09StateData2YDisplacement
 	         $c293 = wSprite09StateData2XDisplacement
 	         $c294 = wSprite09StateData2MapY
@@ -18287,9 +18287,9 @@ WRAM0 bank #0:
 	         $c299 = wSprite09StateData2OrigFacingDirection
 	         $c29d = wSprite09StateData2PictureID
 	         $c29e = wSprite09StateData2ImageBaseOffset
-	         $c2a0 = wSprite10StateData2WalkAnimationCounter
-	         $c2a0 = wSprite09StateData2End
 	         $c2a0 = wSprite10StateData2
+	         $c2a0 = wSprite09StateData2End
+	         $c2a0 = wSprite10StateData2WalkAnimationCounter
 	         $c2a2 = wSprite10StateData2YDisplacement
 	         $c2a3 = wSprite10StateData2XDisplacement
 	         $c2a4 = wSprite10StateData2MapY
@@ -18300,8 +18300,8 @@ WRAM0 bank #0:
 	         $c2a9 = wSprite10StateData2OrigFacingDirection
 	         $c2ad = wSprite10StateData2PictureID
 	         $c2ae = wSprite10StateData2ImageBaseOffset
-	         $c2b0 = wSprite11StateData2
 	         $c2b0 = wSprite11StateData2WalkAnimationCounter
+	         $c2b0 = wSprite11StateData2
 	         $c2b0 = wSprite10StateData2End
 	         $c2b2 = wSprite11StateData2YDisplacement
 	         $c2b3 = wSprite11StateData2XDisplacement
@@ -18326,8 +18326,8 @@ WRAM0 bank #0:
 	         $c2c9 = wSprite12StateData2OrigFacingDirection
 	         $c2cd = wSprite12StateData2PictureID
 	         $c2ce = wSprite12StateData2ImageBaseOffset
-	         $c2d0 = wSprite13StateData2
 	         $c2d0 = wSprite13StateData2WalkAnimationCounter
+	         $c2d0 = wSprite13StateData2
 	         $c2d0 = wSprite12StateData2End
 	         $c2d2 = wSprite13StateData2YDisplacement
 	         $c2d3 = wSprite13StateData2XDisplacement
@@ -18352,9 +18352,9 @@ WRAM0 bank #0:
 	         $c2e9 = wSprite14StateData2OrigFacingDirection
 	         $c2ed = wSprite14StateData2PictureID
 	         $c2ee = wSprite14StateData2ImageBaseOffset
+	         $c2f0 = wSprite14StateData2End
 	         $c2f0 = wSprite15StateData2WalkAnimationCounter
 	         $c2f0 = wSprite15StateData2
-	         $c2f0 = wSprite14StateData2End
 	         $c2f2 = wSprite15StateData2YDisplacement
 	         $c2f3 = wSprite15StateData2XDisplacement
 	         $c2f4 = wSprite15StateData2MapY
@@ -18365,22 +18365,22 @@ WRAM0 bank #0:
 	         $c2f9 = wSprite15StateData2OrigFacingDirection
 	         $c2fd = wSprite15StateData2PictureID
 	         $c2fe = wSprite15StateData2ImageBaseOffset
-	         $c300 = wSprite15StateData2End
 	         $c300 = wSpriteDataEnd
+	         $c300 = wSprite15StateData2End
 	SECTION: $c300-$c39f ($00a0 bytes) ["OAM Buffer"]
+	         $c300 = wShadowOAMSprite00YCoord
 	         $c300 = wShadowOAM
 	         $c300 = wShadowOAMSprite00
-	         $c300 = wShadowOAMSprite00YCoord
 	         $c301 = wShadowOAMSprite00XCoord
 	         $c302 = wShadowOAMSprite00TileID
 	         $c303 = wShadowOAMSprite00Attributes
-	         $c304 = wShadowOAMSprite01YCoord
 	         $c304 = wShadowOAMSprite01
+	         $c304 = wShadowOAMSprite01YCoord
 	         $c305 = wShadowOAMSprite01XCoord
 	         $c306 = wShadowOAMSprite01TileID
 	         $c307 = wShadowOAMSprite01Attributes
-	         $c308 = wShadowOAMSprite02
 	         $c308 = wShadowOAMSprite02YCoord
+	         $c308 = wShadowOAMSprite02
 	         $c309 = wShadowOAMSprite02XCoord
 	         $c30a = wShadowOAMSprite02TileID
 	         $c30b = wShadowOAMSprite02Attributes
@@ -18399,18 +18399,18 @@ WRAM0 bank #0:
 	         $c315 = wShadowOAMSprite05XCoord
 	         $c316 = wShadowOAMSprite05TileID
 	         $c317 = wShadowOAMSprite05Attributes
-	         $c318 = wShadowOAMSprite06
 	         $c318 = wShadowOAMSprite06YCoord
+	         $c318 = wShadowOAMSprite06
 	         $c319 = wShadowOAMSprite06XCoord
 	         $c31a = wShadowOAMSprite06TileID
 	         $c31b = wShadowOAMSprite06Attributes
-	         $c31c = wShadowOAMSprite07
 	         $c31c = wShadowOAMSprite07YCoord
+	         $c31c = wShadowOAMSprite07
 	         $c31d = wShadowOAMSprite07XCoord
 	         $c31e = wShadowOAMSprite07TileID
 	         $c31f = wShadowOAMSprite07Attributes
-	         $c320 = wShadowOAMSprite08
 	         $c320 = wShadowOAMSprite08YCoord
+	         $c320 = wShadowOAMSprite08
 	         $c321 = wShadowOAMSprite08XCoord
 	         $c322 = wShadowOAMSprite08TileID
 	         $c323 = wShadowOAMSprite08Attributes
@@ -18419,8 +18419,8 @@ WRAM0 bank #0:
 	         $c325 = wShadowOAMSprite09XCoord
 	         $c326 = wShadowOAMSprite09TileID
 	         $c327 = wShadowOAMSprite09Attributes
-	         $c328 = wShadowOAMSprite10
 	         $c328 = wShadowOAMSprite10YCoord
+	         $c328 = wShadowOAMSprite10
 	         $c329 = wShadowOAMSprite10XCoord
 	         $c32a = wShadowOAMSprite10TileID
 	         $c32b = wShadowOAMSprite10Attributes
@@ -18429,13 +18429,13 @@ WRAM0 bank #0:
 	         $c32d = wShadowOAMSprite11XCoord
 	         $c32e = wShadowOAMSprite11TileID
 	         $c32f = wShadowOAMSprite11Attributes
-	         $c330 = wShadowOAMSprite12
 	         $c330 = wShadowOAMSprite12YCoord
+	         $c330 = wShadowOAMSprite12
 	         $c331 = wShadowOAMSprite12XCoord
 	         $c332 = wShadowOAMSprite12TileID
 	         $c333 = wShadowOAMSprite12Attributes
-	         $c334 = wShadowOAMSprite13
 	         $c334 = wShadowOAMSprite13YCoord
+	         $c334 = wShadowOAMSprite13
 	         $c335 = wShadowOAMSprite13XCoord
 	         $c336 = wShadowOAMSprite13TileID
 	         $c337 = wShadowOAMSprite13Attributes
@@ -18459,8 +18459,8 @@ WRAM0 bank #0:
 	         $c345 = wShadowOAMSprite17XCoord
 	         $c346 = wShadowOAMSprite17TileID
 	         $c347 = wShadowOAMSprite17Attributes
-	         $c348 = wShadowOAMSprite18
 	         $c348 = wShadowOAMSprite18YCoord
+	         $c348 = wShadowOAMSprite18
 	         $c349 = wShadowOAMSprite18XCoord
 	         $c34a = wShadowOAMSprite18TileID
 	         $c34b = wShadowOAMSprite18Attributes
@@ -18469,13 +18469,13 @@ WRAM0 bank #0:
 	         $c34d = wShadowOAMSprite19XCoord
 	         $c34e = wShadowOAMSprite19TileID
 	         $c34f = wShadowOAMSprite19Attributes
-	         $c350 = wShadowOAMSprite20
 	         $c350 = wShadowOAMSprite20YCoord
+	         $c350 = wShadowOAMSprite20
 	         $c351 = wShadowOAMSprite20XCoord
 	         $c352 = wShadowOAMSprite20TileID
 	         $c353 = wShadowOAMSprite20Attributes
-	         $c354 = wShadowOAMSprite21
 	         $c354 = wShadowOAMSprite21YCoord
+	         $c354 = wShadowOAMSprite21
 	         $c355 = wShadowOAMSprite21XCoord
 	         $c356 = wShadowOAMSprite21TileID
 	         $c357 = wShadowOAMSprite21Attributes
@@ -18484,8 +18484,8 @@ WRAM0 bank #0:
 	         $c359 = wShadowOAMSprite22XCoord
 	         $c35a = wShadowOAMSprite22TileID
 	         $c35b = wShadowOAMSprite22Attributes
-	         $c35c = wShadowOAMSprite23
 	         $c35c = wShadowOAMSprite23YCoord
+	         $c35c = wShadowOAMSprite23
 	         $c35d = wShadowOAMSprite23XCoord
 	         $c35e = wShadowOAMSprite23TileID
 	         $c35f = wShadowOAMSprite23Attributes
@@ -18504,18 +18504,18 @@ WRAM0 bank #0:
 	         $c369 = wShadowOAMSprite26XCoord
 	         $c36a = wShadowOAMSprite26TileID
 	         $c36b = wShadowOAMSprite26Attributes
-	         $c36c = wShadowOAMSprite27
 	         $c36c = wShadowOAMSprite27YCoord
+	         $c36c = wShadowOAMSprite27
 	         $c36d = wShadowOAMSprite27XCoord
 	         $c36e = wShadowOAMSprite27TileID
 	         $c36f = wShadowOAMSprite27Attributes
-	         $c370 = wShadowOAMSprite28
 	         $c370 = wShadowOAMSprite28YCoord
+	         $c370 = wShadowOAMSprite28
 	         $c371 = wShadowOAMSprite28XCoord
 	         $c372 = wShadowOAMSprite28TileID
 	         $c373 = wShadowOAMSprite28Attributes
-	         $c374 = wShadowOAMSprite29
 	         $c374 = wShadowOAMSprite29YCoord
+	         $c374 = wShadowOAMSprite29
 	         $c375 = wShadowOAMSprite29XCoord
 	         $c376 = wShadowOAMSprite29TileID
 	         $c377 = wShadowOAMSprite29Attributes
@@ -18529,8 +18529,8 @@ WRAM0 bank #0:
 	         $c37d = wShadowOAMSprite31XCoord
 	         $c37e = wShadowOAMSprite31TileID
 	         $c37f = wShadowOAMSprite31Attributes
-	         $c380 = wShadowOAMSprite32YCoord
 	         $c380 = wShadowOAMSprite32
+	         $c380 = wShadowOAMSprite32YCoord
 	         $c381 = wShadowOAMSprite32XCoord
 	         $c382 = wShadowOAMSprite32TileID
 	         $c383 = wShadowOAMSprite32Attributes
@@ -18626,8 +18626,8 @@ WRAM0 bank #0:
 	         $c52d = wShadowOAMBackupSprite09XCoord
 	         $c52e = wShadowOAMBackupSprite09TileID
 	         $c52f = wShadowOAMBackupSprite09Attributes
-	         $c530 = wShadowOAMBackupSprite10YCoord
 	         $c530 = wShadowOAMBackupSprite10
+	         $c530 = wShadowOAMBackupSprite10YCoord
 	         $c531 = wShadowOAMBackupSprite10XCoord
 	         $c532 = wShadowOAMBackupSprite10TileID
 	         $c533 = wShadowOAMBackupSprite10Attributes
@@ -18656,8 +18656,8 @@ WRAM0 bank #0:
 	         $c545 = wShadowOAMBackupSprite15XCoord
 	         $c546 = wShadowOAMBackupSprite15TileID
 	         $c547 = wShadowOAMBackupSprite15Attributes
-	         $c548 = wShadowOAMBackupSprite16
 	         $c548 = wShadowOAMBackupSprite16YCoord
+	         $c548 = wShadowOAMBackupSprite16
 	         $c549 = wShadowOAMBackupSprite16XCoord
 	         $c54a = wShadowOAMBackupSprite16TileID
 	         $c54b = wShadowOAMBackupSprite16Attributes
@@ -18832,10 +18832,10 @@ WRAM0 bank #0:
 	         $cc5b = wMonPartySpritesSavedOAM
 	         $cc5b = wElevatorWarpMaps
 	         $cc5b = wVermilionDockTileMapBuffer
-	         $cc5b = wSlotMachineSevenAndBarModeChance
-	         $cc5b = wOaksAideRewardItemName
 	         $cc5b = wHallOfFame
+	         $cc5b = wOaksAideRewardItemName
 	         $cc5b = wDexRatingNumMonsSeen
+	         $cc5b = wSlotMachineSevenAndBarModeChance
 	         $cc5b = wUnusedFlag
 	         $cc5b = wFilteredBagItems
 	         $cc5c = wDexRatingNumMonsOwned
@@ -18881,10 +18881,10 @@ WRAM0 bank #0:
 	         $cd05 = wEnemyNumHits
 	         $cd05 = wLuckySlotHiddenObjectIndex
 	         $cd05 = wEnemyBideAccumulatedDamage
-	         $cd0f = wPlayerMonUnmodifiedLevel
 	         $cd0f = wVermilionDockTileMapBufferEnd
-	         $cd0f = wMiscBattleDataEnd
 	         $cd0f = wInGameTradeGiveMonSpecies
+	         $cd0f = wPlayerMonUnmodifiedLevel
+	         $cd0f = wMiscBattleDataEnd
 	         $cd10 = wPlayerMonUnmodifiedMaxHP
 	         $cd10 = wInGameTradeTextPointerTablePointer
 	         $cd12 = wPlayerMonUnmodifiedAttack
@@ -18933,6 +18933,7 @@ WRAM0 bank #0:
 	         $cd3d = wNumShakes
 	         $cd3d = wPPRestoreItem
 	         $cd3d = wDexMaxSeenMon
+	         $cd3d = wWhichTrade
 	         $cd3d = wChangeBoxSavedMapTextPointer
 	         $cd3d = wBadgeNumberTile
 	         $cd3d = wOptionsTextSpeedCursorX
@@ -18954,22 +18955,21 @@ WRAM0 bank #0:
 	         $cd3d = wChargeMoveNum
 	         $cd3d = wPriceTemp
 	         $cd3d = wTitleMonSpecies
-	         $cd3d = wFieldMoves
-	         $cd3d = wPlayerCharacterOAMTile
-	         $cd3d = wCoordIndex
+	         $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 	         $cd3d = wTempSCX
-	         $cd3d = wUnusedCreditsByte
-	         $cd3d = wBoxMonCounts
-	         $cd3d = wHoFTeamIndex
-	         $cd3d = wWhichTrade
-	         $cd3d = wSavedY
-	         $cd3d = wDayCareStartLevel
 	         $cd3d = wMoveDownSmallStarsOAMCount
+	         $cd3d = wStoppingWhichSlotMachineWheel
+	         $cd3d = wUnusedCreditsByte
+	         $cd3d = wFieldMoves
+	         $cd3d = wCoordIndex
+	         $cd3d = wHoFTeamIndex
+	         $cd3d = wDayCareStartLevel
+	         $cd3d = wBoxMonCounts
+	         $cd3d = wSavedY
+	         $cd3d = wPlayerCharacterOAMTile
 	         $cd3d = wWereAnyMonsAsleep
 	         $cd3d = wFallingObjectsMovementData
 	         $cd3d = wTrainerSpriteOffset
-	         $cd3d = wPlayerSpinWhileMovingUpOrDownAnimDeltaY
-	         $cd3d = wStoppingWhichSlotMachineWheel
 	         $cd3e = wNumCreditsMonsDisplayed
 	         $cd3e = wTrainerInfoTextBoxWidth
 	         $cd3e = wTrainerEngageDistance
@@ -18985,8 +18985,8 @@ WRAM0 bank #0:
 	         $cd3e = wBattleTransitionCircleScreenQuadrantX
 	         $cd3e = wTradingWhichEnemyMon
 	         $cd3e = wTradedEnemyMonSpecies
-	         $cd3e = wBadgeNameTile
 	         $cd3e = wRivalStarterBallSpriteIndex
+	         $cd3e = wBadgeNameTile
 	         $cd3e = wHoFPartyMonIndex
 	         $cd3e = wOptionsBattleAnimCursorX
 	         $cd3f = wJigglypuffFacingDirections
@@ -18997,27 +18997,27 @@ WRAM0 bank #0:
 	         $cd3f = wSlotMachineWheel2Offset
 	         $cd3f = wFlyAnimBirdSpriteImageIndex
 	         $cd3f = wNameOfPlayerMonToBeTraded
+	         $cd3f = wDayCareTotalCost
 	         $cd3f = wHoFMonLevel
 	         $cd3f = wTrainerFacingDirection
 	         $cd3f = wHiddenObjectIndex
-	         $cd3f = wDayCareTotalCost
-	         $cd3f = wHUDGraphicsTiles
 	         $cd3f = wOptionsBattleStyleCursorX
+	         $cd3f = wHUDGraphicsTiles
 	         $cd40 = wOptionsCancelCursorX
 	         $cd40 = wTrainerScreenY
+	         $cd40 = wSlotMachineWheel3Offset
 	         $cd40 = wPlayerSpinInPlaceAnimSoundID
 	         $cd40 = wHiddenObjectY
-	         $cd40 = wSlotMachineWheel3Offset
 	         $cd40 = wHoFMonOrPlayer
 	         $cd41 = wSlotMachineWheel1BottomTile
 	         $cd41 = wSlotMachineWinningSymbol
 	         $cd41 = wHoFTeamIndex2
 	         $cd41 = wNumFieldMoves
+	         $cd41 = wDayCarePerLevelCost
 	         $cd41 = wTradedPlayerMonOT
-	         $cd41 = wHiddenItemOrCoinsIndex
 	         $cd41 = wHiddenObjectX
 	         $cd41 = wTrainerScreenX
-	         $cd41 = wDayCarePerLevelCost
+	         $cd41 = wHiddenItemOrCoinsIndex
 	         $cd42 = wSlotMachineWheel1MiddleTile
 	         $cd42 = wHoFTeamNo
 	         $cd42 = wFieldMovesLeftmostXCoord
@@ -19027,8 +19027,8 @@ WRAM0 bank #0:
 	         $cd45 = wSlotMachineWheel2MiddleTile
 	         $cd46 = wTempCoins1
 	         $cd46 = wSlotMachineWheel2TopTile
-	         $cd47 = wBattleTransitionSpiralDirection
 	         $cd47 = wSlotMachineWheel3BottomTile
+	         $cd47 = wBattleTransitionSpiralDirection
 	         $cd48 = wFacingDirectionList
 	         $cd48 = wSlotMachineWheel3MiddleTile
 	         $cd49 = wTempObtainedBadgesBooleans
@@ -19050,8 +19050,8 @@ WRAM0 bank #0:
 	         $cd50 = wWhichEmotionBubble
 	         $cd59 = wTradedEnemyMonOTID
 	         $cd5b = wGymTrashCanIndex
-	         $cd5b = wOAMBaseTile
 	         $cd5b = wStandingOnWarpPadOrHole
+	         $cd5b = wOAMBaseTile
 	         $cd5c = wSymmetricSpriteOAMAttributes
 	         $cd5d = wMonPartySpriteSpecies
 	         $cd5e = wLeftGBMonSpecies
@@ -19059,12 +19059,12 @@ WRAM0 bank #0:
 	         $cd60 = wMiscFlags
 	         $cd6a = wActionResultOrTookBattleTurn
 	         $cd6b = wJoyIgnore
-	         $cd6c = wNumMovesMinusOne
 	         $cd6c = wDownscaledMonSize
+	         $cd6c = wNumMovesMinusOne
 	         $cd6d = wNameBuffer
 	         $cd6d = wMoveData
-	         $cd6d = wPayDayMoney
 	         $cd6d = wBattleMenuCurrentPP
+	         $cd6d = wPayDayMoney
 	         $cd6d = wEvoDataBuffer
 	         $cd71 = wStatusScreenCurrentPP
 	         $cd73 = wPPUpCountAndMaxPP
@@ -19298,10 +19298,10 @@ WRAM0 bank #0:
 	         $d08a = wFlashScreenLongCounter
 	         $d08a = wSpiralBallsBaseY
 	         $d08a = wFallingObjectMovementByte
-	         $d08a = wTradedMonMovingRight
 	         $d08a = wOptionsInitialized
-	         $d08a = wUnusedWaterDropletsByte
+	         $d08a = wTradedMonMovingRight
 	         $d08a = wNewSlotMachineBallTile
+	         $d08a = wUnusedWaterDropletsByte
 	         $d08b = wNumFallingObjects
 	         $d08b = wSubAnimTransform
 	         $d08b = wSpiralBallsBaseX
@@ -19387,8 +19387,8 @@ WRAM0 bank #0:
 	         $d11e = wUsingPPUp
 	         $d11e = wMoveGrammar
 	         $d11e = wTempTMHM
-	         $d11e = wTypeEffectiveness
 	         $d11e = wNumSetBits
+	         $d11e = wTypeEffectiveness
 	         $d11e = wNamedObjectIndex
 	         $d11e = wCalculateWhoseStats
 	         $d11f = wForcePlayerToChooseMon
@@ -19509,8 +19509,8 @@ WRAM0 bank #0:
 	         $d1de = wPartyMon3DVs
 	         $d1e0 = wPartyMon3PP
 	         $d1e4 = wPartyMon3Level
-	         $d1e5 = wPartyMon3Stats
 	         $d1e5 = wPartyMon3MaxHP
+	         $d1e5 = wPartyMon3Stats
 	         $d1e7 = wPartyMon3Attack
 	         $d1e9 = wPartyMon3Defense
 	         $d1eb = wPartyMon3Speed
@@ -19567,8 +19567,8 @@ WRAM0 bank #0:
 	         $d241 = wPartyMon5Defense
 	         $d243 = wPartyMon5Speed
 	         $d245 = wPartyMon5Special
-	         $d247 = wPartyMon6Species
 	         $d247 = wPartyMon6
+	         $d247 = wPartyMon6Species
 	         $d248 = wPartyMon6HP
 	         $d24a = wPartyMon6BoxLevel
 	         $d24b = wPartyMon6Status
@@ -19968,8 +19968,8 @@ WRAM0 bank #0:
 	         $d94e = wEnemyMon4Defense
 	         $d950 = wEnemyMon4Speed
 	         $d952 = wEnemyMon4Special
-	         $d954 = wEnemyMon5Species
 	         $d954 = wEnemyMon5
+	         $d954 = wEnemyMon5Species
 	         $d955 = wEnemyMon5HP
 	         $d957 = wEnemyMon5BoxLevel
 	         $d958 = wEnemyMon5Status
@@ -19999,8 +19999,8 @@ WRAM0 bank #0:
 	         $d981 = wEnemyMon6HP
 	         $d983 = wEnemyMon6BoxLevel
 	         $d984 = wEnemyMon6Status
-	         $d985 = wEnemyMon6Type1
 	         $d985 = wEnemyMon6Type
+	         $d985 = wEnemyMon6Type1
 	         $d986 = wEnemyMon6Type2
 	         $d987 = wEnemyMon6CatchRate
 	         $d988 = wEnemyMon6Moves
@@ -20148,8 +20148,8 @@ WRAM0 bank #0:
 	         $db12 = wBoxMon4SpecialExp
 	         $db14 = wBoxMon4DVs
 	         $db16 = wBoxMon4PP
-	         $db1a = wBoxMon5Species
 	         $db1a = wBoxMon5
+	         $db1a = wBoxMon5Species
 	         $db1b = wBoxMon5HP
 	         $db1d = wBoxMon5BoxLevel
 	         $db1e = wBoxMon5Status
@@ -20229,8 +20229,8 @@ WRAM0 bank #0:
 	         $db9f = wBoxMon9HP
 	         $dba1 = wBoxMon9BoxLevel
 	         $dba2 = wBoxMon9Status
-	         $dba3 = wBoxMon9Type
 	         $dba3 = wBoxMon9Type1
+	         $dba3 = wBoxMon9Type
 	         $dba4 = wBoxMon9Type2
 	         $dba5 = wBoxMon9CatchRate
 	         $dba6 = wBoxMon9Moves
@@ -20338,8 +20338,8 @@ WRAM0 bank #0:
 	         $dc5c = wBoxMon14SpecialExp
 	         $dc5e = wBoxMon14DVs
 	         $dc60 = wBoxMon14PP
-	         $dc64 = wBoxMon15Species
 	         $dc64 = wBoxMon15
+	         $dc64 = wBoxMon15Species
 	         $dc65 = wBoxMon15HP
 	         $dc67 = wBoxMon15BoxLevel
 	         $dc68 = wBoxMon15Status
@@ -20381,8 +20381,8 @@ WRAM0 bank #0:
 	         $dca7 = wBoxMon17HP
 	         $dca9 = wBoxMon17BoxLevel
 	         $dcaa = wBoxMon17Status
-	         $dcab = wBoxMon17Type1
 	         $dcab = wBoxMon17Type
+	         $dcab = wBoxMon17Type1
 	         $dcac = wBoxMon17Type2
 	         $dcad = wBoxMon17CatchRate
 	         $dcae = wBoxMon17Moves
@@ -20414,8 +20414,8 @@ WRAM0 bank #0:
 	         $dce0 = wBoxMon18SpecialExp
 	         $dce2 = wBoxMon18DVs
 	         $dce4 = wBoxMon18PP
-	         $dce8 = wBoxMon19
 	         $dce8 = wBoxMon19Species
+	         $dce8 = wBoxMon19
 	         $dce9 = wBoxMon19HP
 	         $dceb = wBoxMon19BoxLevel
 	         $dcec = wBoxMon19Status
@@ -20518,18 +20518,18 @@ HRAM bank #0:
 	         $ff8b = hPreviousTileset
 	         $ff8b = hOAMTile
 	         $ff8b = hBaseTileID
+	         $ff8b = hEastWestConnectedMapWidth
 	         $ff8b = hItemPrice
 	         $ff8b = hDexWeight
-	         $ff8b = hEastWestConnectedMapWidth
 	         $ff8b = hSpriteInterlaceCounter
 	         $ff8b = hRLEByteValue
 	         $ff8c = hNorthSouthConnectedMapWidth
 	         $ff8c = hMapWidth
 	         $ff8c = hSpriteHeight
 	         $ff8c = hPartyMonIndex
-	         $ff8c = hSpriteIndex
-	         $ff8c = hTextID
 	         $ff8c = hSlidingRegionSize
+	         $ff8c = hTextID
+	         $ff8c = hSpriteIndex
 	         $ff8c = hDownArrowBlinkCount2
 	         $ff8d = hEnemySpeed
 	         $ff8d = hLoadSpriteTemp1
@@ -20554,13 +20554,13 @@ HRAM bank #0:
 	         $ff94 = hSpritePriority
 	         $ff95 = hSwapItemID
 	         $ff95 = hNPCPlayerYDistance
-	         $ff95 = hNPCSpriteOffset
 	         $ff95 = hDividend
 	         $ff95 = hSignCoordPointer
-	         $ff95 = hQuotient
-	         $ff95 = hNPCMovementDirections2Index
 	         $ff95 = hPastLeadingZeros
+	         $ff95 = hQuotient
 	         $ff95 = hProduct
+	         $ff95 = hNPCMovementDirections2Index
+	         $ff95 = hNPCSpriteOffset
 	         $ff95 = hSwapTemp
 	         $ff96 = hMutateWY
 	         $ff96 = hSwapItemQuantity
@@ -20644,12 +20644,12 @@ HRAM bank #0:
 	         $ffdc = hVendingMachinePrice
 	         $ffdc = hPlayerYCoord
 	         $ffdc = hOaksAideRewardItem
-	         $ffdc = hItemToRemoveIndex
 	         $ffdc = hGymGateAnswer
+	         $ffdc = hItemToRemoveIndex
 	         $ffdd = hPlayerXCoord
 	         $ffdd = hOaksAideNumMonsOwned
-	         $ffe0 = hUnlockedSilphCoDoors
 	         $ffe0 = hBackupGymGateIndex
+	         $ffe0 = hUnlockedSilphCoDoors
 	         $ffe1 = hStartTileID
 	         $ffe4 = hNewPartyLength
 	         $ffe5 = hDividend2
--- a/pokered_vc.sym
+++ b/pokered_vc.sym
@@ -337,8 +337,8 @@
 00:1765 Forest_Coll
 00:1775 House_Coll
 00:177f Gate_Coll
-00:177f ForestGate_Coll
 00:177f Museum_Coll
+00:177f ForestGate_Coll
 00:178a Ship_Coll
 00:1795 ShipPort_Coll
 00:179a Cemetery_Coll
@@ -6900,8 +6900,8 @@
 0f:5647 LinkBattleExchangeData.VC_Wireless_end_exchange
 0f:5649 LinkBattleExchangeData.syncLoop2
 0f:5649 LinkBattleExchangeData.VC_Wireless_net_delay_1_End
-0f:5652 LinkBattleExchangeData.VC_Wireless_start_send_zero_bytes
 0f:5652 LinkBattleExchangeData.VC_Wireless_net_delay_2
+0f:5652 LinkBattleExchangeData.VC_Wireless_start_send_zero_bytes
 0f:5654 LinkBattleExchangeData.syncLoop3
 0f:5654 LinkBattleExchangeData.VC_Wireless_net_delay_2_End
 0f:565d LinkBattleExchangeData.VC_Wireless_end_send_zero_bytes
@@ -9103,8 +9103,8 @@
 13:5e76 BlackbeltPic
 13:6049 Rival1Pic
 13:615f ProfOakPic
-13:627d ScientistPic
 13:627d ChiefPic
+13:627d ScientistPic
 13:63be GiovanniPic
 13:649f RocketPic
 13:6635 CooltrainerMPic
@@ -12190,9 +12190,9 @@
 1a:560f Gate_GFX
 1a:560f Museum_GFX
 1a:560f ForestGate_GFX
+1a:5bff ForestGate_Block
 1a:5bff Gate_Block
 1a:5bff Museum_Block
-1a:5bff ForestGate_Block
 1a:63ff Forest_GFX
 1a:69ff Forest_Block
 1a:71ff Facility_GFX
@@ -17503,8 +17503,8 @@
 00:8000 vChars0
 00:8000 vSprites
 00:8000 vNPCSprites
-00:8800 vTitleLogo
 00:8800 vFont
+00:8800 vTitleLogo
 00:8800 vChars1
 00:8800 vNPCSprites2
 00:9000 vFrontPic
@@ -17632,8 +17632,8 @@
 00:c12b wSprite02StateData1XAdjusted
 00:c12c wSprite02StateData1CollisionData
 00:c130 wSprite02StateData1End
-00:c130 wSprite03StateData1
 00:c130 wSprite03StateData1PictureID
+00:c130 wSprite03StateData1
 00:c131 wSprite03StateData1MovementStatus
 00:c132 wSprite03StateData1ImageIndex
 00:c133 wSprite03StateData1YStepVector
@@ -17662,8 +17662,8 @@
 00:c14b wSprite04StateData1XAdjusted
 00:c14c wSprite04StateData1CollisionData
 00:c150 wSprite05StateData1PictureID
-00:c150 wSprite04StateData1End
 00:c150 wSprite05StateData1
+00:c150 wSprite04StateData1End
 00:c151 wSprite05StateData1MovementStatus
 00:c152 wSprite05StateData1ImageIndex
 00:c153 wSprite05StateData1YStepVector
@@ -17781,9 +17781,9 @@
 00:c1ca wSprite12StateData1YAdjusted
 00:c1cb wSprite12StateData1XAdjusted
 00:c1cc wSprite12StateData1CollisionData
+00:c1d0 wSprite13StateData1PictureID
 00:c1d0 wSprite12StateData1End
 00:c1d0 wSprite13StateData1
-00:c1d0 wSprite13StateData1PictureID
 00:c1d1 wSprite13StateData1MovementStatus
 00:c1d2 wSprite13StateData1ImageIndex
 00:c1d3 wSprite13StateData1YStepVector
@@ -17796,8 +17796,8 @@
 00:c1da wSprite13StateData1YAdjusted
 00:c1db wSprite13StateData1XAdjusted
 00:c1dc wSprite13StateData1CollisionData
-00:c1e0 wSprite14StateData1
 00:c1e0 wSprite14StateData1PictureID
+00:c1e0 wSprite14StateData1
 00:c1e0 wSprite13StateData1End
 00:c1e1 wSprite14StateData1MovementStatus
 00:c1e2 wSprite14StateData1ImageIndex
@@ -17812,8 +17812,8 @@
 00:c1eb wSprite14StateData1XAdjusted
 00:c1ec wSprite14StateData1CollisionData
 00:c1f0 wSprite15StateData1PictureID
-00:c1f0 wSprite14StateData1End
 00:c1f0 wSprite15StateData1
+00:c1f0 wSprite14StateData1End
 00:c1f1 wSprite15StateData1MovementStatus
 00:c1f2 wSprite15StateData1ImageIndex
 00:c1f3 wSprite15StateData1YStepVector
@@ -17827,9 +17827,9 @@
 00:c1fb wSprite15StateData1XAdjusted
 00:c1fc wSprite15StateData1CollisionData
 00:c200 wSpriteStateData2
-00:c200 wSprite15StateData1End
 00:c200 wSpritePlayerStateData2WalkAnimationCounter
 00:c200 wSpritePlayerStateData2
+00:c200 wSprite15StateData1End
 00:c202 wSpritePlayerStateData2YDisplacement
 00:c203 wSpritePlayerStateData2XDisplacement
 00:c204 wSpritePlayerStateData2MapY
@@ -17840,9 +17840,9 @@
 00:c209 wSpritePlayerStateData2OrigFacingDirection
 00:c20d wSpritePlayerStateData2PictureID
 00:c20e wSpritePlayerStateData2ImageBaseOffset
+00:c210 wSprite01StateData2
 00:c210 wSpritePlayerStateData2End
 00:c210 wSprite01StateData2WalkAnimationCounter
-00:c210 wSprite01StateData2
 00:c212 wSprite01StateData2YDisplacement
 00:c213 wSprite01StateData2XDisplacement
 00:c214 wSprite01StateData2MapY
@@ -17854,8 +17854,8 @@
 00:c21d wSprite01StateData2PictureID
 00:c21e wSprite01StateData2ImageBaseOffset
 00:c220 wSprite02StateData2WalkAnimationCounter
-00:c220 wSprite01StateData2End
 00:c220 wSprite02StateData2
+00:c220 wSprite01StateData2End
 00:c222 wSprite02StateData2YDisplacement
 00:c223 wSprite02StateData2XDisplacement
 00:c224 wSprite02StateData2MapY
@@ -17867,8 +17867,8 @@
 00:c22d wSprite02StateData2PictureID
 00:c22e wSprite02StateData2ImageBaseOffset
 00:c230 wSprite03StateData2
-00:c230 wSprite03StateData2WalkAnimationCounter
 00:c230 wSprite02StateData2End
+00:c230 wSprite03StateData2WalkAnimationCounter
 00:c232 wSprite03StateData2YDisplacement
 00:c233 wSprite03StateData2XDisplacement
 00:c234 wSprite03StateData2MapY
@@ -17879,9 +17879,9 @@
 00:c239 wSprite03StateData2OrigFacingDirection
 00:c23d wSprite03StateData2PictureID
 00:c23e wSprite03StateData2ImageBaseOffset
-00:c240 wSprite04StateData2WalkAnimationCounter
 00:c240 wSprite04StateData2
 00:c240 wSprite03StateData2End
+00:c240 wSprite04StateData2WalkAnimationCounter
 00:c242 wSprite04StateData2YDisplacement
 00:c243 wSprite04StateData2XDisplacement
 00:c244 wSprite04StateData2MapY
@@ -17892,9 +17892,9 @@
 00:c249 wSprite04StateData2OrigFacingDirection
 00:c24d wSprite04StateData2PictureID
 00:c24e wSprite04StateData2ImageBaseOffset
-00:c250 wSprite04StateData2End
 00:c250 wSprite05StateData2WalkAnimationCounter
 00:c250 wSprite05StateData2
+00:c250 wSprite04StateData2End
 00:c252 wSprite05StateData2YDisplacement
 00:c253 wSprite05StateData2XDisplacement
 00:c254 wSprite05StateData2MapY
@@ -17905,9 +17905,9 @@
 00:c259 wSprite05StateData2OrigFacingDirection
 00:c25d wSprite05StateData2PictureID
 00:c25e wSprite05StateData2ImageBaseOffset
-00:c260 wSprite06StateData2
-00:c260 wSprite05StateData2End
 00:c260 wSprite06StateData2WalkAnimationCounter
+00:c260 wSprite05StateData2End
+00:c260 wSprite06StateData2
 00:c262 wSprite06StateData2YDisplacement
 00:c263 wSprite06StateData2XDisplacement
 00:c264 wSprite06StateData2MapY
@@ -17918,8 +17918,8 @@
 00:c269 wSprite06StateData2OrigFacingDirection
 00:c26d wSprite06StateData2PictureID
 00:c26e wSprite06StateData2ImageBaseOffset
-00:c270 wSprite06StateData2End
 00:c270 wSprite07StateData2
+00:c270 wSprite06StateData2End
 00:c270 wSprite07StateData2WalkAnimationCounter
 00:c272 wSprite07StateData2YDisplacement
 00:c273 wSprite07StateData2XDisplacement
@@ -17931,9 +17931,9 @@
 00:c279 wSprite07StateData2OrigFacingDirection
 00:c27d wSprite07StateData2PictureID
 00:c27e wSprite07StateData2ImageBaseOffset
-00:c280 wSprite07StateData2End
-00:c280 wSprite08StateData2
 00:c280 wSprite08StateData2WalkAnimationCounter
+00:c280 wSprite08StateData2
+00:c280 wSprite07StateData2End
 00:c282 wSprite08StateData2YDisplacement
 00:c283 wSprite08StateData2XDisplacement
 00:c284 wSprite08StateData2MapY
@@ -17944,9 +17944,9 @@
 00:c289 wSprite08StateData2OrigFacingDirection
 00:c28d wSprite08StateData2PictureID
 00:c28e wSprite08StateData2ImageBaseOffset
+00:c290 wSprite09StateData2WalkAnimationCounter
 00:c290 wSprite09StateData2
 00:c290 wSprite08StateData2End
-00:c290 wSprite09StateData2WalkAnimationCounter
 00:c292 wSprite09StateData2YDisplacement
 00:c293 wSprite09StateData2XDisplacement
 00:c294 wSprite09StateData2MapY
@@ -17957,9 +17957,9 @@
 00:c299 wSprite09StateData2OrigFacingDirection
 00:c29d wSprite09StateData2PictureID
 00:c29e wSprite09StateData2ImageBaseOffset
-00:c2a0 wSprite10StateData2WalkAnimationCounter
-00:c2a0 wSprite09StateData2End
 00:c2a0 wSprite10StateData2
+00:c2a0 wSprite09StateData2End
+00:c2a0 wSprite10StateData2WalkAnimationCounter
 00:c2a2 wSprite10StateData2YDisplacement
 00:c2a3 wSprite10StateData2XDisplacement
 00:c2a4 wSprite10StateData2MapY
@@ -17970,8 +17970,8 @@
 00:c2a9 wSprite10StateData2OrigFacingDirection
 00:c2ad wSprite10StateData2PictureID
 00:c2ae wSprite10StateData2ImageBaseOffset
-00:c2b0 wSprite11StateData2
 00:c2b0 wSprite11StateData2WalkAnimationCounter
+00:c2b0 wSprite11StateData2
 00:c2b0 wSprite10StateData2End
 00:c2b2 wSprite11StateData2YDisplacement
 00:c2b3 wSprite11StateData2XDisplacement
@@ -17996,8 +17996,8 @@
 00:c2c9 wSprite12StateData2OrigFacingDirection
 00:c2cd wSprite12StateData2PictureID
 00:c2ce wSprite12StateData2ImageBaseOffset
-00:c2d0 wSprite13StateData2
 00:c2d0 wSprite13StateData2WalkAnimationCounter
+00:c2d0 wSprite13StateData2
 00:c2d0 wSprite12StateData2End
 00:c2d2 wSprite13StateData2YDisplacement
 00:c2d3 wSprite13StateData2XDisplacement
@@ -18022,9 +18022,9 @@
 00:c2e9 wSprite14StateData2OrigFacingDirection
 00:c2ed wSprite14StateData2PictureID
 00:c2ee wSprite14StateData2ImageBaseOffset
+00:c2f0 wSprite14StateData2End
 00:c2f0 wSprite15StateData2WalkAnimationCounter
 00:c2f0 wSprite15StateData2
-00:c2f0 wSprite14StateData2End
 00:c2f2 wSprite15StateData2YDisplacement
 00:c2f3 wSprite15StateData2XDisplacement
 00:c2f4 wSprite15StateData2MapY
@@ -18035,21 +18035,21 @@
 00:c2f9 wSprite15StateData2OrigFacingDirection
 00:c2fd wSprite15StateData2PictureID
 00:c2fe wSprite15StateData2ImageBaseOffset
-00:c300 wSprite15StateData2End
 00:c300 wSpriteDataEnd
+00:c300 wSprite15StateData2End
+00:c300 wShadowOAMSprite00YCoord
 00:c300 wShadowOAM
 00:c300 wShadowOAMSprite00
-00:c300 wShadowOAMSprite00YCoord
 00:c301 wShadowOAMSprite00XCoord
 00:c302 wShadowOAMSprite00TileID
 00:c303 wShadowOAMSprite00Attributes
-00:c304 wShadowOAMSprite01YCoord
 00:c304 wShadowOAMSprite01
+00:c304 wShadowOAMSprite01YCoord
 00:c305 wShadowOAMSprite01XCoord
 00:c306 wShadowOAMSprite01TileID
 00:c307 wShadowOAMSprite01Attributes
-00:c308 wShadowOAMSprite02
 00:c308 wShadowOAMSprite02YCoord
+00:c308 wShadowOAMSprite02
 00:c309 wShadowOAMSprite02XCoord
 00:c30a wShadowOAMSprite02TileID
 00:c30b wShadowOAMSprite02Attributes
@@ -18068,18 +18068,18 @@
 00:c315 wShadowOAMSprite05XCoord
 00:c316 wShadowOAMSprite05TileID
 00:c317 wShadowOAMSprite05Attributes
-00:c318 wShadowOAMSprite06
 00:c318 wShadowOAMSprite06YCoord
+00:c318 wShadowOAMSprite06
 00:c319 wShadowOAMSprite06XCoord
 00:c31a wShadowOAMSprite06TileID
 00:c31b wShadowOAMSprite06Attributes
-00:c31c wShadowOAMSprite07
 00:c31c wShadowOAMSprite07YCoord
+00:c31c wShadowOAMSprite07
 00:c31d wShadowOAMSprite07XCoord
 00:c31e wShadowOAMSprite07TileID
 00:c31f wShadowOAMSprite07Attributes
-00:c320 wShadowOAMSprite08
 00:c320 wShadowOAMSprite08YCoord
+00:c320 wShadowOAMSprite08
 00:c321 wShadowOAMSprite08XCoord
 00:c322 wShadowOAMSprite08TileID
 00:c323 wShadowOAMSprite08Attributes
@@ -18088,8 +18088,8 @@
 00:c325 wShadowOAMSprite09XCoord
 00:c326 wShadowOAMSprite09TileID
 00:c327 wShadowOAMSprite09Attributes
-00:c328 wShadowOAMSprite10
 00:c328 wShadowOAMSprite10YCoord
+00:c328 wShadowOAMSprite10
 00:c329 wShadowOAMSprite10XCoord
 00:c32a wShadowOAMSprite10TileID
 00:c32b wShadowOAMSprite10Attributes
@@ -18098,13 +18098,13 @@
 00:c32d wShadowOAMSprite11XCoord
 00:c32e wShadowOAMSprite11TileID
 00:c32f wShadowOAMSprite11Attributes
-00:c330 wShadowOAMSprite12
 00:c330 wShadowOAMSprite12YCoord
+00:c330 wShadowOAMSprite12
 00:c331 wShadowOAMSprite12XCoord
 00:c332 wShadowOAMSprite12TileID
 00:c333 wShadowOAMSprite12Attributes
-00:c334 wShadowOAMSprite13
 00:c334 wShadowOAMSprite13YCoord
+00:c334 wShadowOAMSprite13
 00:c335 wShadowOAMSprite13XCoord
 00:c336 wShadowOAMSprite13TileID
 00:c337 wShadowOAMSprite13Attributes
@@ -18128,8 +18128,8 @@
 00:c345 wShadowOAMSprite17XCoord
 00:c346 wShadowOAMSprite17TileID
 00:c347 wShadowOAMSprite17Attributes
-00:c348 wShadowOAMSprite18
 00:c348 wShadowOAMSprite18YCoord
+00:c348 wShadowOAMSprite18
 00:c349 wShadowOAMSprite18XCoord
 00:c34a wShadowOAMSprite18TileID
 00:c34b wShadowOAMSprite18Attributes
@@ -18138,13 +18138,13 @@
 00:c34d wShadowOAMSprite19XCoord
 00:c34e wShadowOAMSprite19TileID
 00:c34f wShadowOAMSprite19Attributes
-00:c350 wShadowOAMSprite20
 00:c350 wShadowOAMSprite20YCoord
+00:c350 wShadowOAMSprite20
 00:c351 wShadowOAMSprite20XCoord
 00:c352 wShadowOAMSprite20TileID
 00:c353 wShadowOAMSprite20Attributes
-00:c354 wShadowOAMSprite21
 00:c354 wShadowOAMSprite21YCoord
+00:c354 wShadowOAMSprite21
 00:c355 wShadowOAMSprite21XCoord
 00:c356 wShadowOAMSprite21TileID
 00:c357 wShadowOAMSprite21Attributes
@@ -18153,8 +18153,8 @@
 00:c359 wShadowOAMSprite22XCoord
 00:c35a wShadowOAMSprite22TileID
 00:c35b wShadowOAMSprite22Attributes
-00:c35c wShadowOAMSprite23
 00:c35c wShadowOAMSprite23YCoord
+00:c35c wShadowOAMSprite23
 00:c35d wShadowOAMSprite23XCoord
 00:c35e wShadowOAMSprite23TileID
 00:c35f wShadowOAMSprite23Attributes
@@ -18173,18 +18173,18 @@
 00:c369 wShadowOAMSprite26XCoord
 00:c36a wShadowOAMSprite26TileID
 00:c36b wShadowOAMSprite26Attributes
-00:c36c wShadowOAMSprite27
 00:c36c wShadowOAMSprite27YCoord
+00:c36c wShadowOAMSprite27
 00:c36d wShadowOAMSprite27XCoord
 00:c36e wShadowOAMSprite27TileID
 00:c36f wShadowOAMSprite27Attributes
-00:c370 wShadowOAMSprite28
 00:c370 wShadowOAMSprite28YCoord
+00:c370 wShadowOAMSprite28
 00:c371 wShadowOAMSprite28XCoord
 00:c372 wShadowOAMSprite28TileID
 00:c373 wShadowOAMSprite28Attributes
-00:c374 wShadowOAMSprite29
 00:c374 wShadowOAMSprite29YCoord
+00:c374 wShadowOAMSprite29
 00:c375 wShadowOAMSprite29XCoord
 00:c376 wShadowOAMSprite29TileID
 00:c377 wShadowOAMSprite29Attributes
@@ -18198,8 +18198,8 @@
 00:c37d wShadowOAMSprite31XCoord
 00:c37e wShadowOAMSprite31TileID
 00:c37f wShadowOAMSprite31Attributes
-00:c380 wShadowOAMSprite32YCoord
 00:c380 wShadowOAMSprite32
+00:c380 wShadowOAMSprite32YCoord
 00:c381 wShadowOAMSprite32XCoord
 00:c382 wShadowOAMSprite32TileID
 00:c383 wShadowOAMSprite32Attributes
@@ -18294,8 +18294,8 @@
 00:c52d wShadowOAMBackupSprite09XCoord
 00:c52e wShadowOAMBackupSprite09TileID
 00:c52f wShadowOAMBackupSprite09Attributes
-00:c530 wShadowOAMBackupSprite10YCoord
 00:c530 wShadowOAMBackupSprite10
+00:c530 wShadowOAMBackupSprite10YCoord
 00:c531 wShadowOAMBackupSprite10XCoord
 00:c532 wShadowOAMBackupSprite10TileID
 00:c533 wShadowOAMBackupSprite10Attributes
@@ -18324,8 +18324,8 @@
 00:c545 wShadowOAMBackupSprite15XCoord
 00:c546 wShadowOAMBackupSprite15TileID
 00:c547 wShadowOAMBackupSprite15Attributes
-00:c548 wShadowOAMBackupSprite16
 00:c548 wShadowOAMBackupSprite16YCoord
+00:c548 wShadowOAMBackupSprite16
 00:c549 wShadowOAMBackupSprite16XCoord
 00:c54a wShadowOAMBackupSprite16TileID
 00:c54b wShadowOAMBackupSprite16Attributes
@@ -18498,10 +18498,10 @@
 00:cc5b wMonPartySpritesSavedOAM
 00:cc5b wElevatorWarpMaps
 00:cc5b wVermilionDockTileMapBuffer
-00:cc5b wSlotMachineSevenAndBarModeChance
-00:cc5b wOaksAideRewardItemName
 00:cc5b wHallOfFame
+00:cc5b wOaksAideRewardItemName
 00:cc5b wDexRatingNumMonsSeen
+00:cc5b wSlotMachineSevenAndBarModeChance
 00:cc5b wUnusedFlag
 00:cc5b wFilteredBagItems
 00:cc5c wDexRatingNumMonsOwned
@@ -18547,10 +18547,10 @@
 00:cd05 wEnemyNumHits
 00:cd05 wLuckySlotHiddenObjectIndex
 00:cd05 wEnemyBideAccumulatedDamage
-00:cd0f wPlayerMonUnmodifiedLevel
 00:cd0f wVermilionDockTileMapBufferEnd
-00:cd0f wMiscBattleDataEnd
 00:cd0f wInGameTradeGiveMonSpecies
+00:cd0f wPlayerMonUnmodifiedLevel
+00:cd0f wMiscBattleDataEnd
 00:cd10 wPlayerMonUnmodifiedMaxHP
 00:cd10 wInGameTradeTextPointerTablePointer
 00:cd12 wPlayerMonUnmodifiedAttack
@@ -18599,6 +18599,7 @@
 00:cd3d wNumShakes
 00:cd3d wPPRestoreItem
 00:cd3d wDexMaxSeenMon
+00:cd3d wWhichTrade
 00:cd3d wChangeBoxSavedMapTextPointer
 00:cd3d wBadgeNumberTile
 00:cd3d wOptionsTextSpeedCursorX
@@ -18620,22 +18621,21 @@
 00:cd3d wChargeMoveNum
 00:cd3d wPriceTemp
 00:cd3d wTitleMonSpecies
-00:cd3d wFieldMoves
-00:cd3d wPlayerCharacterOAMTile
-00:cd3d wCoordIndex
+00:cd3d wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 00:cd3d wTempSCX
-00:cd3d wUnusedCreditsByte
-00:cd3d wBoxMonCounts
-00:cd3d wHoFTeamIndex
-00:cd3d wWhichTrade
-00:cd3d wSavedY
-00:cd3d wDayCareStartLevel
 00:cd3d wMoveDownSmallStarsOAMCount
+00:cd3d wStoppingWhichSlotMachineWheel
+00:cd3d wUnusedCreditsByte
+00:cd3d wFieldMoves
+00:cd3d wCoordIndex
+00:cd3d wHoFTeamIndex
+00:cd3d wDayCareStartLevel
+00:cd3d wBoxMonCounts
+00:cd3d wSavedY
+00:cd3d wPlayerCharacterOAMTile
 00:cd3d wWereAnyMonsAsleep
 00:cd3d wFallingObjectsMovementData
 00:cd3d wTrainerSpriteOffset
-00:cd3d wPlayerSpinWhileMovingUpOrDownAnimDeltaY
-00:cd3d wStoppingWhichSlotMachineWheel
 00:cd3e wNumCreditsMonsDisplayed
 00:cd3e wTrainerInfoTextBoxWidth
 00:cd3e wTrainerEngageDistance
@@ -18651,8 +18651,8 @@
 00:cd3e wBattleTransitionCircleScreenQuadrantX
 00:cd3e wTradingWhichEnemyMon
 00:cd3e wTradedEnemyMonSpecies
-00:cd3e wBadgeNameTile
 00:cd3e wRivalStarterBallSpriteIndex
+00:cd3e wBadgeNameTile
 00:cd3e wHoFPartyMonIndex
 00:cd3e wOptionsBattleAnimCursorX
 00:cd3f wJigglypuffFacingDirections
@@ -18663,27 +18663,27 @@
 00:cd3f wSlotMachineWheel2Offset
 00:cd3f wFlyAnimBirdSpriteImageIndex
 00:cd3f wNameOfPlayerMonToBeTraded
+00:cd3f wDayCareTotalCost
 00:cd3f wHoFMonLevel
 00:cd3f wTrainerFacingDirection
 00:cd3f wHiddenObjectIndex
-00:cd3f wDayCareTotalCost
-00:cd3f wHUDGraphicsTiles
 00:cd3f wOptionsBattleStyleCursorX
+00:cd3f wHUDGraphicsTiles
 00:cd40 wOptionsCancelCursorX
 00:cd40 wTrainerScreenY
+00:cd40 wSlotMachineWheel3Offset
 00:cd40 wPlayerSpinInPlaceAnimSoundID
 00:cd40 wHiddenObjectY
-00:cd40 wSlotMachineWheel3Offset
 00:cd40 wHoFMonOrPlayer
 00:cd41 wSlotMachineWheel1BottomTile
 00:cd41 wSlotMachineWinningSymbol
 00:cd41 wHoFTeamIndex2
 00:cd41 wNumFieldMoves
+00:cd41 wDayCarePerLevelCost
 00:cd41 wTradedPlayerMonOT
-00:cd41 wHiddenItemOrCoinsIndex
 00:cd41 wHiddenObjectX
 00:cd41 wTrainerScreenX
-00:cd41 wDayCarePerLevelCost
+00:cd41 wHiddenItemOrCoinsIndex
 00:cd42 wSlotMachineWheel1MiddleTile
 00:cd42 wHoFTeamNo
 00:cd42 wFieldMovesLeftmostXCoord
@@ -18693,8 +18693,8 @@
 00:cd45 wSlotMachineWheel2MiddleTile
 00:cd46 wTempCoins1
 00:cd46 wSlotMachineWheel2TopTile
-00:cd47 wBattleTransitionSpiralDirection
 00:cd47 wSlotMachineWheel3BottomTile
+00:cd47 wBattleTransitionSpiralDirection
 00:cd48 wFacingDirectionList
 00:cd48 wSlotMachineWheel3MiddleTile
 00:cd49 wTempObtainedBadgesBooleans
@@ -18716,8 +18716,8 @@
 00:cd50 wWhichEmotionBubble
 00:cd59 wTradedEnemyMonOTID
 00:cd5b wGymTrashCanIndex
-00:cd5b wOAMBaseTile
 00:cd5b wStandingOnWarpPadOrHole
+00:cd5b wOAMBaseTile
 00:cd5c wSymmetricSpriteOAMAttributes
 00:cd5d wMonPartySpriteSpecies
 00:cd5e wLeftGBMonSpecies
@@ -18725,12 +18725,12 @@
 00:cd60 wMiscFlags
 00:cd6a wActionResultOrTookBattleTurn
 00:cd6b wJoyIgnore
-00:cd6c wNumMovesMinusOne
 00:cd6c wDownscaledMonSize
+00:cd6c wNumMovesMinusOne
 00:cd6d wNameBuffer
 00:cd6d wMoveData
-00:cd6d wPayDayMoney
 00:cd6d wBattleMenuCurrentPP
+00:cd6d wPayDayMoney
 00:cd6d wEvoDataBuffer
 00:cd71 wStatusScreenCurrentPP
 00:cd73 wPPUpCountAndMaxPP
@@ -18964,10 +18964,10 @@
 00:d08a wFlashScreenLongCounter
 00:d08a wSpiralBallsBaseY
 00:d08a wFallingObjectMovementByte
-00:d08a wTradedMonMovingRight
 00:d08a wOptionsInitialized
-00:d08a wUnusedWaterDropletsByte
+00:d08a wTradedMonMovingRight
 00:d08a wNewSlotMachineBallTile
+00:d08a wUnusedWaterDropletsByte
 00:d08b wNumFallingObjects
 00:d08b wSubAnimTransform
 00:d08b wSpiralBallsBaseX
@@ -19053,8 +19053,8 @@
 00:d11e wUsingPPUp
 00:d11e wMoveGrammar
 00:d11e wTempTMHM
-00:d11e wTypeEffectiveness
 00:d11e wNumSetBits
+00:d11e wTypeEffectiveness
 00:d11e wNamedObjectIndex
 00:d11e wCalculateWhoseStats
 00:d11f wForcePlayerToChooseMon
@@ -19174,8 +19174,8 @@
 00:d1de wPartyMon3DVs
 00:d1e0 wPartyMon3PP
 00:d1e4 wPartyMon3Level
-00:d1e5 wPartyMon3Stats
 00:d1e5 wPartyMon3MaxHP
+00:d1e5 wPartyMon3Stats
 00:d1e7 wPartyMon3Attack
 00:d1e9 wPartyMon3Defense
 00:d1eb wPartyMon3Speed
@@ -19232,8 +19232,8 @@
 00:d241 wPartyMon5Defense
 00:d243 wPartyMon5Speed
 00:d245 wPartyMon5Special
-00:d247 wPartyMon6Species
 00:d247 wPartyMon6
+00:d247 wPartyMon6Species
 00:d248 wPartyMon6HP
 00:d24a wPartyMon6BoxLevel
 00:d24b wPartyMon6Status
@@ -19632,8 +19632,8 @@
 00:d94e wEnemyMon4Defense
 00:d950 wEnemyMon4Speed
 00:d952 wEnemyMon4Special
-00:d954 wEnemyMon5Species
 00:d954 wEnemyMon5
+00:d954 wEnemyMon5Species
 00:d955 wEnemyMon5HP
 00:d957 wEnemyMon5BoxLevel
 00:d958 wEnemyMon5Status
@@ -19663,8 +19663,8 @@
 00:d981 wEnemyMon6HP
 00:d983 wEnemyMon6BoxLevel
 00:d984 wEnemyMon6Status
-00:d985 wEnemyMon6Type1
 00:d985 wEnemyMon6Type
+00:d985 wEnemyMon6Type1
 00:d986 wEnemyMon6Type2
 00:d987 wEnemyMon6CatchRate
 00:d988 wEnemyMon6Moves
@@ -19811,8 +19811,8 @@
 00:db12 wBoxMon4SpecialExp
 00:db14 wBoxMon4DVs
 00:db16 wBoxMon4PP
-00:db1a wBoxMon5Species
 00:db1a wBoxMon5
+00:db1a wBoxMon5Species
 00:db1b wBoxMon5HP
 00:db1d wBoxMon5BoxLevel
 00:db1e wBoxMon5Status
@@ -19892,8 +19892,8 @@
 00:db9f wBoxMon9HP
 00:dba1 wBoxMon9BoxLevel
 00:dba2 wBoxMon9Status
-00:dba3 wBoxMon9Type
 00:dba3 wBoxMon9Type1
+00:dba3 wBoxMon9Type
 00:dba4 wBoxMon9Type2
 00:dba5 wBoxMon9CatchRate
 00:dba6 wBoxMon9Moves
@@ -20001,8 +20001,8 @@
 00:dc5c wBoxMon14SpecialExp
 00:dc5e wBoxMon14DVs
 00:dc60 wBoxMon14PP
-00:dc64 wBoxMon15Species
 00:dc64 wBoxMon15
+00:dc64 wBoxMon15Species
 00:dc65 wBoxMon15HP
 00:dc67 wBoxMon15BoxLevel
 00:dc68 wBoxMon15Status
@@ -20044,8 +20044,8 @@
 00:dca7 wBoxMon17HP
 00:dca9 wBoxMon17BoxLevel
 00:dcaa wBoxMon17Status
-00:dcab wBoxMon17Type1
 00:dcab wBoxMon17Type
+00:dcab wBoxMon17Type1
 00:dcac wBoxMon17Type2
 00:dcad wBoxMon17CatchRate
 00:dcae wBoxMon17Moves
@@ -20077,8 +20077,8 @@
 00:dce0 wBoxMon18SpecialExp
 00:dce2 wBoxMon18DVs
 00:dce4 wBoxMon18PP
-00:dce8 wBoxMon19
 00:dce8 wBoxMon19Species
+00:dce8 wBoxMon19
 00:dce9 wBoxMon19HP
 00:dceb wBoxMon19BoxLevel
 00:dcec wBoxMon19Status
@@ -20174,18 +20174,18 @@
 00:ff8b hPreviousTileset
 00:ff8b hOAMTile
 00:ff8b hBaseTileID
+00:ff8b hEastWestConnectedMapWidth
 00:ff8b hItemPrice
 00:ff8b hDexWeight
-00:ff8b hEastWestConnectedMapWidth
 00:ff8b hSpriteInterlaceCounter
 00:ff8b hRLEByteValue
 00:ff8c hNorthSouthConnectedMapWidth
 00:ff8c hMapWidth
 00:ff8c hSpriteHeight
 00:ff8c hPartyMonIndex
-00:ff8c hSpriteIndex
-00:ff8c hTextID
 00:ff8c hSlidingRegionSize
+00:ff8c hTextID
+00:ff8c hSpriteIndex
 00:ff8c hDownArrowBlinkCount2
 00:ff8d hEnemySpeed
 00:ff8d hLoadSpriteTemp1
@@ -20210,13 +20210,13 @@
 00:ff94 hSpritePriority
 00:ff95 hSwapItemID
 00:ff95 hNPCPlayerYDistance
-00:ff95 hNPCSpriteOffset
 00:ff95 hDividend
 00:ff95 hSignCoordPointer
-00:ff95 hQuotient
-00:ff95 hNPCMovementDirections2Index
 00:ff95 hPastLeadingZeros
+00:ff95 hQuotient
 00:ff95 hProduct
+00:ff95 hNPCMovementDirections2Index
+00:ff95 hNPCSpriteOffset
 00:ff95 hSwapTemp
 00:ff96 hMutateWY
 00:ff96 hSwapItemQuantity
@@ -20300,12 +20300,12 @@
 00:ffdc hVendingMachinePrice
 00:ffdc hPlayerYCoord
 00:ffdc hOaksAideRewardItem
-00:ffdc hItemToRemoveIndex
 00:ffdc hGymGateAnswer
+00:ffdc hItemToRemoveIndex
 00:ffdd hPlayerXCoord
 00:ffdd hOaksAideNumMonsOwned
-00:ffe0 hUnlockedSilphCoDoors
 00:ffe0 hBackupGymGateIndex
+00:ffe0 hUnlockedSilphCoDoors
 00:ffe1 hStartTileID
 00:ffe4 hNewPartyLength
 00:ffe5 hDividend2