5 files changed, 43 insertions, 44 deletions
diff --git a/data/baseStats/ninetails.asm b/data/baseStats/ninetales.asm
index 212f6322..212f6322 100644
--- a/data/baseStats/ninetails.asm
+++ b/data/baseStats/ninetales.asm
diff --git a/data/base_stats.asm b/data/base_stats.asm
index 716d1118..23e85e0f 100755
--- a/data/base_stats.asm
+++ b/data/base_stats.asm
@@ -35,7 +35,7 @@ INCLUDE "data/baseStats/nidoking.asm"
 INCLUDE "data/baseStats/clefairy.asm"
 INCLUDE "data/baseStats/clefable.asm"
 INCLUDE "data/baseStats/vulpix.asm"
-INCLUDE "data/baseStats/ninetails.asm"
+INCLUDE "data/baseStats/ninetales.asm"
 INCLUDE "data/baseStats/jigglypuff.asm"
 INCLUDE "data/baseStats/wigglytuff.asm"
 INCLUDE "data/baseStats/zubat.asm"
diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm
index ccf32510..6738d597 100755
--- a/data/hidden_objects.asm
+++ b/data/hidden_objects.asm
@@ -299,7 +299,7 @@ SaffronPokecenterHiddenObjects:
 
 RedsHouse2FHiddenObjects:
 	hidden_object   1,   0, SPRITE_FACING_UP, OpenRedsPC
-	hidden_object   5,   3, $d0, PrintRedsNESText
+	hidden_object   5,   3, $d0, PrintRedSNESText
 	db $ff
 
 BluesHouseHiddenObjects:
diff --git a/data/mart_inventories.asm b/data/mart_inventories.asm
index 964f7179..b821f4d7 100755
--- a/data/mart_inventories.asm
+++ b/data/mart_inventories.asm
@@ -1,65 +1,64 @@
 ; mart inventories are below
 ; they are texts
-; first byte $FE, next byte # of items, last byte $FF
 
 ; Viridian
-ViridianMartText6:: ; 233b (0:233b)
-	TX_MART POKE_BALL, POTION, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL
+ViridianCashierText::
+	TX_MART POKE_BALL,POTION,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL
 
 ; Pewter
-PewterMartText1:: ; 2343 (0:2343)
-	TX_MART POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
+PewterCashierText::
+	TX_MART POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING,PARLYZ_HEAL
 
 ; Cerulean
-CeruleanMartText1:: ; 234d (0:234d)
-	TX_MART POKE_BALL, POTION, ESCAPE_ROPE, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
+CeruleanCashierText::
+	TX_MART POKE_BALL,POTION,ESCAPE_ROPE,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING,PARLYZ_HEAL
 
-; Bike shop ; 2358 (0:2358)
+; Bike shop
 	TX_MART BICYCLE
 
 ; Vermilion
-VermilionMartText1:: ; 235c (0:235c)
-	TX_MART POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL
+VermilionCashierText::
+	TX_MART POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL,REPEL
 
 ; Lavender
-LavenderMartText1:: ; 2365 (0:2365)
-	TX_MART GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL
+LavenderCashierText::
+	TX_MART GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL,ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL
 
 ; Celadon Dept. Store 2F (1)
-CeladonMart2Text1:: ; 2371 (0:2371)
-	TX_MART GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL
+CeladonMart2Clerk1Text::
+	TX_MART GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE,BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL
 
 ; Celadon Dept. Store 2F (2)
-CeladonMart2Text2:: ; 237d (0:237d)
-	TX_MART TM_32, TM_33, TM_02, TM_07, TM_37, TM_01, TM_05, TM_09, TM_17
+CeladonMart2Clerk2Text::
+	TX_MART TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17
 
 ; Celadon Dept. Store 4F
-CeladonMart4Text1:: ; 2389 (0:2389)
-	TX_MART POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE
+CeladonMart4ClerkText::
+	TX_MART POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE
 
 ; Celadon Dept. Store 5F (1)
-CeladonMart5Text3:: ; 2391 (0:2391)
-	TX_MART X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL
+CeladonMart5Clerk1Text::
+	TX_MART X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED,X_SPECIAL
 
 ; Celadon Dept. Store 5F (2)
-CeladonMart5Text4:: ; 239b (0:239b)
-	TX_MART HP_UP, PROTEIN, IRON, CARBOS, CALCIUM
+CeladonMart5Clerk2Text::
+	TX_MART HP_UP,PROTEIN,IRON,CARBOS,CALCIUM
 
 ; Fuchsia
-FuchsiaMartText1:: ; 23a3 (0:23a3)
-	TX_MART ULTRA_BALL, GREAT_BALL, HYPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL
+FuchsiaCashierText::
+	TX_MART ULTRA_BALL,GREAT_BALL,HYPER_POTION,REVIVE,FULL_HEAL,SUPER_REPEL
 
-; unused? 23ac (0:23ac)
-	TX_MART GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE
+; unused?
+	TX_MART GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE
 
 ; Cinnabar
-CinnabarMartText1:: ; 23b4 (0:23b4)
-	TX_MART ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
+CinnabarCashierText::
+	TX_MART ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL,REVIVE
 
 ; Saffron
-SaffronMartText1:: ; 23be (0:23be)
-	TX_MART GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
+SaffronCashierText::
+	TX_MART GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL,REVIVE
 
 ; Indigo
-IndigoPlateauLobbyText4:: ; 23c7 (0:23c7)
-	TX_MART ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL
+IndigoCashierText::
+	TX_MART ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL,REVIVE,MAX_REPEL
diff --git a/data/trades.asm b/data/trades.asm
index b1430089..77fc55f4 100755
--- a/data/trades.asm
+++ b/data/trades.asm
@@ -1,12 +1,12 @@
 TradeMons: ; 71c1d (1c:5c1d)
 ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total
-	db LICKITUNG, DUGTRIO,   0,"GURIO@@@@@@"
-	db CLEFAIRY,  MR_MIME,   0,"MILES@@@@@@"
-	db BUTTERFREE,BEEDRILL,  2,"STINGER@@@@"
-	db KANGASKHAN,MUK,       0,"STICKY@@@@@"
-	db MEW,       MEW,       2,"BART@@@@@@@"
-	db TANGELA,   PARASECT,  0,"SPIKE@@@@@@"
-	db PIDGEOT,   PIDGEOT,   1,"MARTY@@@@@@"
-	db GOLDUCK,   RHYDON,    1,"BUFFY@@@@@@"
-	db GROWLITHE, DEWGONG,   2,"CEZANNE@@@@"
-	db CUBONE,    MACHOKE,   2,"RICKY@@@@@@"
+	db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@"
+	db CLEFAIRY,  MR_MIME, 0,"MILES@@@@@@"
+	db BUTTERFREE,BEEDRILL,2,"STINGER@@@@"
+	db KANGASKHAN,MUK,     0,"STICKY@@@@@"
+	db MEW,       MEW,     2,"BART@@@@@@@"
+	db TANGELA,   PARASECT,0,"SPIKE@@@@@@"
+	db PIDGEOT,   PIDGEOT, 1,"MARTY@@@@@@"
+	db GOLDUCK,   RHYDON,  1,"BUFFY@@@@@@"
+	db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@"
+	db CUBONE,    MACHOKE, 2,"RICKY@@@@@@"