Merge branch 'master' into event_object_movement

3 files changed, 85 insertions, 81 deletions

diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json
index 29c7c514c..b3f5a6740 100644
--- a/data/maps/Route4_PokemonCenter_1F/map.json
+++ b/data/maps/Route4_PokemonCenter_1F/map.json
@@ -6,15 +6,17 @@
   "region_map_section": "MAPSEC_ROUTE_4",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
-  "unknown_18": 0,
-  "unknown_19": 0,
-  "elevator_flag": 0,
-  "battle_scene": "BATTLE_SCENE_0",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_cycling": false,
+  "allow_escaping": false,
+  "allow_running": false,
+  "show_map_name": false,
+  "floor_number": 0,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": null,
   "object_events": [
     {
-      "graphics_id": "OBJECT_EVENT_GFX_NURSE",
+      "graphics_id": "OBJ_EVENT_GFX_NURSE",
       "x": 7,
       "y": 2,
       "elevation": 0,
@@ -23,11 +25,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route4_PokemonCenter_1F_EventScript_16F8BB",
+      "script": "Route4_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN",
+      "graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
       "x": 1,
       "y": 3,
       "elevation": 3,
@@ -36,11 +38,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route4_PokemonCenter_1F_EventScript_16F75F",
+      "script": "Route4_PokemonCenter_1F_EventScript_MagikarpSalesman",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN",
+      "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
       "x": 12,
       "y": 5,
       "elevation": 3,
@@ -49,11 +51,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route4_PokemonCenter_1F_EventScript_16F754",
+      "script": "Route4_PokemonCenter_1F_EventScript_Gentleman",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_BOY",
+      "graphics_id": "OBJ_EVENT_GFX_BOY",
       "x": 5,
       "y": 4,
       "elevation": 3,
@@ -62,11 +64,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route4_PokemonCenter_1F_EventScript_16F74B",
+      "script": "Route4_PokemonCenter_1F_EventScript_Boy",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
       "x": 14,
       "y": 4,
       "elevation": 3,
@@ -75,11 +77,11 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route4_PokemonCenter_1F_EventScript_16F8C4",
+      "script": "Route4_PokemonCenter_1F_EventScript_Youngster",
       "flag": "0"
     },
     {
-      "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD",
+      "graphics_id": "OBJ_EVENT_GFX_CLIPBOARD",
       "x": 12,
       "y": 6,
       "elevation": 0,
@@ -88,7 +90,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route4_PokemonCenter_1F_EventScript_16F8CD",
+      "script": "Route4_PokemonCenter_1F_EventScript_Newspaper",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc
index ca2c5f611..420e18d1a 100644
--- a/data/maps/Route4_PokemonCenter_1F/scripts.inc
+++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc
@@ -1,3 +1,5 @@
+.equ MAGIKARP_PRICE, 500
+
 Route4_PokemonCenter_1F_MapScripts:: @ 816F739
 	map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
@@ -8,149 +10,149 @@ Route4_PokemonCenter_1F_OnTransition:: @ 816F744
 	setrespawn SPAWN_ROUTE4
 	end
 
-Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B
-	msgbox gUnknown_819D9D4, MSGBOX_NPC
+Route4_PokemonCenter_1F_EventScript_Boy:: @ 816F74B
+	msgbox Route4_PokemonCenter_1F_Text_CanHaveSixMonsWithYou, MSGBOX_NPC
 	end
 
-Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754
+Route4_PokemonCenter_1F_EventScript_Gentleman:: @ 816F754
 	lock
-	msgbox gUnknown_819DA3A
+	msgbox Route4_PokemonCenter_1F_Text_TeamRocketAttacksCerulean
 	release
 	end
 
-Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F
+Route4_PokemonCenter_1F_EventScript_MagikarpSalesman:: @ 816F75F
 	lock
 	faceplayer
-	goto_if_set FLAG_BOUGHT_MAGIKARP, EventScript_16F8A2
+	goto_if_set FLAG_BOUGHT_MAGIKARP, Route4_PokemonCenter_1F_EventScript_AlreadyBoughtMagikarp
 	showmoneybox 0, 0, 0
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq EventScript_16F786
+	goto_if_eq Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpMale
 	compare VAR_RESULT, FEMALE
-	goto_if_eq EventScript_16F794
+	goto_if_eq Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpFemale
 	end
 
-EventScript_16F786:: @ 816F786
-	msgbox gUnknown_819DA9A, MSGBOX_YESNO
-	goto EventScript_16F7A2
+Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpMale:: @ 816F786
+	msgbox Route4_PokemonCenter_1F_Text_LaddieBuyMagikarpForJust500, MSGBOX_YESNO
+	goto Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp
 	end
 
-EventScript_16F794:: @ 816F794
-	msgbox gUnknown_819DB34, MSGBOX_YESNO
-	goto EventScript_16F7A2
+Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpFemale:: @ 816F794
+	msgbox Route4_PokemonCenter_1F_Text_SweetieBuyMagikarpForJust500, MSGBOX_YESNO
+	goto Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp
 	end
 
-EventScript_16F7A2:: @ 816F7A2
+Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp:: @ 816F7A2
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16F888
-	checkmoney 500, 0
+	goto_if_eq Route4_PokemonCenter_1F_EventScript_DeclineMagikarp
+	checkmoney MAGIKARP_PRICE, 0
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16F895
+	goto_if_eq Route4_PokemonCenter_1F_EventScript_NotEnoughMoney
 	textcolor 3
-	setvar VAR_TEMP_1, 129
+	setvar VAR_TEMP_1, SPECIES_MAGIKARP
 	givemon SPECIES_MAGIKARP, 5, ITEM_NONE
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_16F7F6
+	goto_if_eq Route4_PokemonCenter_1F_EventScript_BuyMagikarpParty
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F822
+	goto_if_eq Route4_PokemonCenter_1F_EventScript_BuyMagikarpPC
 	compare VAR_RESULT, 2
-	goto_if_eq EventScript_16F8AC
+	goto_if_eq Route4_PokemonCenter_1F_EventScript_NoRoomForMagikarp
 	end
 
-EventScript_16F7F6:: @ 816F7F6
-	call EventScript_16F86F
+Route4_PokemonCenter_1F_EventScript_BuyMagikarpParty:: @ 816F7F6
+	call Route4_PokemonCenter_1F_EventScript_PayForMagikarp
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16F861
+	goto_if_eq Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp
 	call EventScript_GetGiftMonPartySlot
 	fadescreen FADE_TO_BLACK
 	hidemoneybox 0, 0
 	special ChangePokemonNickname
 	waitstate
-	goto EventScript_16F86A
+	goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp
 	end
 
-EventScript_16F822:: @ 816F822
-	call EventScript_16F86F
+Route4_PokemonCenter_1F_EventScript_BuyMagikarpPC:: @ 816F822
+	call Route4_PokemonCenter_1F_EventScript_PayForMagikarp
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16F84B
+	goto_if_eq Route4_PokemonCenter_1F_EventScript_TransferMagikarpCloseMoneyBox
 	fadescreen FADE_TO_BLACK
 	hidemoneybox 0, 0
 	special ChangeBoxPokemonNickname
 	waitstate
 	lock
 	faceplayer
-	goto EventScript_16F856
+	goto Route4_PokemonCenter_1F_EventScript_TransferMagikarp
 	end
 
-EventScript_16F84B:: @ 816F84B
+Route4_PokemonCenter_1F_EventScript_TransferMagikarpCloseMoneyBox:: @ 816F84B
 	call EventScript_TransferredToPC
-	goto EventScript_16F861
+	goto Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp
 	end
 
-EventScript_16F856:: @ 816F856
+Route4_PokemonCenter_1F_EventScript_TransferMagikarp:: @ 816F856
 	call EventScript_TransferredToPC
-	goto EventScript_16F86A
+	goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp
 	end
 
-EventScript_16F861:: @ 816F861
+Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp:: @ 816F861
 	hidemoneybox 0, 0
-	goto EventScript_16F86A
+	goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp
 	end
 
-EventScript_16F86A:: @ 816F86A
+Route4_PokemonCenter_1F_EventScript_BoughtMagikarp:: @ 816F86A
 	setflag FLAG_BOUGHT_MAGIKARP
 	release
 	end
 
-EventScript_16F86F:: @ 816F86F
-	removemoney 500, 0
+Route4_PokemonCenter_1F_EventScript_PayForMagikarp:: @ 816F86F
+	removemoney MAGIKARP_PRICE, 0
 	updatemoneybox 0, 0, 0
 	playfanfare MUS_FANFA1
-	message Text_19DBD3
+	message Route4_PokemonCenter_1F_Text_PaidOutrageouslyForMagikarp
 	waitmessage
 	waitfanfare
 	getspeciesname 0, SPECIES_MAGIKARP
 	return
 
-EventScript_16F888:: @ 816F888
-	msgbox gUnknown_819DC07
+Route4_PokemonCenter_1F_EventScript_DeclineMagikarp:: @ 816F888
+	msgbox Route4_PokemonCenter_1F_Text_OnlyDoingThisAsFavorToYou
 	hidemoneybox 0, 0
 	release
 	end
 
-EventScript_16F895:: @ 816F895
-	msgbox gUnknown_819DC78
+Route4_PokemonCenter_1F_EventScript_NotEnoughMoney:: @ 816F895
+	msgbox Route4_PokemonCenter_1F_Text_YoullNeedMoreMoney
 	hidemoneybox 0, 0
 	release
 	end
 
-EventScript_16F8A2:: @ 816F8A2
-	msgbox gUnknown_819DC9A
+Route4_PokemonCenter_1F_EventScript_AlreadyBoughtMagikarp:: @ 816F8A2
+	msgbox Route4_PokemonCenter_1F_Text_IDontGiveRefunds
 	release
 	end
 
-EventScript_16F8AC:: @ 816F8AC
+Route4_PokemonCenter_1F_EventScript_NoRoomForMagikarp:: @ 816F8AC
 	textcolor 0
-	msgbox gUnknown_819DC3E
+	msgbox Route4_PokemonCenter_1F_Text_NoRoomForMorePokemon
 	hidemoneybox 0, 0
 	release
 	end
 
-Route4_PokemonCenter_1F_EventScript_16F8BB:: @ 816F8BB
+Route4_PokemonCenter_1F_EventScript_Nurse:: @ 816F8BB
 	lock
 	faceplayer
 	call EventScript_PkmnCenterNurse
 	release
 	end
 
-Route4_PokemonCenter_1F_EventScript_16F8C4:: @ 816F8C4
-	msgbox gUnknown_819DCDB, MSGBOX_NPC
+Route4_PokemonCenter_1F_EventScript_Youngster:: @ 816F8C4
+	msgbox Route4_PokemonCenter_1F_Text_ShouldStoreMonsUsingPC, MSGBOX_NPC
 	end
 
-Route4_PokemonCenter_1F_EventScript_16F8CD:: @ 816F8CD
+Route4_PokemonCenter_1F_EventScript_Newspaper:: @ 816F8CD
 	lock
-	msgbox gUnknown_819DD54
+	msgbox Route4_PokemonCenter_1F_Text_ItsANewspaper
 	release
 	end
diff --git a/data/maps/Route4_PokemonCenter_1F/text.inc b/data/maps/Route4_PokemonCenter_1F/text.inc
index f357b7f76..df65ae33a 100644
--- a/data/maps/Route4_PokemonCenter_1F/text.inc
+++ b/data/maps/Route4_PokemonCenter_1F/text.inc
@@ -1,54 +1,54 @@
-gUnknown_819D9D4:: @ 819D9D4
+Route4_PokemonCenter_1F_Text_CanHaveSixMonsWithYou:: @ 819D9D4
     .string "Okay, set six POKé BALLS in my\n"
     .string "belt…\p"
     .string "Yeah, that'll do it. At most, you\n"
     .string "can have six POKéMON with you.$"
 
-gUnknown_819DA3A:: @ 819DA3A
+Route4_PokemonCenter_1F_Text_TeamRocketAttacksCerulean:: @ 819DA3A
     .string "TEAM ROCKET attacks CERULEAN\n"
     .string "citizens…\p"
     .string "Not a day goes by without TEAM\n"
     .string "ROCKET being in the news.$"
 
-gUnknown_819DA9A:: @ 819DA9A
+Route4_PokemonCenter_1F_Text_LaddieBuyMagikarpForJust500:: @ 819DA9A
     .string "MAN: Hello there, laddie!\n"
     .string "Have I got a deal just for you!\p"
     .string "I'll let you have a secret POKéMON\n"
     .string "- a MAGIKARP - for just ¥500!\p"
     .string "So, you'll buy it, am I right?$"
 
-gUnknown_819DB34:: @ 819DB34
+Route4_PokemonCenter_1F_Text_SweetieBuyMagikarpForJust500:: @ 819DB34
     .string "MAN: Hello there, sweetie pie!\n"
     .string "Have I got a deal just for you!\p"
     .string "I'll let you have a secret POKéMON\n"
     .string "- a MAGIKARP - for just ¥500!\p"
     .string "So, you'll buy it, am I right?$"
 
-Text_19DBD3:: @ 819DBD3
+Route4_PokemonCenter_1F_Text_PaidOutrageouslyForMagikarp:: @ 819DBD3
     .string "{PLAYER} paid an outrageous ¥500\n"
     .string "and bought the MAGIKARP…$"
 
-gUnknown_819DC07:: @ 819DC07
+Route4_PokemonCenter_1F_Text_OnlyDoingThisAsFavorToYou:: @ 819DC07
     .string "No? You say no? I'm only doing this\n"
     .string "as a favor to you!$"
 
-gUnknown_819DC3E:: @ 819DC3E
+Route4_PokemonCenter_1F_Text_NoRoomForMorePokemon:: @ 819DC3E
     .string "There's no more room for any more\n"
     .string "POKéMON, it looks like.$"
 
-gUnknown_819DC78:: @ 819DC78
+Route4_PokemonCenter_1F_Text_YoullNeedMoreMoney:: @ 819DC78
     .string "You'll need more money than that!$"
 
-gUnknown_819DC9A:: @ 819DC9A
+Route4_PokemonCenter_1F_Text_IDontGiveRefunds:: @ 819DC9A
     .string "MAN: Well, I don't give refunds.\n"
     .string "You knew what you were getting!$"
 
-gUnknown_819DCDB:: @ 819DCDB
+Route4_PokemonCenter_1F_Text_ShouldStoreMonsUsingPC:: @ 819DCDB
     .string "Sometimes, you'll have too many\n"
     .string "POKéMON with you to add any more.\p"
     .string "In that case, you should just\n"
     .string "store some using any PC.$"
 
-gUnknown_819DD54:: @ 819DD54
+Route4_PokemonCenter_1F_Text_ItsANewspaper:: @ 819DD54
     .string "It's a newspaper.$"