diff options
-rw-r--r-- | data/event_scripts.s | 3 | ||||
-rw-r--r-- | data/maps/DewfordTown/map.json | 14 | ||||
-rw-r--r-- | data/maps/DewfordTown/scripts.inc | 228 | ||||
-rw-r--r-- | data/maps/DewfordTown_Hall/map.json | 22 | ||||
-rw-r--r-- | data/maps/DewfordTown_Hall/scripts.inc | 284 | ||||
-rw-r--r-- | data/maps/DewfordTown_House1/map.json | 6 | ||||
-rw-r--r-- | data/maps/DewfordTown_House1/scripts.inc | 18 | ||||
-rw-r--r-- | data/maps/DewfordTown_House2/map.json | 4 | ||||
-rw-r--r-- | data/maps/DewfordTown_House2/scripts.inc | 30 |
9 files changed, 304 insertions, 305 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 7bd77505c..f426273bb 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -746,8 +746,7 @@ Common_EventScript_ReadyPetalburgGymForBattle:: @ 8271E84 setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS return -DewfordTown_EventScript_271E8B:: @ 8271E8B -DewfordTown_Hall_EventScript_271E8B:: @ 8271E8B +Common_EventScript_BufferTrendyPhrase:: @ 8271E8B dotimebasedevents setvar VAR_0x8004, 0 special BufferTrendyPhraseString diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 32fe0c313..bfa5a2e8b 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_EventScript_1E95B1", + "script": "DewfordTown_EventScript_Woman", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "3", - "script": "DewfordTown_EventScript_1E9511", + "script": "DewfordTown_EventScript_Briney", "flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_EventScript_1E95D5", + "script": "DewfordTown_EventScript_OldRodFisherman", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_EventScript_1E9922", + "script": "DewfordTown_EventScript_TrendyPhraseBoy", "flag": "0" } ], @@ -136,7 +136,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_EventScript_1E95BA" + "script": "DewfordTown_EventScript_TownSign" }, { "type": "sign", @@ -144,7 +144,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_EventScript_1E95C3" + "script": "DewfordTown_EventScript_GymSign" }, { "type": "sign", @@ -168,7 +168,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_EventScript_1E95CC" + "script": "DewfordTown_EventScript_HallSign" } ] }
\ No newline at end of file diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 9d6011a1f..058a3ffca 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -6,131 +6,131 @@ DewfordTown_OnTransition: @ 81E950D setflag FLAG_VISITED_DEWFORD_TOWN end -DewfordTown_EventScript_1E9511:: @ 81E9511 +DewfordTown_EventScript_Briney:: @ 81E9511 lock faceplayer - goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_1E9585 - message DewfordTown_Text_1E9C8A + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_ReturnToPetalburgPrompt + message DewfordTown_Text_WhereAreWeBound waitmessage multichoicedefault 21, 6, MULTI_BRINEY_ON_DEWFORD, 2, 0 switch VAR_RESULT - case 0, DewfordTown_EventScript_1E955A - case 1, DewfordTown_EventScript_1E956A - case 2, DewfordTown_EventScript_1E957A - case MULTI_B_PRESSED, DewfordTown_EventScript_1E957A + case 0, DewfordTown_EventScript_ChoosePetalburg + case 1, DewfordTown_EventScript_ChooseSlateport + case 2, DewfordTown_EventScript_CancelSailSelect + case MULTI_B_PRESSED, DewfordTown_EventScript_CancelSailSelect end -DewfordTown_EventScript_1E955A:: @ 81E955A - msgbox DewfordTown_Text_1E9CE5, MSGBOX_DEFAULT +DewfordTown_EventScript_ChoosePetalburg:: @ 81E955A + msgbox DewfordTown_Text_PetalburgWereSettingSail, MSGBOX_DEFAULT closemessage - goto DewfordTown_EventScript_1E9660 + goto DewfordTown_EventScript_SailToPetalburg release end -DewfordTown_EventScript_1E956A:: @ 81E956A - msgbox DewfordTown_Text_1E9D3A, MSGBOX_DEFAULT +DewfordTown_EventScript_ChooseSlateport:: @ 81E956A + msgbox DewfordTown_Text_SlateportWereSettingSail, MSGBOX_DEFAULT closemessage - goto DewfordTown_EventScript_1E96E7 + goto DewfordTown_EventScript_SailToSlateport release end -DewfordTown_EventScript_1E957A:: @ 81E957A - msgbox DewfordTown_Text_1E9D8F, MSGBOX_DEFAULT +DewfordTown_EventScript_CancelSailSelect:: @ 81E957A + msgbox DewfordTown_Text_JustTellMeWhenYouNeedToSetSail, MSGBOX_DEFAULT closemessage release end -DewfordTown_EventScript_1E9585:: @ 81E9585 - msgbox DewfordTown_Text_1E9B24, MSGBOX_YESNO +DewfordTown_EventScript_ReturnToPetalburgPrompt:: @ 81E9585 + msgbox DewfordTown_Text_SetSailBackToPetalburg, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq DewfordTown_EventScript_1E95A2 - msgbox DewfordTown_Text_1E9BD9, MSGBOX_DEFAULT + goto_if_eq DewfordTown_EventScript_SailBackToPetalburg + msgbox DewfordTown_Text_GoDeliverIllBeWaiting, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E95A2:: @ 81E95A2 - msgbox DewfordTown_Text_1E9B7F, MSGBOX_DEFAULT +DewfordTown_EventScript_SailBackToPetalburg:: @ 81E95A2 + msgbox DewfordTown_Text_PetalburgWereSettingSail2, MSGBOX_DEFAULT closemessage - goto DewfordTown_EventScript_1E9660 + goto DewfordTown_EventScript_SailToPetalburg end -DewfordTown_EventScript_1E95B1:: @ 81E95B1 - msgbox DewfordTown_Text_1E99A8, MSGBOX_NPC +DewfordTown_EventScript_Woman:: @ 81E95B1 + msgbox DewfordTown_Text_TinyIslandCommunity, MSGBOX_NPC end -DewfordTown_EventScript_1E95BA:: @ 81E95BA - msgbox DewfordTown_Text_1E9A0F, MSGBOX_SIGN +DewfordTown_EventScript_TownSign:: @ 81E95BA + msgbox DewfordTown_Text_TownSign, MSGBOX_SIGN end -DewfordTown_EventScript_1E95C3:: @ 81E95C3 - msgbox DewfordTown_Text_1E9A3D, MSGBOX_SIGN +DewfordTown_EventScript_GymSign:: @ 81E95C3 + msgbox DewfordTown_Text_GymSign, MSGBOX_SIGN end -DewfordTown_EventScript_1E95CC:: @ 81E95CC - msgbox DewfordTown_Text_1E9A7F, MSGBOX_SIGN +DewfordTown_EventScript_HallSign:: @ 81E95CC + msgbox DewfordTown_Text_HallSign, MSGBOX_SIGN end -DewfordTown_EventScript_1E95D5:: @ 81E95D5 +DewfordTown_EventScript_OldRodFisherman:: @ 81E95D5 lock faceplayer - goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_1E962A - msgbox DewfordTown_Text_1E9DD1, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_HowsFishing + msgbox DewfordTown_Text_GettingItchToFish, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq DewfordTown_EventScript_1E95FF + goto_if_eq DewfordTown_EventScript_GiveOldRod compare VAR_RESULT, NO - goto_if_eq DewfordTown_EventScript_1E9620 + goto_if_eq DewfordTown_EventScript_NotGettingItchToFish end -DewfordTown_EventScript_1E95FF:: @ 81E95FF - msgbox DewfordTown_Text_1E9E14, MSGBOX_DEFAULT +DewfordTown_EventScript_GiveOldRod:: @ 81E95FF + msgbox DewfordTown_Text_GiveYouOneOfMyRods, MSGBOX_DEFAULT giveitem_std ITEM_OLD_ROD setflag FLAG_RECEIVED_OLD_ROD - msgbox DewfordTown_Text_1E9E65, MSGBOX_DEFAULT + msgbox DewfordTown_Text_ThrowInFishingAdvice, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E9620:: @ 81E9620 - msgbox DewfordTown_Text_1E9F92, MSGBOX_DEFAULT +DewfordTown_EventScript_NotGettingItchToFish:: @ 81E9620 + msgbox DewfordTown_Text_ThatsTooBadThen, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E962A:: @ 81E962A - message DewfordTown_Text_1E9FB8 +DewfordTown_EventScript_HowsFishing:: @ 81E962A + message DewfordTown_Text_HowsYourFishing waitmessage multichoice 20, 8, MULTI_HOWS_FISHING, 1 compare VAR_RESULT, 0 - goto_if_eq DewfordTown_EventScript_1E964C + goto_if_eq DewfordTown_EventScript_FishingExcellent compare VAR_RESULT, 1 - goto_if_eq DewfordTown_EventScript_1E9656 + goto_if_eq DewfordTown_EventScript_FishingNotSoGood end -DewfordTown_EventScript_1E964C:: @ 81E964C - msgbox DewfordTown_Text_1E9FD0, MSGBOX_DEFAULT +DewfordTown_EventScript_FishingExcellent:: @ 81E964C + msgbox DewfordTown_Text_GreatHaulInSomeBigOnes, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E9656:: @ 81E9656 - msgbox DewfordTown_Text_1EA004, MSGBOX_DEFAULT +DewfordTown_EventScript_FishingNotSoGood:: @ 81E9656 + msgbox DewfordTown_Text_FishingAdvice, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E9660:: @ 81E9660 +DewfordTown_EventScript_SailToPetalburg:: @ 81E9660 call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 0 - applymovement 2, DewfordTown_Movement_1E991D + applymovement 2, DewfordTown_Movement_BrineyBoardBoat waitmovement 0 removeobject 2 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic - applymovement 4, DewfordTown_Movement_1E97A2 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E97A2 + applymovement 4, DewfordTown_Movement_SailToDewford + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToDewford waitmovement 0 showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 call Common_EventScript_StopBrineysBoatMusic - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9914 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_ExitBoatPetalburg waitmovement 0 showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY @@ -146,36 +146,36 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 release end -DewfordTown_EventScript_1E96E7:: @ 81E96E7 +DewfordTown_EventScript_SailToSlateport:: @ 81E96E7 call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 1 - applymovement 2, DewfordTown_Movement_1E991D + applymovement 2, DewfordTown_Movement_BrineyBoardBoat waitmovement 0 removeobject 2 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic - applymovement 4, DewfordTown_Movement_1E9865 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9865 + applymovement 4, DewfordTown_Movement_SailToPetalburg + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToPetalburg waitmovement 0 call Common_EventScript_StopBrineysBoatMusic showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9918 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_ExitBoatSlateport waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 setobjectpriority 2, MAP_ROUTE109, 0 - applymovement 2, DewfordTown_Movement_1E991F + applymovement 2, DewfordTown_Movement_BrineyExitBoat waitmovement 0 clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY addobject 1 clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN - call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9790 - call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9799 + call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateportDeliverGoods + call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateport closemessage copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN @@ -184,15 +184,15 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 release end -DewfordTown_EventScript_1E9790:: @ 81E9790 +DewfordTown_EventScript_LandedSlateportDeliverGoods:: @ 81E9790 msgbox DewfordTown_Text_BrineyLandedInSlateportDeliverGoods, MSGBOX_DEFAULT return -DewfordTown_EventScript_1E9799:: @ 81E9799 +DewfordTown_EventScript_LandedSlateport:: @ 81E9799 msgbox DewfordTown_Text_BrineyLandedInSlateport, MSGBOX_DEFAULT return -DewfordTown_Movement_1E97A2: @ 81E97A2 +DewfordTown_Movement_SailToDewford: @ 81E97A2 walk_up walk_up walk_fast_up @@ -389,7 +389,7 @@ DewfordTown_Movement_1E97A2: @ 81E97A2 walk_up step_end -DewfordTown_Movement_1E9865: @ 81E9865 +DewfordTown_Movement_SailToPetalburg: @ 81E9865 walk_right walk_fast_right walk_fast_right @@ -563,94 +563,94 @@ DewfordTown_Movement_1E9865: @ 81E9865 walk_fast_up step_end -DewfordTown_Movement_1E9911: @ 81E9911 +DewfordTown_Movement_PlayerBoardBoat: @ 81E9911 walk_right walk_up step_end -DewfordTown_Movement_1E9914: @ 81E9914 +DewfordTown_Movement_ExitBoatPetalburg: @ 81E9914 walk_up walk_up walk_up step_end -DewfordTown_Movement_1E9918: @ 81E9918 +DewfordTown_Movement_ExitBoatSlateport: @ 81E9918 walk_up walk_up walk_up walk_in_place_fastest_down step_end -DewfordTown_Movement_1E991D: @ 81E991D +DewfordTown_Movement_BrineyBoardBoat: @ 81E991D walk_up step_end -DewfordTown_Movement_1E991F: @ 81E991F +DewfordTown_Movement_BrineyExitBoat: @ 81E991F walk_up walk_up step_end -DewfordTown_EventScript_1E9922:: @ 81E9922 +DewfordTown_EventScript_TrendyPhraseBoy:: @ 81E9922 lock faceplayer - call DewfordTown_EventScript_271E8B - msgbox DewfordTown_Text_1EA136, MSGBOX_YESNO + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Text_XIsTheBiggestHappeningThingRight, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq DewfordTown_EventScript_1E9948 + goto_if_eq DewfordTown_EventScript_ConfirmTrendyPhrase compare VAR_RESULT, NO - goto_if_eq DewfordTown_EventScript_1E9952 + goto_if_eq DewfordTown_EventScript_RejectTrendyPhrase end -DewfordTown_EventScript_1E9948:: @ 81E9948 - msgbox DewfordTown_Text_1EA491, MSGBOX_DEFAULT +DewfordTown_EventScript_ConfirmTrendyPhrase:: @ 81E9948 + msgbox DewfordTown_Text_YeahDefinitionOfInRightNow, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E9952:: @ 81E9952 - msgbox DewfordTown_Text_1EA242, MSGBOX_DEFAULT +DewfordTown_EventScript_RejectTrendyPhrase:: @ 81E9952 + msgbox DewfordTown_Text_TellMeWhatsNewAndIn, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_TRENDY_PHRASE call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 1 - goto_if_eq DewfordTown_EventScript_1E997D + goto_if_eq DewfordTown_EventScript_GiveNewTrendyPhrase compare VAR_RESULT, 0 - goto_if_eq DewfordTown_EventScript_1E9994 + goto_if_eq DewfordTown_EventScript_CancelNewTrendyPhrase end -DewfordTown_EventScript_1E997D:: @ 81E997D +DewfordTown_EventScript_GiveNewTrendyPhrase:: @ 81E997D incrementgamestat GAME_STAT_STARTED_TRENDS compare VAR_0x8004, 0 - goto_if_eq DewfordTown_EventScript_1E999E - msgbox DewfordTown_Text_1EA2AA, MSGBOX_DEFAULT + goto_if_eq DewfordTown_EventScript_PhraseNotTrendyEnough + msgbox DewfordTown_Text_OfCourseIKnowAboutThat, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E9994:: @ 81E9994 - msgbox DewfordTown_Text_1EA443, MSGBOX_DEFAULT +DewfordTown_EventScript_CancelNewTrendyPhrase:: @ 81E9994 + msgbox DewfordTown_Text_HearOfAnyTrendsComeShareWithMe, MSGBOX_DEFAULT release end -DewfordTown_EventScript_1E999E:: @ 81E999E - msgbox DewfordTown_Text_1EA3FE, MSGBOX_DEFAULT +DewfordTown_EventScript_PhraseNotTrendyEnough:: @ 81E999E + msgbox DewfordTown_Text_XHuhIThinkYIsCool, MSGBOX_DEFAULT release end -DewfordTown_Text_1E99A8: @ 81E99A8 +DewfordTown_Text_TinyIslandCommunity: @ 81E99A8 .string "DEWFORD is a tiny island community.\n" .string "If something gets trendy here,\l" .string "everyone picks up on it right away.$" -DewfordTown_Text_1E9A0F: @ 81E9A0F +DewfordTown_Text_TownSign: @ 81E9A0F .string "DEWFORD TOWN\n" .string "“A tiny island in the blue sea.”$" -DewfordTown_Text_1E9A3D: @ 81E9A3D +DewfordTown_Text_GymSign: @ 81E9A3D .string "DEWFORD TOWN POKéMON GYM\n" .string "LEADER: BRAWLY\l" .string "“A big wave in fighting!”$" -DewfordTown_Text_1E9A7F: @ 81E9A7F +DewfordTown_Text_HallSign: @ 81E9A7F .string "DEWFORD HALL\n" .string "“Everyone's information exchange!”$" @@ -660,18 +660,18 @@ Route104_Text_LandedInDewfordDeliverLetter: @ 81E9AAF .string "I suppose you're off to deliver that\n" .string "LETTER to, who was it now, STEVEN!$" -DewfordTown_Text_1E9B24: @ 81E9B24 +DewfordTown_Text_SetSailBackToPetalburg: @ 81E9B24 .string "MR. BRINEY: Have you delivered your\n" .string "LETTER?\p" .string "Or were you meaning to sail back to\n" .string "PETALBURG?$" -DewfordTown_Text_1E9B7F: @ 81E9B7F +DewfordTown_Text_PetalburgWereSettingSail2: @ 81E9B7F .string "MR. BRINEY: PETALBURG it is, then!\p" .string "Anchors aweigh!\n" .string "PEEKO, we're setting sail, my darling!$" -DewfordTown_Text_1E9BD9: @ 81E9BD9 +DewfordTown_Text_GoDeliverIllBeWaiting: @ 81E9BD9 .string "MR. BRINEY: Then you go on and deliver\n" .string "the LETTER. I'll be waiting.$" @@ -681,35 +681,35 @@ DewfordTown_Text_BrineyLandedInDewford: @ 81E9C1D .string "You just go on and tell me whenever\n" .string "you want to set sail again!$" -DewfordTown_Text_1E9C8A: @ 81E9C8A +DewfordTown_Text_WhereAreWeBound: @ 81E9C8A .string "MR. BRINEY: Ahoy!\n" .string "For you, I'll go out to sea anytime!\p" .string "Now, my friend, where are we bound?$" -DewfordTown_Text_1E9CE5: @ 81E9CE5 +DewfordTown_Text_PetalburgWereSettingSail: @ 81E9CE5 .string "MR. BRINEY: PETALBURG, is it?\p" .string "Anchors aweigh!\n" .string "PEEKO, we're setting sail, my darling!$" -DewfordTown_Text_1E9D3A: @ 81E9D3A +DewfordTown_Text_SlateportWereSettingSail: @ 81E9D3A .string "MR. BRINEY: SLATEPORT, is it?\p" .string "Anchors aweigh!\n" .string "PEEKO, we're setting sail, my darling!$" -DewfordTown_Text_1E9D8F: @ 81E9D8F +DewfordTown_Text_JustTellMeWhenYouNeedToSetSail: @ 81E9D8F .string "MR. BRINEY: You just tell me whenever\n" .string "you need to set sail again!$" -DewfordTown_Text_1E9DD1: @ 81E9DD1 +DewfordTown_Text_GettingItchToFish: @ 81E9DD1 .string "This is a renowned fishing spot.\n" .string "Are you getting the itch to fish?$" -DewfordTown_Text_1E9E14: @ 81E9E14 +DewfordTown_Text_GiveYouOneOfMyRods: @ 81E9E14 .string "I hear you, and I like what\n" .string "you're saying!\p" .string "I'll give you one of my fishing RODS.$" -DewfordTown_Text_1E9E65: @ 81E9E65 +DewfordTown_Text_ThrowInFishingAdvice: @ 81E9E65 .string "And, as an added bonus, I'll even throw\n" .string "in a little fishing advice!\p" .string "First, you want to face the water,\n" @@ -721,19 +721,19 @@ DewfordTown_Text_1E9E65: @ 81E9E65 .string "you need to time the pulls on your ROD\l" .string "to haul them in.$" -DewfordTown_Text_1E9F92: @ 81E9F92 +DewfordTown_Text_ThatsTooBadThen: @ 81E9F92 .string "Oh, is that so?\n" .string "That's too bad, then.$" -DewfordTown_Text_1E9FB8: @ 81E9FB8 +DewfordTown_Text_HowsYourFishing: @ 81E9FB8 .string "Yo!\n" .string "How's your fishing?$" -DewfordTown_Text_1E9FD0: @ 81E9FD0 +DewfordTown_Text_GreatHaulInSomeBigOnes: @ 81E9FD0 .string "Is that right! That's great!\n" .string "Haul in some big ones!$" -DewfordTown_Text_1EA004: @ 81EA004 +DewfordTown_Text_FishingAdvice: @ 81EA004 .string "Oh, hey, don't get down on yourself!\n" .string "I'll give you a little fishing advice.\p" .string "First, you want to face the water,\n" @@ -745,7 +745,7 @@ DewfordTown_Text_1EA004: @ 81EA004 .string "you need to time the pulls on your ROD\l" .string "to haul them in.$" -DewfordTown_Text_1EA136: @ 81EA136 +DewfordTown_Text_XIsTheBiggestHappeningThingRight: @ 81EA136 .string "I like what's hip, happening, and trendy.\n" .string "I'm always checking it out.\p" .string "Listen, have you heard about this new\n" @@ -759,13 +759,13 @@ DewfordTown_Text_1EA136: @ 81EA136 .string "“{STR_VAR_1}”\l" .string "is the biggest happening thing, right?$" -DewfordTown_Text_1EA242: @ 81EA242 +DewfordTown_Text_TellMeWhatsNewAndIn: @ 81EA242 .string "Hunh?\n" .string "It's not the hip and happening thing?\p" .string "Well, hey, you have to tell me,\n" .string "what's new and what's “in”?$" -DewfordTown_Text_1EA2AA: @ 81EA2AA +DewfordTown_Text_OfCourseIKnowAboutThat: @ 81EA2AA .string "Hunh?\n" .string "“{STR_VAR_2}”?\p" .string "… …\p" @@ -783,18 +783,18 @@ DewfordTown_Text_1EA2AA: @ 81EA2AA .string "Now, “{STR_VAR_2}” is\n" .string "what's vital and in tune with the times!$" -DewfordTown_Text_1EA3FE: @ 81EA3FE +DewfordTown_Text_XHuhIThinkYIsCool: @ 81EA3FE .string "Hmm…\n" .string "“{STR_VAR_2},” huh?\p" .string "But personally, I think\n" .string "“{STR_VAR_1}”\l" .string "is what's real in cool.$" -DewfordTown_Text_1EA443: @ 81EA443 +DewfordTown_Text_HearOfAnyTrendsComeShareWithMe: @ 81EA443 .string "Well, if you hear of any happening new\n" .string "trends, come share them with me, okay?$" -DewfordTown_Text_1EA491: @ 81EA491 +DewfordTown_Text_YeahDefinitionOfInRightNow: @ 81EA491 .string "Yeah, absolutely right!\p" .string "“{STR_VAR_1}” is the\n" .string "definition of “in” right now.$" diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index b801ea3c2..087981fde 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD4D0", + "script": "DewfordTown_Hall_EventScript_Girl", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD4F9", + "script": "DewfordTown_Hall_EventScript_Woman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD50A", + "script": "DewfordTown_Hall_EventScript_Man", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD547", + "script": "DewfordTown_Hall_EventScript_ExpertM", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD563", + "script": "DewfordTown_Hall_EventScript_Twin", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD57F", + "script": "DewfordTown_Hall_EventScript_LittleBoy", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD62F", + "script": "DewfordTown_Hall_EventScript_SchoolKidM", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD63B", + "script": "DewfordTown_Hall_EventScript_PsychicM", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Hall_EventScript_1FD7DA", + "script": "DewfordTown_Hall_EventScript_SludgeBombMan", "flag": "FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN" } ], @@ -156,7 +156,7 @@ "y": 1, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_Hall_EventScript_1FD590" + "script": "DewfordTown_Hall_EventScript_Bookshelf" }, { "type": "sign", @@ -164,7 +164,7 @@ "y": 1, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DewfordTown_Hall_EventScript_1FD5A0" + "script": "DewfordTown_Hall_EventScript_Painting" } ] }
\ No newline at end of file diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index e6eeec010..971dd2321 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -1,319 +1,319 @@ DewfordTown_Hall_MapScripts:: @ 81FD4CF .byte 0 -DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0 +DewfordTown_Hall_EventScript_Girl:: @ 81FD4D0 lock faceplayer - call DewfordTown_Hall_EventScript_271E8B + call Common_EventScript_BufferTrendyPhrase special TrendyPhraseIsOld - compare VAR_RESULT, 1 - goto_if_eq DewfordTown_Hall_EventScript_1FD4EF - msgbox DewfordTown_Hall_Text_1FD818, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq DewfordTown_Hall_EventScript_GirlBoredOfTrend + msgbox DewfordTown_Hall_Text_CantImagineLifeWithoutTrend, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD4EF:: @ 81FD4EF - msgbox DewfordTown_Hall_Text_1FD877, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_GirlBoredOfTrend:: @ 81FD4EF + msgbox DewfordTown_Hall_Text_GettingBoredOfTrend, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD4F9:: @ 81FD4F9 +DewfordTown_Hall_EventScript_Woman:: @ 81FD4F9 lock faceplayer - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FD8ED, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Hall_Text_TeachingMonAboutTrend, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A +DewfordTown_Hall_EventScript_Man:: @ 81FD50A lock faceplayer - call DewfordTown_Hall_EventScript_271E8B + call Common_EventScript_BufferTrendyPhrase special sub_811EF6C - msgbox DewfordTown_Hall_Text_1FD948, MSGBOX_YESNO + msgbox DewfordTown_Hall_Text_DeepLinkBetweenXAndY, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq DewfordTown_Hall_EventScript_1FD533 + goto_if_eq DewfordTown_Hall_EventScript_ConfirmTrendLink compare VAR_RESULT, NO - goto_if_eq DewfordTown_Hall_EventScript_1FD53D + goto_if_eq DewfordTown_Hall_EventScript_RejectTrendLink end -DewfordTown_Hall_EventScript_1FD533:: @ 81FD533 - msgbox DewfordTown_Hall_Text_1FD9B3, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_ConfirmTrendLink:: @ 81FD533 + msgbox DewfordTown_Hall_Text_MyHunchWasRight, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD53D:: @ 81FD53D - msgbox DewfordTown_Hall_Text_1FDA06, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_RejectTrendLink:: @ 81FD53D + msgbox DewfordTown_Hall_Text_NotEasyToKeepUp, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD547:: @ 81FD547 +DewfordTown_Hall_EventScript_ExpertM:: @ 81FD547 lock faceplayer - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Hall_Text_TVShowAboutTrend, MSGBOX_DEFAULT closemessage applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 release end -DewfordTown_Hall_EventScript_1FD563:: @ 81FD563 +DewfordTown_Hall_EventScript_Twin:: @ 81FD563 lock faceplayer - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea, MSGBOX_DEFAULT closemessage applymovement 5, Common_Movement_WalkInPlaceFastestUp waitmovement 0 release end -DewfordTown_Hall_EventScript_1FD57F:: @ 81FD57F +DewfordTown_Hall_EventScript_LittleBoy:: @ 81FD57F lock faceplayer - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDAC4, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Hall_Text_CollectTrendMerchandise, MSGBOX_DEFAULT release end -DewfordTown_Hall_EventScript_1FD590:: @ 81FD590 +DewfordTown_Hall_EventScript_Bookshelf:: @ 81FD590 lockall - call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDB89, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + msgbox DewfordTown_Hall_Text_BooksAboutTrend, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD5A0:: @ 81FD5A0 +DewfordTown_Hall_EventScript_Painting:: @ 81FD5A0 lockall - call DewfordTown_Hall_EventScript_271E8B + call Common_EventScript_BufferTrendyPhrase special GetDewfordHallPaintingNameIndex switch VAR_RESULT - case 0, DewfordTown_Hall_EventScript_1FD607 - case 4, DewfordTown_Hall_EventScript_1FD607 - case 1, DewfordTown_Hall_EventScript_1FD611 - case 5, DewfordTown_Hall_EventScript_1FD607 - case 2, DewfordTown_Hall_EventScript_1FD61B - case 6, DewfordTown_Hall_EventScript_1FD61B - case 3, DewfordTown_Hall_EventScript_1FD625 - case 7, DewfordTown_Hall_EventScript_1FD61B + case 0, DewfordTown_Hall_EventScript_ScreamTitle + case 4, DewfordTown_Hall_EventScript_ScreamTitle + case 1, DewfordTown_Hall_EventScript_SmileTitle + case 5, DewfordTown_Hall_EventScript_ScreamTitle + case 2, DewfordTown_Hall_EventScript_LastTitle + case 6, DewfordTown_Hall_EventScript_LastTitle + case 3, DewfordTown_Hall_EventScript_BirthTitle + case 7, DewfordTown_Hall_EventScript_LastTitle end -DewfordTown_Hall_EventScript_1FD607:: @ 81FD607 - msgbox DewfordTown_Hall_Text_1FDC05, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_ScreamTitle:: @ 81FD607 + msgbox DewfordTown_Hall_Text_TrendsScream, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD611:: @ 81FD611 - msgbox DewfordTown_Hall_Text_1FDC21, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_SmileTitle:: @ 81FD611 + msgbox DewfordTown_Hall_Text_TrendsSmile, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD61B:: @ 81FD61B - msgbox DewfordTown_Hall_Text_1FDC3C, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_LastTitle:: @ 81FD61B + msgbox DewfordTown_Hall_Text_LastTrend, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD625:: @ 81FD625 - msgbox DewfordTown_Hall_Text_1FDC57, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_BirthTitle:: @ 81FD625 + msgbox DewfordTown_Hall_Text_BirthOfTrend, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD62F:: @ 81FD62F +DewfordTown_Hall_EventScript_SchoolKidM:: @ 81FD62F lockall setvar VAR_0x8008, 0 - goto DewfordTown_Hall_EventScript_1FD647 + goto DewfordTown_Hall_EventScript_DoTrendDebate end -DewfordTown_Hall_EventScript_1FD63B:: @ 81FD63B +DewfordTown_Hall_EventScript_PsychicM:: @ 81FD63B lockall setvar VAR_0x8008, 1 - goto DewfordTown_Hall_EventScript_1FD647 + goto DewfordTown_Hall_EventScript_DoTrendDebate end -DewfordTown_Hall_EventScript_1FD647:: @ 81FD647 - call DewfordTown_Hall_EventScript_271E8B +DewfordTown_Hall_EventScript_DoTrendDebate:: @ 81FD647 + call Common_EventScript_BufferTrendyPhrase special GetDewfordHallPaintingNameIndex switch VAR_RESULT - case 0, DewfordTown_Hall_EventScript_1FD6AD - case 1, DewfordTown_Hall_EventScript_1FD6AD - case 2, DewfordTown_Hall_EventScript_1FD6C9 - case 3, DewfordTown_Hall_EventScript_1FD6C9 - case 4, DewfordTown_Hall_EventScript_1FD6E5 - case 5, DewfordTown_Hall_EventScript_1FD6E5 - case 6, DewfordTown_Hall_EventScript_1FD701 - case 7, DewfordTown_Hall_EventScript_1FD71D + case 0, DewfordTown_Hall_EventScript_TrendDebate1 + case 1, DewfordTown_Hall_EventScript_TrendDebate1 + case 2, DewfordTown_Hall_EventScript_TrendDebate2 + case 3, DewfordTown_Hall_EventScript_TrendDebate2 + case 4, DewfordTown_Hall_EventScript_TrendDebate3 + case 5, DewfordTown_Hall_EventScript_TrendDebate3 + case 6, DewfordTown_Hall_EventScript_TrendDebate4 + case 7, DewfordTown_Hall_EventScript_TrendDebate5 end -DewfordTown_Hall_EventScript_1FD6AD:: @ 81FD6AD - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDC76, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDCE2, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate1:: @ 81FD6AD + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_SawTrendCoolestThing, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_AllegedTrendNotAuthentic, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD6C9:: @ 81FD6C9 - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDD95, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDE0E, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate2:: @ 81FD6C9 + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_ComposedTrendThemeSong, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_WorkOnYourSinging, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD6E5:: @ 81FD6E5 - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDE77, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDED8, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate3:: @ 81FD6E5 + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_OrganizeTrendParty, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_BrilliantIndeed, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD701:: @ 81FD701 - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDF72, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDFF1, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate4:: @ 81FD701 + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_TrendHasBecomePartOfLife, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_TrendWeighsHeavilyOnMind, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD71D:: @ 81FD71D - call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FE09A, MSGBOX_DEFAULT - call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FE0F2, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_TrendDebate5:: @ 81FD71D + call DewfordTown_Hall_EventScript_DebateReact1 + msgbox DewfordTown_Hall_Text_IfWeTeamUpWellBeInvincible, MSGBOX_DEFAULT + call DewfordTown_Hall_EventScript_DebateReact2 + msgbox DewfordTown_Hall_Text_WellBeTrendDuo, MSGBOX_DEFAULT releaseall end -DewfordTown_Hall_EventScript_1FD739:: @ 81FD739 +DewfordTown_Hall_EventScript_DontMovePlayer1:: @ 81FD739 return -DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A - applymovement 8, DewfordTown_Hall_Movement_1FD7D6 +DewfordTown_Hall_EventScript_DebateReact1:: @ 81FD73A + applymovement 8, DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft waitmovement 0 compare VAR_0x8008, 0 - goto_if_eq DewfordTown_Hall_EventScript_1FD75B + goto_if_eq DewfordTown_Hall_EventScript_PlayerReactWest compare VAR_0x8008, 1 - goto_if_eq DewfordTown_Hall_EventScript_1FD771 + goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer2 end -DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B +DewfordTown_Hall_EventScript_PlayerReactWest:: @ 81FD75B compare VAR_FACING, DIR_EAST - goto_if_eq DewfordTown_Hall_EventScript_1FD739 + goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -DewfordTown_Hall_EventScript_1FD771:: @ 81FD771 +DewfordTown_Hall_EventScript_DontMovePlayer2:: @ 81FD771 return -DewfordTown_Hall_EventScript_1FD772:: @ 81FD772 - applymovement 7, DewfordTown_Hall_Movement_1FD7D8 +DewfordTown_Hall_EventScript_DebateReact2:: @ 81FD772 + applymovement 7, DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight waitmovement 0 compare VAR_0x8008, 0 - goto_if_eq DewfordTown_Hall_EventScript_1FD793 + goto_if_eq DewfordTown_Hall_EventScript_PlayerReactNorthSouth compare VAR_0x8008, 1 - goto_if_eq DewfordTown_Hall_EventScript_1FD7C0 + goto_if_eq DewfordTown_Hall_EventScript_PlayerReactEast end -DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 +DewfordTown_Hall_EventScript_PlayerReactNorthSouth:: @ 81FD793 compare VAR_FACING, DIR_NORTH - call_if_eq DewfordTown_Hall_EventScript_1FD7AA + call_if_eq DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp compare VAR_FACING, DIR_SOUTH - call_if_eq DewfordTown_Hall_EventScript_1FD7B5 + call_if_eq DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown return -DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA +DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp:: @ 81FD7AA applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 +DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown:: @ 81FD7B5 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 +DewfordTown_Hall_EventScript_PlayerReactEast:: @ 81FD7C0 compare VAR_FACING, DIR_WEST - goto_if_eq DewfordTown_Hall_EventScript_1FD739 + goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -DewfordTown_Hall_Movement_1FD7D6: @ 81FD7D6 +DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft: @ 81FD7D6 walk_in_place_left step_end -DewfordTown_Hall_Movement_1FD7D8: @ 81FD7D8 +DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight: @ 81FD7D8 walk_in_place_right step_end -DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA +DewfordTown_Hall_EventScript_SludgeBombMan:: @ 81FD7DA lock faceplayer - call DewfordTown_Hall_EventScript_271E8B - goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1FD80E - msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT + call Common_EventScript_BufferTrendyPhrase + goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_ReceivedSludgeBomb + msgbox DewfordTown_Hall_Text_GiveYouSludgeBomb, MSGBOX_DEFAULT giveitem_std ITEM_TM36 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM36 release end -DewfordTown_Hall_EventScript_1FD80E:: @ 81FD80E - msgbox DewfordTown_Hall_Text_1FE1ED, MSGBOX_DEFAULT +DewfordTown_Hall_EventScript_ReceivedSludgeBomb:: @ 81FD80E + msgbox DewfordTown_Hall_Text_LoveSludgeBombButTrendInToo, MSGBOX_DEFAULT release end -DewfordTown_Hall_Text_1FD818: @ 81FD818 +DewfordTown_Hall_Text_CantImagineLifeWithoutTrend: @ 81FD818 .string "What's in vogue? Why, it has to be\n" .string "“{STR_VAR_1}”!\p" .string "I can't imagine what life would be like\n" .string "without “{STR_VAR_1}”!$" -DewfordTown_Hall_Text_1FD877: @ 81FD877 +DewfordTown_Hall_Text_GettingBoredOfTrend: @ 81FD877 .string "What's in vogue? Why, it has to be\n" .string "“{STR_VAR_1}”!\p" .string "But I'm getting kind of bored with it.\p" .string "I should look for the next big thing.$" -DewfordTown_Hall_Text_1FD8ED: @ 81FD8ED +DewfordTown_Hall_Text_TeachingMonAboutTrend: @ 81FD8ED .string "I'm teaching my POKéMON about\n" .string "“{STR_VAR_1},”\l" .string "but it's not going well.\p" .string "It's a bit too much, I think.$" -DewfordTown_Hall_Text_1FD948: @ 81FD948 +DewfordTown_Hall_Text_DeepLinkBetweenXAndY: @ 81FD948 .string "I'm studying up on the hip and trendy\n" .string "“{STR_VAR_1}” now.\p" .string "Is it true that there's a deep link\n" .string "between “{STR_VAR_1}”\l" .string "and “{STR_VAR_2}”?$" -DewfordTown_Hall_Text_1FD9B3: @ 81FD9B3 +DewfordTown_Hall_Text_MyHunchWasRight: @ 81FD9B3 .string "Oh!\n" .string "So, my hunch was right!\p" .string "I'm one step closer to being hip and\n" .string "happening, yowza!$" -DewfordTown_Hall_Text_1FDA06: @ 81FDA06 +DewfordTown_Hall_Text_NotEasyToKeepUp: @ 81FDA06 .string "What?!\n" .string "Is that so?!\p" .string "It's not easy for an older fellow like\n" .string "me to keep up with trends!$" -DewfordTown_Hall_Text_1FDA5C: @ 81FDA5C +DewfordTown_Hall_Text_TVShowAboutTrend: @ 81FDA5C .string "This whole business about\n" .string "“{STR_VAR_1}”…\l" .string "Isn't there a TV show on it?$" -DewfordTown_Hall_Text_1FDA99: @ 81FDA99 +DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea: @ 81FDA99 .string "Across the sea…\p" .string "Is “{STR_VAR_1}”\n" .string "even more popular?$" -DewfordTown_Hall_Text_1FDAC4: @ 81FDAC4 +DewfordTown_Hall_Text_CollectTrendMerchandise: @ 81FDAC4 .string "I collect official\n" .string "“{STR_VAR_1}”\l" .string "licensed merchandise.\p" @@ -327,7 +327,7 @@ DewfordTown_Hall_Text_1FDAC4: @ 81FDAC4 .string "Heheh, I own!\n" .string "I'm not sharing anything with you!$" -DewfordTown_Hall_Text_1FDB89: @ 81FDB89 +DewfordTown_Hall_Text_BooksAboutTrend: @ 81FDB89 .string "IDENTIFYING GOOD\n" .string "“{STR_VAR_1}” &\l" .string "BAD “{STR_VAR_1}”…\p" @@ -339,30 +339,30 @@ DewfordTown_Hall_Text_1FDB89: @ 81FDB89 .string "It's neatly jammed with books about\n" .string "“{STR_VAR_1}.”$" -DewfordTown_Hall_Text_1FDC05: @ 81FDC05 +DewfordTown_Hall_Text_TrendsScream: @ 81FDC05 .string "“{STR_VAR_1}'S\n" .string "SCREAM” is the title.$" -DewfordTown_Hall_Text_1FDC21: @ 81FDC21 +DewfordTown_Hall_Text_TrendsSmile: @ 81FDC21 .string "“{STR_VAR_1}'S\n" .string "SMILE” is the title.$" -DewfordTown_Hall_Text_1FDC3C: @ 81FDC3C +DewfordTown_Hall_Text_LastTrend: @ 81FDC3C .string "It's titled “THE LAST\n" .string "{STR_VAR_1}”.$" -DewfordTown_Hall_Text_1FDC57: @ 81FDC57 +DewfordTown_Hall_Text_BirthOfTrend: @ 81FDC57 .string "It's titled “THE BIRTH OF\n" .string "{STR_VAR_1}”.$" -DewfordTown_Hall_Text_1FDC76: @ 81FDC76 +DewfordTown_Hall_Text_SawTrendCoolestThing: @ 81FDC76 .string "I saw “{STR_VAR_1}”!\n" .string "Cool, huh?\p" .string "It's, like, the coolest thing going!\p" .string "It was awesome!\n" .string "It was the real thing, oh yeah!$" -DewfordTown_Hall_Text_1FDCE2: @ 81FDCE2 +DewfordTown_Hall_Text_AllegedTrendNotAuthentic: @ 81FDCE2 .string "Oh, no, no, no.\p" .string "That alleged\n" .string "“{STR_VAR_1}”\l" @@ -372,7 +372,7 @@ DewfordTown_Hall_Text_1FDCE2: @ 81FDCE2 .string "Sharper, yet more mellow!\p" .string "Ah, no matter. It's astonishing!$" -DewfordTown_Hall_Text_1FDD95: @ 81FDD95 +DewfordTown_Hall_Text_ComposedTrendThemeSong: @ 81FDD95 .string "Hey, listen, I composed a theme song\n" .string "for “{STR_VAR_1}.”\p" .string "“{STR_VAR_1}”\n" @@ -384,20 +384,20 @@ DewfordTown_Hall_Text_1FDD95: @ 81FDD95 .string "Wonderful\n" .string "{STR_VAR_1}!$" -DewfordTown_Hall_Text_1FDE0E: @ 81FDE0E +DewfordTown_Hall_Text_WorkOnYourSinging: @ 81FDE0E .string "… …\p" .string "I dare say, chap, it would pay for you\n" .string "to work on your singing before you\l" .string "trifle yourself with\l" .string "“{STR_VAR_1}.”$" -DewfordTown_Hall_Text_1FDE77: @ 81FDE77 +DewfordTown_Hall_Text_OrganizeTrendParty: @ 81FDE77 .string "Anyway, as I was saying earlier, we\n" .string "should get together and organize a\l" .string "“{STR_VAR_1}” party\l" .string "on the island.$" -DewfordTown_Hall_Text_1FDED8: @ 81FDED8 +DewfordTown_Hall_Text_BrilliantIndeed: @ 81FDED8 .string "Oh, a smashing good idea!\p" .string "It will settle once and for all\n" .string "who is the best at\l" @@ -406,14 +406,14 @@ DewfordTown_Hall_Text_1FDED8: @ 81FDED8 .string "Starting today, our lives will revolve\n" .string "around “{STR_VAR_1}”!$" -DewfordTown_Hall_Text_1FDF72: @ 81FDF72 +DewfordTown_Hall_Text_TrendHasBecomePartOfLife: @ 81FDF72 .string "I was thinking, though…\p" .string "Wouldn't you agree that\n" .string "“{STR_VAR_1}” has\l" .string "grown from being something trendy to\l" .string "being a part of our daily lives?$" -DewfordTown_Hall_Text_1FDFF1: @ 81FDFF1 +DewfordTown_Hall_Text_TrendWeighsHeavilyOnMind: @ 81FDFF1 .string "Beg pardon?\n" .string "That much, what?\p" .string "However, it's true that\n" @@ -424,19 +424,19 @@ DewfordTown_Hall_Text_1FDFF1: @ 81FDFF1 .string "“{STR_VAR_1}”\l" .string "PROFESSOR, old sport!$" -DewfordTown_Hall_Text_1FE09A: @ 81FE09A +DewfordTown_Hall_Text_IfWeTeamUpWellBeInvincible: @ 81FE09A .string "If you and me team up as a combo,\n" .string "we'll be invincible when it comes to all\l" .string "things “{STR_VAR_1}”!$" -DewfordTown_Hall_Text_1FE0F2: @ 81FE0F2 +DewfordTown_Hall_Text_WellBeTrendDuo: @ 81FE0F2 .string "Spot on, my friend!\p" .string "We shall be the\n" .string "“{STR_VAR_1}” DUO!\p" .string "Isn't that a ripe image?\n" .string "Hahahah!$" -DewfordTown_Hall_Text_1FE142: @ 81FE142 +DewfordTown_Hall_Text_GiveYouSludgeBomb: @ 81FE142 .string "For me, SLUDGE BOMB is at the peak\n" .string "of popularity. It's the one.\p" .string "Hunh? You're telling me that you don't\n" @@ -444,7 +444,7 @@ DewfordTown_Hall_Text_1FE142: @ 81FE142 .string "That's outright pitiful.\n" .string "I'll give you one.$" -DewfordTown_Hall_Text_1FE1ED: @ 81FE1ED +DewfordTown_Hall_Text_LoveSludgeBombButTrendInToo: @ 81FE1ED .string "I love SLUDGE BOMB.\p" .string "But POKéMON with the move\n" .string "“{STR_VAR_1}”\l" diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index dfae500bd..beb6d5275 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House1_EventScript_1FC3D7", + "script": "DewfordTown_House1_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House1_EventScript_1FC3CE", + "script": "DewfordTown_House1_EventScript_Man", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House1_EventScript_1FC3E0", + "script": "DewfordTown_House1_EventScript_Zigzagoon", "flag": "0" } ], diff --git a/data/maps/DewfordTown_House1/scripts.inc b/data/maps/DewfordTown_House1/scripts.inc index 32706dbde..06e377057 100644 --- a/data/maps/DewfordTown_House1/scripts.inc +++ b/data/maps/DewfordTown_House1/scripts.inc @@ -1,36 +1,36 @@ DewfordTown_House1_MapScripts:: @ 81FC3CD .byte 0 -DewfordTown_House1_EventScript_1FC3CE:: @ 81FC3CE - msgbox DewfordTown_House1_Text_1FC3F3, MSGBOX_NPC +DewfordTown_House1_EventScript_Man:: @ 81FC3CE + msgbox DewfordTown_House1_Text_LotToBeSaidForLivingOnIsland, MSGBOX_NPC end -DewfordTown_House1_EventScript_1FC3D7:: @ 81FC3D7 - msgbox DewfordTown_House1_Text_1FC45B, MSGBOX_NPC +DewfordTown_House1_EventScript_Woman:: @ 81FC3D7 + msgbox DewfordTown_House1_Text_LifeGoesSlowlyOnIsland, MSGBOX_NPC end -DewfordTown_House1_EventScript_1FC3E0:: @ 81FC3E0 +DewfordTown_House1_EventScript_Zigzagoon:: @ 81FC3E0 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox DewfordTown_House1_Text_1FC510, MSGBOX_DEFAULT + msgbox DewfordTown_House1_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end -DewfordTown_House1_Text_1FC3F3: @ 81FC3F3 +DewfordTown_House1_Text_LotToBeSaidForLivingOnIsland: @ 81FC3F3 .string "There's a lot to be said for living on\n" .string "a small island like this in harmony with\l" .string "POKéMON and the family.$" -DewfordTown_House1_Text_1FC45B: @ 81FC45B +DewfordTown_House1_Text_LifeGoesSlowlyOnIsland: @ 81FC45B .string "I left the major port of SLATEPORT\n" .string "CITY when I married my husband here.\p" .string "Life goes by slowly on this little\n" .string "island. But being surrounded by the\l" .string "beautiful sea--that's happiness, too.$" -DewfordTown_House1_Text_1FC510: @ 81FC510 +DewfordTown_House1_Text_Zigzagoon: @ 81FC510 .string "ZIGZAGOON: Guguuh!$" diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index bc9c008fc..ac1abca36 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House2_EventScript_1FE22E", + "script": "DewfordTown_House2_EventScript_Man", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_House2_EventScript_1FE271", + "script": "DewfordTown_House2_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc index eb6beb951..43d2c1b5e 100644 --- a/data/maps/DewfordTown_House2/scripts.inc +++ b/data/maps/DewfordTown_House2/scripts.inc @@ -1,33 +1,33 @@ DewfordTown_House2_MapScripts:: @ 81FE22D .byte 0 -DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E +DewfordTown_House2_EventScript_Man:: @ 81FE22E lock faceplayer - goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_1FE267 - msgbox DewfordTown_House2_Text_1FE27A, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_ExplainSilkScarf + msgbox DewfordTown_House2_Text_WantYouToHaveSilkScarf, MSGBOX_DEFAULT giveitem_std ITEM_SILK_SCARF - compare VAR_RESULT, 0 - goto_if_eq DewfordTown_House2_EventScript_1FE25D + compare VAR_RESULT, FALSE + goto_if_eq DewfordTown_House2_EventScript_NoRoomForScarf setflag FLAG_RECEIVED_SILK_SCARF release end -DewfordTown_House2_EventScript_1FE25D:: @ 81FE25D - msgbox DewfordTown_House2_Text_1FE356, MSGBOX_DEFAULT +DewfordTown_House2_EventScript_NoRoomForScarf:: @ 81FE25D + msgbox DewfordTown_House2_Text_NoRoom, MSGBOX_DEFAULT release end -DewfordTown_House2_EventScript_1FE267:: @ 81FE267 - msgbox DewfordTown_House2_Text_1FE3D1, MSGBOX_DEFAULT +DewfordTown_House2_EventScript_ExplainSilkScarf:: @ 81FE267 + msgbox DewfordTown_House2_Text_ExplainSilkScarf, MSGBOX_DEFAULT release end -DewfordTown_House2_EventScript_1FE271:: @ 81FE271 - msgbox DewfordTown_House2_Text_1FE444, MSGBOX_NPC +DewfordTown_House2_EventScript_Boy:: @ 81FE271 + msgbox DewfordTown_House2_Text_BrawlySoCool, MSGBOX_NPC end -DewfordTown_House2_Text_1FE27A: @ 81FE27A +DewfordTown_House2_Text_WantYouToHaveSilkScarf: @ 81FE27A .string "Gorge your eyes on this!\p" .string "It's a SILK SCARF. It's right at the\n" .string "cutting edge of fashion, yeah!\p" @@ -36,19 +36,19 @@ DewfordTown_House2_Text_1FE27A: @ 81FE27A .string "Oh, you're a delight!\n" .string "Here you go. I want you to have it!$" -DewfordTown_House2_Text_1FE356: @ 81FE356 +DewfordTown_House2_Text_NoRoom: @ 81FE356 .string "Oh, you don't have room?\p" .string "Now, listen tight, this SCARF is a must-\n" .string "have! Why, I would sell all my items\l" .string "in order to get it!$" -DewfordTown_House2_Text_1FE3D1: @ 81FE3D1 +DewfordTown_House2_Text_ExplainSilkScarf: @ 81FE3D1 .string "The SILK SCARF raises the power of\n" .string "NORMAL-type moves.\p" .string "It's a marvelous SCARF that will go\n" .string "with almost all POKéMON!$" -DewfordTown_House2_Text_1FE444: @ 81FE444 +DewfordTown_House2_Text_BrawlySoCool: @ 81FE444 .string "Wow, you bothered to cross the sea\n" .string "to visit DEWFORD?\p" .string "Did you maybe come here because you\n" |