From 5d35662c4ccfec2247ac138cb1e341eec1967ac4 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 15:41:42 -0500 Subject: [PATCH] Document Pacifidlog scripts --- data/maps/PacifidlogTown/map.json | 8 +- data/maps/PacifidlogTown/scripts.inc | 28 +++---- data/maps/PacifidlogTown_House1/map.json | 4 +- data/maps/PacifidlogTown_House1/scripts.inc | 12 +-- data/maps/PacifidlogTown_House2/map.json | 6 +- data/maps/PacifidlogTown_House2/scripts.inc | 88 ++++++++++----------- data/maps/PacifidlogTown_House3/map.json | 4 +- data/maps/PacifidlogTown_House3/scripts.inc | 42 +++++----- data/maps/PacifidlogTown_House4/map.json | 6 +- data/maps/PacifidlogTown_House4/scripts.inc | 34 ++++---- data/maps/PacifidlogTown_House5/map.json | 4 +- data/maps/PacifidlogTown_House5/scripts.inc | 22 +++--- 12 files changed, 129 insertions(+), 129 deletions(-) diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index 3070d9c07..ff64a5967 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_EventScript_1EBACC", + "script": "PacifidlogTown_EventScript_Girl", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_EventScript_1EBAD5", + "script": "PacifidlogTown_EventScript_Fisherman", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_EventScript_1EBAC3", + "script": "PacifidlogTown_EventScript_NinjaBoy", "flag": "0" } ], @@ -125,7 +125,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PacifidlogTown_EventScript_1EBADE" + "script": "PacifidlogTown_EventScript_TownSign" }, { "type": "sign", diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index 26e9924ed..fc491cfe3 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -1,44 +1,44 @@ PacifidlogTown_MapScripts:: @ 81EBAB1 map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_OnTransition - map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_MapScript1_1EBAC0 + map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_OnResume .byte 0 PacifidlogTown_OnTransition: @ 81EBABC setflag FLAG_VISITED_PACIFIDLOG_TOWN end -PacifidlogTown_MapScript1_1EBAC0: @ 81EBAC0 +PacifidlogTown_OnResume: @ 81EBAC0 setstepcallback STEP_CB_PACIFIDLOG_BRIDGE end -PacifidlogTown_EventScript_1EBAC3:: @ 81EBAC3 - msgbox PacifidlogTown_Text_1EBB6C, MSGBOX_NPC +PacifidlogTown_EventScript_NinjaBoy:: @ 81EBAC3 + msgbox PacifidlogTown_Text_NeatHousesOnWater, MSGBOX_NPC end -PacifidlogTown_EventScript_1EBACC:: @ 81EBACC - msgbox PacifidlogTown_Text_1EBAE7, MSGBOX_NPC +PacifidlogTown_EventScript_Girl:: @ 81EBACC + msgbox PacifidlogTown_Text_FastRunningCurrent, MSGBOX_NPC end -PacifidlogTown_EventScript_1EBAD5:: @ 81EBAD5 - msgbox PacifidlogTown_Text_1EBBAC, MSGBOX_NPC +PacifidlogTown_EventScript_Fisherman:: @ 81EBAD5 + msgbox PacifidlogTown_Text_SkyPillarTooScary, MSGBOX_NPC end -PacifidlogTown_EventScript_1EBADE:: @ 81EBADE - msgbox PacifidlogTown_Text_1EBC7A, MSGBOX_SIGN +PacifidlogTown_EventScript_TownSign:: @ 81EBADE + msgbox PacifidlogTown_Text_TownSign, MSGBOX_SIGN end -PacifidlogTown_Text_1EBAE7: @ 81EBAE7 +PacifidlogTown_Text_FastRunningCurrent: @ 81EBAE7 .string "The sea between PACIFIDLOG and\n" .string "SLATEPORT has a fast-running tide.\p" .string "If you decide to SURF, you could end\n" .string "up swept away somewhere else.$" -PacifidlogTown_Text_1EBB6C: @ 81EBB6C +PacifidlogTown_Text_NeatHousesOnWater: @ 81EBB6C .string "See, isn't it neat?\n" .string "These houses are on water!\p" .string "I was born here!$" -PacifidlogTown_Text_1EBBAC: @ 81EBBAC +PacifidlogTown_Text_SkyPillarTooScary: @ 81EBBAC .string "The SKY PILLAR?\p" .string "…Oh, you must mean that tall, tall\n" .string "tower a little further out.\p" @@ -47,7 +47,7 @@ PacifidlogTown_Text_1EBBAC: @ 81EBBAC .string "Life at sea level in PACIFIDLOG,\n" .string "that suits me fine.$" -PacifidlogTown_Text_1EBC7A: @ 81EBC7A +PacifidlogTown_Text_TownSign: @ 81EBC7A .string "PACIFIDLOG TOWN\p" .string "“Where the morning sun smiles upon\n" .string "the waters.”$" diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index 1e48da85c..8f7357246 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House1_EventScript_20365D", + "script": "PacifidlogTown_House1_EventScript_Man", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House1_EventScript_203666", + "script": "PacifidlogTown_House1_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House1/scripts.inc b/data/maps/PacifidlogTown_House1/scripts.inc index 937b645bc..7759cb29a 100644 --- a/data/maps/PacifidlogTown_House1/scripts.inc +++ b/data/maps/PacifidlogTown_House1/scripts.inc @@ -1,15 +1,15 @@ PacifidlogTown_House1_MapScripts:: @ 820365C .byte 0 -PacifidlogTown_House1_EventScript_20365D:: @ 820365D - msgbox PacifidlogTown_House1_Text_20366F, MSGBOX_NPC +PacifidlogTown_House1_EventScript_Man:: @ 820365D + msgbox PacifidlogTown_House1_Text_RegiStory, MSGBOX_NPC end -PacifidlogTown_House1_EventScript_203666:: @ 8203666 - msgbox PacifidlogTown_House1_Text_20373A, MSGBOX_NPC +PacifidlogTown_House1_EventScript_Woman:: @ 8203666 + msgbox PacifidlogTown_House1_Text_SixDotsOpenThreeDoors, MSGBOX_NPC end -PacifidlogTown_House1_Text_20366F: @ 820366F +PacifidlogTown_House1_Text_RegiStory: @ 820366F .string "In the HOENN region, there are three\n" .string "POKéMON that represent the power of\l" .string "rock, ice, and steel.\p" @@ -18,7 +18,7 @@ PacifidlogTown_House1_Text_20366F: @ 820366F .string "That's the story I heard when I was\n" .string "just a little kid.$" -PacifidlogTown_House1_Text_20373A: @ 820373A +PacifidlogTown_House1_Text_SixDotsOpenThreeDoors: @ 820373A .string "“Six dots open three doors.”\p" .string "Grandpa used to say that, but I don't\n" .string "know what he meant.$" diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index d57720795..8c9cd91af 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House2_EventScript_203792", + "script": "PacifidlogTown_House2_EventScript_FanClubYoungerBrother", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House2_EventScript_203891", + "script": "PacifidlogTown_House2_EventScript_HappyAzurill", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House2_EventScript_2038AC", + "script": "PacifidlogTown_House2_EventScript_UnhappyAzurill", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index 4f646ff43..d22a87dc9 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -1,101 +1,101 @@ PacifidlogTown_House2_MapScripts:: @ 8203791 .byte 0 -PacifidlogTown_House2_EventScript_203792:: @ 8203792 +PacifidlogTown_House2_EventScript_FanClubYoungerBrother:: @ 8203792 lock faceplayer dotimebasedevents - call PacifidlogTown_House2_EventScript_2037DE - goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_20387E - call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_2037F8 - call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_203801 + call PacifidlogTown_House2_EventScript_UpdateFanClubTMFlag + goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_ComeBackInXDays + call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_MonAssessment + call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_FirstMonAssessment setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 - goto_if_ge PacifidlogTown_House2_EventScript_203816 + goto_if_ge PacifidlogTown_House2_EventScript_GiveReturn specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 2 - goto_if_ge PacifidlogTown_House2_EventScript_203845 - goto PacifidlogTown_House2_EventScript_20384F + goto_if_ge PacifidlogTown_House2_EventScript_PutInEffort + goto PacifidlogTown_House2_EventScript_GiveFrustration end -PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE +PacifidlogTown_House2_EventScript_UpdateFanClubTMFlag:: @ 82037DE goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, Common_EventScript_NopReturn specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable compare VAR_RESULT, 0 - call_if_eq PacifidlogTown_House2_EventScript_203812 + call_if_eq PacifidlogTown_House2_EventScript_ClearReceivedFanClubTM return -PacifidlogTown_House2_EventScript_2037F8:: @ 82037F8 - msgbox PacifidlogTown_House2_Text_20395B, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_MonAssessment:: @ 82037F8 + msgbox PacifidlogTown_House2_Text_AhYourPokemon, MSGBOX_DEFAULT return -PacifidlogTown_House2_EventScript_203801:: @ 8203801 - msgbox PacifidlogTown_House2_Text_2038C7, MSGBOX_DEFAULT - msgbox PacifidlogTown_House2_Text_20395B, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_FirstMonAssessment:: @ 8203801 + msgbox PacifidlogTown_House2_Text_ChairmansYoungerBrotherOnVacation, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_AhYourPokemon, MSGBOX_DEFAULT return -PacifidlogTown_House2_EventScript_203812:: @ 8203812 +PacifidlogTown_House2_EventScript_ClearReceivedFanClubTM:: @ 8203812 clearflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK return -PacifidlogTown_House2_EventScript_203816:: @ 8203816 - msgbox PacifidlogTown_House2_Text_20396D, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_GiveReturn:: @ 8203816 + msgbox PacifidlogTown_House2_Text_AdoringPokemonTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_TM27 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay - msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_ExplainReturnFrustration, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_203845:: @ 8203845 - msgbox PacifidlogTown_House2_Text_2039CE, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_PutInEffort:: @ 8203845 + msgbox PacifidlogTown_House2_Text_PutInSomeMoreEffort, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_20384F:: @ 820384F - msgbox PacifidlogTown_House2_Text_203A2F, MSGBOX_DEFAULT +PacifidlogTown_House2_EventScript_GiveFrustration:: @ 820384F + msgbox PacifidlogTown_House2_Text_ViciousPokemonTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_TM21 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay - msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_ExplainReturnFrustration, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_20387E:: @ 820387E +PacifidlogTown_House2_EventScript_ComeBackInXDays:: @ 820387E specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable buffernumberstring 0, VAR_RESULT - msgbox PacifidlogTown_House2_Text_203AF4, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_GetGoodTMInXDays, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_203891:: @ 8203891 +PacifidlogTown_House2_EventScript_HappyAzurill:: @ 8203891 lock faceplayer waitse playmoncry SPECIES_AZURILL, 0 - msgbox PacifidlogTown_House2_Text_203B8D, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_Rurii, MSGBOX_DEFAULT waitmoncry - msgbox PacifidlogTown_House2_Text_203B9D, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_VeryFriendlyWithTrainer, MSGBOX_DEFAULT release end -PacifidlogTown_House2_EventScript_2038AC:: @ 82038AC +PacifidlogTown_House2_EventScript_UnhappyAzurill:: @ 82038AC lock faceplayer waitse playmoncry SPECIES_AZURILL, 2 - msgbox PacifidlogTown_House2_Text_203BCE, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_Rururi, MSGBOX_DEFAULT waitmoncry - msgbox PacifidlogTown_House2_Text_203BDF, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_DoesntLikeTrainerVeryMuch, MSGBOX_DEFAULT release end -PacifidlogTown_House2_Text_2038C7: @ 82038C7 +PacifidlogTown_House2_Text_ChairmansYoungerBrotherOnVacation: @ 82038C7 .string "Er-hem!\p" .string "I am the POKéMON FAN CLUB's most\n" .string "important person, the CHAIRMAN's\l" @@ -103,50 +103,50 @@ PacifidlogTown_House2_Text_2038C7: @ 82038C7 .string "I'm here enjoying my vacation with\n" .string "POKéMON, yes, indeed.$" -PacifidlogTown_House2_Text_20395B: @ 820395B +PacifidlogTown_House2_Text_AhYourPokemon: @ 820395B .string "Ah!\n" .string "Your POKéMON…$" -PacifidlogTown_House2_Text_20396D: @ 820396D +PacifidlogTown_House2_Text_AdoringPokemonTakeThis: @ 820396D .string "It clearly likes you very much.\p" .string "A POKéMON that adoring and adorable\n" .string "deserves a TM like this, no?$" -PacifidlogTown_House2_Text_2039CE: @ 82039CE +PacifidlogTown_House2_Text_PutInSomeMoreEffort: @ 82039CE .string "Hmm…\n" .string "It's not bad, but it's also not good.\p" .string "You, as the TRAINER, need to put in\n" .string "some more effort.$" -PacifidlogTown_House2_Text_203A2F: @ 8203A2F +PacifidlogTown_House2_Text_ViciousPokemonTakeThis: @ 8203A2F .string "It has a vicious look to it.\p" .string "A frightening POKéMON like that\n" .string "deserves a TM like this.$" -PacifidlogTown_House2_Text_203A85: @ 8203A85 +PacifidlogTown_House2_Text_ExplainReturnFrustration: @ 8203A85 .string "If a POKéMON likes you a lot, RETURN's\n" .string "power is enhanced.\p" .string "If it doesn't like you, FRUSTRATION's\n" .string "power goes up.$" -PacifidlogTown_House2_Text_203AF4: @ 8203AF4 +PacifidlogTown_House2_Text_GetGoodTMInXDays: @ 8203AF4 .string "Oh, yes. In about {STR_VAR_1} or so days,\n" .string "I should be getting a good TM or two.\p" .string "You should come see me then.\n" .string "I'll give you a TM that's suitable for\l" .string "your POKéMON.$" -PacifidlogTown_House2_Text_203B8D: @ 8203B8D +PacifidlogTown_House2_Text_Rurii: @ 8203B8D .string "AZURILL: Rurii.$" -PacifidlogTown_House2_Text_203B9D: @ 8203B9D +PacifidlogTown_House2_Text_VeryFriendlyWithTrainer: @ 8203B9D .string "It appears to be very friendly with the\n" .string "TRAINER.$" -PacifidlogTown_House2_Text_203BCE: @ 8203BCE +PacifidlogTown_House2_Text_Rururi: @ 8203BCE .string "AZURILL: Rururi!$" -PacifidlogTown_House2_Text_203BDF: @ 8203BDF +PacifidlogTown_House2_Text_DoesntLikeTrainerVeryMuch: @ 8203BDF .string "It doesn't appear to like the TRAINER\n" .string "very much.$" diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index 181d69a80..11bd0761b 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House3_EventScript_203CB5", + "script": "PacifidlogTown_House3_EventScript_Girl", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House3_EventScript_203C11", + "script": "PacifidlogTown_House3_EventScript_Trader", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc index 921f788d6..ea33c8d01 100644 --- a/data/maps/PacifidlogTown_House3/scripts.inc +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -1,59 +1,59 @@ PacifidlogTown_House3_MapScripts:: @ 8203C10 .byte 0 -PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 +PacifidlogTown_House3_EventScript_Trader:: @ 8203C11 lock faceplayer - goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_203CAB + goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_TradeCompleted setvar VAR_0x8008, INGAME_TRADE_HORSEA copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - msgbox PacifidlogTown_House3_Text_203CBE, MSGBOX_YESNO + msgbox PacifidlogTown_House3_Text_WillingToTradeIt, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq PacifidlogTown_House3_EventScript_203C93 + goto_if_eq PacifidlogTown_House3_EventScript_DeclineTrade special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_if_eq PacifidlogTown_House3_EventScript_203C93 + goto_if_eq PacifidlogTown_House3_EventScript_DeclineTrade copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if_ne PacifidlogTown_House3_EventScript_203C9D + goto_if_ne PacifidlogTown_House3_EventScript_NotRequestedMon copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_0x8009 - msgbox PacifidlogTown_House3_Text_203D87, MSGBOX_DEFAULT + msgbox PacifidlogTown_House3_Text_ItsSubtlyDifferentThankYou, MSGBOX_DEFAULT setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release end -PacifidlogTown_House3_EventScript_203C93:: @ 8203C93 - msgbox PacifidlogTown_House3_Text_203E12, MSGBOX_DEFAULT +PacifidlogTown_House3_EventScript_DeclineTrade:: @ 8203C93 + msgbox PacifidlogTown_House3_Text_NotDesperateOrAnything, MSGBOX_DEFAULT release end -PacifidlogTown_House3_EventScript_203C9D:: @ 8203C9D +PacifidlogTown_House3_EventScript_NotRequestedMon:: @ 8203C9D bufferspeciesname 0, VAR_0x8009 - msgbox PacifidlogTown_House3_Text_203DDE, MSGBOX_DEFAULT + msgbox PacifidlogTown_House3_Text_WontAcceptAnyLessThanRealMon, MSGBOX_DEFAULT release end -PacifidlogTown_House3_EventScript_203CAB:: @ 8203CAB - msgbox PacifidlogTown_House3_Text_203E7F, MSGBOX_DEFAULT +PacifidlogTown_House3_EventScript_TradeCompleted:: @ 8203CAB + msgbox PacifidlogTown_House3_Text_ReallyWantedToGetBagon, MSGBOX_DEFAULT release end -PacifidlogTown_House3_EventScript_203CB5:: @ 8203CB5 - msgbox PacifidlogTown_House3_Text_203EF1, MSGBOX_NPC +PacifidlogTown_House3_EventScript_Girl:: @ 8203CB5 + msgbox PacifidlogTown_House3_Text_IsThatAPokedex, MSGBOX_NPC end -PacifidlogTown_House3_Text_203CBE: @ 8203CBE +PacifidlogTown_House3_Text_WillingToTradeIt: @ 8203CBE .string "Check out this {STR_VAR_2}!\p" .string "It's the {STR_VAR_2} that I caught\n" .string "yesterday to celebrate my birthday!\p" @@ -62,29 +62,29 @@ PacifidlogTown_House3_Text_203CBE: @ 8203CBE .string "I'll tell you what. I might be willing\n" .string "to trade it for a {STR_VAR_1}.$" -PacifidlogTown_House3_Text_203D87: @ 8203D87 +PacifidlogTown_House3_Text_ItsSubtlyDifferentThankYou: @ 8203D87 .string "Oh, so this is a {STR_VAR_1}?\p" .string "It's sort of like a {STR_VAR_2},\n" .string "and yet it's subtly different.\p" .string "Thank you!$" -PacifidlogTown_House3_Text_203DDE: @ 8203DDE +PacifidlogTown_House3_Text_WontAcceptAnyLessThanRealMon: @ 8203DDE .string "No, no, no! I won't accept any\n" .string "less than a real {STR_VAR_1}!$" -PacifidlogTown_House3_Text_203E12: @ 8203E12 +PacifidlogTown_House3_Text_NotDesperateOrAnything: @ 8203E12 .string "Oh, so you're not going to go through\n" .string "with this?\p" .string "That's cool. I'm not desperate to make\n" .string "a trade or anything.$" -PacifidlogTown_House3_Text_203E7F: @ 8203E7F +PacifidlogTown_House3_Text_ReallyWantedToGetBagon: @ 8203E7F .string "I know I could go looking for one\n" .string "on my own, but…\p" .string "But I really wanted to get a BAGON\n" .string "that another TRAINER caught…$" -PacifidlogTown_House3_Text_203EF1: @ 8203EF1 +PacifidlogTown_House3_Text_IsThatAPokedex: @ 8203EF1 .string "Is that a POKéDEX?\p" .string "Did you get to meet a lot of different\n" .string "POKéMON?\p" diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index d38384fc9..f196f6a8a 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House4_EventScript_203F55", + "script": "PacifidlogTown_House4_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House4_EventScript_203F4C", + "script": "PacifidlogTown_House4_EventScript_LittleGirl", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House4_EventScript_203F5E", + "script": "PacifidlogTown_House4_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc index 1535b534d..42a988bc2 100644 --- a/data/maps/PacifidlogTown_House4/scripts.inc +++ b/data/maps/PacifidlogTown_House4/scripts.inc @@ -1,53 +1,53 @@ PacifidlogTown_House4_MapScripts:: @ 8203F4B .byte 0 -PacifidlogTown_House4_EventScript_203F4C:: @ 8203F4C - msgbox PacifidlogTown_House4_Text_204017, MSGBOX_NPC +PacifidlogTown_House4_EventScript_LittleGirl:: @ 8203F4C + msgbox PacifidlogTown_House4_Text_SkyPokemon, MSGBOX_NPC end -PacifidlogTown_House4_EventScript_203F55:: @ 8203F55 - msgbox PacifidlogTown_House4_Text_203F93, MSGBOX_NPC +PacifidlogTown_House4_EventScript_Woman:: @ 8203F55 + msgbox PacifidlogTown_House4_Text_PeopleSawHighFlyingPokemon, MSGBOX_NPC end -PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E +PacifidlogTown_House4_EventScript_Boy:: @ 8203F5E lock faceplayer - msgbox PacifidlogTown_House4_Text_204035, MSGBOX_YESNO + msgbox PacifidlogTown_House4_Text_WhereDidYouComeFrom, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq PacifidlogTown_House4_EventScript_203F7F + goto_if_eq PacifidlogTown_House4_EventScript_Yes compare VAR_RESULT, NO - goto_if_eq PacifidlogTown_House4_EventScript_203F89 + goto_if_eq PacifidlogTown_House4_EventScript_No end -PacifidlogTown_House4_EventScript_203F7F:: @ 8203F7F - msgbox PacifidlogTown_House4_Text_20404E, MSGBOX_DEFAULT +PacifidlogTown_House4_EventScript_Yes:: @ 8203F7F + msgbox PacifidlogTown_House4_Text_YesTown, MSGBOX_DEFAULT release end -PacifidlogTown_House4_EventScript_203F89:: @ 8203F89 - msgbox PacifidlogTown_House4_Text_204084, MSGBOX_DEFAULT +PacifidlogTown_House4_EventScript_No:: @ 8203F89 + msgbox PacifidlogTown_House4_Text_YouHaveToComeFromSomewhere, MSGBOX_DEFAULT release end -PacifidlogTown_House4_Text_203F93: @ 8203F93 +PacifidlogTown_House4_Text_PeopleSawHighFlyingPokemon: @ 8203F93 .string "People were saying they saw a POKéMON\n" .string "flying high above HOENN.\p" .string "Is it flying around all the time?\n" .string "Doesn't it need to rest somewhere?$" -PacifidlogTown_House4_Text_204017: @ 8204017 +PacifidlogTown_House4_Text_SkyPokemon: @ 8204017 .string "A sky POKéMON!\n" .string "A sky POKéMON!$" -PacifidlogTown_House4_Text_204035: @ 8204035 +PacifidlogTown_House4_Text_WhereDidYouComeFrom: @ 8204035 .string "Where did you come from?$" -PacifidlogTown_House4_Text_20404E: @ 820404E +PacifidlogTown_House4_Text_YesTown: @ 820404E .string "Yes?\n" .string "YES TOWN?\p" .string "I've never heard of a place like that.$" -PacifidlogTown_House4_Text_204084: @ 8204084 +PacifidlogTown_House4_Text_YouHaveToComeFromSomewhere: @ 8204084 .string "No? That doesn't make any sense.\n" .string "You have to come from somewhere.\p" .string "Oh! Wait! You're not going to say you\n" diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index db7e51c46..c828d7a29 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House5_EventScript_204111", + "script": "PacifidlogTown_House5_EventScript_MirageIslandWatcher", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_House5_EventScript_204137", + "script": "PacifidlogTown_House5_EventScript_Gentleman", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_House5/scripts.inc b/data/maps/PacifidlogTown_House5/scripts.inc index cdc54fefe..f8be20f47 100644 --- a/data/maps/PacifidlogTown_House5/scripts.inc +++ b/data/maps/PacifidlogTown_House5/scripts.inc @@ -1,33 +1,33 @@ PacifidlogTown_House5_MapScripts:: @ 8204110 .byte 0 -PacifidlogTown_House5_EventScript_204111:: @ 8204111 +PacifidlogTown_House5_EventScript_MirageIslandWatcher:: @ 8204111 lock faceplayer specialvar VAR_RESULT, IsMirageIslandPresent - compare VAR_RESULT, 1 - goto_if_eq PacifidlogTown_House5_EventScript_20412D - msgbox PacifidlogTown_House5_Text_204140, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq PacifidlogTown_House5_EventScript_MirageIslandPresent + msgbox PacifidlogTown_House5_Text_CantSeeMirageIslandToday, MSGBOX_DEFAULT release end -PacifidlogTown_House5_EventScript_20412D:: @ 820412D - msgbox PacifidlogTown_House5_Text_204161, MSGBOX_DEFAULT +PacifidlogTown_House5_EventScript_MirageIslandPresent:: @ 820412D + msgbox PacifidlogTown_House5_Text_CanSeeMirageIslandToday, MSGBOX_DEFAULT release end -PacifidlogTown_House5_EventScript_204137:: @ 8204137 - msgbox PacifidlogTown_House5_Text_20418B, MSGBOX_NPC +PacifidlogTown_House5_EventScript_Gentleman:: @ 8204137 + msgbox PacifidlogTown_House5_Text_MirageIslandAppearDependingOnWeather, MSGBOX_NPC end -PacifidlogTown_House5_Text_204140: @ 8204140 +PacifidlogTown_House5_Text_CantSeeMirageIslandToday: @ 8204140 .string "I can't see MIRAGE ISLAND today…$" -PacifidlogTown_House5_Text_204161: @ 8204161 +PacifidlogTown_House5_Text_CanSeeMirageIslandToday: @ 8204161 .string "Oh! Oh my!\n" .string "I can see MIRAGE ISLAND today!$" -PacifidlogTown_House5_Text_20418B: @ 820418B +PacifidlogTown_House5_Text_MirageIslandAppearDependingOnWeather: @ 820418B .string "MIRAGE ISLAND…\p" .string "It must become visible and invisible\n" .string "depending on the weather conditions\l"