From 1cfeae9ffa11bb86a214721bb264f26ca8cb7d5a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 30 Jan 2020 16:46:37 -0500 Subject: Document Routes 10-14 scripts --- data/maps/Route10_PokemonCenter_1F/map.json | 10 +++--- data/maps/Route10_PokemonCenter_1F/scripts.inc | 42 ++++++++++++++------------ data/maps/Route10_PokemonCenter_1F/text.inc | 14 ++++----- 3 files changed, 34 insertions(+), 32 deletions(-) (limited to 'data/maps/Route10_PokemonCenter_1F') diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index dc1543ef0..d089e5544 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_1F_EventScript_16FC41", + "script": "Route10_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_1F_EventScript_16FC53", + "script": "Route10_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_1F_EventScript_16FC4A", + "script": "Route10_PokemonCenter_1F_EventScript_FatMan", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_1F_EventScript_16FC5C", + "script": "Route10_PokemonCenter_1F_EventScript_Youngster", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_PokemonCenter_1F_EventScript_16FC65", + "script": "Route10_PokemonCenter_1F_EventScript_Aide", "flag": "0" } ], diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 56e0b448e..a4d477a4b 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -1,3 +1,5 @@ +.equ REQUIRED_OWNED_MONS, 20 + Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -8,55 +10,55 @@ Route10_PokemonCenter_1F_OnTransition:: @ 816FC3A setrespawn SPAWN_ROUTE10 end -Route10_PokemonCenter_1F_EventScript_16FC41:: @ 816FC41 +Route10_PokemonCenter_1F_EventScript_Nurse:: @ 816FC41 lock faceplayer call EventScript_PkmnCenterNurse release end -Route10_PokemonCenter_1F_EventScript_16FC4A:: @ 816FC4A - msgbox gUnknown_819E59D, MSGBOX_NPC +Route10_PokemonCenter_1F_EventScript_FatMan:: @ 816FC4A + msgbox Route10_PokemonCenter_1F_Text_NuggetUselessSoldFor5000, MSGBOX_NPC end -Route10_PokemonCenter_1F_EventScript_16FC53:: @ 816FC53 - msgbox gUnknown_819E523, MSGBOX_NPC +Route10_PokemonCenter_1F_EventScript_Gentleman:: @ 816FC53 + msgbox Route10_PokemonCenter_1F_Text_EveryTypeStrongerThanOthers, MSGBOX_NPC end -Route10_PokemonCenter_1F_EventScript_16FC5C:: @ 816FC5C - msgbox gUnknown_819E5D2, MSGBOX_NPC +Route10_PokemonCenter_1F_EventScript_Youngster:: @ 816FC5C + msgbox Route10_PokemonCenter_1F_Text_HeardGhostsHauntLavender, MSGBOX_NPC end -Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 +Route10_PokemonCenter_1F_EventScript_Aide:: @ 816FC65 lock faceplayer - call EventScript_16FCF1 - goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, EventScript_16FCE7 - msgbox gUnknown_819E5FB, MSGBOX_YESNO + call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo + goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone + msgbox Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 - call EventScript_16FCF1 - compare VAR_0x8006, 20 + call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo + compare VAR_0x8006, REQUIRED_OWNED_MONS goto_if_lt Aide_EventScript_HaventCaughtEnough - msgbox gUnknown_819E733 + msgbox Route10_PokemonCenter_1F_Text_GreatHereYouGo checkitemspace ITEM_EVERSTONE, 1 compare VAR_RESULT, FALSE goto_if_eq Aide_EventScript_NoRoomForItem - giveitem_msg gUnknown_819E786, ITEM_EVERSTONE + giveitem_msg Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide, ITEM_EVERSTONE setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE - msgbox gUnknown_819E7AF + msgbox Route10_PokemonCenter_1F_Text_ExplainEverstone release end -EventScript_16FCE7:: @ 816FCE7 - msgbox gUnknown_819E7AF +Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone:: @ 816FCE7 + msgbox Route10_PokemonCenter_1F_Text_ExplainEverstone release end -EventScript_16FCF1:: @ 816FCF1 - getnumberstring 0, 20 +Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo:: @ 816FCF1 + getnumberstring 0, REQUIRED_OWNED_MONS getitemname 1, ITEM_EVERSTONE return diff --git a/data/maps/Route10_PokemonCenter_1F/text.inc b/data/maps/Route10_PokemonCenter_1F/text.inc index 3360854fe..7c63407ae 100644 --- a/data/maps/Route10_PokemonCenter_1F/text.inc +++ b/data/maps/Route10_PokemonCenter_1F/text.inc @@ -1,18 +1,18 @@ -gUnknown_819E523:: @ 819E523 +Route10_PokemonCenter_1F_Text_EveryTypeStrongerThanOthers:: @ 819E523 .string "The types of POKéMON match up\n" .string "differently with each other.\p" .string "Every type is stronger than some\n" .string "types and weaker than others.$" -gUnknown_819E59D:: @ 819E59D +Route10_PokemonCenter_1F_Text_NuggetUselessSoldFor5000:: @ 819E59D .string "A NUGGET is totally useless.\n" .string "So I sold it for ¥5000.$" -gUnknown_819E5D2:: @ 819E5D2 +Route10_PokemonCenter_1F_Text_HeardGhostsHauntLavender:: @ 819E5D2 .string "I heard that ghosts haunt\n" .string "LAVENDER TOWN.$" -gUnknown_819E5FB:: @ 819E5FB +Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons:: @ 819E5FB .string "Oh… {PLAYER}!\n" .string "I've been looking for you!\p" .string "It's me, one of the ever-present\n" @@ -26,17 +26,17 @@ gUnknown_819E5FB:: @ 819E5FB .string "Have you gathered data on at least\n" .string "twenty kinds of POKéMON?$" -gUnknown_819E733:: @ 819E733 +Route10_PokemonCenter_1F_Text_GreatHereYouGo:: @ 819E733 .string "Great! You have caught or owned\n" .string "{STR_VAR_3} kinds of POKéMON!\p" .string "Congratulations!\n" .string "Here you go!$" -gUnknown_819E786:: @ 819E786 +Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide:: @ 819E786 .string "{PLAYER} received the EVERSTONE\n" .string "from the AIDE.$" -gUnknown_819E7AF:: @ 819E7AF +Route10_PokemonCenter_1F_Text_ExplainEverstone:: @ 819E7AF .string "Making POKéMON evolve certainly\n" .string "can add to the POKéDEX.\p" .string "However, at times, you may not\n" -- cgit v1.2.3 From 4643330fdd2f458a4f714eb7ae1a586d2d24da37 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 14:08:29 -0500 Subject: Name allow_cycling, floor_number header properties --- data/maps/Route10_PokemonCenter_1F/map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route10_PokemonCenter_1F') diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index dc1543ef0..61430e9d4 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -7,7 +7,7 @@ "requires_flash": false, "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", - "unknown_18": 0, + "allow_cycling": false, "unknown_19": 0, "elevator_flag": 0, "battle_scene": "BATTLE_SCENE_0", -- cgit v1.2.3 From e94f9c148358f2e25e6ebbd58d39eb9ddd27f7c3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 14:52:42 -0500 Subject: Name allow_escaping, allow_running, show_map_name header properties --- data/maps/Route10_PokemonCenter_1F/map.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'data/maps/Route10_PokemonCenter_1F') diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index 61430e9d4..a9baaa56d 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -8,8 +8,10 @@ "weather": "WEATHER_NONE", "map_type": "MAP_TYPE_8", "allow_cycling": false, - "unknown_19": 0, - "elevator_flag": 0, + "allow_escaping": false, + "allow_running": false, + "show_map_name": false, + "floor_number": 0, "battle_scene": "BATTLE_SCENE_0", "connections": null, "object_events": [ -- cgit v1.2.3 From 729c224bf2421c30e64f2082f19907b5e66b8138 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 16:16:03 -0500 Subject: Name battle scene and map type constants --- data/maps/Route10_PokemonCenter_1F/map.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route10_PokemonCenter_1F') diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index a9baaa56d..3d4a72c7f 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -6,13 +6,13 @@ "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_8", + "map_type": "MAP_TYPE_INDOOR", "allow_cycling": false, "allow_escaping": false, "allow_running": false, "show_map_name": false, "floor_number": 0, - "battle_scene": "BATTLE_SCENE_0", + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", "connections": null, "object_events": [ { -- cgit v1.2.3 From 1fc8db43b7254f7445b335cec22c7406edb1902d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 23 Feb 2020 17:00:12 -0500 Subject: Sync object event gfx constants --- data/maps/Route10_PokemonCenter_1F/map.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/maps/Route10_PokemonCenter_1F') diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index 3003e5115..203ae9295 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJECT_EVENT_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 4, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 3, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 6, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST", "x": 12, "y": 5, "elevation": 3, -- cgit v1.2.3 From 7af1b35d17b7077b13e04c2717b48a55960fa8ce Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 3 Mar 2020 16:18:45 -0500 Subject: Sync some specials/drop unnecessary prefixes --- data/maps/Route10_PokemonCenter_1F/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/Route10_PokemonCenter_1F') diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index a4d477a4b..aa59cd95b 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -38,7 +38,7 @@ Route10_PokemonCenter_1F_EventScript_Aide:: @ 816FC65 compare VAR_RESULT, NO goto_if_eq Aide_EventScript_DeclineCheckMons setvar VAR_0x8004, 0 - specialvar VAR_RESULT, Special_GetPokedexCount + specialvar VAR_RESULT, GetPokedexCount getnumberstring 2, VAR_0x8006 call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo compare VAR_0x8006, REQUIRED_OWNED_MONS -- cgit v1.2.3