diff --git a/data/event_scripts.s b/data/event_scripts.s index 8d00495a7..004f61131 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -343,9 +343,9 @@ gStdScriptsEnd:: .include "data/maps/PalletTown_PlayersHouse_2F/scripts.inc" .include "data/maps/PalletTown_RivalsHouse/scripts.inc" .include "data/maps/PalletTown_ProfessorOaksLab/scripts.inc" - .include "data/maps/ViridianCity_House1/scripts.inc" + .include "data/maps/ViridianCity_House/scripts.inc" .include "data/maps/ViridianCity_Gym/scripts.inc" - .include "data/maps/ViridianCity_House2/scripts.inc" + .include "data/maps/ViridianCity_School/scripts.inc" .include "data/maps/ViridianCity_Mart/scripts.inc" .include "data/maps/ViridianCity_PokemonCenter_1F/scripts.inc" .include "data/maps/ViridianCity_PokemonCenter_2F/scripts.inc" @@ -669,9 +669,9 @@ gStdScriptsEnd:: .include "data/maps/PalletTown_PlayersHouse_2F/text.inc" .include "data/maps/PalletTown_RivalsHouse/text.inc" .include "data/maps/PalletTown_ProfessorOaksLab/text.inc" - .include "data/maps/ViridianCity_House1/text.inc" + .include "data/maps/ViridianCity_House/text.inc" .include "data/maps/ViridianCity_Gym/text.inc" - .include "data/maps/ViridianCity_House2/text.inc" + .include "data/maps/ViridianCity_School/text.inc" .include "data/maps/ViridianCity_Mart/text.inc" .include "data/maps/ViridianCity_PokemonCenter_1F/text.inc" .include "data/maps/PewterCity_Museum_1F/text.inc" diff --git a/data/layouts/ViridianCity_House1/border.bin b/data/layouts/ViridianCity_House/border.bin similarity index 100% rename from data/layouts/ViridianCity_House1/border.bin rename to data/layouts/ViridianCity_House/border.bin diff --git a/data/layouts/ViridianCity_House1/map.bin b/data/layouts/ViridianCity_House/map.bin similarity index 100% rename from data/layouts/ViridianCity_House1/map.bin rename to data/layouts/ViridianCity_House/map.bin diff --git a/data/layouts/ViridianCity_House2/border.bin b/data/layouts/ViridianCity_School/border.bin similarity index 100% rename from data/layouts/ViridianCity_House2/border.bin rename to data/layouts/ViridianCity_School/border.bin diff --git a/data/layouts/ViridianCity_House2/map.bin b/data/layouts/ViridianCity_School/map.bin similarity index 100% rename from data/layouts/ViridianCity_House2/map.bin rename to data/layouts/ViridianCity_School/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index b44d6ed86..41d0eb1b5 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -2984,16 +2984,16 @@ "blockdata_filepath": "data/layouts/SevenIsland_House_Room2/map.bin" }, { - "id": "LAYOUT_VIRIDIAN_CITY_HOUSE2", - "name": "ViridianCity_House2_Layout", + "id": "LAYOUT_VIRIDIAN_CITY_SCHOOL", + "name": "ViridianCity_School_Layout", "width": 10, "height": 9, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_School", - "border_filepath": "data/layouts/ViridianCity_House2/border.bin", - "blockdata_filepath": "data/layouts/ViridianCity_House2/map.bin" + "border_filepath": "data/layouts/ViridianCity_School/border.bin", + "blockdata_filepath": "data/layouts/ViridianCity_School/map.bin" }, { "id": "LAYOUT_CELADON_CITY_RESTAURANT_DUPLICATE", @@ -3104,16 +3104,16 @@ "blockdata_filepath": "data/layouts/Route5_PokemonDayCare/map.bin" }, { - "id": "LAYOUT_VIRIDIAN_CITY_HOUSE1", - "name": "ViridianCity_House1_Layout", + "id": "LAYOUT_VIRIDIAN_CITY_HOUSE", + "name": "ViridianCity_House_Layout", "width": 11, "height": 9, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_GenericBuilding2", - "border_filepath": "data/layouts/ViridianCity_House1/border.bin", - "blockdata_filepath": "data/layouts/ViridianCity_House1/map.bin" + "border_filepath": "data/layouts/ViridianCity_House/border.bin", + "blockdata_filepath": "data/layouts/ViridianCity_House/map.bin" }, { "id": "LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE", diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index ea6a6794a..1254d1b83 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -161,7 +161,7 @@ "x": 25, "y": 11, "elevation": 3, - "dest_map": "MAP_VIRIDIAN_CITY_HOUSE1", + "dest_map": "MAP_VIRIDIAN_CITY_HOUSE", "dest_warp_id": 1 }, { @@ -175,7 +175,7 @@ "x": 25, "y": 18, "elevation": 0, - "dest_map": "MAP_VIRIDIAN_CITY_HOUSE2", + "dest_map": "MAP_VIRIDIAN_CITY_SCHOOL", "dest_warp_id": 1 }, { diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House/map.json similarity index 84% rename from data/maps/ViridianCity_House1/map.json rename to data/maps/ViridianCity_House/map.json index eb5780daa..72273ebd7 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_VIRIDIAN_CITY_HOUSE1", - "name": "ViridianCity_House1", - "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE1", + "id": "MAP_VIRIDIAN_CITY_HOUSE", + "name": "ViridianCity_House", + "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE", "music": "MUS_PEWTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "ViridianCity_House1_EventScript_BaldingMan", + "script": "ViridianCity_House_EventScript_BaldingMan", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 2, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "ViridianCity_House1_EventScript_LittleGirl", + "script": "ViridianCity_House_EventScript_LittleGirl", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "ViridianCity_House1_EventScript_Speary", + "script": "ViridianCity_House_EventScript_Speary", "flag": "0" } ], @@ -86,7 +86,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ViridianCity_House1_EventScript_NicknameSign" + "script": "ViridianCity_House_EventScript_NicknameSign" } ] } diff --git a/data/maps/ViridianCity_House/scripts.inc b/data/maps/ViridianCity_House/scripts.inc new file mode 100644 index 000000000..177304c4d --- /dev/null +++ b/data/maps/ViridianCity_House/scripts.inc @@ -0,0 +1,24 @@ +ViridianCity_House_MapScripts:: + .byte 0 + +ViridianCity_House_EventScript_BaldingMan:: + msgbox ViridianCity_House_Text_NicknamingIsFun, MSGBOX_NPC + end + +ViridianCity_House_EventScript_LittleGirl:: + msgbox ViridianCity_House_Text_MyDaddyLovesMonsToo, MSGBOX_NPC + end + +ViridianCity_House_EventScript_Speary:: + lock + faceplayer + waitse + playmoncry SPECIES_SPEAROW, CRY_MODE_NORMAL + msgbox ViridianCity_House_Text_Speary + waitmoncry + release + end + +ViridianCity_House_EventScript_NicknameSign:: + msgbox ViridianCity_House_Text_SpearowNameSpeary, MSGBOX_SIGN + end diff --git a/data/maps/ViridianCity_House1/text.inc b/data/maps/ViridianCity_House/text.inc similarity index 65% rename from data/maps/ViridianCity_House1/text.inc rename to data/maps/ViridianCity_House/text.inc index 83d3cec1a..db09f4621 100644 --- a/data/maps/ViridianCity_House1/text.inc +++ b/data/maps/ViridianCity_House/text.inc @@ -1,16 +1,16 @@ -ViridianCity_House1_Text_NicknamingIsFun:: +ViridianCity_House_Text_NicknamingIsFun:: .string "Coming up with nicknames is fun,\n" .string "but it's not so easy to do.\p" .string "Clever names are nice, but simple\n" .string "names are easier to remember.$" -ViridianCity_House1_Text_MyDaddyLovesMonsToo:: +ViridianCity_House_Text_MyDaddyLovesMonsToo:: .string "My daddy loves POKéMON, too.$" -ViridianCity_House1_Text_Speary:: +ViridianCity_House_Text_Speary:: .string "SPEARY: Tetweet!$" -ViridianCity_House1_Text_SpearowNameSpeary:: +ViridianCity_House_Text_SpearowNameSpeary:: .string "SPEAROW\n" .string "Name: SPEARY$" diff --git a/data/maps/ViridianCity_House1/scripts.inc b/data/maps/ViridianCity_House1/scripts.inc deleted file mode 100644 index 0ef2732aa..000000000 --- a/data/maps/ViridianCity_House1/scripts.inc +++ /dev/null @@ -1,24 +0,0 @@ -ViridianCity_House1_MapScripts:: - .byte 0 - -ViridianCity_House1_EventScript_BaldingMan:: - msgbox ViridianCity_House1_Text_NicknamingIsFun, MSGBOX_NPC - end - -ViridianCity_House1_EventScript_LittleGirl:: - msgbox ViridianCity_House1_Text_MyDaddyLovesMonsToo, MSGBOX_NPC - end - -ViridianCity_House1_EventScript_Speary:: - lock - faceplayer - waitse - playmoncry SPECIES_SPEAROW, CRY_MODE_NORMAL - msgbox ViridianCity_House1_Text_Speary - waitmoncry - release - end - -ViridianCity_House1_EventScript_NicknameSign:: - msgbox ViridianCity_House1_Text_SpearowNameSpeary, MSGBOX_SIGN - end diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc deleted file mode 100644 index 4b0a7d420..000000000 --- a/data/maps/ViridianCity_House2/scripts.inc +++ /dev/null @@ -1,100 +0,0 @@ -.set LOCALID_WOMAN, 1 -.set LOCALID_LASS, 2 - -ViridianCity_House2_MapScripts:: - .byte 0 - -ViridianCity_House2_EventScript_Lass:: - lock - faceplayer - msgbox ViridianCity_House2_Text_TryingToMemorizeNotes - closemessage - applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp - waitmovement 0 - release - end - -ViridianCity_House2_EventScript_Woman:: - lock - faceplayer - msgbox ViridianCity_House2_Text_ReadBlackboardCarefully - closemessage - applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection - waitmovement 0 - release - end - -ViridianCity_House2_EventScript_Notebook:: - lockall - msgbox ViridianCity_House2_Text_NotebookFirstPage - msgbox ViridianCity_House2_Text_TurnThePage, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq ViridianCity_House2_EventScript_StopReadingNotebook - msgbox ViridianCity_House2_Text_NotebookSecondPage - msgbox ViridianCity_House2_Text_TurnThePage, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq ViridianCity_House2_EventScript_StopReadingNotebook - msgbox ViridianCity_House2_Text_NotebookThirdPage - msgbox ViridianCity_House2_Text_TurnThePage, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq ViridianCity_House2_EventScript_StopReadingNotebook - msgbox ViridianCity_House2_Text_NotebookFourthPage - applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp - waitmovement 0 - textcolor 1 - msgbox ViridianCity_House2_Text_HeyDontLookAtMyNotes - releaseall - end - -ViridianCity_House2_EventScript_StopReadingNotebook:: - releaseall - end - -ViridianCity_House2_EventScript_Blackboard:: - lockall - msgbox ViridianCity_House2_Text_BlackboardListsStatusProblems - goto ViridianCity_House2_EventScript_ChooseBlackboardTopic - end - -ViridianCity_House2_EventScript_ChooseBlackboardTopic:: - message ViridianCity_House2_Text_ReadWhichTopic - waitmessage - multichoicegrid 7, 1, MULTICHOICE_TRAINER_SCHOOL_WHITEBOARD, 3, FALSE - switch VAR_RESULT - case 0, ViridianCity_House2_EventScript_ReadSleep - case 1, ViridianCity_House2_EventScript_ReadPoison - case 2, ViridianCity_House2_EventScript_ReadParalysis - case 3, ViridianCity_House2_EventScript_ReadBurn - case 4, ViridianCity_House2_EventScript_ReadFreeze - case 5, ViridianCity_House2_EventScript_ExitBlackboard - case 127, ViridianCity_House2_EventScript_ExitBlackboard - end - -ViridianCity_House2_EventScript_ReadSleep:: - msgbox ViridianCity_House2_Text_ExplainSleep - goto ViridianCity_House2_EventScript_ChooseBlackboardTopic - end - -ViridianCity_House2_EventScript_ReadBurn:: - msgbox ViridianCity_House2_Text_ExplainBurn - goto ViridianCity_House2_EventScript_ChooseBlackboardTopic - end - -ViridianCity_House2_EventScript_ReadPoison:: - msgbox ViridianCity_House2_Text_ExplainPoison - goto ViridianCity_House2_EventScript_ChooseBlackboardTopic - end - -ViridianCity_House2_EventScript_ReadFreeze:: - msgbox ViridianCity_House2_Text_ExplainFreeze - goto ViridianCity_House2_EventScript_ChooseBlackboardTopic - end - -ViridianCity_House2_EventScript_ReadParalysis:: - msgbox ViridianCity_House2_Text_ExplainParalysis - goto ViridianCity_House2_EventScript_ChooseBlackboardTopic - end - -ViridianCity_House2_EventScript_ExitBlackboard:: - releaseall - end diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_School/map.json similarity index 80% rename from data/maps/ViridianCity_House2/map.json rename to data/maps/ViridianCity_School/map.json index 3b2b1cbbf..7dd444ac5 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_School/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_VIRIDIAN_CITY_HOUSE2", - "name": "ViridianCity_House2", - "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE2", + "id": "MAP_VIRIDIAN_CITY_SCHOOL", + "name": "ViridianCity_School", + "layout": "LAYOUT_VIRIDIAN_CITY_SCHOOL", "music": "MUS_PEWTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "ViridianCity_House2_EventScript_Woman", + "script": "ViridianCity_School_EventScript_Woman", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "ViridianCity_House2_EventScript_Lass", + "script": "ViridianCity_School_EventScript_Lass", "flag": "0" } ], @@ -73,7 +73,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ViridianCity_House2_EventScript_Notebook" + "script": "ViridianCity_School_EventScript_Notebook" }, { "type": "sign", @@ -81,7 +81,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ViridianCity_House2_EventScript_Blackboard" + "script": "ViridianCity_School_EventScript_Blackboard" }, { "type": "sign", @@ -89,7 +89,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ViridianCity_House2_EventScript_Blackboard" + "script": "ViridianCity_School_EventScript_Blackboard" }, { "type": "sign", @@ -97,7 +97,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "ViridianCity_House2_EventScript_PokemonJournal" + "script": "ViridianCity_School_EventScript_PokemonJournal" }, { "type": "sign", @@ -105,7 +105,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "ViridianCity_House2_EventScript_PokemonJournal" + "script": "ViridianCity_School_EventScript_PokemonJournal" } ] } diff --git a/data/maps/ViridianCity_School/scripts.inc b/data/maps/ViridianCity_School/scripts.inc new file mode 100644 index 000000000..9b4cbcbf2 --- /dev/null +++ b/data/maps/ViridianCity_School/scripts.inc @@ -0,0 +1,100 @@ +.set LOCALID_WOMAN, 1 +.set LOCALID_LASS, 2 + +ViridianCity_School_MapScripts:: + .byte 0 + +ViridianCity_School_EventScript_Lass:: + lock + faceplayer + msgbox ViridianCity_School_Text_TryingToMemorizeNotes + closemessage + applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp + waitmovement 0 + release + end + +ViridianCity_School_EventScript_Woman:: + lock + faceplayer + msgbox ViridianCity_School_Text_ReadBlackboardCarefully + closemessage + applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection + waitmovement 0 + release + end + +ViridianCity_School_EventScript_Notebook:: + lockall + msgbox ViridianCity_School_Text_NotebookFirstPage + msgbox ViridianCity_School_Text_TurnThePage, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq ViridianCity_School_EventScript_StopReadingNotebook + msgbox ViridianCity_School_Text_NotebookSecondPage + msgbox ViridianCity_School_Text_TurnThePage, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq ViridianCity_School_EventScript_StopReadingNotebook + msgbox ViridianCity_School_Text_NotebookThirdPage + msgbox ViridianCity_School_Text_TurnThePage, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq ViridianCity_School_EventScript_StopReadingNotebook + msgbox ViridianCity_School_Text_NotebookFourthPage + applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp + waitmovement 0 + textcolor 1 + msgbox ViridianCity_School_Text_HeyDontLookAtMyNotes + releaseall + end + +ViridianCity_School_EventScript_StopReadingNotebook:: + releaseall + end + +ViridianCity_School_EventScript_Blackboard:: + lockall + msgbox ViridianCity_School_Text_BlackboardListsStatusProblems + goto ViridianCity_School_EventScript_ChooseBlackboardTopic + end + +ViridianCity_School_EventScript_ChooseBlackboardTopic:: + message ViridianCity_School_Text_ReadWhichTopic + waitmessage + multichoicegrid 7, 1, MULTICHOICE_TRAINER_SCHOOL_WHITEBOARD, 3, FALSE + switch VAR_RESULT + case 0, ViridianCity_School_EventScript_ReadSleep + case 1, ViridianCity_School_EventScript_ReadPoison + case 2, ViridianCity_School_EventScript_ReadParalysis + case 3, ViridianCity_School_EventScript_ReadBurn + case 4, ViridianCity_School_EventScript_ReadFreeze + case 5, ViridianCity_School_EventScript_ExitBlackboard + case 127, ViridianCity_School_EventScript_ExitBlackboard + end + +ViridianCity_School_EventScript_ReadSleep:: + msgbox ViridianCity_School_Text_ExplainSleep + goto ViridianCity_School_EventScript_ChooseBlackboardTopic + end + +ViridianCity_School_EventScript_ReadBurn:: + msgbox ViridianCity_School_Text_ExplainBurn + goto ViridianCity_School_EventScript_ChooseBlackboardTopic + end + +ViridianCity_School_EventScript_ReadPoison:: + msgbox ViridianCity_School_Text_ExplainPoison + goto ViridianCity_School_EventScript_ChooseBlackboardTopic + end + +ViridianCity_School_EventScript_ReadFreeze:: + msgbox ViridianCity_School_Text_ExplainFreeze + goto ViridianCity_School_EventScript_ChooseBlackboardTopic + end + +ViridianCity_School_EventScript_ReadParalysis:: + msgbox ViridianCity_School_Text_ExplainParalysis + goto ViridianCity_School_EventScript_ChooseBlackboardTopic + end + +ViridianCity_School_EventScript_ExitBlackboard:: + releaseall + end diff --git a/data/maps/ViridianCity_House2/text.inc b/data/maps/ViridianCity_School/text.inc similarity index 79% rename from data/maps/ViridianCity_House2/text.inc rename to data/maps/ViridianCity_School/text.inc index 0d3cc3ab9..65437fa33 100644 --- a/data/maps/ViridianCity_House2/text.inc +++ b/data/maps/ViridianCity_School/text.inc @@ -1,13 +1,13 @@ -ViridianCity_House2_Text_TryingToMemorizeNotes:: +ViridianCity_School_Text_TryingToMemorizeNotes:: .string "Whew! I'm trying to memorize all my\n" .string "notes.$" -ViridianCity_House2_Text_ReadBlackboardCarefully:: +ViridianCity_School_Text_ReadBlackboardCarefully:: .string "Okay!\p" .string "Be sure to read what's on the\n" .string "blackboard carefully!$" -ViridianCity_House2_Text_NotebookFirstPage:: +ViridianCity_School_Text_NotebookFirstPage:: .string "Let's check out the notebook.\p" .string "First page…\p" .string "POKé BALLS are used to catch\n" @@ -17,14 +17,14 @@ ViridianCity_House2_Text_NotebookFirstPage:: .string "People who raise and battle\n" .string "with POKéMON are called TRAINERS.$" -ViridianCity_House2_Text_NotebookSecondPage:: +ViridianCity_School_Text_NotebookSecondPage:: .string "Second page…\p" .string "A healthy POKéMON may be hard to\n" .string "catch, so weaken it first.\p" .string "Poison, burn, or cause another\n" .string "status problem to weaken it.$" -ViridianCity_House2_Text_NotebookThirdPage:: +ViridianCity_School_Text_NotebookThirdPage:: .string "Third page…\p" .string "POKéMON TRAINERS seek others to\n" .string "engage in POKéMON battles.\p" @@ -33,7 +33,7 @@ ViridianCity_House2_Text_NotebookThirdPage:: .string "Battles are constantly waged at\n" .string "POKéMON GYMS everywhere.$" -ViridianCity_House2_Text_NotebookFourthPage:: +ViridianCity_School_Text_NotebookFourthPage:: .string "Fourth page…\p" .string "The ultimate goal for all POKéMON\n" .string "TRAINERS is simple.\p" @@ -43,21 +43,21 @@ ViridianCity_House2_Text_NotebookFourthPage:: .string "The ELITE FOUR of the POKéMON\n" .string "LEAGUE!$" -ViridianCity_House2_Text_TurnThePage:: +ViridianCity_School_Text_TurnThePage:: .string "Turn the page?$" -ViridianCity_House2_Text_HeyDontLookAtMyNotes:: +ViridianCity_School_Text_HeyDontLookAtMyNotes:: .string "GIRL: Hey!\n" .string "Don't look at my notes!$" -ViridianCity_House2_Text_BlackboardListsStatusProblems:: +ViridianCity_School_Text_BlackboardListsStatusProblems:: .string "The blackboard lists POKéMON\n" .string "STATUS problems during battles.$" -ViridianCity_House2_Text_ReadWhichTopic:: +ViridianCity_School_Text_ReadWhichTopic:: .string "Which topic do you want to read?$" -ViridianCity_House2_Text_ExplainSleep:: +ViridianCity_School_Text_ExplainSleep:: .string "A POKéMON can't attack if it's\n" .string "asleep.\p" .string "POKéMON will stay asleep even\n" @@ -65,19 +65,19 @@ ViridianCity_House2_Text_ExplainSleep:: .string "Use AWAKENING to awaken one\n" .string "from sleep.$" -ViridianCity_House2_Text_ExplainBurn:: +ViridianCity_School_Text_ExplainBurn:: .string "A burn reduces ATTACK power.\n" .string "It also causes ongoing HP loss.\p" .string "A burn remains after a battle.\n" .string "Use BURN HEAL to cure a burn.$" -ViridianCity_House2_Text_ExplainPoison:: +ViridianCity_School_Text_ExplainPoison:: .string "When poisoned, a POKéMON's health\n" .string "steadily drops.\p" .string "Poison lingers after battles.\n" .string "Use an ANTIDOTE to cure poison!$" -ViridianCity_House2_Text_ExplainFreeze:: +ViridianCity_School_Text_ExplainFreeze:: .string "A frozen POKéMON becomes\n" .string "helplessly immobile.\p" .string "It stays frozen even after the\n" @@ -85,7 +85,7 @@ ViridianCity_House2_Text_ExplainFreeze:: .string "Use ICE HEAL to thaw out the\n" .string "suffering POKéMON.$" -ViridianCity_House2_Text_ExplainParalysis:: +ViridianCity_School_Text_ExplainParalysis:: .string "Paralysis reduces SPEED and may\n" .string "prevent the POKéMON from moving.\p" .string "Paralysis remains after battles.\n" diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index ad423a9db..8c382f504 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -313,9 +313,9 @@ "PalletTown_ProfessorOaksLab" ], "gMapGroup_IndoorViridian": [ - "ViridianCity_House1", + "ViridianCity_House", "ViridianCity_Gym", - "ViridianCity_House2", + "ViridianCity_School", "ViridianCity_Mart", "ViridianCity_PokemonCenter_1F", "ViridianCity_PokemonCenter_2F" diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index b2e12c4c2..4950fd73d 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -1,4 +1,4 @@ -ViridianCity_House2_EventScript_PokemonJournal:: +ViridianCity_School_EventScript_PokemonJournal:: lock faceplayer famechecker FAMECHECKER_OAK, 3 diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 5218ee717..e2bfad149 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -252,7 +252,7 @@ #define LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB 263 #define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN 264 #define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2 265 -#define LAYOUT_VIRIDIAN_CITY_HOUSE2 266 +#define LAYOUT_VIRIDIAN_CITY_SCHOOL 266 #define LAYOUT_CELADON_CITY_RESTAURANT_DUPLICATE 267 #define LAYOUT_CELADON_CITY_HOTEL_DUPLICATE 268 #define LAYOUT_MT_EMBER_RUBY_PATH_B4F 269 @@ -262,7 +262,7 @@ #define LAYOUT_VERMILION_CITY_POKEMON_FAN_CLUB 273 #define LAYOUT_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE 274 #define LAYOUT_ROUTE5_POKEMON_DAY_CARE 275 -#define LAYOUT_VIRIDIAN_CITY_HOUSE1 276 +#define LAYOUT_VIRIDIAN_CITY_HOUSE 276 #define LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE 277 #define LAYOUT_SEAFOAM_ISLANDS_B3F_CURRENT_STOPPED 278 #define LAYOUT_SEAFOAM_ISLANDS_B4F_CURRENT_STOPPED 279 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index b22eca15c..b6f38b365 100644 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -274,9 +274,9 @@ #define MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB (3 | (4 << 8)) // gMapGroup_IndoorViridian -#define MAP_VIRIDIAN_CITY_HOUSE1 (0 | (5 << 8)) +#define MAP_VIRIDIAN_CITY_HOUSE (0 | (5 << 8)) #define MAP_VIRIDIAN_CITY_GYM (1 | (5 << 8)) -#define MAP_VIRIDIAN_CITY_HOUSE2 (2 | (5 << 8)) +#define MAP_VIRIDIAN_CITY_SCHOOL (2 | (5 << 8)) #define MAP_VIRIDIAN_CITY_MART (3 | (5 << 8)) #define MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F (4 | (5 << 8)) #define MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F (5 | (5 << 8))