Fix comment/style issues caused from w-izing.

9 files changed, 22 insertions, 21 deletions

diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm
index 6ec490b71..4d1eea2e8 100644
--- a/engine/battle/ai/items.asm
+++ b/engine/battle/ai/items.asm
@@ -21,7 +21,7 @@ AI_SwitchOrTryItem: ; 38000
 	jr nz, DontSwitch
 
 	ld hl, TrainerClassAttributes + TRNATTR_AI_ITEM_SWITCH
-	ld a, [wInBattleTowerBattle] ; Load always the first wTrainerClass for BattleTower-Trainers
+	ld a, [wInBattleTowerBattle] ; always load the first trainer class in wTrainerClass for BattleTower-Trainers
 	and a
 	jr nz, .ok
 
diff --git a/engine/battle/ai/move.asm b/engine/battle/ai/move.asm
index c3e9bed27..b5ac966f8 100755
--- a/engine/battle/ai/move.asm
+++ b/engine/battle/ai/move.asm
@@ -66,7 +66,7 @@ AIChooseMove: ; 440ce
 .ApplyLayers:
 	ld hl, TrainerClassAttributes + TRNATTR_AI_MOVE_WEIGHTS
 
-	; If we have a battle in BattleTower just load the Attributes of the first wTrainerClass (Falkner)
+	; If we have a battle in BattleTower just load the Attributes of the first trainer class in wTrainerClass (Falkner)
 	; so we have always the same AI, regardless of the loaded class of trainer
 	ld a, [wInBattleTowerBattle]
 	bit 0, a
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 4cdd7f226..3742f00c9 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -6133,7 +6133,7 @@ LoadEnemyMon: ; 3e8eb
 ; Notes:
 ;   BattleRandom is used to ensure sync between Game Boys
 
-; Clear the whole wEnemyMon struct
+; Clear the whole enemy mon struct (wEnemyMon)
 	xor a
 	ld hl, wEnemyMonSpecies
 	ld bc, wEnemyMonEnd - wEnemyMon
@@ -6989,7 +6989,8 @@ ApplyStatLevelMultiplier: ; 3ecb7
 ; 3ed45
 
 BadgeStatBoosts: ; 3ed45
-; Raise wBattleMon stats depending on which badges have been obtained.
+; Raise the stats of the battle mon in wBattleMon
+; depending on which badges have been obtained.
 
 ; Every other badge boosts a stat, starting from the first.
 
diff --git a/engine/color.asm b/engine/color.asm
index 88dd8e8d6..21842b7b3 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -602,7 +602,7 @@ ApplyPals:
 	ld hl, wBGPals1
 	ld de, wBGPals2
 	ld bc, 16 palettes
-	ld a, BANK(wPals)
+	ld a, BANK(wGBCPalettes)
 	call FarCopyWRAM
 	ret
 
diff --git a/engine/credits.asm b/engine/credits.asm
index eb5347f26..1aaecf64a 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -13,7 +13,7 @@ Credits:: ; 109847
 
 	ld a, [rSVBK]
 	push af
-	ld a, BANK(wPals)
+	ld a, BANK(wGBCPalettes)
 	ld [rSVBK], a
 
 	call ClearBGPalettes
diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm
index d482c3cfa..d6c467867 100755
--- a/engine/crystal_intro.asm
+++ b/engine/crystal_intro.asm
@@ -352,7 +352,7 @@ INCBIN "gfx/splash/logo2.1bpp"
 CrystalIntro: ; e48ac
 	ld a, [rSVBK]
 	push af
-	ld a, BANK(wPals)
+	ld a, BANK(wGBCPalettes)
 	ld [rSVBK], a
 	ld a, [hInMenu]
 	push af
diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm
index b93a10dd2..a84c3f449 100644
--- a/engine/pic_animation.asm
+++ b/engine/pic_animation.asm
@@ -326,7 +326,7 @@ PokeAnim_InitPicAttributes: ; d01d6
 	ld [wPokeAnimPointer], a
 	ld a, b
 	ld [wPokeAnimPointer + 1], a
-; hl contains wTileMap coords
+; hl contains tilemap coords
 	ld a, l
 	ld [wPokeAnimCoord], a
 	ld a, h
diff --git a/engine/pokegear.asm b/engine/pokegear.asm
index a782b31b6..affe9d6bd 100755
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -247,7 +247,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 0
-	ld bc, wTileMapEnd - wTileMap
+	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	ld a, $4f
 	call ByteFill
 	ld a, [wPokegearCard]
diff --git a/engine/variables.asm b/engine/variables.asm
index 25870a967..89026fdba 100755
--- a/engine/variables.asm
+++ b/engine/variables.asm
@@ -39,26 +39,26 @@ _GetVarAction:: ; 80648 (20:4648)
 	; RETVAR_STRBUF2: copy [de] to wStringBuffer2
 	; RETVAR_ADDR_DE: return address in de
 	; RETVAR_EXECUTE: call function
-	dwb wStringBuffer2,                  RETVAR_STRBUF2
-	dwb wPartyCount,                     RETVAR_STRBUF2
+	dwb wStringBuffer2,                 RETVAR_STRBUF2
+	dwb wPartyCount,                    RETVAR_STRBUF2
 	dwb .BattleResult,                  RETVAR_EXECUTE
-	dwb wBattleType,                     RETVAR_ADDR_DE
-	dwb wTimeOfDay,                      RETVAR_STRBUF2
+	dwb wBattleType,                    RETVAR_ADDR_DE
+	dwb wTimeOfDay,                     RETVAR_STRBUF2
 	dwb .CountCaughtMons,               RETVAR_EXECUTE
 	dwb .CountSeenMons,                 RETVAR_EXECUTE
 	dwb .CountBadges,                   RETVAR_EXECUTE
-	dwb wPlayerState,                    RETVAR_ADDR_DE
-	dwb .wPlayerFacing,                  RETVAR_EXECUTE
+	dwb wPlayerState,                   RETVAR_ADDR_DE
+	dwb .PlayerFacing,                  RETVAR_EXECUTE
 	dwb hHours,                         RETVAR_STRBUF2
 	dwb .DayOfWeek,                     RETVAR_EXECUTE
-	dwb wMapGroup,                       RETVAR_STRBUF2
-	dwb wMapNumber,                      RETVAR_STRBUF2
+	dwb wMapGroup,                      RETVAR_STRBUF2
+	dwb wMapNumber,                     RETVAR_STRBUF2
 	dwb .UnownCaught,                   RETVAR_EXECUTE
-	dwb wEnvironment,                    RETVAR_STRBUF2
+	dwb wEnvironment,                   RETVAR_STRBUF2
 	dwb .BoxFreeSpace,                  RETVAR_EXECUTE
 	dwb wBugContestMinsRemaining,       RETVAR_STRBUF2
-	dwb wXCoord,                         RETVAR_STRBUF2
-	dwb wYCoord,                         RETVAR_STRBUF2
+	dwb wXCoord,                        RETVAR_STRBUF2
+	dwb wYCoord,                        RETVAR_STRBUF2
 	dwb wSpecialPhoneCallID,            RETVAR_STRBUF2
 	dwb wNrOfBeatenBattleTowerTrainers, RETVAR_STRBUF2
 	dwb wKurtApricornQuantity,          RETVAR_STRBUF2
@@ -96,7 +96,7 @@ _GetVarAction:: ; 80648 (20:4648)
 	jp .loadstringbuffer2
 ; 806ef
 
-.wPlayerFacing: ; 806ef
+.PlayerFacing: ; 806ef
 ; The direction the player is facing.
 	ld a, [wPlayerDirection]
 	and $c