Add macros, constants, and labels for map scripts and text (#367)

This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.

constants/sprite_constants.asm

@@ -28,7 +28,7 @@
 	const SPRITE_ROCKET                  ; $18
 	const SPRITE_CHANNELER               ; $19
 	const SPRITE_WAITER                  ; $1a
-	const SPRITE_ERIKA                   ; $1b
+	const SPRITE_SILPH_WORKER_F          ; $1b
 	const SPRITE_MIDDLE_AGED_WOMAN       ; $1c
 	const SPRITE_BRUNETTE_GIRL           ; $1d
 	const SPRITE_LANCE                   ; $1e
@@ -45,7 +45,7 @@
 	const SPRITE_NURSE                   ; $29
 	const SPRITE_LINK_RECEPTIONIST       ; $2a
 	const SPRITE_SILPH_PRESIDENT         ; $2b
-	const SPRITE_SILPH_WORKER            ; $2c
+	const SPRITE_SILPH_WORKER_M          ; $2c
 	const SPRITE_WARDEN                  ; $2d
 	const SPRITE_CAPTAIN                 ; $2e
 	const SPRITE_FISHER                  ; $2f

data/items/marts.asm

@@ -1,50 +1,50 @@
 ; mart inventories are below
 ; they are texts
 
-ViridianCashierText::
+ViridianMartClerkText::
 	script_mart POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL
 
-PewterCashierText::
+PewterMartClerkText::
 	script_mart POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
 
-CeruleanCashierText::
+CeruleanMartClerkText::
 	script_mart POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
 
-BikeShopCashierText:: ; unreferenced
+UnusedBikeShopClerkText:: ; unreferenced
 	script_mart BICYCLE
 
-VermilionCashierText::
+VermilionMartClerkText::
 	script_mart POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL
 
-LavenderCashierText::
+LavenderMartClerkText::
 	script_mart GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL
 
-CeladonMart2Clerk1Text::
+CeladonMart2FClerk1Text::
 	script_mart GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL
 
-CeladonMart2Clerk2Text::
+CeladonMart2FClerk2Text::
 	script_mart TM_DOUBLE_TEAM, TM_REFLECT, TM_RAZOR_WIND, TM_HORN_DRILL, TM_EGG_BOMB, TM_MEGA_PUNCH, TM_MEGA_KICK, TM_TAKE_DOWN, TM_SUBMISSION
 
-CeladonMart4ClerkText::
+CeladonMart4FClerkText::
 	script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE
 
-CeladonMart5Clerk1Text::
+CeladonMart5FClerk1Text::
 	script_mart X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL
 
-CeladonMart5Clerk2Text::
+CeladonMart5FClerk2Text::
 	script_mart HP_UP, PROTEIN, IRON, CARBOS, CALCIUM
 
-FuchsiaCashierText::
+FuchsiaMartClerkText::
 	script_mart ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL
 
-UnusedCashierText:: ; unreferenced
+UnusedMartClerkText:: ; unreferenced
 	script_mart GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE
 
-CinnabarCashierText::
+CinnabarMartClerkText::
 	script_mart ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
 
-SaffronCashierText::
+SaffronMartClerkText::
 	script_mart GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
 
-IndigoCashierText::
+IndigoPlateauLobbyClerkText::
 	script_mart ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL

data/maps/objects/AgathasRoom.asm

@@ -1,3 +1,6 @@
+	object_const_def
+	const AGATHASROOM_AGATHA
+
 AgathasRoom_Object:
 	db $0 ; border block
 
@@ -10,6 +13,6 @@ AgathasRoom_Object:
 	def_bg_events
 
 	def_object_events
-	object_event  5,  2, SPRITE_AGATHA, STAY, DOWN, 1, OPP_AGATHA, 1
+	object_event  5,  2, SPRITE_AGATHA, STAY, DOWN, TEXT_AGATHASROOM_AGATHA, OPP_AGATHA, 1
 
 	def_warps_to AGATHAS_ROOM

data/maps/objects/BikeShop.asm

@@ -1,3 +1,8 @@
+	object_const_def
+	const BIKESHOP_CLERK
+	const BIKESHOP_MIDDLE_AGED_WOMAN
+	const BIKESHOP_YOUNGSTER
+
 BikeShop_Object:
 	db $e ; border block
 
@@ -8,8 +13,8 @@ BikeShop_Object:
 	def_bg_events
 
 	def_object_events
-	object_event  6,  2, SPRITE_BIKE_SHOP_CLERK, STAY, NONE, 1 ; person
-	object_event  5,  6, SPRITE_MIDDLE_AGED_WOMAN, WALK, UP_DOWN, 2 ; person
-	object_event  1,  3, SPRITE_YOUNGSTER, STAY, UP, 3 ; person
+	object_event  6,  2, SPRITE_BIKE_SHOP_CLERK, STAY, NONE, TEXT_BIKESHOP_CLERK
+	object_event  5,  6, SPRITE_MIDDLE_AGED_WOMAN, WALK, UP_DOWN, TEXT_BIKESHOP_MIDDLE_AGED_WOMAN
+	object_event  1,  3, SPRITE_YOUNGSTER, STAY, UP, TEXT_BIKESHOP_YOUNGSTER
 
 	def_warps_to BIKE_SHOP

data/maps/objects/BillsHouse.asm

@@ -1,3 +1,8 @@
+	object_const_def
+	const BILLSHOUSE_BILL_POKEMON
+	const BILLSHOUSE_BILL1
+	const BILLSHOUSE_BILL2
+
 BillsHouse_Object:
 	db $d ; border block
 
@@ -8,8 +13,8 @@ BillsHouse_Object:
 	def_bg_events
 
 	def_object_events
-	object_event  6,  5, SPRITE_MONSTER, STAY, NONE, 1 ; person
-	object_event  4,  4, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person
-	object_event  6,  5, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
+	object_event  6,  5, SPRITE_MONSTER, STAY, NONE, TEXT_BILLSHOUSE_BILL_POKEMON
+	object_event  4,  4, SPRITE_SUPER_NERD, STAY, NONE, TEXT_BILLSHOUSE_BILL_SS_TICKET
+	object_event  6,  5, SPRITE_SUPER_NERD, STAY, NONE, TEXT_BILLSHOUSE_BILL_CHECK_OUT_MY_RARE_POKEMON
 
 	def_warps_to BILLS_HOUSE

data/maps/objects/BluesHouse.asm

@@ -1,3 +1,8 @@
+	object_const_def
+	const BLUESHOUSE_DAISY1
+	const BLUESHOUSE_DAISY2
+	const BLUESHOUSE_TOWN_MAP
+
 BluesHouse_Object:
 	db $a ; border block
 
@@ -8,8 +13,8 @@ BluesHouse_Object:
 	def_bg_events
 
 	def_object_events
-	object_event  2,  3, SPRITE_DAISY, STAY, RIGHT, 1
-	object_event  6,  4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0
-	object_event  3,  3, SPRITE_POKEDEX, STAY, NONE, 3, 0
+	object_event  2,  3, SPRITE_DAISY, STAY, RIGHT, TEXT_BLUESHOUSE_DAISY_SITTING
+	object_event  6,  4, SPRITE_DAISY, WALK, UP_DOWN, TEXT_BLUESHOUSE_DAISY_WALKING, 0
+	object_event  3,  3, SPRITE_POKEDEX, STAY, NONE, TEXT_BLUESHOUSE_TOWN_MAP, 0
 
 	def_warps_to BLUES_HOUSE

data/maps/objects/BrunosRoom.asm

@@ -1,3 +1,6 @@
+	object_const_def
+	const BRUNOSROOM_BRUNO
+
 BrunosRoom_Object:
 	db $3 ; border block
 
@@ -10,6 +13,6 @@ BrunosRoom_Object:
 	def_bg_events
 
 	def_object_events
-	object_event  5,  2, SPRITE_BRUNO, STAY, DOWN, 1, OPP_BRUNO, 1
+	object_event  5,  2, SPRITE_BRUNO, STAY, DOWN, TEXT_BRUNOSROOM_BRUNO, OPP_BRUNO, 1
 
 	def_warps_to BRUNOS_ROOM

data/maps/objects/CeladonChiefHouse.asm

@@ -1,3 +1,8 @@
+	object_const_def
+	const CELADONCHIEFHOUSE_CHIEF
+	const CELADONCHIEFHOUSE_ROCKET
+	const CELADONCHIEFHOUSE_SAILOR
+
 CeladonChiefHouse_Object:
 	db $f ; border block
 
@@ -8,8 +13,8 @@ CeladonChiefHouse_Object:
 	def_bg_events
 
 	def_object_events
-	object_event  4,  2, SPRITE_GRAMPS, STAY, DOWN, 1 ; person
-	object_event  1,  4, SPRITE_ROCKET, WALK, ANY_DIR, 2 ; person
-	object_event  5,  6, SPRITE_SAILOR, STAY, LEFT, 3 ; person
+	object_event  4,  2, SPRITE_GRAMPS, STAY, DOWN, TEXT_CELADONCHIEFHOUSE_CHIEF
+	object_event  1,  4, SPRITE_ROCKET, WALK, ANY_DIR, TEXT_CELADONCHIEFHOUSE_ROCKET
+	object_event  5,  6, SPRITE_SAILOR, STAY, LEFT, TEXT_CELADONCHIEFHOUSE_SAILOR
 
 	def_warps_to CELADON_CHIEF_HOUSE

data/maps/objects/CeladonCity.asm

@@ -1,3 +1,14 @@
+	object_const_def
+	const CELADONCITY_LITTLE_GIRL
+	const CELADONCITY_GRAMPS1
+	const CELADONCITY_GIRL
+	const CELADONCITY_GRAMPS2
+	const CELADONCITY_GRAMPS3
+	const CELADONCITY_FISHER
+	const CELADONCITY_POLIWRATH
+	const CELADONCITY_ROCKET1
+	const CELADONCITY_ROCKET2
+
 CeladonCity_Object:
 	db $f ; border block
 
@@ -17,25 +28,25 @@ CeladonCity_Object:
 	warp_event 43, 27, CELADON_HOTEL, 1
 
 	def_bg_events
-	bg_event 27, 15, 10 ; CeladonCityText10
-	bg_event 19, 15, 11 ; CeladonCityText11
-	bg_event 42,  9, 12 ; PokeCenterSignText
-	bg_event 13, 29, 13 ; CeladonCityText13
-	bg_event 21,  9, 14 ; CeladonCityText14
-	bg_event 12, 13, 15 ; CeladonCityText15
-	bg_event 39, 21, 16 ; CeladonCityText16
-	bg_event 33, 21, 17 ; CeladonCityText17
-	bg_event 27, 21, 18 ; CeladonCityText18
+	bg_event 27, 15, TEXT_CELADONCITY_TRAINER_TIPS1
+	bg_event 19, 15, TEXT_CELADONCITY_SIGN
+	bg_event 42,  9, TEXT_CELADONCITY_POKECENTER_SIGN
+	bg_event 13, 29, TEXT_CELADONCITY_GYM_SIGN
+	bg_event 21,  9, TEXT_CELADONCITY_MANSION_SIGN
+	bg_event 12, 13, TEXT_CELADONCITY_DEPTSTORE_SIGN
+	bg_event 39, 21, TEXT_CELADONCITY_TRAINER_TIPS2
+	bg_event 33, 21, TEXT_CELADONCITY_PRIZEEXCHANGE_SIGN
+	bg_event 27, 21, TEXT_CELADONCITY_GAMECORNER_SIGN
 
 	def_object_events
-	object_event  8, 17, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person
-	object_event 11, 28, SPRITE_GRAMPS, STAY, UP, 2 ; person
-	object_event 14, 19, SPRITE_GIRL, WALK, UP_DOWN, 3 ; person
-	object_event 25, 22, SPRITE_GRAMPS, STAY, DOWN, 4 ; person
-	object_event 22, 16, SPRITE_GRAMPS, STAY, DOWN, 5 ; person
-	object_event 32, 12, SPRITE_FISHER, STAY, LEFT, 6 ; person
-	object_event 30, 12, SPRITE_MONSTER, STAY, RIGHT, 7 ; person
-	object_event 32, 29, SPRITE_ROCKET, WALK, LEFT_RIGHT, 8 ; person
-	object_event 42, 14, SPRITE_ROCKET, WALK, LEFT_RIGHT, 9 ; person
+	object_event  8, 17, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, TEXT_CELADONCITY_LITTLE_GIRL
+	object_event 11, 28, SPRITE_GRAMPS, STAY, UP, TEXT_CELADONCITY_GRAMPS1
+	object_event 14, 19, SPRITE_GIRL, WALK, UP_DOWN, TEXT_CELADONCITY_GIRL
+	object_event 25, 22, SPRITE_GRAMPS, STAY, DOWN, TEXT_CELADONCITY_GRAMPS2
+	object_event 22, 16, SPRITE_GRAMPS, STAY, DOWN, TEXT_CELADONCITY_GRAMPS3
+	object_event 32, 12, SPRITE_FISHER, STAY, LEFT, TEXT_CELADONCITY_FISHER
+	object_event 30, 12, SPRITE_MONSTER, STAY, RIGHT, TEXT_CELADONCITY_POLIWRATH
+	object_event 32, 29, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_CELADONCITY_ROCKET1
+	object_event 42, 14, SPRITE_ROCKET, WALK, LEFT_RIGHT, TEXT_CELADONCITY_ROCKET2
 
 	def_warps_to CELADON_CITY

data/maps/objects/CeladonDiner.asm

@@ -1,3 +1,10 @@
+	object_const_def
+	const CELADONDINER_COOK
+	const CELADONDINER_MIDDLE_AGED_WOMAN
+	const CELADONDINER_MIDDLE_AGED_MAN
+	const CELADONDINER_FISHER
+	const CELADONDINER_GYM_GUIDE
+
 CeladonDiner_Object:
 	db $f ; border block
 
@@ -8,10 +15,10 @@ CeladonDiner_Object:
 	def_bg_events
 
 	def_object_events
-	object_event  8,  5, SPRITE_COOK, WALK, LEFT_RIGHT, 1 ; person
-	object_event  7,  2, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person
-	object_event  1,  4, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 3 ; person
-	object_event  5,  3, SPRITE_FISHER, STAY, RIGHT, 4 ; person
-	object_event  0,  1, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person
+	object_event  8,  5, SPRITE_COOK, WALK, LEFT_RIGHT, TEXT_CELADONDINER_COOK
+	object_event  7,  2, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, TEXT_CELADONDINER_MIDDLE_AGED_WOMAN
+	object_event  1,  4, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, TEXT_CELADONDINER_MIDDLE_AGED_MAN
+	object_event  5,  3, SPRITE_FISHER, STAY, RIGHT, TEXT_CELADONDINER_FISHER
+	object_event  0,  1, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_CELADONDINER_GYM_GUIDE
 
 	def_warps_to CELADON_DINER

data/maps/objects/CeladonGym.asm

@@ -1,3 +1,13 @@
+	object_const_def
+	const CELADONGYM_ERIKA
+	const CELADONGYM_COOLTRAINER_F1
+	const CELADONGYM_BEAUTY1
+	const CELADONGYM_COOLTRAINER_F2
+	const CELADONGYM_BEAUTY2
+	const CELADONGYM_COOLTRAINER_F3
+	const CELADONGYM_BEAUTY3
+	const CELADONGYM_COOLTRAINER_F4
+
 CeladonGym_Object:
 	db $3 ; border block
 
@@ -8,13 +18,13 @@ CeladonGym_Object:
 	def_bg_events
 
 	def_object_events
-	object_event  4,  3, SPRITE_ERIKA, STAY, DOWN, 1, OPP_ERIKA, 1
-	object_event  2, 11, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 17
-	object_event  7, 10, SPRITE_BEAUTY, STAY, LEFT, 3, OPP_BEAUTY, 1
-	object_event  9,  5, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11
-	object_event  1,  5, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 2
-	object_event  6,  3, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 18
-	object_event  3,  3, SPRITE_BEAUTY, STAY, DOWN, 7, OPP_BEAUTY, 3
-	object_event  5,  3, SPRITE_COOLTRAINER_F, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1
+	object_event  4,  3, SPRITE_SILPH_WORKER_F, STAY, DOWN, TEXT_CELADONGYM_ERIKA, OPP_ERIKA, 1
+	object_event  2, 11, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_CELADONGYM_COOLTRAINER_F1, OPP_LASS, 17
+	object_event  7, 10, SPRITE_BEAUTY, STAY, LEFT, TEXT_CELADONGYM_BEAUTY1, OPP_BEAUTY, 1
+	object_event  9,  5, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_CELADONGYM_COOLTRAINER_F2, OPP_JR_TRAINER_F, 11
+	object_event  1,  5, SPRITE_BEAUTY, STAY, DOWN, TEXT_CELADONGYM_BEAUTY2, OPP_BEAUTY, 2
+	object_event  6,  3, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_CELADONGYM_COOLTRAINER_F3, OPP_LASS, 18
+	object_event  3,  3, SPRITE_BEAUTY, STAY, DOWN, TEXT_CELADONGYM_BEAUTY3, OPP_BEAUTY, 3
+	object_event  5,  3, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_CELADONGYM_COOLTRAINER_F4, OPP_COOLTRAINER_F, 1
 
 	def_warps_to CELADON_GYM

data/maps/objects/CeladonHotel.asm

@@ -1,3 +1,8 @@
+	object_const_def
+	const CELADONHOTEL_GRANNY
+	const CELADONHOTEL_BEAUTY
+	const CELADONHOTEL_SUPER_NERD
+
 CeladonHotel_Object:
 	db $0 ; border block
 
@@ -8,8 +13,8 @@ CeladonHotel_Object:
 	def_bg_events
 
 	def_object_events
-	object_event  3,  1, SPRITE_GRANNY, STAY, DOWN, 1 ; person
-	object_event  2,  4, SPRITE_BEAUTY, STAY, NONE, 2 ; person
-	object_event  8,  4, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person
+	object_event  3,  1, SPRITE_GRANNY, STAY, DOWN, TEXT_CELADONHOTEL_GRANNY
+	object_event  2,  4, SPRITE_BEAUTY, STAY, NONE, TEXT_CELADONHOTEL_BEAUTY
+	object_event  8,  4, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, TEXT_CELADONHOTEL_SUPER_NERD
 
 	def_warps_to CELADON_HOTEL

data/maps/objects/CeladonMansion1F.asm

@@ -1,3 +1,9 @@
+	object_const_def
+	const CELADONMANSION1F_MEOWTH
+	const CELADONMANSION1F_GRANNY
+	const CELADONMANSION1F_CLEFAIRY
+	const CELADONMANSION1F_NIDORANF
+
 CeladonMansion1F_Object:
 	db $f ; border block
 
@@ -9,12 +15,12 @@ CeladonMansion1F_Object:
 	warp_event  2,  1, CELADON_MANSION_2F, 3
 
 	def_bg_events
-	bg_event  4,  9, 5 ; CeladonMansion1Text5
+	bg_event  4,  9, TEXT_CELADONMANSION1F_MANAGERS_SUITE_SIGN
 
 	def_object_events
-	object_event  0,  5, SPRITE_MONSTER, STAY, RIGHT, 1 ; person
-	object_event  1,  5, SPRITE_GRANNY, STAY, DOWN, 2 ; person
-	object_event  1,  8, SPRITE_FAIRY, WALK, LEFT_RIGHT, 3 ; person
-	object_event  4,  4, SPRITE_MONSTER, WALK, UP_DOWN, 4 ; person
+	object_event  0,  5, SPRITE_MONSTER, STAY, RIGHT, TEXT_CELADONMANSION1F_MEOWTH
+	object_event  1,  5, SPRITE_GRANNY, STAY, DOWN, TEXT_CELADONMANSION1F_GRANNY
+	object_event  1,  8, SPRITE_FAIRY, WALK, LEFT_RIGHT, TEXT_CELADONMANSION1F_CLEFAIRY
+	object_event  4,  4, SPRITE_MONSTER, WALK, UP_DOWN, TEXT_CELADONMANSION1F_NIDORANF
 
 	def_warps_to CELADON_MANSION_1F

data/maps/objects/CeladonMansion2F.asm

@@ -8,7 +8,7 @@ CeladonMansion2F_Object:
 	warp_event  4,  1, CELADON_MANSION_3F, 4
 
 	def_bg_events
-	bg_event  4,  9, 1 ; CeladonMansion2Text1
+	bg_event  4,  9, TEXT_CELADONMANSION2F_MEETING_ROOM_SIGN
 
 	def_object_events