diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-11-07 14:49:52 -0500 |
---|---|---|
committer | GriffinR <griffin.richards@comcast.net> | 2019-11-07 14:49:52 -0500 |
commit | 979ece7d56387e72fa2938401c511be95d67601e (patch) | |
tree | 1b92dd298b9df559edf7c9d56e1d77fc51c615fb | |
parent | 03a7995570766b96c942c08dbc7168d9daab4dc6 (diff) |
Document Fortree scripts
-rw-r--r-- | data/maps/FortreeCity/map.json | 18 | ||||
-rw-r--r-- | data/maps/FortreeCity/scripts.inc | 88 | ||||
-rw-r--r-- | data/maps/FortreeCity_DecorationShop/map.json | 8 | ||||
-rw-r--r-- | data/maps/FortreeCity_DecorationShop/scripts.inc | 16 | ||||
-rw-r--r-- | data/maps/FortreeCity_House1/map.json | 6 | ||||
-rw-r--r-- | data/maps/FortreeCity_House1/scripts.inc | 48 | ||||
-rw-r--r-- | data/maps/FortreeCity_House2/map.json | 2 | ||||
-rw-r--r-- | data/maps/FortreeCity_House2/scripts.inc | 48 | ||||
-rw-r--r-- | data/maps/FortreeCity_House3/map.json | 4 | ||||
-rw-r--r-- | data/maps/FortreeCity_House3/scripts.inc | 12 | ||||
-rw-r--r-- | data/maps/FortreeCity_House4/map.json | 6 | ||||
-rw-r--r-- | data/maps/FortreeCity_House4/scripts.inc | 48 | ||||
-rw-r--r-- | data/maps/FortreeCity_House5/map.json | 6 | ||||
-rw-r--r-- | data/maps/FortreeCity_House5/scripts.inc | 18 |
14 files changed, 164 insertions, 164 deletions
diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index 454fc34d3..ce1dcee3e 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25B6", + "script": "FortreeCity_EventScript_Man", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25DE", + "script": "FortreeCity_EventScript_Girl", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25BF", + "script": "FortreeCity_EventScript_Woman", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25F0", + "script": "FortreeCity_EventScript_Boy", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25E7", + "script": "FortreeCity_EventScript_OldMan", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E25F9", + "script": "FortreeCity_EventScript_GameboyKid", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_EventScript_1E2614", + "script": "FortreeCity_EventScript_Kecleon", "flag": "FLAG_HIDE_FORTREE_CITY_KECLEON" } ], @@ -190,7 +190,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FortreeCity_EventScript_1E2602" + "script": "FortreeCity_EventScript_CitySign" }, { "type": "sign", @@ -214,7 +214,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "FortreeCity_EventScript_1E260B" + "script": "FortreeCity_EventScript_GymSign" }, { "type": "sign", diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index 716a511b0..748ed2558 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -1,76 +1,76 @@ FortreeCity_MapScripts:: @ 81E25A4 map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_OnTransition - map_script MAP_SCRIPT_ON_RESUME, FortreeCity_MapScript1_1E25B3 + map_script MAP_SCRIPT_ON_RESUME, FortreeCity_OnResume .byte 0 FortreeCity_OnTransition: @ 81E25AF setflag FLAG_VISITED_FORTREE_CITY end -FortreeCity_MapScript1_1E25B3: @ 81E25B3 +FortreeCity_OnResume: @ 81E25B3 setstepcallback STEP_CB_FORTREE_BRIDGE end -FortreeCity_EventScript_1E25B6:: @ 81E25B6 - msgbox FortreeCity_Text_1E2676, MSGBOX_NPC +FortreeCity_EventScript_Man:: @ 81E25B6 + msgbox FortreeCity_Text_SawGiganticPokemonInSky, MSGBOX_NPC end -FortreeCity_EventScript_1E25BF:: @ 81E25BF +FortreeCity_EventScript_Woman:: @ 81E25BF lock faceplayer - goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_1E25D4 - msgbox FortreeCity_Text_1E2738, MSGBOX_DEFAULT + goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_WomanGymAccessible + msgbox FortreeCity_Text_SomethingBlockingGym, MSGBOX_DEFAULT release end -FortreeCity_EventScript_1E25D4:: @ 81E25D4 - msgbox FortreeCity_Text_1E27B6, MSGBOX_DEFAULT +FortreeCity_EventScript_WomanGymAccessible:: @ 81E25D4 + msgbox FortreeCity_Text_ThisTimeIllBeatWinona, MSGBOX_DEFAULT release end -FortreeCity_EventScript_1E25DE:: @ 81E25DE - msgbox FortreeCity_Text_1E27FE, MSGBOX_NPC +FortreeCity_EventScript_Girl:: @ 81E25DE + msgbox FortreeCity_Text_TreesGrowByDrinkingRainwater, MSGBOX_NPC end -FortreeCity_EventScript_1E25E7:: @ 81E25E7 - msgbox FortreeCity_Text_1E2880, MSGBOX_NPC +FortreeCity_EventScript_OldMan:: @ 81E25E7 + msgbox FortreeCity_Text_EveryoneHealthyAndLively, MSGBOX_NPC end -FortreeCity_EventScript_1E25F0:: @ 81E25F0 - msgbox FortreeCity_Text_1E292E, MSGBOX_NPC +FortreeCity_EventScript_Boy:: @ 81E25F0 + msgbox FortreeCity_Text_BugPokemonComeThroughWindow, MSGBOX_NPC end -FortreeCity_EventScript_1E25F9:: @ 81E25F9 - msgbox FortreeCity_Text_1E299D, MSGBOX_NPC +FortreeCity_EventScript_GameboyKid:: @ 81E25F9 + msgbox FortreeCity_Text_PokemonThatEvolveWhenTraded, MSGBOX_NPC end -FortreeCity_EventScript_1E2602:: @ 81E2602 - msgbox FortreeCity_Text_1E2AAC, MSGBOX_SIGN +FortreeCity_EventScript_CitySign:: @ 81E2602 + msgbox FortreeCity_Text_CitySign, MSGBOX_SIGN end -FortreeCity_EventScript_1E260B:: @ 81E260B - msgbox FortreeCity_Text_1E2AE6, MSGBOX_SIGN +FortreeCity_EventScript_GymSign:: @ 81E260B + msgbox FortreeCity_Text_GymSign, MSGBOX_SIGN end -FortreeCity_EventScript_1E2614:: @ 81E2614 +FortreeCity_EventScript_Kecleon:: @ 81E2614 lock faceplayer checkitem ITEM_DEVON_SCOPE, 1 - compare VAR_RESULT, 1 - goto_if_eq FortreeCity_EventScript_1E2630 - msgbox FortreeCity_Text_1E29E5, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq FortreeCity_EventScript_AskUseDevonScope + msgbox FortreeCity_Text_SomethingUnseeable, MSGBOX_DEFAULT release end -FortreeCity_EventScript_1E2630:: @ 81E2630 - msgbox FortreeCity_Text_1E2A08, MSGBOX_YESNO +FortreeCity_EventScript_AskUseDevonScope:: @ 81E2630 + msgbox FortreeCity_Text_UnseeableUseDevonScope, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq FortreeCity_EventScript_1E2645 + goto_if_eq FortreeCity_EventScript_UseDevonScope release end -FortreeCity_EventScript_1E2645:: @ 81E2645 - msgbox FortreeCity_Text_1E2A48, MSGBOX_DEFAULT +FortreeCity_EventScript_UseDevonScope:: @ 81E2645 + msgbox FortreeCity_Text_UsedDevonScopePokemonFled, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Movement_KecleonAppears waitmovement 0 @@ -78,18 +78,18 @@ FortreeCity_EventScript_1E2645:: @ 81E2645 playmoncry SPECIES_KECLEON, 2 delay 40 waitmoncry - applymovement VAR_LAST_TALKED, FortreeCity_Movement_1E2674 + applymovement VAR_LAST_TALKED, FortreeCity_Movement_KecleonFlee waitmovement 0 removeobject VAR_LAST_TALKED setflag FLAG_KECLEON_FLED_FORTREE release end -FortreeCity_Movement_1E2674: @ 81E2674 +FortreeCity_Movement_KecleonFlee: @ 81E2674 walk_right step_end -FortreeCity_Text_1E2676: @ 81E2676 +FortreeCity_Text_SawGiganticPokemonInSky: @ 81E2676 .string "No one believes me, but I saw this\n" .string "gigantic POKéMON in the sky.\p" .string "It seemed to squirm as it flew toward\n" @@ -98,23 +98,23 @@ FortreeCity_Text_1E2676: @ 81E2676 .string "Um… You, uh…smell singed.\p" .string "Were you at a volcano or something?$" -FortreeCity_Text_1E2738: @ 81E2738 +FortreeCity_Text_SomethingBlockingGym: @ 81E2738 .string "I want to go to the POKéMON GYM,\n" .string "but something's blocking the way.\p" .string "After all the bother I went through\n" .string "training on ROUTE 120…$" -FortreeCity_Text_1E27B6: @ 81E27B6 +FortreeCity_Text_ThisTimeIllBeatWinona: @ 81E27B6 .string "I've got my pride-and-joy POKéMON\n" .string "with me. This time, I'll beat WINONA.$" -FortreeCity_Text_1E27FE: @ 81E27FE +FortreeCity_Text_TreesGrowByDrinkingRainwater: @ 81E27FE .string "The ground absorbs rainwater, and\n" .string "trees grow by drinking that water…\p" .string "Our FORTREE CITY exists because\n" .string "there's both water and soil.$" -FortreeCity_Text_1E2880: @ 81E2880 +FortreeCity_Text_EveryoneHealthyAndLively: @ 81E2880 .string "The CITY consists of homes built on\n" .string "trees.\p" .string "Perhaps because of that lifestyle,\n" @@ -122,35 +122,35 @@ FortreeCity_Text_1E2880: @ 81E2880 .string "Why, even myself--I feel as if I've\n" .string "grown thirty years younger.$" -FortreeCity_Text_1E292E: @ 81E292E +FortreeCity_Text_BugPokemonComeThroughWindow: @ 81E292E .string "Living on top of trees is okay.\p" .string "But sometimes BUG POKéMON come in\n" .string "through windows.\l" .string "It can be really startling.$" -FortreeCity_Text_1E299D: @ 81E299D +FortreeCity_Text_PokemonThatEvolveWhenTraded: @ 81E299D .string "There are POKéMON that evolve when\n" .string "you trade them! That's what I heard.$" -FortreeCity_Text_1E29E5: @ 81E29E5 +FortreeCity_Text_SomethingUnseeable: @ 81E29E5 .string "Something unseeable is in the way.$" -FortreeCity_Text_1E2A08: @ 81E2A08 +FortreeCity_Text_UnseeableUseDevonScope: @ 81E2A08 .string "Something unseeable is in the way.\p" .string "Want to use the DEVON SCOPE?$" -FortreeCity_Text_1E2A48: @ 81E2A48 +FortreeCity_Text_UsedDevonScopePokemonFled: @ 81E2A48 .string "{PLAYER} used the DEVON SCOPE.\p" .string "An invisible POKéMON became completely\n" .string "visible!\p" .string "The startled POKéMON fled!$" -FortreeCity_Text_1E2AAC: @ 81E2AAC +FortreeCity_Text_CitySign: @ 81E2AAC .string "FORTREE CITY\n" .string "“The treetop city that frolics with\l" .string "nature.”$" -FortreeCity_Text_1E2AE6: @ 81E2AE6 +FortreeCity_Text_GymSign: @ 81E2AE6 .string "FORTREE CITY POKéMON GYM\n" .string "LEADER: WINONA\p" .string "“The bird user taking flight into\n" diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index a8654e708..ac0ca1f89 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_21800E", + "script": "FortreeCity_DecorationShop_EventScript_PokefanM", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_218017", + "script": "FortreeCity_DecorationShop_EventScript_Girl", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_218020", + "script": "FortreeCity_DecorationShop_EventScript_ClerkDesks", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_DecorationShop_EventScript_21804C", + "script": "FortreeCity_DecorationShop_EventScript_ClerkChairs", "flag": "0" } ], diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc index 14c864ee5..4dd751b0f 100644 --- a/data/maps/FortreeCity_DecorationShop/scripts.inc +++ b/data/maps/FortreeCity_DecorationShop/scripts.inc @@ -1,15 +1,15 @@ FortreeCity_DecorationShop_MapScripts:: @ 821800D .byte 0 -FortreeCity_DecorationShop_EventScript_21800E:: @ 821800E - msgbox FortreeCity_DecorationShop_Text_218078, MSGBOX_NPC +FortreeCity_DecorationShop_EventScript_PokefanM:: @ 821800E + msgbox FortreeCity_DecorationShop_Text_MerchandiseSentToPC, MSGBOX_NPC end -FortreeCity_DecorationShop_EventScript_218017:: @ 8218017 - msgbox FortreeCity_DecorationShop_Text_2180ED, MSGBOX_NPC +FortreeCity_DecorationShop_EventScript_Girl:: @ 8218017 + msgbox FortreeCity_DecorationShop_Text_BuyingDeskForDolls, MSGBOX_NPC end -FortreeCity_DecorationShop_EventScript_218020:: @ 8218020 +FortreeCity_DecorationShop_EventScript_ClerkDesks:: @ 8218020 lock faceplayer message gText_HowMayIServeYou @@ -33,7 +33,7 @@ FortreeCity_DecorationShop_PokemartDecor_Desks: @ 8218038 release end -FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C +FortreeCity_DecorationShop_EventScript_ClerkChairs:: @ 821804C lock faceplayer message gText_HowMayIServeYou @@ -57,13 +57,13 @@ FortreeCity_DecorationShop_PokemartDecor_Chairs: @ 8218064 release end -FortreeCity_DecorationShop_Text_218078: @ 8218078 +FortreeCity_DecorationShop_Text_MerchandiseSentToPC: @ 8218078 .string "Merchandise you buy here is sent to\n" .string "your own PC.\p" .string "That's fantastic! I wish they could\n" .string "also deliver me home like that.$" -FortreeCity_DecorationShop_Text_2180ED: @ 82180ED +FortreeCity_DecorationShop_Text_BuyingDeskForDolls: @ 82180ED .string "I'm buying a pretty desk and I'm\n" .string "putting my cute DOLLS on it.\p" .string "If I don't, when I decorate my\n" diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index 62469515a..f984e2be5 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House1_EventScript_2162BB", + "script": "FortreeCity_House1_EventScript_Trader", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House1_EventScript_216368", + "script": "FortreeCity_House1_EventScript_Zigzagoon", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House1_EventScript_21635F", + "script": "FortreeCity_House1_EventScript_ExpertF", "flag": "0" } ], diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc index 9ef94b12b..c7f4a8d5b 100644 --- a/data/maps/FortreeCity_House1/scripts.inc +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -1,69 +1,69 @@ FortreeCity_House1_MapScripts:: @ 82162BA .byte 0 -FortreeCity_House1_EventScript_2162BB:: @ 82162BB +FortreeCity_House1_EventScript_Trader:: @ 82162BB lock faceplayer - goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_216355 + goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_TradeCompleted setvar VAR_0x8008, INGAME_TRADE_PLUSLE copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT - msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO + msgbox FortreeCity_House1_Text_YouWillTradeWontYou, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq FortreeCity_House1_EventScript_21633D + goto_if_eq FortreeCity_House1_EventScript_DeclineTrade special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_if_eq FortreeCity_House1_EventScript_21633D + goto_if_eq FortreeCity_House1_EventScript_DeclineTrade copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if_ne FortreeCity_House1_EventScript_216347 + goto_if_ne FortreeCity_House1_EventScript_NotRequestedMon copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_216440, MSGBOX_DEFAULT + msgbox FortreeCity_House1_Text_MonYouTakeCare, MSGBOX_DEFAULT setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release end -FortreeCity_House1_EventScript_21633D:: @ 821633D - msgbox FortreeCity_House1_Text_21649F, MSGBOX_DEFAULT +FortreeCity_House1_EventScript_DeclineTrade:: @ 821633D + msgbox FortreeCity_House1_Text_YouWontTradeMe, MSGBOX_DEFAULT release end -FortreeCity_House1_EventScript_216347:: @ 8216347 +FortreeCity_House1_EventScript_NotRequestedMon:: @ 8216347 bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_216474, MSGBOX_DEFAULT + msgbox FortreeCity_House1_Text_ThisIsntAMon, MSGBOX_DEFAULT release end -FortreeCity_House1_EventScript_216355:: @ 8216355 - msgbox FortreeCity_House1_Text_2164DB, MSGBOX_DEFAULT +FortreeCity_House1_EventScript_TradeCompleted:: @ 8216355 + msgbox FortreeCity_House1_Text_GoingToMakeVolbeatStrong, MSGBOX_DEFAULT release end -FortreeCity_House1_EventScript_21635F:: @ 821635F - msgbox FortreeCity_House1_Text_21653B, MSGBOX_NPC +FortreeCity_House1_EventScript_ExpertF:: @ 821635F + msgbox FortreeCity_House1_Text_TradingMemoriesWithOthers, MSGBOX_NPC end -FortreeCity_House1_EventScript_216368:: @ 8216368 +FortreeCity_House1_EventScript_Zigzagoon:: @ 8216368 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House1_Text_216597, MSGBOX_DEFAULT + msgbox FortreeCity_House1_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end -FortreeCity_House1_Text_21637B: @ 821637B +FortreeCity_House1_Text_YouWillTradeWontYou: @ 821637B .string "Wrooooaaar! I need it!\n" .string "I have to get me a {STR_VAR_1}!\l" .string "I'll do anything for it!\p" @@ -73,29 +73,29 @@ FortreeCity_House1_Text_21637B: @ 821637B .string "your {STR_VAR_1} for my {STR_VAR_2},\l" .string "won't you?$" -FortreeCity_House1_Text_216440: @ 8216440 +FortreeCity_House1_Text_MonYouTakeCare: @ 8216440 .string "Oh, yeah, right on!\p" .string "{STR_VAR_1}, welcome!\n" .string "{STR_VAR_2}, you take care!$" -FortreeCity_House1_Text_216474: @ 8216474 +FortreeCity_House1_Text_ThisIsntAMon: @ 8216474 .string "Uh, no, I don't think so.\n" .string "That isn't a {STR_VAR_1}.$" -FortreeCity_House1_Text_21649F: @ 821649F +FortreeCity_House1_Text_YouWontTradeMe: @ 821649F .string "No? You won't trade me?\n" .string "Even after I bared my heart to you?$" -FortreeCity_House1_Text_2164DB: @ 82164DB +FortreeCity_House1_Text_GoingToMakeVolbeatStrong: @ 82164DB .string "I'm going to make VOLBEAT super\n" .string "strong from this moment on!\p" .string "I hope you do the same with PLUSLE!$" -FortreeCity_House1_Text_21653B: @ 821653B +FortreeCity_House1_Text_TradingMemoriesWithOthers: @ 821653B .string "Trading POKéMON with others…\p" .string "It's as if you're trading your own\n" .string "memories with other people.$" -FortreeCity_House1_Text_216597: @ 8216597 +FortreeCity_House1_Text_Zigzagoon: @ 8216597 .string "ZIGZAGOON: Gumomoh?$" diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index 492590c6c..c4988e863 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House2_EventScript_2177CB", + "script": "FortreeCity_House2_EventScript_HiddenPowerGiver", "flag": "0" }, { diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index 14ab157ed..bfbe40ff4 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -1,82 +1,82 @@ FortreeCity_House2_MapScripts:: @ 82177CA .byte 0 -FortreeCity_House2_EventScript_2177CB:: @ 82177CB +FortreeCity_House2_EventScript_HiddenPowerGiver:: @ 82177CB lock faceplayer - goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_21786E - call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_217862 - msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_ExplainHiddenPower + call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_Greeting + msgbox FortreeCity_House2_Text_CoinInWhichHand, MSGBOX_DEFAULT multichoice 21, 8, MULTI_RIGHTLEFT, 1 switch VAR_RESULT - case 1, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_21796A, MSGBOX_DEFAULT + case 1, FortreeCity_House2_EventScript_WrongGuess + msgbox FortreeCity_House2_Text_CorrectTryAgainWhichHand, MSGBOX_DEFAULT multichoice 21, 8, MULTI_RIGHTLEFT, 1 switch VAR_RESULT - case 1, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_2179C9, MSGBOX_DEFAULT + case 1, FortreeCity_House2_EventScript_WrongGuess + msgbox FortreeCity_House2_Text_CorrectTryAgainWhichHand2, MSGBOX_DEFAULT multichoice 21, 8, MULTI_RIGHTLEFT, 1 switch VAR_RESULT - case 0, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT + case 0, FortreeCity_House2_EventScript_WrongGuess + msgbox FortreeCity_House2_Text_YourHiddenPowerHasAwoken, MSGBOX_DEFAULT giveitem_std ITEM_TM10 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM10 - msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT + msgbox FortreeCity_House2_Text_ExplainHiddenPower, MSGBOX_DEFAULT release end -FortreeCity_House2_EventScript_217862:: @ 8217862 - msgbox FortreeCity_House2_Text_217882, MSGBOX_DEFAULT +FortreeCity_House2_EventScript_Greeting:: @ 8217862 + msgbox FortreeCity_House2_Text_HiddenPowersArousedByNature, MSGBOX_DEFAULT setflag FLAG_MET_HIDDEN_POWER_GIVER return -FortreeCity_House2_EventScript_21786E:: @ 821786E - msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT +FortreeCity_House2_EventScript_ExplainHiddenPower:: @ 821786E + msgbox FortreeCity_House2_Text_ExplainHiddenPower, MSGBOX_DEFAULT release end -FortreeCity_House2_EventScript_217878:: @ 8217878 - msgbox FortreeCity_House2_Text_217AC7, MSGBOX_DEFAULT +FortreeCity_House2_EventScript_WrongGuess:: @ 8217878 + msgbox FortreeCity_House2_Text_YouGuessedWrong, MSGBOX_DEFAULT release end -FortreeCity_House2_Text_217882: @ 8217882 +FortreeCity_House2_Text_HiddenPowersArousedByNature: @ 8217882 .string "People… POKéMON…\p" .string "Their hidden powers are aroused by\n" .string "living in natural environments…$" -FortreeCity_House2_Text_2178D6: @ 82178D6 +FortreeCity_House2_Text_CoinInWhichHand: @ 82178D6 .string "Let this old woman see if your hidden\n" .string "power has awoken…\p" .string "I hold a coin in my hand.\p" .string "Now, tell me, have I palmed it in\n" .string "the right hand? Or in the left?$" -FortreeCity_House2_Text_21796A: @ 821796A +FortreeCity_House2_Text_CorrectTryAgainWhichHand: @ 821796A .string "Oh! Yes, correct!\p" .string "We shall try again.\p" .string "In which hand have I palmed the coin?\n" .string "The right or left?$" -FortreeCity_House2_Text_2179C9: @ 82179C9 +FortreeCity_House2_Text_CorrectTryAgainWhichHand2: @ 82179C9 .string "Oh! Yes, correct!\p" .string "We shall try again.\p" .string "In which hand have I palmed the coin?\n" .string "The right or left?$" -FortreeCity_House2_Text_217A28: @ 8217A28 +FortreeCity_House2_Text_YourHiddenPowerHasAwoken: @ 8217A28 .string "Oh! Splendid!\n" .string "Your hidden power has awoken!\p" .string "Here, take this and awaken the hidden\n" .string "power of your POKéMON.$" -FortreeCity_House2_Text_217A91: @ 8217A91 +FortreeCity_House2_Text_ExplainHiddenPower: @ 8217A91 .string "HIDDEN POWER is a move that changes\n" .string "with the POKéMON.$" -FortreeCity_House2_Text_217AC7: @ 8217AC7 +FortreeCity_House2_Text_YouGuessedWrong: @ 8217AC7 .string "No, too bad.\n" .string "You guessed wrong.$" diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index 8b7e971c7..ce70f4605 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House3_EventScript_217AE8", + "script": "FortreeCity_House3_EventScript_Maniac", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House3_EventScript_217AF1", + "script": "FortreeCity_House3_EventScript_SchoolKidM", "flag": "0" } ], diff --git a/data/maps/FortreeCity_House3/scripts.inc b/data/maps/FortreeCity_House3/scripts.inc index fe1f6cfee..396bd4b22 100644 --- a/data/maps/FortreeCity_House3/scripts.inc +++ b/data/maps/FortreeCity_House3/scripts.inc @@ -1,15 +1,15 @@ FortreeCity_House3_MapScripts:: @ 8217AE7 .byte 0 -FortreeCity_House3_EventScript_217AE8:: @ 8217AE8 - msgbox FortreeCity_House3_Text_217AFA, MSGBOX_NPC +FortreeCity_House3_EventScript_Maniac:: @ 8217AE8 + msgbox FortreeCity_House3_Text_MetStevenHadAmazingPokemon, MSGBOX_NPC end -FortreeCity_House3_EventScript_217AF1:: @ 8217AF1 - msgbox FortreeCity_House3_Text_217C22, MSGBOX_NPC +FortreeCity_House3_EventScript_SchoolKidM:: @ 8217AF1 + msgbox FortreeCity_House3_Text_OhYouHavePokedex, MSGBOX_NPC end -FortreeCity_House3_Text_217AFA: @ 8217AFA +FortreeCity_House3_Text_MetStevenHadAmazingPokemon: @ 8217AFA .string "While speaking about POKéDEXES,\n" .string "I remembered something.\p" .string "I met this TRAINER, STEVEN, when\n" @@ -21,7 +21,7 @@ FortreeCity_House3_Text_217AFA: @ 8217AFA .string "He might even be stronger than the\n" .string "GYM LEADER in this town…$" -FortreeCity_House3_Text_217C22: @ 8217C22 +FortreeCity_House3_Text_OhYouHavePokedex: @ 8217C22 .string "What's that thing you have there?\p" .string "… … … … … …\p" .string "Oh, it's called a POKéDEX?\n" diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index a9db995ed..01d1a99e8 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House4_EventScript_217C81", + "script": "FortreeCity_House4_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House4_EventScript_217C8A", + "script": "FortreeCity_House4_EventScript_Boy", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House4_EventScript_217D20", + "script": "FortreeCity_House4_EventScript_Wingull", "flag": "FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL" } ], diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index 5dc9d769a..b050ba3f9 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -1,51 +1,51 @@ FortreeCity_House4_MapScripts:: @ 8217C80 .byte 0 -FortreeCity_House4_EventScript_217C81:: @ 8217C81 - msgbox FortreeCity_House4_Text_217D33, MSGBOX_NPC +FortreeCity_House4_EventScript_Woman:: @ 8217C81 + msgbox FortreeCity_House4_Text_BringsWorldCloserTogether, MSGBOX_NPC end -FortreeCity_House4_EventScript_217C8A:: @ 8217C8A +FortreeCity_House4_EventScript_Boy:: @ 8217C8A lockall - goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_217D06 - goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_217CD8 - goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_217CC4 - msgbox FortreeCity_House4_Text_217DB9, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_ReceivedMentalHerb + goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_WingullReturned + goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_WingullOnErrand + msgbox FortreeCity_House4_Text_GoBirdPokemon, MSGBOX_DEFAULT closemessage setflag FLAG_WINGULL_SENT_ON_ERRAND clearflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL - applymovement 3, FortreeCity_House4_Movement_217D1A + applymovement 3, FortreeCity_House4_Movement_WingullExit waitmovement 0 removeobject 3 releaseall end -FortreeCity_House4_EventScript_217CC4:: @ 8217CC4 +FortreeCity_House4_EventScript_WingullOnErrand:: @ 8217CC4 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox FortreeCity_House4_Text_217DD2, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_AskedWingullToRunErrand, MSGBOX_DEFAULT releaseall end -FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 +FortreeCity_House4_EventScript_WingullReturned:: @ 8217CD8 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb, MSGBOX_DEFAULT giveitem_std ITEM_MENTAL_HERB - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_MENTAL_HERB releaseall end -FortreeCity_House4_EventScript_217D06:: @ 8217D06 +FortreeCity_House4_EventScript_ReceivedMentalHerb:: @ 8217D06 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox FortreeCity_House4_Text_217EA8, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_FriendsFarAwayThanksToWingull, MSGBOX_DEFAULT releaseall end -FortreeCity_House4_Movement_217D1A: @ 8217D1A +FortreeCity_House4_Movement_WingullExit: @ 8217D1A walk_fast_down walk_fast_down walk_fast_right @@ -53,31 +53,31 @@ FortreeCity_House4_Movement_217D1A: @ 8217D1A delay_8 step_end -FortreeCity_House4_EventScript_217D20:: @ 8217D20 +FortreeCity_House4_EventScript_Wingull:: @ 8217D20 lock faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox FortreeCity_House4_Text_217EE0, MSGBOX_DEFAULT + msgbox FortreeCity_House4_Text_Wingull, MSGBOX_DEFAULT waitmoncry release end -FortreeCity_House4_Text_217D33: @ 8217D33 +FortreeCity_House4_Text_BringsWorldCloserTogether: @ 8217D33 .string "By being together with POKéMON,\n" .string "people make more and more friends.\p" .string "And that brings the world closer\n" .string "together. I think it's wonderful!$" -FortreeCity_House4_Text_217DB9: @ 8217DB9 +FortreeCity_House4_Text_GoBirdPokemon: @ 8217DB9 .string "There!\n" .string "Go, BIRD POKéMON!$" -FortreeCity_House4_Text_217DD2: @ 8217DD2 +FortreeCity_House4_Text_AskedWingullToRunErrand: @ 8217DD2 .string "Heheh, I asked my WINGULL to run\n" .string "an errand for me.$" -FortreeCity_House4_Text_217E05: @ 8217E05 +FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb: @ 8217E05 .string "Good!\n" .string "Welcome back, WINGULL!\p" .string "Huh? What is this?\n" @@ -87,10 +87,10 @@ FortreeCity_House4_Text_217E05: @ 8217E05 .string "But I'm not a TRAINER, so you can\n" .string "have it.$" -FortreeCity_House4_Text_217EA8: @ 8217EA8 +FortreeCity_House4_Text_FriendsFarAwayThanksToWingull: @ 8217EA8 .string "Thanks to my WINGULL, I have friends\n" .string "who live far away.$" -FortreeCity_House4_Text_217EE0: @ 8217EE0 +FortreeCity_House4_Text_Wingull: @ 8217EE0 .string "WINGULL: Pihyoh!$" diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index a60c02ec3..a53b4e35c 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House5_EventScript_217EF2", + "script": "FortreeCity_House5_EventScript_PokefanF", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House5_EventScript_217F04", + "script": "FortreeCity_House5_EventScript_Zigzagoon", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House5_EventScript_217EFB", + "script": "FortreeCity_House5_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/FortreeCity_House5/scripts.inc b/data/maps/FortreeCity_House5/scripts.inc index a40fe0e83..4d27c2f06 100644 --- a/data/maps/FortreeCity_House5/scripts.inc +++ b/data/maps/FortreeCity_House5/scripts.inc @@ -1,35 +1,35 @@ FortreeCity_House5_MapScripts:: @ 8217EF1 .byte 0 -FortreeCity_House5_EventScript_217EF2:: @ 8217EF2 - msgbox FortreeCity_House5_Text_217F17, MSGBOX_NPC +FortreeCity_House5_EventScript_PokefanF:: @ 8217EF2 + msgbox FortreeCity_House5_Text_TreeHousesAreGreat, MSGBOX_NPC end -FortreeCity_House5_EventScript_217EFB:: @ 8217EFB - msgbox FortreeCity_House5_Text_217F80, MSGBOX_NPC +FortreeCity_House5_EventScript_Man:: @ 8217EFB + msgbox FortreeCity_House5_Text_AdaptedToNature, MSGBOX_NPC end -FortreeCity_House5_EventScript_217F04:: @ 8217F04 +FortreeCity_House5_EventScript_Zigzagoon:: @ 8217F04 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House5_Text_217FFB, MSGBOX_DEFAULT + msgbox FortreeCity_House5_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end -FortreeCity_House5_Text_217F17: @ 8217F17 +FortreeCity_House5_Text_TreeHousesAreGreat: @ 8217F17 .string "The tree houses of FORTREE are great!\p" .string "I think it's the number one town for\n" .string "living together with POKéMON.$" -FortreeCity_House5_Text_217F80: @ 8217F80 +FortreeCity_House5_Text_AdaptedToNature: @ 8217F80 .string "POKéMON and people have adapted to\n" .string "nature for survival.\p" .string "There's no need to make nature\n" .string "conform to the way we want to live.$" -FortreeCity_House5_Text_217FFB: @ 8217FFB +FortreeCity_House5_Text_Zigzagoon: @ 8217FFB .string "ZIGZAGOON: Bufuu!$" |