From ad2c55570ba9478d2a44128c72076f36ea65bda2 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Sat, 6 Aug 2022 16:59:07 +0000 Subject: [PATCH] Merge pull request #529 from GriffinRichards/rename-viridian --- pokefirered.sym | 108 ++++++++++++++++++++--------------------- pokefirered_rev1.sym | 108 ++++++++++++++++++++--------------------- pokeleafgreen.sym | 108 ++++++++++++++++++++--------------------- pokeleafgreen_rev1.sym | 108 ++++++++++++++++++++--------------------- 4 files changed, 216 insertions(+), 216 deletions(-) diff --git a/pokefirered.sym b/pokefirered.sym index 3a787f538..1ceacd8d4 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -15219,11 +15219,11 @@ 08169e71 g 00000000 PalletTown_ProfessorOaksLab_EventScript_LeftSign 08169e7a g 00000000 PalletTown_ProfessorOaksLab_EventScript_RightSign 08169e90 g 00000000 PalletTown_ProfessorOaksLab_EventScript_RightSignAlt -08169e9a g 00000000 ViridianCity_House1_MapScripts -08169e9b g 00000000 ViridianCity_House1_EventScript_BaldingMan -08169ea4 g 00000000 ViridianCity_House1_EventScript_LittleGirl -08169ead g 00000000 ViridianCity_House1_EventScript_Speary -08169ec0 g 00000000 ViridianCity_House1_EventScript_NicknameSign +08169e9a g 00000000 ViridianCity_House_MapScripts +08169e9b g 00000000 ViridianCity_House_EventScript_BaldingMan +08169ea4 g 00000000 ViridianCity_House_EventScript_LittleGirl +08169ead g 00000000 ViridianCity_House_EventScript_Speary +08169ec0 g 00000000 ViridianCity_House_EventScript_NicknameSign 08169ec9 g 00000000 ViridianCity_Gym_MapScripts 08169eca g 00000000 ViridianCity_Gym_EventScript_Giovanni 08169f04 g 00000000 ViridianCity_Gym_EventScript_DefeatedGiovanni @@ -15241,19 +15241,19 @@ 0816a047 g 00000000 ViridianCity_Gym_EventScript_GymGuyPostVictory 0816a05e g 00000000 ViridianCity_Gym_EventScript_GymStatue 0816a072 g 00000000 ViridianCity_Gym_EventScript_GymStatuePostVictory -0816a07c g 00000000 ViridianCity_House2_MapScripts -0816a07d g 00000000 ViridianCity_House2_EventScript_Lass -0816a094 g 00000000 ViridianCity_House2_EventScript_Woman -0816a0ab g 00000000 ViridianCity_House2_EventScript_Notebook -0816a11b g 00000000 ViridianCity_House2_EventScript_StopReadingNotebook -0816a11d g 00000000 ViridianCity_House2_EventScript_Blackboard -0816a12c g 00000000 ViridianCity_House2_EventScript_ChooseBlackboardTopic -0816a18b g 00000000 ViridianCity_House2_EventScript_ReadSleep -0816a199 g 00000000 ViridianCity_House2_EventScript_ReadBurn -0816a1a7 g 00000000 ViridianCity_House2_EventScript_ReadPoison -0816a1b5 g 00000000 ViridianCity_House2_EventScript_ReadFreeze -0816a1c3 g 00000000 ViridianCity_House2_EventScript_ReadParalysis -0816a1d1 g 00000000 ViridianCity_House2_EventScript_ExitBlackboard +0816a07c g 00000000 ViridianCity_School_MapScripts +0816a07d g 00000000 ViridianCity_School_EventScript_Lass +0816a094 g 00000000 ViridianCity_School_EventScript_Woman +0816a0ab g 00000000 ViridianCity_School_EventScript_Notebook +0816a11b g 00000000 ViridianCity_School_EventScript_StopReadingNotebook +0816a11d g 00000000 ViridianCity_School_EventScript_Blackboard +0816a12c g 00000000 ViridianCity_School_EventScript_ChooseBlackboardTopic +0816a18b g 00000000 ViridianCity_School_EventScript_ReadSleep +0816a199 g 00000000 ViridianCity_School_EventScript_ReadBurn +0816a1a7 g 00000000 ViridianCity_School_EventScript_ReadPoison +0816a1b5 g 00000000 ViridianCity_School_EventScript_ReadFreeze +0816a1c3 g 00000000 ViridianCity_School_EventScript_ReadParalysis +0816a1d1 g 00000000 ViridianCity_School_EventScript_ExitBlackboard 0816a1d3 g 00000000 ViridianCity_Mart_MapScripts 0816a1de g 00000000 ViridianCity_Mart_OnLoad 0816a1e8 g 00000000 ViridianCity_Mart_EventScript_HideQuestionnaire @@ -18902,10 +18902,10 @@ 0818f0e8 g 00000000 PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded 0818f103 g 00000000 PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex 0818f1db g 00000000 PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex -0818f292 g 00000000 ViridianCity_House1_Text_NicknamingIsFun -0818f30f g 00000000 ViridianCity_House1_Text_MyDaddyLovesMonsToo -0818f32c g 00000000 ViridianCity_House1_Text_Speary -0818f33d g 00000000 ViridianCity_House1_Text_SpearowNameSpeary +0818f292 g 00000000 ViridianCity_House_Text_NicknamingIsFun +0818f30f g 00000000 ViridianCity_House_Text_MyDaddyLovesMonsToo +0818f32c g 00000000 ViridianCity_House_Text_Speary +0818f33d g 00000000 ViridianCity_House_Text_SpearowNameSpeary 0818f352 g 00000000 ViridianCity_Gym_Text_GiovanniIntro 0818f43f g 00000000 ViridianCity_Gym_Text_GiovanniDefeat 0818f4a2 g 00000000 ViridianCity_Gym_Text_GiovanniPostBattle @@ -18941,21 +18941,21 @@ 0818fb56 g 00000000 ViridianCity_Gym_Text_GymGuyPostVictory 0818fb8d g 00000000 ViridianCity_Gym_Text_GymStatue 0818fbc1 g 00000000 ViridianCity_Gym_Text_GymStatuePlayerWon -0818fc00 g 00000000 ViridianCity_House2_Text_TryingToMemorizeNotes -0818fc2b g 00000000 ViridianCity_House2_Text_ReadBlackboardCarefully -0818fc65 g 00000000 ViridianCity_House2_Text_NotebookFirstPage -0818fd23 g 00000000 ViridianCity_House2_Text_NotebookSecondPage -0818fda8 g 00000000 ViridianCity_House2_Text_NotebookThirdPage -0818fe5c g 00000000 ViridianCity_House2_Text_NotebookFourthPage -0818ff19 g 00000000 ViridianCity_House2_Text_TurnThePage -0818ff28 g 00000000 ViridianCity_House2_Text_HeyDontLookAtMyNotes -0818ff4b g 00000000 ViridianCity_House2_Text_BlackboardListsStatusProblems -0818ff88 g 00000000 ViridianCity_House2_Text_ReadWhichTopic -0818ffa9 g 00000000 ViridianCity_House2_Text_ExplainSleep -08190025 g 00000000 ViridianCity_House2_Text_ExplainBurn -0819009f g 00000000 ViridianCity_House2_Text_ExplainPoison -0819010f g 00000000 ViridianCity_House2_Text_ExplainFreeze -08190199 g 00000000 ViridianCity_House2_Text_ExplainParalysis +0818fc00 g 00000000 ViridianCity_School_Text_TryingToMemorizeNotes +0818fc2b g 00000000 ViridianCity_School_Text_ReadBlackboardCarefully +0818fc65 g 00000000 ViridianCity_School_Text_NotebookFirstPage +0818fd23 g 00000000 ViridianCity_School_Text_NotebookSecondPage +0818fda8 g 00000000 ViridianCity_School_Text_NotebookThirdPage +0818fe5c g 00000000 ViridianCity_School_Text_NotebookFourthPage +0818ff19 g 00000000 ViridianCity_School_Text_TurnThePage +0818ff28 g 00000000 ViridianCity_School_Text_HeyDontLookAtMyNotes +0818ff4b g 00000000 ViridianCity_School_Text_BlackboardListsStatusProblems +0818ff88 g 00000000 ViridianCity_School_Text_ReadWhichTopic +0818ffa9 g 00000000 ViridianCity_School_Text_ExplainSleep +08190025 g 00000000 ViridianCity_School_Text_ExplainBurn +0819009f g 00000000 ViridianCity_School_Text_ExplainPoison +0819010f g 00000000 ViridianCity_School_Text_ExplainFreeze +08190199 g 00000000 ViridianCity_School_Text_ExplainParalysis 0819021a g 00000000 ViridianCity_Mart_Text_YouCameFromPallet 0819023a g 00000000 ViridianCity_Mart_Text_TakeThisToProfOak 08190289 g 00000000 ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk @@ -21000,7 +21000,7 @@ 081acd07 g 00000000 SevenIsland_TanobyRuins_EventScript_Clifford 081acd2e g 00000000 SevenIsland_TanobyRuins_EventScript_CliffordRematch 081acd45 g 00000000 Text_TestMsg -081acd65 g 00000000 ViridianCity_House2_EventScript_PokemonJournal +081acd65 g 00000000 ViridianCity_School_EventScript_PokemonJournal 081acd8d g 00000000 EventScript_PokemonJournalUnused1 081acdb5 g 00000000 EventScript_PokemonJournalUnused2 081acdd0 g 00000000 FourIsland_PokemonCenter_1F_EventScript_PokemonJournal @@ -28711,9 +28711,9 @@ 08338b68 g 00000000 SevenIsland_House_Room2_Layout_Border 08338b70 g 00000000 SevenIsland_House_Room2_Layout_Blockdata 08338c48 g 00000000 SevenIsland_House_Room2_Layout -08338c64 g 00000000 ViridianCity_House2_Layout_Border -08338c6c g 00000000 ViridianCity_House2_Layout_Blockdata -08338d20 g 00000000 ViridianCity_House2_Layout +08338c64 g 00000000 ViridianCity_School_Layout_Border +08338c6c g 00000000 ViridianCity_School_Layout_Blockdata +08338d20 g 00000000 ViridianCity_School_Layout 08338d3c g 00000000 CeladonCity_Restaurant_Duplicate_Layout_Border 08338d44 g 00000000 CeladonCity_Restaurant_Duplicate_Layout_Blockdata 08338e90 g 00000000 CeladonCity_Restaurant_Duplicate_Layout @@ -28741,9 +28741,9 @@ 0833ace0 g 00000000 Route5_PokemonDayCare_Layout_Border 0833ace8 g 00000000 Route5_PokemonDayCare_Layout_Blockdata 0833adc0 g 00000000 Route5_PokemonDayCare_Layout -0833addc g 00000000 ViridianCity_House1_Layout_Border -0833ade4 g 00000000 ViridianCity_House1_Layout_Blockdata -0833aeac g 00000000 ViridianCity_House1_Layout +0833addc g 00000000 ViridianCity_House_Layout_Border +0833ade4 g 00000000 ViridianCity_House_Layout_Blockdata +0833aeac g 00000000 ViridianCity_House_Layout 0833aec8 g 00000000 FourIsland_PokemonDayCare_Layout_Border 0833aed0 g 00000000 FourIsland_PokemonDayCare_Layout_Blockdata 0833afa8 g 00000000 FourIsland_PokemonDayCare_Layout @@ -29324,9 +29324,9 @@ 08350d6c g 00000000 PalletTown_PlayersHouse_2F 08350d88 g 00000000 PalletTown_RivalsHouse 08350da4 g 00000000 PalletTown_ProfessorOaksLab -08350dc0 g 00000000 ViridianCity_House1 +08350dc0 g 00000000 ViridianCity_House 08350ddc g 00000000 ViridianCity_Gym -08350df8 g 00000000 ViridianCity_House2 +08350df8 g 00000000 ViridianCity_School 08350e14 g 00000000 ViridianCity_Mart 08350e30 g 00000000 ViridianCity_PokemonCenter_1F 08350e4c g 00000000 ViridianCity_PokemonCenter_2F @@ -32126,18 +32126,18 @@ 083b9928 g 00000000 PalletTown_ProfessorOaksLab_MapCoordEvents 083b9988 g 00000000 PalletTown_ProfessorOaksLab_MapBGEvents 083b99b8 g 00000000 PalletTown_ProfessorOaksLab_MapEvents -083b99cc g 00000000 ViridianCity_House1_ObjectEvents -083b9a14 g 00000000 ViridianCity_House1_MapWarps -083b9a2c g 00000000 ViridianCity_House1_MapBGEvents -083b9a38 g 00000000 ViridianCity_House1_MapEvents +083b99cc g 00000000 ViridianCity_House_ObjectEvents +083b9a14 g 00000000 ViridianCity_House_MapWarps +083b9a2c g 00000000 ViridianCity_House_MapBGEvents +083b9a38 g 00000000 ViridianCity_House_MapEvents 083b9a4c g 00000000 ViridianCity_Gym_ObjectEvents 083b9b3c g 00000000 ViridianCity_Gym_MapWarps 083b9b54 g 00000000 ViridianCity_Gym_MapBGEvents 083b9b78 g 00000000 ViridianCity_Gym_MapEvents -083b9b8c g 00000000 ViridianCity_House2_ObjectEvents -083b9bbc g 00000000 ViridianCity_House2_MapWarps -083b9bd4 g 00000000 ViridianCity_House2_MapBGEvents -083b9c10 g 00000000 ViridianCity_House2_MapEvents +083b9b8c g 00000000 ViridianCity_School_ObjectEvents +083b9bbc g 00000000 ViridianCity_School_MapWarps +083b9bd4 g 00000000 ViridianCity_School_MapBGEvents +083b9c10 g 00000000 ViridianCity_School_MapEvents 083b9c24 g 00000000 ViridianCity_Mart_ObjectEvents 083b9c6c g 00000000 ViridianCity_Mart_MapWarps 083b9c84 g 00000000 ViridianCity_Mart_MapEvents diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index e6a76a6f4..bf13794a3 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -15220,11 +15220,11 @@ 08169ee9 g 00000000 PalletTown_ProfessorOaksLab_EventScript_LeftSign 08169ef2 g 00000000 PalletTown_ProfessorOaksLab_EventScript_RightSign 08169f08 g 00000000 PalletTown_ProfessorOaksLab_EventScript_RightSignAlt -08169f12 g 00000000 ViridianCity_House1_MapScripts -08169f13 g 00000000 ViridianCity_House1_EventScript_BaldingMan -08169f1c g 00000000 ViridianCity_House1_EventScript_LittleGirl -08169f25 g 00000000 ViridianCity_House1_EventScript_Speary -08169f38 g 00000000 ViridianCity_House1_EventScript_NicknameSign +08169f12 g 00000000 ViridianCity_House_MapScripts +08169f13 g 00000000 ViridianCity_House_EventScript_BaldingMan +08169f1c g 00000000 ViridianCity_House_EventScript_LittleGirl +08169f25 g 00000000 ViridianCity_House_EventScript_Speary +08169f38 g 00000000 ViridianCity_House_EventScript_NicknameSign 08169f41 g 00000000 ViridianCity_Gym_MapScripts 08169f42 g 00000000 ViridianCity_Gym_EventScript_Giovanni 08169f7c g 00000000 ViridianCity_Gym_EventScript_DefeatedGiovanni @@ -15242,19 +15242,19 @@ 0816a0bf g 00000000 ViridianCity_Gym_EventScript_GymGuyPostVictory 0816a0d6 g 00000000 ViridianCity_Gym_EventScript_GymStatue 0816a0ea g 00000000 ViridianCity_Gym_EventScript_GymStatuePostVictory -0816a0f4 g 00000000 ViridianCity_House2_MapScripts -0816a0f5 g 00000000 ViridianCity_House2_EventScript_Lass -0816a10c g 00000000 ViridianCity_House2_EventScript_Woman -0816a123 g 00000000 ViridianCity_House2_EventScript_Notebook -0816a193 g 00000000 ViridianCity_House2_EventScript_StopReadingNotebook -0816a195 g 00000000 ViridianCity_House2_EventScript_Blackboard -0816a1a4 g 00000000 ViridianCity_House2_EventScript_ChooseBlackboardTopic -0816a203 g 00000000 ViridianCity_House2_EventScript_ReadSleep -0816a211 g 00000000 ViridianCity_House2_EventScript_ReadBurn -0816a21f g 00000000 ViridianCity_House2_EventScript_ReadPoison -0816a22d g 00000000 ViridianCity_House2_EventScript_ReadFreeze -0816a23b g 00000000 ViridianCity_House2_EventScript_ReadParalysis -0816a249 g 00000000 ViridianCity_House2_EventScript_ExitBlackboard +0816a0f4 g 00000000 ViridianCity_School_MapScripts +0816a0f5 g 00000000 ViridianCity_School_EventScript_Lass +0816a10c g 00000000 ViridianCity_School_EventScript_Woman +0816a123 g 00000000 ViridianCity_School_EventScript_Notebook +0816a193 g 00000000 ViridianCity_School_EventScript_StopReadingNotebook +0816a195 g 00000000 ViridianCity_School_EventScript_Blackboard +0816a1a4 g 00000000 ViridianCity_School_EventScript_ChooseBlackboardTopic +0816a203 g 00000000 ViridianCity_School_EventScript_ReadSleep +0816a211 g 00000000 ViridianCity_School_EventScript_ReadBurn +0816a21f g 00000000 ViridianCity_School_EventScript_ReadPoison +0816a22d g 00000000 ViridianCity_School_EventScript_ReadFreeze +0816a23b g 00000000 ViridianCity_School_EventScript_ReadParalysis +0816a249 g 00000000 ViridianCity_School_EventScript_ExitBlackboard 0816a24b g 00000000 ViridianCity_Mart_MapScripts 0816a256 g 00000000 ViridianCity_Mart_OnLoad 0816a260 g 00000000 ViridianCity_Mart_EventScript_HideQuestionnaire @@ -18903,10 +18903,10 @@ 0818f160 g 00000000 PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded 0818f17b g 00000000 PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex 0818f253 g 00000000 PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex -0818f30a g 00000000 ViridianCity_House1_Text_NicknamingIsFun -0818f387 g 00000000 ViridianCity_House1_Text_MyDaddyLovesMonsToo -0818f3a4 g 00000000 ViridianCity_House1_Text_Speary -0818f3b5 g 00000000 ViridianCity_House1_Text_SpearowNameSpeary +0818f30a g 00000000 ViridianCity_House_Text_NicknamingIsFun +0818f387 g 00000000 ViridianCity_House_Text_MyDaddyLovesMonsToo +0818f3a4 g 00000000 ViridianCity_House_Text_Speary +0818f3b5 g 00000000 ViridianCity_House_Text_SpearowNameSpeary 0818f3ca g 00000000 ViridianCity_Gym_Text_GiovanniIntro 0818f4b7 g 00000000 ViridianCity_Gym_Text_GiovanniDefeat 0818f51a g 00000000 ViridianCity_Gym_Text_GiovanniPostBattle @@ -18942,21 +18942,21 @@ 0818fbce g 00000000 ViridianCity_Gym_Text_GymGuyPostVictory 0818fc05 g 00000000 ViridianCity_Gym_Text_GymStatue 0818fc39 g 00000000 ViridianCity_Gym_Text_GymStatuePlayerWon -0818fc78 g 00000000 ViridianCity_House2_Text_TryingToMemorizeNotes -0818fca3 g 00000000 ViridianCity_House2_Text_ReadBlackboardCarefully -0818fcdd g 00000000 ViridianCity_House2_Text_NotebookFirstPage -0818fd9b g 00000000 ViridianCity_House2_Text_NotebookSecondPage -0818fe20 g 00000000 ViridianCity_House2_Text_NotebookThirdPage -0818fed4 g 00000000 ViridianCity_House2_Text_NotebookFourthPage -0818ff91 g 00000000 ViridianCity_House2_Text_TurnThePage -0818ffa0 g 00000000 ViridianCity_House2_Text_HeyDontLookAtMyNotes -0818ffc3 g 00000000 ViridianCity_House2_Text_BlackboardListsStatusProblems -08190000 g 00000000 ViridianCity_House2_Text_ReadWhichTopic -08190021 g 00000000 ViridianCity_House2_Text_ExplainSleep -0819009d g 00000000 ViridianCity_House2_Text_ExplainBurn -08190117 g 00000000 ViridianCity_House2_Text_ExplainPoison -08190187 g 00000000 ViridianCity_House2_Text_ExplainFreeze -08190211 g 00000000 ViridianCity_House2_Text_ExplainParalysis +0818fc78 g 00000000 ViridianCity_School_Text_TryingToMemorizeNotes +0818fca3 g 00000000 ViridianCity_School_Text_ReadBlackboardCarefully +0818fcdd g 00000000 ViridianCity_School_Text_NotebookFirstPage +0818fd9b g 00000000 ViridianCity_School_Text_NotebookSecondPage +0818fe20 g 00000000 ViridianCity_School_Text_NotebookThirdPage +0818fed4 g 00000000 ViridianCity_School_Text_NotebookFourthPage +0818ff91 g 00000000 ViridianCity_School_Text_TurnThePage +0818ffa0 g 00000000 ViridianCity_School_Text_HeyDontLookAtMyNotes +0818ffc3 g 00000000 ViridianCity_School_Text_BlackboardListsStatusProblems +08190000 g 00000000 ViridianCity_School_Text_ReadWhichTopic +08190021 g 00000000 ViridianCity_School_Text_ExplainSleep +0819009d g 00000000 ViridianCity_School_Text_ExplainBurn +08190117 g 00000000 ViridianCity_School_Text_ExplainPoison +08190187 g 00000000 ViridianCity_School_Text_ExplainFreeze +08190211 g 00000000 ViridianCity_School_Text_ExplainParalysis 08190292 g 00000000 ViridianCity_Mart_Text_YouCameFromPallet 081902b2 g 00000000 ViridianCity_Mart_Text_TakeThisToProfOak 08190301 g 00000000 ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk @@ -21001,7 +21001,7 @@ 081acd7f g 00000000 SevenIsland_TanobyRuins_EventScript_Clifford 081acda6 g 00000000 SevenIsland_TanobyRuins_EventScript_CliffordRematch 081acdbd g 00000000 Text_TestMsg -081acddd g 00000000 ViridianCity_House2_EventScript_PokemonJournal +081acddd g 00000000 ViridianCity_School_EventScript_PokemonJournal 081ace05 g 00000000 EventScript_PokemonJournalUnused1 081ace2d g 00000000 EventScript_PokemonJournalUnused2 081ace48 g 00000000 FourIsland_PokemonCenter_1F_EventScript_PokemonJournal @@ -28712,9 +28712,9 @@ 08338bd8 g 00000000 SevenIsland_House_Room2_Layout_Border 08338be0 g 00000000 SevenIsland_House_Room2_Layout_Blockdata 08338cb8 g 00000000 SevenIsland_House_Room2_Layout -08338cd4 g 00000000 ViridianCity_House2_Layout_Border -08338cdc g 00000000 ViridianCity_House2_Layout_Blockdata -08338d90 g 00000000 ViridianCity_House2_Layout +08338cd4 g 00000000 ViridianCity_School_Layout_Border +08338cdc g 00000000 ViridianCity_School_Layout_Blockdata +08338d90 g 00000000 ViridianCity_School_Layout 08338dac g 00000000 CeladonCity_Restaurant_Duplicate_Layout_Border 08338db4 g 00000000 CeladonCity_Restaurant_Duplicate_Layout_Blockdata 08338f00 g 00000000 CeladonCity_Restaurant_Duplicate_Layout @@ -28742,9 +28742,9 @@ 0833ad50 g 00000000 Route5_PokemonDayCare_Layout_Border 0833ad58 g 00000000 Route5_PokemonDayCare_Layout_Blockdata 0833ae30 g 00000000 Route5_PokemonDayCare_Layout -0833ae4c g 00000000 ViridianCity_House1_Layout_Border -0833ae54 g 00000000 ViridianCity_House1_Layout_Blockdata -0833af1c g 00000000 ViridianCity_House1_Layout +0833ae4c g 00000000 ViridianCity_House_Layout_Border +0833ae54 g 00000000 ViridianCity_House_Layout_Blockdata +0833af1c g 00000000 ViridianCity_House_Layout 0833af38 g 00000000 FourIsland_PokemonDayCare_Layout_Border 0833af40 g 00000000 FourIsland_PokemonDayCare_Layout_Blockdata 0833b018 g 00000000 FourIsland_PokemonDayCare_Layout @@ -29325,9 +29325,9 @@ 08350ddc g 00000000 PalletTown_PlayersHouse_2F 08350df8 g 00000000 PalletTown_RivalsHouse 08350e14 g 00000000 PalletTown_ProfessorOaksLab -08350e30 g 00000000 ViridianCity_House1 +08350e30 g 00000000 ViridianCity_House 08350e4c g 00000000 ViridianCity_Gym -08350e68 g 00000000 ViridianCity_House2 +08350e68 g 00000000 ViridianCity_School 08350e84 g 00000000 ViridianCity_Mart 08350ea0 g 00000000 ViridianCity_PokemonCenter_1F 08350ebc g 00000000 ViridianCity_PokemonCenter_2F @@ -32127,18 +32127,18 @@ 083b9998 g 00000000 PalletTown_ProfessorOaksLab_MapCoordEvents 083b99f8 g 00000000 PalletTown_ProfessorOaksLab_MapBGEvents 083b9a28 g 00000000 PalletTown_ProfessorOaksLab_MapEvents -083b9a3c g 00000000 ViridianCity_House1_ObjectEvents -083b9a84 g 00000000 ViridianCity_House1_MapWarps -083b9a9c g 00000000 ViridianCity_House1_MapBGEvents -083b9aa8 g 00000000 ViridianCity_House1_MapEvents +083b9a3c g 00000000 ViridianCity_House_ObjectEvents +083b9a84 g 00000000 ViridianCity_House_MapWarps +083b9a9c g 00000000 ViridianCity_House_MapBGEvents +083b9aa8 g 00000000 ViridianCity_House_MapEvents 083b9abc g 00000000 ViridianCity_Gym_ObjectEvents 083b9bac g 00000000 ViridianCity_Gym_MapWarps 083b9bc4 g 00000000 ViridianCity_Gym_MapBGEvents 083b9be8 g 00000000 ViridianCity_Gym_MapEvents -083b9bfc g 00000000 ViridianCity_House2_ObjectEvents -083b9c2c g 00000000 ViridianCity_House2_MapWarps -083b9c44 g 00000000 ViridianCity_House2_MapBGEvents -083b9c80 g 00000000 ViridianCity_House2_MapEvents +083b9bfc g 00000000 ViridianCity_School_ObjectEvents +083b9c2c g 00000000 ViridianCity_School_MapWarps +083b9c44 g 00000000 ViridianCity_School_MapBGEvents +083b9c80 g 00000000 ViridianCity_School_MapEvents 083b9c94 g 00000000 ViridianCity_Mart_ObjectEvents 083b9cdc g 00000000 ViridianCity_Mart_MapWarps 083b9cf4 g 00000000 ViridianCity_Mart_MapEvents diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index 81ada4cef..7a4152acc 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -15221,11 +15221,11 @@ 08169e4d g 00000000 PalletTown_ProfessorOaksLab_EventScript_LeftSign 08169e56 g 00000000 PalletTown_ProfessorOaksLab_EventScript_RightSign 08169e6c g 00000000 PalletTown_ProfessorOaksLab_EventScript_RightSignAlt -08169e76 g 00000000 ViridianCity_House1_MapScripts -08169e77 g 00000000 ViridianCity_House1_EventScript_BaldingMan -08169e80 g 00000000 ViridianCity_House1_EventScript_LittleGirl -08169e89 g 00000000 ViridianCity_House1_EventScript_Speary -08169e9c g 00000000 ViridianCity_House1_EventScript_NicknameSign +08169e76 g 00000000 ViridianCity_House_MapScripts +08169e77 g 00000000 ViridianCity_House_EventScript_BaldingMan +08169e80 g 00000000 ViridianCity_House_EventScript_LittleGirl +08169e89 g 00000000 ViridianCity_House_EventScript_Speary +08169e9c g 00000000 ViridianCity_House_EventScript_NicknameSign 08169ea5 g 00000000 ViridianCity_Gym_MapScripts 08169ea6 g 00000000 ViridianCity_Gym_EventScript_Giovanni 08169ee0 g 00000000 ViridianCity_Gym_EventScript_DefeatedGiovanni @@ -15243,19 +15243,19 @@ 0816a023 g 00000000 ViridianCity_Gym_EventScript_GymGuyPostVictory 0816a03a g 00000000 ViridianCity_Gym_EventScript_GymStatue 0816a04e g 00000000 ViridianCity_Gym_EventScript_GymStatuePostVictory -0816a058 g 00000000 ViridianCity_House2_MapScripts -0816a059 g 00000000 ViridianCity_House2_EventScript_Lass -0816a070 g 00000000 ViridianCity_House2_EventScript_Woman -0816a087 g 00000000 ViridianCity_House2_EventScript_Notebook -0816a0f7 g 00000000 ViridianCity_House2_EventScript_StopReadingNotebook -0816a0f9 g 00000000 ViridianCity_House2_EventScript_Blackboard -0816a108 g 00000000 ViridianCity_House2_EventScript_ChooseBlackboardTopic -0816a167 g 00000000 ViridianCity_House2_EventScript_ReadSleep -0816a175 g 00000000 ViridianCity_House2_EventScript_ReadBurn -0816a183 g 00000000 ViridianCity_House2_EventScript_ReadPoison -0816a191 g 00000000 ViridianCity_House2_EventScript_ReadFreeze -0816a19f g 00000000 ViridianCity_House2_EventScript_ReadParalysis -0816a1ad g 00000000 ViridianCity_House2_EventScript_ExitBlackboard +0816a058 g 00000000 ViridianCity_School_MapScripts +0816a059 g 00000000 ViridianCity_School_EventScript_Lass +0816a070 g 00000000 ViridianCity_School_EventScript_Woman +0816a087 g 00000000 ViridianCity_School_EventScript_Notebook +0816a0f7 g 00000000 ViridianCity_School_EventScript_StopReadingNotebook +0816a0f9 g 00000000 ViridianCity_School_EventScript_Blackboard +0816a108 g 00000000 ViridianCity_School_EventScript_ChooseBlackboardTopic +0816a167 g 00000000 ViridianCity_School_EventScript_ReadSleep +0816a175 g 00000000 ViridianCity_School_EventScript_ReadBurn +0816a183 g 00000000 ViridianCity_School_EventScript_ReadPoison +0816a191 g 00000000 ViridianCity_School_EventScript_ReadFreeze +0816a19f g 00000000 ViridianCity_School_EventScript_ReadParalysis +0816a1ad g 00000000 ViridianCity_School_EventScript_ExitBlackboard 0816a1af g 00000000 ViridianCity_Mart_MapScripts 0816a1ba g 00000000 ViridianCity_Mart_OnLoad 0816a1c4 g 00000000 ViridianCity_Mart_EventScript_HideQuestionnaire @@ -18904,10 +18904,10 @@ 0818f0c4 g 00000000 PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded 0818f0df g 00000000 PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex 0818f1b7 g 00000000 PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex -0818f26e g 00000000 ViridianCity_House1_Text_NicknamingIsFun -0818f2eb g 00000000 ViridianCity_House1_Text_MyDaddyLovesMonsToo -0818f308 g 00000000 ViridianCity_House1_Text_Speary -0818f319 g 00000000 ViridianCity_House1_Text_SpearowNameSpeary +0818f26e g 00000000 ViridianCity_House_Text_NicknamingIsFun +0818f2eb g 00000000 ViridianCity_House_Text_MyDaddyLovesMonsToo +0818f308 g 00000000 ViridianCity_House_Text_Speary +0818f319 g 00000000 ViridianCity_House_Text_SpearowNameSpeary 0818f32e g 00000000 ViridianCity_Gym_Text_GiovanniIntro 0818f41b g 00000000 ViridianCity_Gym_Text_GiovanniDefeat 0818f47e g 00000000 ViridianCity_Gym_Text_GiovanniPostBattle @@ -18943,21 +18943,21 @@ 0818fb32 g 00000000 ViridianCity_Gym_Text_GymGuyPostVictory 0818fb69 g 00000000 ViridianCity_Gym_Text_GymStatue 0818fb9d g 00000000 ViridianCity_Gym_Text_GymStatuePlayerWon -0818fbdc g 00000000 ViridianCity_House2_Text_TryingToMemorizeNotes -0818fc07 g 00000000 ViridianCity_House2_Text_ReadBlackboardCarefully -0818fc41 g 00000000 ViridianCity_House2_Text_NotebookFirstPage -0818fcff g 00000000 ViridianCity_House2_Text_NotebookSecondPage -0818fd84 g 00000000 ViridianCity_House2_Text_NotebookThirdPage -0818fe38 g 00000000 ViridianCity_House2_Text_NotebookFourthPage -0818fef5 g 00000000 ViridianCity_House2_Text_TurnThePage -0818ff04 g 00000000 ViridianCity_House2_Text_HeyDontLookAtMyNotes -0818ff27 g 00000000 ViridianCity_House2_Text_BlackboardListsStatusProblems -0818ff64 g 00000000 ViridianCity_House2_Text_ReadWhichTopic -0818ff85 g 00000000 ViridianCity_House2_Text_ExplainSleep -08190001 g 00000000 ViridianCity_House2_Text_ExplainBurn -0819007b g 00000000 ViridianCity_House2_Text_ExplainPoison -081900eb g 00000000 ViridianCity_House2_Text_ExplainFreeze -08190175 g 00000000 ViridianCity_House2_Text_ExplainParalysis +0818fbdc g 00000000 ViridianCity_School_Text_TryingToMemorizeNotes +0818fc07 g 00000000 ViridianCity_School_Text_ReadBlackboardCarefully +0818fc41 g 00000000 ViridianCity_School_Text_NotebookFirstPage +0818fcff g 00000000 ViridianCity_School_Text_NotebookSecondPage +0818fd84 g 00000000 ViridianCity_School_Text_NotebookThirdPage +0818fe38 g 00000000 ViridianCity_School_Text_NotebookFourthPage +0818fef5 g 00000000 ViridianCity_School_Text_TurnThePage +0818ff04 g 00000000 ViridianCity_School_Text_HeyDontLookAtMyNotes +0818ff27 g 00000000 ViridianCity_School_Text_BlackboardListsStatusProblems +0818ff64 g 00000000 ViridianCity_School_Text_ReadWhichTopic +0818ff85 g 00000000 ViridianCity_School_Text_ExplainSleep +08190001 g 00000000 ViridianCity_School_Text_ExplainBurn +0819007b g 00000000 ViridianCity_School_Text_ExplainPoison +081900eb g 00000000 ViridianCity_School_Text_ExplainFreeze +08190175 g 00000000 ViridianCity_School_Text_ExplainParalysis 081901f6 g 00000000 ViridianCity_Mart_Text_YouCameFromPallet 08190216 g 00000000 ViridianCity_Mart_Text_TakeThisToProfOak 08190265 g 00000000 ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk @@ -21002,7 +21002,7 @@ 081acce3 g 00000000 SevenIsland_TanobyRuins_EventScript_Clifford 081acd0a g 00000000 SevenIsland_TanobyRuins_EventScript_CliffordRematch 081acd21 g 00000000 Text_TestMsg -081acd41 g 00000000 ViridianCity_House2_EventScript_PokemonJournal +081acd41 g 00000000 ViridianCity_School_EventScript_PokemonJournal 081acd69 g 00000000 EventScript_PokemonJournalUnused1 081acd91 g 00000000 EventScript_PokemonJournalUnused2 081acdac g 00000000 FourIsland_PokemonCenter_1F_EventScript_PokemonJournal @@ -28713,9 +28713,9 @@ 08338b48 g 00000000 SevenIsland_House_Room2_Layout_Border 08338b50 g 00000000 SevenIsland_House_Room2_Layout_Blockdata 08338c28 g 00000000 SevenIsland_House_Room2_Layout -08338c44 g 00000000 ViridianCity_House2_Layout_Border -08338c4c g 00000000 ViridianCity_House2_Layout_Blockdata -08338d00 g 00000000 ViridianCity_House2_Layout +08338c44 g 00000000 ViridianCity_School_Layout_Border +08338c4c g 00000000 ViridianCity_School_Layout_Blockdata +08338d00 g 00000000 ViridianCity_School_Layout 08338d1c g 00000000 CeladonCity_Restaurant_Duplicate_Layout_Border 08338d24 g 00000000 CeladonCity_Restaurant_Duplicate_Layout_Blockdata 08338e70 g 00000000 CeladonCity_Restaurant_Duplicate_Layout @@ -28743,9 +28743,9 @@ 0833acc0 g 00000000 Route5_PokemonDayCare_Layout_Border 0833acc8 g 00000000 Route5_PokemonDayCare_Layout_Blockdata 0833ada0 g 00000000 Route5_PokemonDayCare_Layout -0833adbc g 00000000 ViridianCity_House1_Layout_Border -0833adc4 g 00000000 ViridianCity_House1_Layout_Blockdata -0833ae8c g 00000000 ViridianCity_House1_Layout +0833adbc g 00000000 ViridianCity_House_Layout_Border +0833adc4 g 00000000 ViridianCity_House_Layout_Blockdata +0833ae8c g 00000000 ViridianCity_House_Layout 0833aea8 g 00000000 FourIsland_PokemonDayCare_Layout_Border 0833aeb0 g 00000000 FourIsland_PokemonDayCare_Layout_Blockdata 0833af88 g 00000000 FourIsland_PokemonDayCare_Layout @@ -29326,9 +29326,9 @@ 08350d4c g 00000000 PalletTown_PlayersHouse_2F 08350d68 g 00000000 PalletTown_RivalsHouse 08350d84 g 00000000 PalletTown_ProfessorOaksLab -08350da0 g 00000000 ViridianCity_House1 +08350da0 g 00000000 ViridianCity_House 08350dbc g 00000000 ViridianCity_Gym -08350dd8 g 00000000 ViridianCity_House2 +08350dd8 g 00000000 ViridianCity_School 08350df4 g 00000000 ViridianCity_Mart 08350e10 g 00000000 ViridianCity_PokemonCenter_1F 08350e2c g 00000000 ViridianCity_PokemonCenter_2F @@ -32128,18 +32128,18 @@ 083b9908 g 00000000 PalletTown_ProfessorOaksLab_MapCoordEvents 083b9968 g 00000000 PalletTown_ProfessorOaksLab_MapBGEvents 083b9998 g 00000000 PalletTown_ProfessorOaksLab_MapEvents -083b99ac g 00000000 ViridianCity_House1_ObjectEvents -083b99f4 g 00000000 ViridianCity_House1_MapWarps -083b9a0c g 00000000 ViridianCity_House1_MapBGEvents -083b9a18 g 00000000 ViridianCity_House1_MapEvents +083b99ac g 00000000 ViridianCity_House_ObjectEvents +083b99f4 g 00000000 ViridianCity_House_MapWarps +083b9a0c g 00000000 ViridianCity_House_MapBGEvents +083b9a18 g 00000000 ViridianCity_House_MapEvents 083b9a2c g 00000000 ViridianCity_Gym_ObjectEvents 083b9b1c g 00000000 ViridianCity_Gym_MapWarps 083b9b34 g 00000000 ViridianCity_Gym_MapBGEvents 083b9b58 g 00000000 ViridianCity_Gym_MapEvents -083b9b6c g 00000000 ViridianCity_House2_ObjectEvents -083b9b9c g 00000000 ViridianCity_House2_MapWarps -083b9bb4 g 00000000 ViridianCity_House2_MapBGEvents -083b9bf0 g 00000000 ViridianCity_House2_MapEvents +083b9b6c g 00000000 ViridianCity_School_ObjectEvents +083b9b9c g 00000000 ViridianCity_School_MapWarps +083b9bb4 g 00000000 ViridianCity_School_MapBGEvents +083b9bf0 g 00000000 ViridianCity_School_MapEvents 083b9c04 g 00000000 ViridianCity_Mart_ObjectEvents 083b9c4c g 00000000 ViridianCity_Mart_MapWarps 083b9c64 g 00000000 ViridianCity_Mart_MapEvents diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index 1798d68d2..ed2e4ccb3 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -15222,11 +15222,11 @@ 08169ec5 g 00000000 PalletTown_ProfessorOaksLab_EventScript_LeftSign 08169ece g 00000000 PalletTown_ProfessorOaksLab_EventScript_RightSign 08169ee4 g 00000000 PalletTown_ProfessorOaksLab_EventScript_RightSignAlt -08169eee g 00000000 ViridianCity_House1_MapScripts -08169eef g 00000000 ViridianCity_House1_EventScript_BaldingMan -08169ef8 g 00000000 ViridianCity_House1_EventScript_LittleGirl -08169f01 g 00000000 ViridianCity_House1_EventScript_Speary -08169f14 g 00000000 ViridianCity_House1_EventScript_NicknameSign +08169eee g 00000000 ViridianCity_House_MapScripts +08169eef g 00000000 ViridianCity_House_EventScript_BaldingMan +08169ef8 g 00000000 ViridianCity_House_EventScript_LittleGirl +08169f01 g 00000000 ViridianCity_House_EventScript_Speary +08169f14 g 00000000 ViridianCity_House_EventScript_NicknameSign 08169f1d g 00000000 ViridianCity_Gym_MapScripts 08169f1e g 00000000 ViridianCity_Gym_EventScript_Giovanni 08169f58 g 00000000 ViridianCity_Gym_EventScript_DefeatedGiovanni @@ -15244,19 +15244,19 @@ 0816a09b g 00000000 ViridianCity_Gym_EventScript_GymGuyPostVictory 0816a0b2 g 00000000 ViridianCity_Gym_EventScript_GymStatue 0816a0c6 g 00000000 ViridianCity_Gym_EventScript_GymStatuePostVictory -0816a0d0 g 00000000 ViridianCity_House2_MapScripts -0816a0d1 g 00000000 ViridianCity_House2_EventScript_Lass -0816a0e8 g 00000000 ViridianCity_House2_EventScript_Woman -0816a0ff g 00000000 ViridianCity_House2_EventScript_Notebook -0816a16f g 00000000 ViridianCity_House2_EventScript_StopReadingNotebook -0816a171 g 00000000 ViridianCity_House2_EventScript_Blackboard -0816a180 g 00000000 ViridianCity_House2_EventScript_ChooseBlackboardTopic -0816a1df g 00000000 ViridianCity_House2_EventScript_ReadSleep -0816a1ed g 00000000 ViridianCity_House2_EventScript_ReadBurn -0816a1fb g 00000000 ViridianCity_House2_EventScript_ReadPoison -0816a209 g 00000000 ViridianCity_House2_EventScript_ReadFreeze -0816a217 g 00000000 ViridianCity_House2_EventScript_ReadParalysis -0816a225 g 00000000 ViridianCity_House2_EventScript_ExitBlackboard +0816a0d0 g 00000000 ViridianCity_School_MapScripts +0816a0d1 g 00000000 ViridianCity_School_EventScript_Lass +0816a0e8 g 00000000 ViridianCity_School_EventScript_Woman +0816a0ff g 00000000 ViridianCity_School_EventScript_Notebook +0816a16f g 00000000 ViridianCity_School_EventScript_StopReadingNotebook +0816a171 g 00000000 ViridianCity_School_EventScript_Blackboard +0816a180 g 00000000 ViridianCity_School_EventScript_ChooseBlackboardTopic +0816a1df g 00000000 ViridianCity_School_EventScript_ReadSleep +0816a1ed g 00000000 ViridianCity_School_EventScript_ReadBurn +0816a1fb g 00000000 ViridianCity_School_EventScript_ReadPoison +0816a209 g 00000000 ViridianCity_School_EventScript_ReadFreeze +0816a217 g 00000000 ViridianCity_School_EventScript_ReadParalysis +0816a225 g 00000000 ViridianCity_School_EventScript_ExitBlackboard 0816a227 g 00000000 ViridianCity_Mart_MapScripts 0816a232 g 00000000 ViridianCity_Mart_OnLoad 0816a23c g 00000000 ViridianCity_Mart_EventScript_HideQuestionnaire @@ -18905,10 +18905,10 @@ 0818f13c g 00000000 PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded 0818f157 g 00000000 PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex 0818f22f g 00000000 PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex -0818f2e6 g 00000000 ViridianCity_House1_Text_NicknamingIsFun -0818f363 g 00000000 ViridianCity_House1_Text_MyDaddyLovesMonsToo -0818f380 g 00000000 ViridianCity_House1_Text_Speary -0818f391 g 00000000 ViridianCity_House1_Text_SpearowNameSpeary +0818f2e6 g 00000000 ViridianCity_House_Text_NicknamingIsFun +0818f363 g 00000000 ViridianCity_House_Text_MyDaddyLovesMonsToo +0818f380 g 00000000 ViridianCity_House_Text_Speary +0818f391 g 00000000 ViridianCity_House_Text_SpearowNameSpeary 0818f3a6 g 00000000 ViridianCity_Gym_Text_GiovanniIntro 0818f493 g 00000000 ViridianCity_Gym_Text_GiovanniDefeat 0818f4f6 g 00000000 ViridianCity_Gym_Text_GiovanniPostBattle @@ -18944,21 +18944,21 @@ 0818fbaa g 00000000 ViridianCity_Gym_Text_GymGuyPostVictory 0818fbe1 g 00000000 ViridianCity_Gym_Text_GymStatue 0818fc15 g 00000000 ViridianCity_Gym_Text_GymStatuePlayerWon -0818fc54 g 00000000 ViridianCity_House2_Text_TryingToMemorizeNotes -0818fc7f g 00000000 ViridianCity_House2_Text_ReadBlackboardCarefully -0818fcb9 g 00000000 ViridianCity_House2_Text_NotebookFirstPage -0818fd77 g 00000000 ViridianCity_House2_Text_NotebookSecondPage -0818fdfc g 00000000 ViridianCity_House2_Text_NotebookThirdPage -0818feb0 g 00000000 ViridianCity_House2_Text_NotebookFourthPage -0818ff6d g 00000000 ViridianCity_House2_Text_TurnThePage -0818ff7c g 00000000 ViridianCity_House2_Text_HeyDontLookAtMyNotes -0818ff9f g 00000000 ViridianCity_House2_Text_BlackboardListsStatusProblems -0818ffdc g 00000000 ViridianCity_House2_Text_ReadWhichTopic -0818fffd g 00000000 ViridianCity_House2_Text_ExplainSleep -08190079 g 00000000 ViridianCity_House2_Text_ExplainBurn -081900f3 g 00000000 ViridianCity_House2_Text_ExplainPoison -08190163 g 00000000 ViridianCity_House2_Text_ExplainFreeze -081901ed g 00000000 ViridianCity_House2_Text_ExplainParalysis +0818fc54 g 00000000 ViridianCity_School_Text_TryingToMemorizeNotes +0818fc7f g 00000000 ViridianCity_School_Text_ReadBlackboardCarefully +0818fcb9 g 00000000 ViridianCity_School_Text_NotebookFirstPage +0818fd77 g 00000000 ViridianCity_School_Text_NotebookSecondPage +0818fdfc g 00000000 ViridianCity_School_Text_NotebookThirdPage +0818feb0 g 00000000 ViridianCity_School_Text_NotebookFourthPage +0818ff6d g 00000000 ViridianCity_School_Text_TurnThePage +0818ff7c g 00000000 ViridianCity_School_Text_HeyDontLookAtMyNotes +0818ff9f g 00000000 ViridianCity_School_Text_BlackboardListsStatusProblems +0818ffdc g 00000000 ViridianCity_School_Text_ReadWhichTopic +0818fffd g 00000000 ViridianCity_School_Text_ExplainSleep +08190079 g 00000000 ViridianCity_School_Text_ExplainBurn +081900f3 g 00000000 ViridianCity_School_Text_ExplainPoison +08190163 g 00000000 ViridianCity_School_Text_ExplainFreeze +081901ed g 00000000 ViridianCity_School_Text_ExplainParalysis 0819026e g 00000000 ViridianCity_Mart_Text_YouCameFromPallet 0819028e g 00000000 ViridianCity_Mart_Text_TakeThisToProfOak 081902dd g 00000000 ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk @@ -21003,7 +21003,7 @@ 081acd5b g 00000000 SevenIsland_TanobyRuins_EventScript_Clifford 081acd82 g 00000000 SevenIsland_TanobyRuins_EventScript_CliffordRematch 081acd99 g 00000000 Text_TestMsg -081acdb9 g 00000000 ViridianCity_House2_EventScript_PokemonJournal +081acdb9 g 00000000 ViridianCity_School_EventScript_PokemonJournal 081acde1 g 00000000 EventScript_PokemonJournalUnused1 081ace09 g 00000000 EventScript_PokemonJournalUnused2 081ace24 g 00000000 FourIsland_PokemonCenter_1F_EventScript_PokemonJournal @@ -28714,9 +28714,9 @@ 08338bb8 g 00000000 SevenIsland_House_Room2_Layout_Border 08338bc0 g 00000000 SevenIsland_House_Room2_Layout_Blockdata 08338c98 g 00000000 SevenIsland_House_Room2_Layout -08338cb4 g 00000000 ViridianCity_House2_Layout_Border -08338cbc g 00000000 ViridianCity_House2_Layout_Blockdata -08338d70 g 00000000 ViridianCity_House2_Layout +08338cb4 g 00000000 ViridianCity_School_Layout_Border +08338cbc g 00000000 ViridianCity_School_Layout_Blockdata +08338d70 g 00000000 ViridianCity_School_Layout 08338d8c g 00000000 CeladonCity_Restaurant_Duplicate_Layout_Border 08338d94 g 00000000 CeladonCity_Restaurant_Duplicate_Layout_Blockdata 08338ee0 g 00000000 CeladonCity_Restaurant_Duplicate_Layout @@ -28744,9 +28744,9 @@ 0833ad30 g 00000000 Route5_PokemonDayCare_Layout_Border 0833ad38 g 00000000 Route5_PokemonDayCare_Layout_Blockdata 0833ae10 g 00000000 Route5_PokemonDayCare_Layout -0833ae2c g 00000000 ViridianCity_House1_Layout_Border -0833ae34 g 00000000 ViridianCity_House1_Layout_Blockdata -0833aefc g 00000000 ViridianCity_House1_Layout +0833ae2c g 00000000 ViridianCity_House_Layout_Border +0833ae34 g 00000000 ViridianCity_House_Layout_Blockdata +0833aefc g 00000000 ViridianCity_House_Layout 0833af18 g 00000000 FourIsland_PokemonDayCare_Layout_Border 0833af20 g 00000000 FourIsland_PokemonDayCare_Layout_Blockdata 0833aff8 g 00000000 FourIsland_PokemonDayCare_Layout @@ -29327,9 +29327,9 @@ 08350dbc g 00000000 PalletTown_PlayersHouse_2F 08350dd8 g 00000000 PalletTown_RivalsHouse 08350df4 g 00000000 PalletTown_ProfessorOaksLab -08350e10 g 00000000 ViridianCity_House1 +08350e10 g 00000000 ViridianCity_House 08350e2c g 00000000 ViridianCity_Gym -08350e48 g 00000000 ViridianCity_House2 +08350e48 g 00000000 ViridianCity_School 08350e64 g 00000000 ViridianCity_Mart 08350e80 g 00000000 ViridianCity_PokemonCenter_1F 08350e9c g 00000000 ViridianCity_PokemonCenter_2F @@ -32129,18 +32129,18 @@ 083b9978 g 00000000 PalletTown_ProfessorOaksLab_MapCoordEvents 083b99d8 g 00000000 PalletTown_ProfessorOaksLab_MapBGEvents 083b9a08 g 00000000 PalletTown_ProfessorOaksLab_MapEvents -083b9a1c g 00000000 ViridianCity_House1_ObjectEvents -083b9a64 g 00000000 ViridianCity_House1_MapWarps -083b9a7c g 00000000 ViridianCity_House1_MapBGEvents -083b9a88 g 00000000 ViridianCity_House1_MapEvents +083b9a1c g 00000000 ViridianCity_House_ObjectEvents +083b9a64 g 00000000 ViridianCity_House_MapWarps +083b9a7c g 00000000 ViridianCity_House_MapBGEvents +083b9a88 g 00000000 ViridianCity_House_MapEvents 083b9a9c g 00000000 ViridianCity_Gym_ObjectEvents 083b9b8c g 00000000 ViridianCity_Gym_MapWarps 083b9ba4 g 00000000 ViridianCity_Gym_MapBGEvents 083b9bc8 g 00000000 ViridianCity_Gym_MapEvents -083b9bdc g 00000000 ViridianCity_House2_ObjectEvents -083b9c0c g 00000000 ViridianCity_House2_MapWarps -083b9c24 g 00000000 ViridianCity_House2_MapBGEvents -083b9c60 g 00000000 ViridianCity_House2_MapEvents +083b9bdc g 00000000 ViridianCity_School_ObjectEvents +083b9c0c g 00000000 ViridianCity_School_MapWarps +083b9c24 g 00000000 ViridianCity_School_MapBGEvents +083b9c60 g 00000000 ViridianCity_School_MapEvents 083b9c74 g 00000000 ViridianCity_Mart_ObjectEvents 083b9cbc g 00000000 ViridianCity_Mart_MapWarps 083b9cd4 g 00000000 ViridianCity_Mart_MapEvents