diff --git a/asm/macros/battle_frontier/battle_tower.inc b/asm/macros/battle_frontier/battle_tower.inc
index afdd11e05a..14a038add2 100644
--- a/asm/macros/battle_frontier/battle_tower.inc
+++ b/asm/macros/battle_frontier/battle_tower.inc
@@ -53,7 +53,7 @@
 	special CallBattleTowerFunc
 	.endm
 	
-	@ This acts like old tower_getopponentintro, but tower_getopponentintro was changed in the French and Italian versions.
+	@ This acts like old tower_getopponentintro, but tower_getopponentintro was changed in the French, Italian and Spanish versions.
 	.macro tower_getopponentintro2 opponent:req
 	setvar VAR_0x8004, BATTLE_TOWER_FUNC_GET_OPPONENT_INTRO2
 	setvar VAR_0x8005, \opponent
diff --git a/charmap.txt b/charmap.txt
index a96a98d85c..0ffec5a067 100644
--- a/charmap.txt
+++ b/charmap.txt
@@ -50,15 +50,15 @@ LV          = 34
 PK          = 53
 PKMN        = 53 54
 POKEBLOCK   = 55 56 57 58 59
-POKE 		= 55 56
+POKE        = 55 56
 'Í'         = 5A
 '%'         = 5B
 '('         = 5C
 ')'         = 5D
-POKEMELLA	= 5E 5F 60 61 62
-MELLA		= 60 61 62
-POKEMELLE	= 5E 5F 60 61 63
-Pco			= 64 @ Battle Points symbol, French
+POKEMELLA   = 5E 5F 60 61 62
+MELLA       = 60 61 62
+POKEMELLE   = 5E 5F 60 61 63
+Pco         = 64 @ Battle Points symbol, French only
 'â'         = 68
 'í'         = 6F
 UNK_SPACER  = 77