From c128e68062b0f9ff06be35d8563549fe8144f7d4 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Sat, 17 Apr 2021 16:32:55 +0100 Subject: Replace rival labels --- data/event_scripts.s | 4 +- data/layouts/PalletTown_GarysHouse/border.bin | Bin 8 -> 0 bytes data/layouts/PalletTown_GarysHouse/map.bin | 1 - data/layouts/PalletTown_RivalsHouse/border.bin | Bin 0 -> 8 bytes data/layouts/PalletTown_RivalsHouse/map.bin | 1 + data/layouts/layouts.json | 8 +- data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 6 +- data/maps/PalletTown/map.json | 2 +- data/maps/PalletTown_GarysHouse/map.json | 95 ----------- data/maps/PalletTown_GarysHouse/scripts.inc | 182 ---------------------- data/maps/PalletTown_GarysHouse/text.inc | 121 -------------- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 2 +- data/maps/PalletTown_RivalsHouse/map.json | 95 +++++++++++ data/maps/PalletTown_RivalsHouse/scripts.inc | 182 ++++++++++++++++++++++ data/maps/PalletTown_RivalsHouse/text.inc | 121 ++++++++++++++ data/maps/map_groups.json | 2 +- 16 files changed, 411 insertions(+), 411 deletions(-) delete mode 100644 data/layouts/PalletTown_GarysHouse/border.bin delete mode 100644 data/layouts/PalletTown_GarysHouse/map.bin create mode 100644 data/layouts/PalletTown_RivalsHouse/border.bin create mode 100644 data/layouts/PalletTown_RivalsHouse/map.bin delete mode 100644 data/maps/PalletTown_GarysHouse/map.json delete mode 100644 data/maps/PalletTown_GarysHouse/scripts.inc delete mode 100644 data/maps/PalletTown_GarysHouse/text.inc create mode 100644 data/maps/PalletTown_RivalsHouse/map.json create mode 100644 data/maps/PalletTown_RivalsHouse/scripts.inc create mode 100644 data/maps/PalletTown_RivalsHouse/text.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 26fddad77..cbc607230 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -341,7 +341,7 @@ gStdScriptsEnd:: .include "data/maps/SevenIsland_TanobyRuins/scripts.inc" .include "data/maps/PalletTown_PlayersHouse_1F/scripts.inc" .include "data/maps/PalletTown_PlayersHouse_2F/scripts.inc" - .include "data/maps/PalletTown_GarysHouse/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_Gym/scripts.inc" @@ -667,7 +667,7 @@ gStdScriptsEnd:: .include "data/maps/SevenIsland_TanobyRuins/text.inc" .include "data/maps/PalletTown_PlayersHouse_1F/text.inc" .include "data/maps/PalletTown_PlayersHouse_2F/text.inc" - .include "data/maps/PalletTown_GarysHouse/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_Gym/text.inc" diff --git a/data/layouts/PalletTown_GarysHouse/border.bin b/data/layouts/PalletTown_GarysHouse/border.bin deleted file mode 100644 index a886cd764..000000000 Binary files a/data/layouts/PalletTown_GarysHouse/border.bin and /dev/null differ diff --git a/data/layouts/PalletTown_GarysHouse/map.bin b/data/layouts/PalletTown_GarysHouse/map.bin deleted file mode 100644 index a29b5dbdc..000000000 --- a/data/layouts/PalletTown_GarysHouse/map.bin +++ /dev/null @@ -1 +0,0 @@ -  ./ -!"  +,1267(5)*((3490:0>0?0 0=0 0 0 0 0 0;0<0 0000C0D0D0D0D0F0000 0000S0K0LMN0V0000 0000S0K0TUN0V0000 0000[0\0\0\0\0^0000W000000000000G0_00000000000O4444444444 \ No newline at end of file diff --git a/data/layouts/PalletTown_RivalsHouse/border.bin b/data/layouts/PalletTown_RivalsHouse/border.bin new file mode 100644 index 000000000..a886cd764 Binary files /dev/null and b/data/layouts/PalletTown_RivalsHouse/border.bin differ diff --git a/data/layouts/PalletTown_RivalsHouse/map.bin b/data/layouts/PalletTown_RivalsHouse/map.bin new file mode 100644 index 000000000..a29b5dbdc --- /dev/null +++ b/data/layouts/PalletTown_RivalsHouse/map.bin @@ -0,0 +1 @@ +  ./ -!"  +,1267(5)*((3490:0>0?0 0=0 0 0 0 0 0;0<0 0000C0D0D0D0D0F0000 0000S0K0LMN0V0000 0000S0K0TUN0V0000 0000[0\0\0\0\0^0000W000000000000G0_00000000000O4444444444 \ No newline at end of file diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 1083cd406..b44d6ed86 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -26,16 +26,16 @@ "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_2F/map.bin" }, { - "id": "LAYOUT_PALLET_TOWN_GARYS_HOUSE", - "name": "PalletTown_GarysHouse_Layout", + "id": "LAYOUT_PALLET_TOWN_RIVALS_HOUSE", + "name": "PalletTown_RivalsHouse_Layout", "width": 13, "height": 10, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_GenericBuilding2", - "border_filepath": "data/layouts/PalletTown_GarysHouse/border.bin", - "blockdata_filepath": "data/layouts/PalletTown_GarysHouse/map.bin" + "border_filepath": "data/layouts/PalletTown_RivalsHouse/border.bin", + "blockdata_filepath": "data/layouts/PalletTown_RivalsHouse/map.bin" }, { "id": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F", diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 1d46a2bf8..1bcb8aa24 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -111,9 +111,9 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: @ 8170CB1 msgbox OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis giveitem_msg OneIsland_PokemonCenter_1F_Text_ObtainedTriPass, ITEM_TRI_PASS, 1, MUS_OBTAIN_KEY_ITEM msgbox OneIsland_PokemonCenter_1F_Text_PassLetsYouTravelBetweenIslands - compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2 call_if_ge OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage - compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2 call_if_lt OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap setflag FLAG_SYS_SEVII_MAP_123 msgbox OneIsland_PokemonCenter_1F_Text_BillCatchYouLater @@ -146,7 +146,7 @@ OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: @ 8170E46 OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap:: @ 8170E58 setflag FLAG_HIDE_TOWN_MAP - setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + setvar VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2 giveitem_msg OneIsland_PokemonCenter_1F_Text_ReceivedTownMap, ITEM_TOWN_MAP, 1, MUS_OBTAIN_KEY_ITEM return diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 91819b8b1..9296719e0 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -78,7 +78,7 @@ "x": 15, "y": 7, "elevation": 0, - "dest_map": "MAP_PALLET_TOWN_GARYS_HOUSE", + "dest_map": "MAP_PALLET_TOWN_RIVALS_HOUSE", "dest_warp_id": 0 }, { diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json deleted file mode 100644 index b59a5fc0f..000000000 --- a/data/maps/PalletTown_GarysHouse/map.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "id": "MAP_PALLET_TOWN_GARYS_HOUSE", - "name": "PalletTown_GarysHouse", - "layout": "LAYOUT_PALLET_TOWN_GARYS_HOUSE", - "music": "MUS_PALLET", - "region_map_section": "MAPSEC_PALLET_TOWN", - "requires_flash": false, - "weather": "WEATHER_NONE", - "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": "OBJ_EVENT_GFX_DAISY", - "x": 10, - "y": 6, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", - "movement_range_x": 1, - "movement_range_y": 3, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "PalletTown_GarysHouse_EventScript_Daisy", - "flag": "0" - }, - { - "graphics_id": "OBJ_EVENT_GFX_TOWN_MAP", - "x": 6, - "y": 4, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 1, - "movement_range_y": 1, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "PalletTown_GarysHouse_EventScript_TownMap", - "flag": "FLAG_HIDE_TOWN_MAP" - } - ], - "warp_events": [ - { - "x": 4, - "y": 8, - "elevation": 3, - "dest_map": "MAP_PALLET_TOWN", - "dest_warp_id": 1 - }, - { - "x": 5, - "y": 8, - "elevation": 3, - "dest_map": "MAP_PALLET_TOWN", - "dest_warp_id": 1 - }, - { - "x": 3, - "y": 8, - "elevation": 3, - "dest_map": "MAP_PALLET_TOWN", - "dest_warp_id": 1 - } - ], - "coord_events": [], - "bg_events": [ - { - "type": "sign", - "x": 12, - "y": 1, - "elevation": 0, - "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PalletTown_GarysHouse_EventScript_Bookshelf" - }, - { - "type": "sign", - "x": 11, - "y": 1, - "elevation": 0, - "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PalletTown_GarysHouse_EventScript_Bookshelf" - }, - { - "type": "sign", - "x": 9, - "y": 1, - "elevation": 0, - "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PalletTown_GarysHouse_EventScript_Picture" - } - ] -} diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc deleted file mode 100644 index e61904c71..000000000 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ /dev/null @@ -1,182 +0,0 @@ -.equ LOCALID_DAISY, 1 -.equ LOCALID_TOWN_MAP, 2 - -.equ RECEIVED_TOWN_MAP, VAR_TEMP_1 - -PalletTown_GarysHouse_MapScripts:: @ 8168D27 - map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_GarysHouse_OnTransition - .byte 0 - -PalletTown_GarysHouse_OnTransition:: @ 8168D2D - compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if_lt PalletTown_GarysHouse_EventScript_MoveDaisyToTable - compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - call_if_ge PalletTown_GarysHouse_EventScript_AlreadyReceivedTownMap - end - -PalletTown_GarysHouse_EventScript_MoveDaisyToTable:: @ 8168D44 - setobjectmovementtype LOCALID_DAISY, MOVEMENT_TYPE_FACE_RIGHT - setobjectxyperm LOCALID_DAISY, 5, 4 - return - -PalletTown_GarysHouse_EventScript_AlreadyReceivedTownMap:: @ 8168D50 - setvar RECEIVED_TOWN_MAP, TRUE - return - -PalletTown_GarysHouse_EventScript_Daisy:: @ 8168D56 - lock - faceplayer - famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_GarysHouse_EventScript_GroomMon - compare RECEIVED_TOWN_MAP, TRUE - goto_if_eq PalletTown_GarysHouse_EventScript_PleaseGiveMonsRest - compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - goto_if_eq PalletTown_GarysHouse_EventScript_ExplainTownMap - compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 - goto_if_eq PalletTown_GarysHouse_EventScript_GiveTownMap - compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - goto_if_ge PalletTown_GarysHouse_EventScript_HeardBattledRival - msgbox PalletTown_GarysHouse_Text_HiBrothersAtLab - closemessage - applymovement LOCALID_DAISY, Movement_FaceOriginalDirection - waitmovement 0 - release - end - -PalletTown_GarysHouse_EventScript_HeardBattledRival:: @ 8168DAF - msgbox PalletTown_GarysHouse_Text_HeardYouBattledRival - release - end - -PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9 - goto_if_questlog EventScript_ReleaseEnd - special QuestLog_CutRecording - compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 - goto_if_lt PalletTown_GarysHouse_EventScript_RateMonFriendship - msgbox PalletTown_GarysHouse_Text_LikeMeToGroomMon, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq PalletTown_GarysHouse_EventScript_DeclineGrooming - msgbox PalletTown_GarysHouse_Text_GroomWhichOne - special ChoosePartyMon - waitstate - lock - faceplayer - compare VAR_0x8004, PARTY_SIZE - goto_if_ge PalletTown_GarysHouse_EventScript_DeclineGrooming - specialvar VAR_RESULT, GetPartyMonSpecies - compare VAR_RESULT, SPECIES_EGG - goto_if_eq PalletTown_GarysHouse_EventScript_CantGroomEgg - msgbox PalletTown_GarysHouse_Text_LookingNiceInNoTime - closemessage - fadescreen FADE_TO_BLACK - playfanfare MUS_HEAL - waitfanfare - special DaisyMassageServices - fadescreen FADE_FROM_BLACK - special BufferMonNickname - msgbox PalletTown_GarysHouse_Text_ThereYouGoAllDone - release - end - -PalletTown_GarysHouse_EventScript_CantGroomEgg:: @ 8168E32 - msgbox PalletTown_GarysHouse_Text_CantGroomAnEgg - release - end - -PalletTown_GarysHouse_EventScript_DeclineGrooming:: @ 8168E3C - msgbox PalletTown_GarysHouse_Text_DontNeedAnyGrooming - release - end - -PalletTown_GarysHouse_EventScript_RateMonFriendship:: @ 8168E46 - msgbox PalletTown_GarysHouse_Text_MayISeeFirstMon - specialvar VAR_RESULT, GetLeadMonFriendship - switch VAR_RESULT - case 0, PalletTown_GarysHouse_EventScript_MonFriendshipLowest - case 1, PalletTown_GarysHouse_EventScript_MonFriendshipLower - case 2, PalletTown_GarysHouse_EventScript_MonFriendshipLow - case 3, PalletTown_GarysHouse_EventScript_MonFriendshipMid - case 4, PalletTown_GarysHouse_EventScript_MonFriendshipHigh - case 5, PalletTown_GarysHouse_EventScript_MonFriendshipHigher - case 6, PalletTown_GarysHouse_EventScript_MonFriendshipHighest - end - -PalletTown_GarysHouse_EventScript_MonFriendshipLowest:: @ 8168EA6 - msgbox PalletTown_GarysHouse_Text_WhyWouldMonHateYouSoMuch - release - end - -PalletTown_GarysHouse_EventScript_MonFriendshipLower:: @ 8168EB0 - msgbox PalletTown_GarysHouse_Text_DontLikeWayItGlaresAtYou - release - end - -PalletTown_GarysHouse_EventScript_MonFriendshipLow:: @ 8168EBA - msgbox PalletTown_GarysHouse_Text_NotFamiliarWithYouYet - release - end - -PalletTown_GarysHouse_EventScript_MonFriendshipMid:: @ 8168EC4 - msgbox PalletTown_GarysHouse_Text_ItsWarmingUpToYou - release - end - -PalletTown_GarysHouse_EventScript_MonFriendshipHigh:: @ 8168ECE - msgbox PalletTown_GarysHouse_Text_ItsQuiteFriendly - release - end - -PalletTown_GarysHouse_EventScript_MonFriendshipHigher:: @ 8168ED8 - msgbox PalletTown_GarysHouse_Text_ItLooksVeryHappy - release - end - -PalletTown_GarysHouse_EventScript_MonFriendshipHighest:: @ 8168EE2 - msgbox PalletTown_GarysHouse_Text_CouldntLoveYouMore - release - end - -PalletTown_GarysHouse_EventScript_PleaseGiveMonsRest:: @ 8168EEC - msgbox PalletTown_GarysHouse_Text_PleaseGiveMonsRest - release - end - -PalletTown_GarysHouse_EventScript_GiveTownMap:: @ 8168EF6 - msgbox PalletTown_GarysHouse_Text_ErrandForGrandpaThisWillHelp - closemessage - checkitemspace ITEM_TOWN_MAP, 1 - compare VAR_RESULT, FALSE - goto_if_eq PalletTown_GarysHouse_EventScript_NoRoomForTownMap - applymovement LOCALID_DAISY, Movement_WalkInPlaceFastestRight - waitmovement 0 - removeobject LOCALID_TOWN_MAP - setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - delay 15 - applymovement LOCALID_DAISY, Movement_FacePlayer - waitmovement 0 - delay 12 - giveitem_msg PalletTown_GarysHouse_Text_ReceivedTownMapFromDaisy, ITEM_TOWN_MAP, 1, MUS_OBTAIN_KEY_ITEM - release - end - -PalletTown_GarysHouse_EventScript_NoRoomForTownMap:: @ 8168F4F - msgbox PalletTown_GarysHouse_Text_DontHaveSpaceForThis - release - end - -PalletTown_GarysHouse_EventScript_ExplainTownMap:: @ 8168F59 - msgbox PalletTown_GarysHouse_Text_ExplainTownMap - release - end - -PalletTown_GarysHouse_EventScript_TownMap:: @ 8168F63 - msgbox PalletTown_GarysHouse_Text_ItsBigMapOfKanto, MSGBOX_NPC - end - -PalletTown_GarysHouse_EventScript_Bookshelf:: @ 8168F6C - msgbox PalletTown_GarysHouse_Text_ShelvesCrammedFullOfBooks, MSGBOX_SIGN - end - -PalletTown_GarysHouse_EventScript_Picture:: @ 8168F75 - msgbox PalletTown_GarysHouse_Text_LovelyAndSweetClefairy, MSGBOX_SIGN - end diff --git a/data/maps/PalletTown_GarysHouse/text.inc b/data/maps/PalletTown_GarysHouse/text.inc deleted file mode 100644 index 38e3adbdc..000000000 --- a/data/maps/PalletTown_GarysHouse/text.inc +++ /dev/null @@ -1,121 +0,0 @@ -PalletTown_GarysHouse_Text_HiBrothersAtLab:: @ 818D58C - .string "DAISY: Hi, {PLAYER}!\p" - .string "My brother, {RIVAL}, is out at\n" - .string "Grandpa's LAB.$" - -PalletTown_GarysHouse_Text_HeardYouBattledRival:: @ 818D5C4 - .string "DAISY: {PLAYER}, I heard you had\n" - .string "a battle against {RIVAL}.\p" - .string "I wish I'd seen that!$" - -PalletTown_GarysHouse_Text_ErrandForGrandpaThisWillHelp:: @ 818D60A - .string "Grandpa asked you to run an\n" - .string "errand?\p" - .string "Gee, that's lazy of him.\n" - .string "Here, this will help you.$" - -PalletTown_GarysHouse_Text_ReceivedTownMapFromDaisy:: @ 818D661 - .string "{PLAYER} received a TOWN MAP\n" - .string "from DAISY.$" - -PalletTown_GarysHouse_Text_DontHaveSpaceForThis:: @ 818D684 - .string "You don't have space for this in\n" - .string "your BAG.$" - -PalletTown_GarysHouse_Text_ExplainTownMap:: @ 818D6AF - .string "You can use the TOWN MAP to find\n" - .string "out where you are, or check the\l" - .string "names of places.$" - -PalletTown_GarysHouse_Text_PleaseGiveMonsRest:: @ 818D701 - .string "DAISY: Just like people, POKéMON\n" - .string "are living things.\p" - .string "When they get tired, please give\n" - .string "them a rest.$" - -PalletTown_GarysHouse_Text_ItsBigMapOfKanto:: @ 818D763 - .string "It's a big map of the KANTO region.\n" - .string "Now this would be useful!$" - -PalletTown_GarysHouse_Text_ShelvesCrammedFullOfBooks:: @ 818D7A1 - .string "The shelves are crammed full of\n" - .string "books on POKéMON.$" - -PalletTown_GarysHouse_Text_LikeMeToGroomMon:: @ 818D7D3 - .string "DAISY: Hi, {PLAYER}!\n" - .string "Good timing.\p" - .string "I'm about to have some tea.\n" - .string "Would you like to join me?\p" - .string "Oh, but look.\n" - .string "Your POKéMON are a little dirty.\p" - .string "Would you like me to groom one?$" - -PalletTown_GarysHouse_Text_DontNeedAnyGrooming:: @ 818D875 - .string "You don't need any grooming done?\n" - .string "Okay, we'll just have tea.$" - -PalletTown_GarysHouse_Text_GroomWhichOne:: @ 818D8B2 - .string "Which one should I groom?$" - -PalletTown_GarysHouse_Text_LookingNiceInNoTime:: @ 818D8CC - .string "DAISY: Okay, I'll get it looking\n" - .string "nice in no time.$" - -PalletTown_GarysHouse_Text_ThereYouGoAllDone:: @ 818D8FE - .string "{SIZE}Á{STR_VAR_1} looks dreamily content…\p" - .string "{SIZE}ÈDAISY: There you go! All done.\n" - .string "See? Doesn't it look nice?\p" - .string "Giggle…\n" - .string "It's such a cute POKéMON.$" - -PalletTown_GarysHouse_Text_CantGroomAnEgg:: @ 818D97B - .string "Oh, sorry. I honestly can't\n" - .string "groom an EGG.$" - -PalletTown_GarysHouse_Text_MayISeeFirstMon:: @ 818D9A5 - .string "DAISY: Your POKéMON grow to love\n" - .string "you if you raise them with love.\p" - .string "For example, {PLAYER}, may I see\n" - .string "your first POKéMON?$" - -PalletTown_GarysHouse_Text_CouldntLoveYouMore:: @ 818DA16 - .string "It couldn't possibly love you\n" - .string "any more than it does now.\p" - .string "Your POKéMON is happy beyond\n" - .string "words.$" - -PalletTown_GarysHouse_Text_ItLooksVeryHappy:: @ 818DA73 - .string "It looks very happy.\p" - .string "I wish {RIVAL} could see this and\n" - .string "learn something from it.$" - -PalletTown_GarysHouse_Text_ItsQuiteFriendly:: @ 818DABE - .string "It's quite friendly with you.\n" - .string "Keep being good to it!$" - -PalletTown_GarysHouse_Text_ItsWarmingUpToYou:: @ 818DAF3 - .string "It's warming up to you.\n" - .string "Trust must be growing between you.$" - -PalletTown_GarysHouse_Text_NotFamiliarWithYouYet:: @ 818DB2E - .string "It's not quite familiar with you\n" - .string "yet.\p" - .string "POKéMON are all quite wary when\n" - .string "you first get them.$" - -PalletTown_GarysHouse_Text_DontLikeWayItGlaresAtYou:: @ 818DB88 - .string "{PLAYER}, I don't like the way it\n" - .string "glares at you.\p" - .string "Could you try being a little nicer\n" - .string "to it?$" - -PalletTown_GarysHouse_Text_WhyWouldMonHateYouSoMuch:: @ 818DBDD - .string "…Um, it's not easy for me to say\n" - .string "this, but…\p" - .string "Is there some reason why your\n" - .string "POKéMON would hate you so much?$" - -PalletTown_GarysHouse_Text_LovelyAndSweetClefairy:: @ 818DC47 - .string "“The lovely and sweet\n" - .string "CLEFAIRY”$" - diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 43000bc34..56227a452 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -755,7 +755,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 2 setvar VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 - setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 + setvar VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 1 setvar VAR_MAP_SCENE_ROUTE22, 1 release end diff --git a/data/maps/PalletTown_RivalsHouse/map.json b/data/maps/PalletTown_RivalsHouse/map.json new file mode 100644 index 000000000..d6eafde70 --- /dev/null +++ b/data/maps/PalletTown_RivalsHouse/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_PALLET_TOWN_RIVALS_HOUSE", + "name": "PalletTown_RivalsHouse", + "layout": "LAYOUT_PALLET_TOWN_RIVALS_HOUSE", + "music": "MUS_PALLET", + "region_map_section": "MAPSEC_PALLET_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "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": "OBJ_EVENT_GFX_DAISY", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "PalletTown_RivalsHouse_EventScript_Daisy", + "flag": "0" + }, + { + "graphics_id": "OBJ_EVENT_GFX_TOWN_MAP", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "PalletTown_RivalsHouse_EventScript_TownMap", + "flag": "FLAG_HIDE_TOWN_MAP" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PALLET_TOWN", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 12, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PalletTown_RivalsHouse_EventScript_Bookshelf" + }, + { + "type": "sign", + "x": 11, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PalletTown_RivalsHouse_EventScript_Bookshelf" + }, + { + "type": "sign", + "x": 9, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PalletTown_RivalsHouse_EventScript_Picture" + } + ] +} diff --git a/data/maps/PalletTown_RivalsHouse/scripts.inc b/data/maps/PalletTown_RivalsHouse/scripts.inc new file mode 100644 index 000000000..208cd2030 --- /dev/null +++ b/data/maps/PalletTown_RivalsHouse/scripts.inc @@ -0,0 +1,182 @@ +.equ LOCALID_DAISY, 1 +.equ LOCALID_TOWN_MAP, 2 + +.equ RECEIVED_TOWN_MAP, VAR_TEMP_1 + +PalletTown_RivalsHouse_MapScripts:: @ 8168D27 + map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_RivalsHouse_OnTransition + .byte 0 + +PalletTown_RivalsHouse_OnTransition:: @ 8168D2D + compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2 + call_if_lt PalletTown_RivalsHouse_EventScript_MoveDaisyToTable + compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2 + call_if_ge PalletTown_RivalsHouse_EventScript_AlreadyReceivedTownMap + end + +PalletTown_RivalsHouse_EventScript_MoveDaisyToTable:: @ 8168D44 + setobjectmovementtype LOCALID_DAISY, MOVEMENT_TYPE_FACE_RIGHT + setobjectxyperm LOCALID_DAISY, 5, 4 + return + +PalletTown_RivalsHouse_EventScript_AlreadyReceivedTownMap:: @ 8168D50 + setvar RECEIVED_TOWN_MAP, TRUE + return + +PalletTown_RivalsHouse_EventScript_Daisy:: @ 8168D56 + lock + faceplayer + famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_RivalsHouse_EventScript_GroomMon + compare RECEIVED_TOWN_MAP, TRUE + goto_if_eq PalletTown_RivalsHouse_EventScript_PleaseGiveMonsRest + compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2 + goto_if_eq PalletTown_RivalsHouse_EventScript_ExplainTownMap + compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 1 + goto_if_eq PalletTown_RivalsHouse_EventScript_GiveTownMap + compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 + goto_if_ge PalletTown_RivalsHouse_EventScript_HeardBattledRival + msgbox PalletTown_RivalsHouse_Text_HiBrothersAtLab + closemessage + applymovement LOCALID_DAISY, Movement_FaceOriginalDirection + waitmovement 0 + release + end + +PalletTown_RivalsHouse_EventScript_HeardBattledRival:: @ 8168DAF + msgbox PalletTown_RivalsHouse_Text_HeardYouBattledRival + release + end + +PalletTown_RivalsHouse_EventScript_GroomMon:: @ 8168DB9 + goto_if_questlog EventScript_ReleaseEnd + special QuestLog_CutRecording + compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 + goto_if_lt PalletTown_RivalsHouse_EventScript_RateMonFriendship + msgbox PalletTown_RivalsHouse_Text_LikeMeToGroomMon, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq PalletTown_RivalsHouse_EventScript_DeclineGrooming + msgbox PalletTown_RivalsHouse_Text_GroomWhichOne + special ChoosePartyMon + waitstate + lock + faceplayer + compare VAR_0x8004, PARTY_SIZE + goto_if_ge PalletTown_RivalsHouse_EventScript_DeclineGrooming + specialvar VAR_RESULT, GetPartyMonSpecies + compare VAR_RESULT, SPECIES_EGG + goto_if_eq PalletTown_RivalsHouse_EventScript_CantGroomEgg + msgbox PalletTown_RivalsHouse_Text_LookingNiceInNoTime + closemessage + fadescreen FADE_TO_BLACK + playfanfare MUS_HEAL + waitfanfare + special DaisyMassageServices + fadescreen FADE_FROM_BLACK + special BufferMonNickname + msgbox PalletTown_RivalsHouse_Text_ThereYouGoAllDone + release + end + +PalletTown_RivalsHouse_EventScript_CantGroomEgg:: @ 8168E32 + msgbox PalletTown_RivalsHouse_Text_CantGroomAnEgg + release + end + +PalletTown_RivalsHouse_EventScript_DeclineGrooming:: @ 8168E3C + msgbox PalletTown_RivalsHouse_Text_DontNeedAnyGrooming + release + end + +PalletTown_RivalsHouse_EventScript_RateMonFriendship:: @ 8168E46 + msgbox PalletTown_RivalsHouse_Text_MayISeeFirstMon + specialvar VAR_RESULT, GetLeadMonFriendship + switch VAR_RESULT + case 0, PalletTown_RivalsHouse_EventScript_MonFriendshipLowest + case 1, PalletTown_RivalsHouse_EventScript_MonFriendshipLower + case 2, PalletTown_RivalsHouse_EventScript_MonFriendshipLow + case 3, PalletTown_RivalsHouse_EventScript_MonFriendshipMid + case 4, PalletTown_RivalsHouse_EventScript_MonFriendshipHigh + case 5, PalletTown_RivalsHouse_EventScript_MonFriendshipHigher + case 6, PalletTown_RivalsHouse_EventScript_MonFriendshipHighest + end + +PalletTown_RivalsHouse_EventScript_MonFriendshipLowest:: @ 8168EA6 + msgbox PalletTown_RivalsHouse_Text_WhyWouldMonHateYouSoMuch + release + end + +PalletTown_RivalsHouse_EventScript_MonFriendshipLower:: @ 8168EB0 + msgbox PalletTown_RivalsHouse_Text_DontLikeWayItGlaresAtYou + release + end + +PalletTown_RivalsHouse_EventScript_MonFriendshipLow:: @ 8168EBA + msgbox PalletTown_RivalsHouse_Text_NotFamiliarWithYouYet + release + end + +PalletTown_RivalsHouse_EventScript_MonFriendshipMid:: @ 8168EC4 + msgbox PalletTown_RivalsHouse_Text_ItsWarmingUpToYou + release + end + +PalletTown_RivalsHouse_EventScript_MonFriendshipHigh:: @ 8168ECE + msgbox PalletTown_RivalsHouse_Text_ItsQuiteFriendly + release + end + +PalletTown_RivalsHouse_EventScript_MonFriendshipHigher:: @ 8168ED8 + msgbox PalletTown_RivalsHouse_Text_ItLooksVeryHappy + release + end + +PalletTown_RivalsHouse_EventScript_MonFriendshipHighest:: @ 8168EE2 + msgbox PalletTown_RivalsHouse_Text_CouldntLoveYouMore + release + end + +PalletTown_RivalsHouse_EventScript_PleaseGiveMonsRest:: @ 8168EEC + msgbox PalletTown_RivalsHouse_Text_PleaseGiveMonsRest + release + end + +PalletTown_RivalsHouse_EventScript_GiveTownMap:: @ 8168EF6 + msgbox PalletTown_RivalsHouse_Text_ErrandForGrandpaThisWillHelp + closemessage + checkitemspace ITEM_TOWN_MAP, 1 + compare VAR_RESULT, FALSE + goto_if_eq PalletTown_RivalsHouse_EventScript_NoRoomForTownMap + applymovement LOCALID_DAISY, Movement_WalkInPlaceFastestRight + waitmovement 0 + removeobject LOCALID_TOWN_MAP + setvar VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2 + delay 15 + applymovement LOCALID_DAISY, Movement_FacePlayer + waitmovement 0 + delay 12 + giveitem_msg PalletTown_RivalsHouse_Text_ReceivedTownMapFromDaisy, ITEM_TOWN_MAP, 1, MUS_OBTAIN_KEY_ITEM + release + end + +PalletTown_RivalsHouse_EventScript_NoRoomForTownMap:: @ 8168F4F + msgbox PalletTown_RivalsHouse_Text_DontHaveSpaceForThis + release + end + +PalletTown_RivalsHouse_EventScript_ExplainTownMap:: @ 8168F59 + msgbox PalletTown_RivalsHouse_Text_ExplainTownMap + release + end + +PalletTown_RivalsHouse_EventScript_TownMap:: @ 8168F63 + msgbox PalletTown_RivalsHouse_Text_ItsBigMapOfKanto, MSGBOX_NPC + end + +PalletTown_RivalsHouse_EventScript_Bookshelf:: @ 8168F6C + msgbox PalletTown_RivalsHouse_Text_ShelvesCrammedFullOfBooks, MSGBOX_SIGN + end + +PalletTown_RivalsHouse_EventScript_Picture:: @ 8168F75 + msgbox PalletTown_RivalsHouse_Text_LovelyAndSweetClefairy, MSGBOX_SIGN + end diff --git a/data/maps/PalletTown_RivalsHouse/text.inc b/data/maps/PalletTown_RivalsHouse/text.inc new file mode 100644 index 000000000..319ba6e90 --- /dev/null +++ b/data/maps/PalletTown_RivalsHouse/text.inc @@ -0,0 +1,121 @@ +PalletTown_RivalsHouse_Text_HiBrothersAtLab:: @ 818D58C + .string "DAISY: Hi, {PLAYER}!\p" + .string "My brother, {RIVAL}, is out at\n" + .string "Grandpa's LAB.$" + +PalletTown_RivalsHouse_Text_HeardYouBattledRival:: @ 818D5C4 + .string "DAISY: {PLAYER}, I heard you had\n" + .string "a battle against {RIVAL}.\p" + .string "I wish I'd seen that!$" + +PalletTown_RivalsHouse_Text_ErrandForGrandpaThisWillHelp:: @ 818D60A + .string "Grandpa asked you to run an\n" + .string "errand?\p" + .string "Gee, that's lazy of him.\n" + .string "Here, this will help you.$" + +PalletTown_RivalsHouse_Text_ReceivedTownMapFromDaisy:: @ 818D661 + .string "{PLAYER} received a TOWN MAP\n" + .string "from DAISY.$" + +PalletTown_RivalsHouse_Text_DontHaveSpaceForThis:: @ 818D684 + .string "You don't have space for this in\n" + .string "your BAG.$" + +PalletTown_RivalsHouse_Text_ExplainTownMap:: @ 818D6AF + .string "You can use the TOWN MAP to find\n" + .string "out where you are, or check the\l" + .string "names of places.$" + +PalletTown_RivalsHouse_Text_PleaseGiveMonsRest:: @ 818D701 + .string "DAISY: Just like people, POKéMON\n" + .string "are living things.\p" + .string "When they get tired, please give\n" + .string "them a rest.$" + +PalletTown_RivalsHouse_Text_ItsBigMapOfKanto:: @ 818D763 + .string "It's a big map of the KANTO region.\n" + .string "Now this would be useful!$" + +PalletTown_RivalsHouse_Text_ShelvesCrammedFullOfBooks:: @ 818D7A1 + .string "The shelves are crammed full of\n" + .string "books on POKéMON.$" + +PalletTown_RivalsHouse_Text_LikeMeToGroomMon:: @ 818D7D3 + .string "DAISY: Hi, {PLAYER}!\n" + .string "Good timing.\p" + .string "I'm about to have some tea.\n" + .string "Would you like to join me?\p" + .string "Oh, but look.\n" + .string "Your POKéMON are a little dirty.\p" + .string "Would you like me to groom one?$" + +PalletTown_RivalsHouse_Text_DontNeedAnyGrooming:: @ 818D875 + .string "You don't need any grooming done?\n" + .string "Okay, we'll just have tea.$" + +PalletTown_RivalsHouse_Text_GroomWhichOne:: @ 818D8B2 + .string "Which one should I groom?$" + +PalletTown_RivalsHouse_Text_LookingNiceInNoTime:: @ 818D8CC + .string "DAISY: Okay, I'll get it looking\n" + .string "nice in no time.$" + +PalletTown_RivalsHouse_Text_ThereYouGoAllDone:: @ 818D8FE + .string "{SIZE}Á{STR_VAR_1} looks dreamily content…\p" + .string "{SIZE}ÈDAISY: There you go! All done.\n" + .string "See? Doesn't it look nice?\p" + .string "Giggle…\n" + .string "It's such a cute POKéMON.$" + +PalletTown_RivalsHouse_Text_CantGroomAnEgg:: @ 818D97B + .string "Oh, sorry. I honestly can't\n" + .string "groom an EGG.$" + +PalletTown_RivalsHouse_Text_MayISeeFirstMon:: @ 818D9A5 + .string "DAISY: Your POKéMON grow to love\n" + .string "you if you raise them with love.\p" + .string "For example, {PLAYER}, may I see\n" + .string "your first POKéMON?$" + +PalletTown_RivalsHouse_Text_CouldntLoveYouMore:: @ 818DA16 + .string "It couldn't possibly love you\n" + .string "any more than it does now.\p" + .string "Your POKéMON is happy beyond\n" + .string "words.$" + +PalletTown_RivalsHouse_Text_ItLooksVeryHappy:: @ 818DA73 + .string "It looks very happy.\p" + .string "I wish {RIVAL} could see this and\n" + .string "learn something from it.$" + +PalletTown_RivalsHouse_Text_ItsQuiteFriendly:: @ 818DABE + .string "It's quite friendly with you.\n" + .string "Keep being good to it!$" + +PalletTown_RivalsHouse_Text_ItsWarmingUpToYou:: @ 818DAF3 + .string "It's warming up to you.\n" + .string "Trust must be growing between you.$" + +PalletTown_RivalsHouse_Text_NotFamiliarWithYouYet:: @ 818DB2E + .string "It's not quite familiar with you\n" + .string "yet.\p" + .string "POKéMON are all quite wary when\n" + .string "you first get them.$" + +PalletTown_RivalsHouse_Text_DontLikeWayItGlaresAtYou:: @ 818DB88 + .string "{PLAYER}, I don't like the way it\n" + .string "glares at you.\p" + .string "Could you try being a little nicer\n" + .string "to it?$" + +PalletTown_RivalsHouse_Text_WhyWouldMonHateYouSoMuch:: @ 818DBDD + .string "…Um, it's not easy for me to say\n" + .string "this, but…\p" + .string "Is there some reason why your\n" + .string "POKéMON would hate you so much?$" + +PalletTown_RivalsHouse_Text_LovelyAndSweetClefairy:: @ 818DC47 + .string "“The lovely and sweet\n" + .string "CLEFAIRY”$" + diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index e8a346f5a..a468baa37 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -309,7 +309,7 @@ "gMapGroup4": [ "PalletTown_PlayersHouse_1F", "PalletTown_PlayersHouse_2F", - "PalletTown_GarysHouse", + "PalletTown_RivalsHouse", "PalletTown_ProfessorOaksLab" ], "gMapGroup5": [ -- cgit v1.2.3