diff options
Diffstat (limited to 'data')
62 files changed, 763 insertions, 768 deletions
diff --git a/data/cable_club.s b/data/cable_club.s deleted file mode 100644 index 8ea8b9167..000000000 --- a/data/cable_club.s +++ /dev/null @@ -1,15 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnknown_83C6AB0:: @ 83C6AB0 - .byte 0, 16, 11, 11, 2, 15 - .2byte 0x125 - -gUnknown_83C6AB8:: @ 83C6AB8 - .4byte gUnknown_841DF8B - .4byte gUnknown_841DF92 - .4byte gUnknown_841DF99 - .4byte gUnknown_841DFA0 diff --git a/data/event_scripts.s b/data/event_scripts.s index c088f893d..1e9e38b98 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -34,6 +34,7 @@ #include "constants/quest_log.h" #include "constants/daycare.h" #include "constants/easy_chat.h" +#include "constants/trainer_card.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .set FALSE, 0 diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index ed72da60f..35dd24e8c 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_EventScript_167E2E", + "script": "FourIsland_EventScript_OldWoman", "flag": "0" }, { @@ -155,7 +155,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_EventScript_167E73", + "script": "FourIsland_EventScript_FatMan", "flag": "0" }, { @@ -168,7 +168,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_EventScript_167E5A", + "script": "FourIsland_EventScript_LittleGirl", "flag": "0" } ], @@ -237,7 +237,7 @@ "x": 13, "y": 19, "elevation": 0, - "script": "FourIsland_EventScript_167E7C" + "script": "FourIsland_EventScript_IslandSign" }, { "type": "hidden_item", @@ -264,7 +264,7 @@ "x": 31, "y": 23, "elevation": 0, - "script": "FourIsland_EventScript_167E85" + "script": "FourIsland_EventScript_LoreleisHouseSign" } ] } diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 85e1db283..8a7dfafbf 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -1,3 +1,6 @@ +.equ LOCALID_DAYCARE_MAN, 1 +.equ LOCALID_RIVAL, 10 + FourIsland_MapScripts:: @ 8167CAE map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_OnFrame @@ -6,65 +9,64 @@ FourIsland_MapScripts:: @ 8167CAE FourIsland_OnTransition:: @ 8167CB9 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND compare VAR_MAP_SCENE_FOUR_ISLAND, 0 - call_if_eq EventScript_167CCD - call EventScript_167CD1 + call_if_eq FourIsland_EventScript_ShowRival + call FourIsland_EventScript_TrySetDayCareManPos end -EventScript_167CCD:: @ 8167CCD +FourIsland_EventScript_ShowRival:: @ 8167CCD clearflag FLAG_HIDE_FOUR_ISLAND_RIVAL return -EventScript_167CD1:: @ 8167CD1 - goto_if_unset FLAG_PENDING_DAYCARE_EGG, EventScript_167CE1 - setobjectxyperm 1, 16, 14 - -EventScript_167CE1:: @ 8167CE1 +FourIsland_EventScript_TrySetDayCareManPos:: @ 8167CD1 + goto_if_unset FLAG_PENDING_DAYCARE_EGG, FourIsland_EventScript_EndSetDayCareManPos + setobjectxyperm LOCALID_DAYCARE_MAN, 16, 14 +FourIsland_EventScript_EndSetDayCareManPos:: @ 8167CE1 return FourIsland_OnFrame:: @ 8167CE2 - map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, EventScript_167CEC + map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, FourIsland_EventScript_RivalScene .2byte 0 -EventScript_167CEC:: @ 8167CEC +FourIsland_EventScript_RivalScene:: @ 8167CEC lockall textcolor 0 - applymovement 10, Movement_WalkInPlaceFastestDown + applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown waitmovement 0 playbgm MUS_RIVAL1, 0 - applymovement 10, Movement_ExclamationMark + applymovement LOCALID_RIVAL, Movement_ExclamationMark waitmovement 0 - applymovement 10, Movement_Delay48 + applymovement LOCALID_RIVAL, Movement_Delay48 waitmovement 0 delay 25 - applymovement 10, Movement_167D49 + applymovement LOCALID_RIVAL, FourIsland_Movement_RivalApproach waitmovement 0 - msgbox gUnknown_8182B37 + msgbox FourIsland_Text_RivalAlreadyGotEggBeSmellingYa closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_167D52 - applymovement 10, Movement_167D4E + applymovement OBJ_EVENT_ID_PLAYER, FourIsland_Movement_PlayerWatchRivalExit + applymovement LOCALID_RIVAL, FourIsland_Movement_RivalExit waitmovement 0 fadedefaultbgm playse SE_KAIDAN delay 35 - removeobject 10 + removeobject LOCALID_RIVAL setvar VAR_MAP_SCENE_FOUR_ISLAND, 1 releaseall end -Movement_167D49:: @ 8167D49 +FourIsland_Movement_RivalApproach:: @ 8167D49 walk_right walk_right walk_down walk_down step_end -Movement_167D4E:: @ 8167D4E +FourIsland_Movement_RivalExit:: @ 8167D4E delay_16 delay_4 walk_down step_end -Movement_167D52:: @ 8167D52 +FourIsland_Movement_PlayerWatchRivalExit:: @ 8167D52 walk_left walk_in_place_fastest_right step_end @@ -136,36 +138,36 @@ FourIsland_EventScript_CheckOnTwoMons:: @ 8167E19 release end -FourIsland_EventScript_167E2E:: @ 8167E2E +FourIsland_EventScript_OldWoman:: @ 8167E2E lock faceplayer - goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167E43 - msgbox gUnknown_8182A2B + goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, FourIsland_EventScript_OldWomanLoreleiLeft + msgbox FourIsland_Text_LoreleiHasReturned release end -EventScript_167E43:: @ 8167E43 +FourIsland_EventScript_OldWomanLoreleiLeft:: @ 8167E43 famechecker FAMECHECKER_LORELEI, 5 - msgbox gUnknown_8182A75 + msgbox FourIsland_Text_LoreleiMetLaprasAsChild release end -FourIsland_EventScript_167E5A:: @ 8167E5A +FourIsland_EventScript_LittleGirl:: @ 8167E5A lock faceplayer famechecker FAMECHECKER_LORELEI, 4 - msgbox gUnknown_8182CE3 + msgbox FourIsland_Text_LoreleiHasLotsOfStuffedDolls release end -FourIsland_EventScript_167E73:: @ 8167E73 - msgbox gUnknown_8182D8E, MSGBOX_NPC +FourIsland_EventScript_FatMan:: @ 8167E73 + msgbox FourIsland_Text_MadeSlushieUsingIcefallCaveIce, MSGBOX_NPC end -FourIsland_EventScript_167E7C:: @ 8167E7C - msgbox gUnknown_8182A03, MSGBOX_SIGN +FourIsland_EventScript_IslandSign:: @ 8167E7C + msgbox FourIsland_Text_IslandSign, MSGBOX_SIGN end -FourIsland_EventScript_167E85:: @ 8167E85 - msgbox gUnknown_8182DEB, MSGBOX_SIGN +FourIsland_EventScript_LoreleisHouseSign:: @ 8167E85 + msgbox FourIsland_Text_LoreleisHouse, MSGBOX_SIGN end diff --git a/data/maps/FourIsland/text.inc b/data/maps/FourIsland/text.inc index 04845b223..e54650761 100644 --- a/data/maps/FourIsland/text.inc +++ b/data/maps/FourIsland/text.inc @@ -1,13 +1,13 @@ -gUnknown_8182A03:: @ 8182A03 +FourIsland_Text_IslandSign:: @ 8182A03 .string "FOUR ISLAND\n" .string "The Warm, Blue, Floe Island$" -gUnknown_8182A2B:: @ 8182A2B +FourIsland_Text_LoreleiHasReturned:: @ 8182A2B .string "LORELEI has returned.\p" .string "Did she find the city life too\n" .string "stressful, I wonder?$" -gUnknown_8182A75:: @ 8182A75 +FourIsland_Text_LoreleiMetLaprasAsChild:: @ 8182A75 .string "LORELEI has gone back.\p" .string "The LAPRAS she has, I imagine it\n" .string "to be the one she met as a child.\p" @@ -16,7 +16,7 @@ gUnknown_8182A75:: @ 8182A75 .string "Perhaps that POKéMON has been with\n" .string "her ever since.$" -gUnknown_8182B37:: @ 8182B37 +FourIsland_Text_RivalAlreadyGotEggBeSmellingYa:: @ 8182B37 .string "{RIVAL}: Hey!\n" .string "{PLAYER}!\p" .string "What are you doing here in the\n" @@ -37,7 +37,7 @@ gUnknown_8182B37:: @ 8182B37 .string "waste.\p" .string "Be smelling ya!$" -gUnknown_8182CE3:: @ 8182CE3 +FourIsland_Text_LoreleiHasLotsOfStuffedDolls:: @ 8182CE3 .string "Oh, you found me!\n" .string "Please don't tell LORELEI.\p" .string "Did you know that LORELEI has lots\n" @@ -45,12 +45,12 @@ gUnknown_8182CE3:: @ 8182CE3 .string "Every time she comes back to\n" .string "FOUR ISLAND, her collection grows!$" -gUnknown_8182D8E:: @ 8182D8E +FourIsland_Text_MadeSlushieUsingIcefallCaveIce:: @ 8182D8E .string "Ooh, chilly!\p" .string "I made a slushie using ice I\n" .string "shaved inside ICEFALL CAVE.\p" .string "It's chilly and tasty!$" -gUnknown_8182DEB:: @ 8182DEB +FourIsland_Text_LoreleisHouse:: @ 8182DEB .string "LORELEI'S HOUSE$" diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index 6cd0223da..fa23fe2cd 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_Harbor_EventScript_171C99", + "script": "FourIsland_Harbor_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/FourIsland_Harbor/scripts.inc b/data/maps/FourIsland_Harbor/scripts.inc index d8933d783..3a16cd3e3 100644 --- a/data/maps/FourIsland_Harbor/scripts.inc +++ b/data/maps/FourIsland_Harbor/scripts.inc @@ -1,7 +1,7 @@ FourIsland_Harbor_MapScripts:: @ 8171C98 .byte 0 -FourIsland_Harbor_EventScript_171C99:: @ 8171C99 +FourIsland_Harbor_EventScript_Sailor:: @ 8171C99 lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index 3d4984879..f581ffa5a 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_House1_EventScript_171C45", + "script": "FourIsland_House1_EventScript_FatMan", "flag": "0" } ], diff --git a/data/maps/FourIsland_House1/scripts.inc b/data/maps/FourIsland_House1/scripts.inc index 46ec500fe..e8e6322f5 100644 --- a/data/maps/FourIsland_House1/scripts.inc +++ b/data/maps/FourIsland_House1/scripts.inc @@ -1,6 +1,6 @@ FourIsland_House1_MapScripts:: @ 8171C44 .byte 0 -FourIsland_House1_EventScript_171C45:: @ 8171C45 - msgbox gUnknown_81A3802, MSGBOX_NPC +FourIsland_House1_EventScript_FatMan:: @ 8171C45 + msgbox FourIsland_House1_Text_YoureAwfullyHeavy, MSGBOX_NPC end diff --git a/data/maps/FourIsland_House1/text.inc b/data/maps/FourIsland_House1/text.inc index 2d4f8c4bd..255b3c028 100644 --- a/data/maps/FourIsland_House1/text.inc +++ b/data/maps/FourIsland_House1/text.inc @@ -1,4 +1,7 @@ -Text_1A3778:: @ 81A3778 +@ Text for this file was split weirdly, and is instead in FourIsland_PokemonCenter_1F/text.inc +@ Theres also an unused JP version of that text in this file instead + +JPText_BodySlamTeach:: @ 81A3778 .string "そーれ ぼよーん！\n" .string "どっちが さきに へたばるか？\l" .string "のしかかり しょうぶ してるんだ\p" @@ -7,17 +10,17 @@ Text_1A3778:: @ 81A3778 .string "かわりに きみの ポケモンに\l" .string "のしかかり おしえて やろっか？$" -Text_1A37DB:: @ 81A37DB +JPText_BodySlamDeclined:: @ 81A37DB .string "また おいで ぼよーん！$" -Text_1A37E8:: @ 81A37E8 +JPText_BodySlamWhichMon:: @ 81A37E8 .string "どの ポケモンに\n" .string "おしえたい かい？$" -Text_1A37FB:: @ 81A37FB +JPText_BodySlamTaught:: @ 81A37FB .string "ぼよよーん！$" -gUnknown_81A3802:: @ 81A3802 +FourIsland_House1_Text_YoureAwfullyHeavy:: @ 81A3802 .string "There! Boing!\n" .string "You're awfully heavy!$" diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index b83419325..a4b926233 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_House2_EventScript_1B2938", + "script": "FourIsland_House2_EventScript_StickerMan", "flag": "0" } ], diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index 7dbe72a88..1c09bc412 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C58", + "script": "FourIsland_LoreleisHouse_EventScript_Lorelei", "flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" }, { @@ -103,7 +103,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" }, { @@ -116,7 +116,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL" }, { @@ -129,7 +129,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL" }, { @@ -142,7 +142,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL" }, { @@ -155,7 +155,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL" }, { @@ -168,7 +168,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL" }, { @@ -181,7 +181,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL" }, { @@ -194,7 +194,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL" }, { @@ -207,7 +207,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_LoreleisHouse_EventScript_171C8D", + "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEIS_HOUSE_LAPRAS_DOLL" } ], diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc index c39cc1da9..6259870e6 100644 --- a/data/maps/FourIsland_LoreleisHouse/scripts.inc +++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc @@ -6,28 +6,28 @@ FourIsland_LoreleisHouse_OnTransition:: @ 8171C54 special Special_ComputeLoreleiDollCollection end -FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58 +FourIsland_LoreleisHouse_EventScript_Lorelei:: @ 8171C58 lock faceplayer - goto_if_set FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE, EventScript_171C83 - goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_171C76 - msgbox gUnknown_81A3826 + goto_if_set FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE, FourIsland_LoreleisHouse_EventScript_Lorelei3 + goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, FourIsland_LoreleisHouse_EventScript_Lorelei2 + msgbox FourIsland_LoreleisHouse_Text_IfAnythingWereToHappenToIsland release end -EventScript_171C76:: @ 8171C76 +FourIsland_LoreleisHouse_EventScript_Lorelei2:: @ 8171C76 setflag FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE - msgbox gUnknown_81A390C + msgbox FourIsland_LoreleisHouse_Text_IllReturnToLeagueInShortWhile release end -EventScript_171C83:: @ 8171C83 - msgbox gUnknown_81A39D8 +FourIsland_LoreleisHouse_EventScript_Lorelei3:: @ 8171C83 + msgbox FourIsland_LoreleisHouse_Text_WillDoWhatICanHereAndNow release end -FourIsland_LoreleisHouse_EventScript_171C8D:: @ 8171C8D +FourIsland_LoreleisHouse_EventScript_Doll:: @ 8171C8D lock - msgbox gUnknown_81A3A42 + msgbox FourIsland_LoreleisHouse_Text_StuffedMonDollsGalore release end diff --git a/data/maps/FourIsland_LoreleisHouse/text.inc b/data/maps/FourIsland_LoreleisHouse/text.inc index 5c7d0cd81..b332cd50e 100644 --- a/data/maps/FourIsland_LoreleisHouse/text.inc +++ b/data/maps/FourIsland_LoreleisHouse/text.inc @@ -1,4 +1,4 @@ -gUnknown_81A3826:: @ 81A3826 +FourIsland_LoreleisHouse_Text_IfAnythingWereToHappenToIsland:: @ 81A3826 .string "LORELEI: There's something weighing\n" .string "heavily on my mind.\p" .string "If anything were to happen on\n" @@ -8,7 +8,7 @@ gUnknown_81A3826:: @ 81A3826 .string "I wonder if that would make me\n" .string "irresponsible to my home…$" -gUnknown_81A390C:: @ 81A390C +FourIsland_LoreleisHouse_Text_IllReturnToLeagueInShortWhile:: @ 81A390C .string "LORELEI: So, you managed to solve\n" .string "all the problems here?\p" .string "That's wonderful.\p" @@ -18,12 +18,12 @@ gUnknown_81A390C:: @ 81A390C .string "I'll return to the POKéMON LEAGUE\n" .string "in a short while.$" -gUnknown_81A39D8:: @ 81A39D8 +FourIsland_LoreleisHouse_Text_WillDoWhatICanHereAndNow:: @ 81A39D8 .string "I don't know what will happen in\n" .string "the future, but…\p" .string "I will do what I can here and now.\n" .string "That's all I can do.$" -gUnknown_81A3A42:: @ 81A3A42 +FourIsland_LoreleisHouse_Text_StuffedMonDollsGalore:: @ 81A3A42 .string "Stuffed POKéMON dolls galore!$" diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index f5820fef9..5543c8c50 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_Mart_EventScript_171CAE", + "script": "FourIsland_Mart_EventScript_Clerk", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_Mart_EventScript_1ACF46", + "script": "FourIsland_Mart_EventScript_OldMan", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_Mart_EventScript_171CE8", + "script": "FourIsland_Mart_EventScript_Camper", "flag": "0" } ], diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index 5f85eaae4..36b3a0914 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -1,19 +1,19 @@ FourIsland_Mart_MapScripts:: @ 8171CAD .byte 0 -FourIsland_Mart_EventScript_171CAE:: @ 8171CAE +FourIsland_Mart_EventScript_Clerk:: @ 8171CAE goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_171CD4 + pokemart FourIsland_Mart_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_171CD4:: @ 8171CD4 +FourIsland_Mart_Items:: @ 8171CD4 .2byte ITEM_ULTRA_BALL .2byte ITEM_FULL_RESTORE .2byte ITEM_MAX_POTION @@ -26,6 +26,6 @@ Items_171CD4:: @ 8171CD4 release end -FourIsland_Mart_EventScript_171CE8:: @ 8171CE8 - msgbox gUnknown_81A3B14, MSGBOX_NPC +FourIsland_Mart_EventScript_Camper:: @ 8171CE8 + msgbox FourIsland_Mart_Text_IcefallCaveIsFrigid, MSGBOX_NPC end diff --git a/data/maps/FourIsland_Mart/text.inc b/data/maps/FourIsland_Mart/text.inc index eba66dd37..afde0e79c 100644 --- a/data/maps/FourIsland_Mart/text.inc +++ b/data/maps/FourIsland_Mart/text.inc @@ -1,4 +1,4 @@ -Text_1A3A60:: @ 81A3A60 +FourIsland_Mart_Text_LoreleiGrewUpOnThisIsland:: @ 81A3A60 .string "We've had a great and powerful\n" .string "TRAINER grow up on this island.\p" .string "I bet even you'd know her.\n" @@ -6,7 +6,7 @@ Text_1A3A60:: @ 81A3A60 .string "When LORELEI was just a tyke,\n" .string "I taught her about POKéMON.$" -gUnknown_81A3B14:: @ 81A3B14 +FourIsland_Mart_Text_IcefallCaveIsFrigid:: @ 81A3B14 .string "The SEVII ISLANDS are in a warm\n" .string "region overall.\p" .string "But there is one exception you\n" diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index a8bf5fa97..7757c904e 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_1F_EventScript_171BF9", + "script": "FourIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_1F_EventScript_171C02", + "script": "FourIsland_PokemonCenter_1F_EventScript_Man", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_1F_EventScript_171C0B", + "script": "FourIsland_PokemonCenter_1F_EventScript_Woman", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_PokemonCenter_1F_EventScript_171C14", + "script": "FourIsland_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" } ], @@ -91,14 +91,14 @@ "x": 3, "y": 1, "elevation": 0, - "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0" + "script": "FourIsland_PokemonCenter_1F_EventScript_PokemonJournal" }, { "type": "bg_event_type_1", "x": 2, "y": 1, "elevation": 0, - "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0" + "script": "FourIsland_PokemonCenter_1F_EventScript_PokemonJournal" } ] } diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index 4ee8e33c1..afb0c7582 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -7,21 +7,21 @@ FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5 setrespawn SPAWN_FOUR_ISLAND end -FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9 +FourIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171BF9 lock faceplayer call EventScript_PkmnCenterNurse release end -FourIsland_PokemonCenter_1F_EventScript_171C02:: @ 8171C02 - msgbox gUnknown_81A3627, MSGBOX_NPC +FourIsland_PokemonCenter_1F_EventScript_Man:: @ 8171C02 + msgbox FourIsland_PokemonCenter_1F_Text_RareIceMonsInCave, MSGBOX_NPC end -FourIsland_PokemonCenter_1F_EventScript_171C0B:: @ 8171C0B - msgbox gUnknown_81A3697, MSGBOX_NPC +FourIsland_PokemonCenter_1F_EventScript_Woman:: @ 8171C0B + msgbox FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore, MSGBOX_NPC end -FourIsland_PokemonCenter_1F_EventScript_171C14:: @ 8171C14 - msgbox gUnknown_81A3734, MSGBOX_NPC +FourIsland_PokemonCenter_1F_EventScript_Gentleman:: @ 8171C14 + msgbox FourIsland_PokemonCenter_1F_Text_NewPokemonJournalHasntArrived, MSGBOX_NPC end diff --git a/data/maps/FourIsland_PokemonCenter_1F/text.inc b/data/maps/FourIsland_PokemonCenter_1F/text.inc index 954aabd96..43e6cacf6 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/text.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/text.inc @@ -1,3 +1,4 @@ +@ The 5 texts below are supposed to be in FourIsland_House1 Text_BodySlamTeach:: @ 81A3505 .string "Ready?\n" .string "Boing!\p" @@ -19,17 +20,17 @@ Text_BodySlamWhichMon:: @ 81A35DA Text_BodySlamTaught:: @ 81A3609 .string "Boioing!$" -Text_1A3612:: @ 81A3612 +FourIsland_House1_Text_FatMan:: @ 81A3612 .string "それ ぼよーん！\n" .string "おまえ おもいなあー！$" -gUnknown_81A3627:: @ 81A3627 +FourIsland_PokemonCenter_1F_Text_RareIceMonsInCave:: @ 81A3627 .string "There's a rare kind of ICE POKéMON\n" .string "that lives in the cave.\p" .string "We get a lot of visitors hoping to\n" .string "see that POKéMON.$" -gUnknown_81A3697:: @ 81A3697 +FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore:: @ 81A3697 .string "Oh? A POKéMON EGG?\n" .string "…I have no idea.\p" .string "…Oh, wait. The DAY-CARE people\n" @@ -37,7 +38,7 @@ gUnknown_81A3697:: @ 81A3697 .string "They said that they'd found EGGS\n" .string "before on their property.$" -gUnknown_81A3734:: @ 81A3734 +FourIsland_PokemonCenter_1F_Text_NewPokemonJournalHasntArrived:: @ 81A3734 .string "What's this?\p" .string "The new POKéMON JOURNAL hasn't\n" .string "arrived on this island?$" diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 9ccf2b29d..94e4ec4bf 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1677E5", + "script": "ThreeIsland_EventScript_AntiBiker1", "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_167989", + "script": "ThreeIsland_EventScript_AntiBiker2", "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1677D8", + "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1677D8", + "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1677D8", + "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1677D8", + "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1677D8", + "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1677D8", + "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { @@ -166,7 +166,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_167C77", + "script": "ThreeIsland_EventScript_Woman", "flag": "0" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_167C80", + "script": "ThreeIsland_EventScript_LittleBoy", "flag": "0" }, { @@ -192,7 +192,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_167C89", + "script": "ThreeIsland_EventScript_Doduo", "flag": "0" }, { @@ -205,7 +205,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_167CA5", + "script": "ThreeIsland_EventScript_Biker6", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" } ], @@ -268,7 +268,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, - "script": "ThreeIsland_EventScript_1679B5" + "script": "ThreeIsland_EventScript_BikerBossIntroTrigger" }, { "type": "trigger", @@ -277,7 +277,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, - "script": "ThreeIsland_EventScript_1679B5" + "script": "ThreeIsland_EventScript_BikerBossIntroTrigger" }, { "type": "trigger", @@ -286,7 +286,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, - "script": "ThreeIsland_EventScript_1679B5" + "script": "ThreeIsland_EventScript_BikerBossIntroTrigger" }, { "type": "trigger", @@ -295,7 +295,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, - "script": "ThreeIsland_EventScript_1679B5" + "script": "ThreeIsland_EventScript_BikerBossIntroTrigger" }, { "type": "trigger", @@ -304,7 +304,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, - "script": "ThreeIsland_EventScript_167A1D" + "script": "ThreeIsland_EventScript_BattleBikersTriggerLeft" }, { "type": "trigger", @@ -313,7 +313,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, - "script": "ThreeIsland_EventScript_167A29" + "script": "ThreeIsland_EventScript_BattleBikersTriggerMidLeft" }, { "type": "trigger", @@ -322,7 +322,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, - "script": "ThreeIsland_EventScript_167A35" + "script": "ThreeIsland_EventScript_BattleBikersTriggerMid" }, { "type": "trigger", @@ -331,7 +331,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, - "script": "ThreeIsland_EventScript_1679B5" + "script": "ThreeIsland_EventScript_BikerBossIntroTrigger" }, { "type": "trigger", @@ -340,7 +340,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, - "script": "ThreeIsland_EventScript_167A41" + "script": "ThreeIsland_EventScript_BattleBikersTriggerMidRight" }, { "type": "trigger", @@ -349,7 +349,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, - "script": "ThreeIsland_EventScript_167A4D" + "script": "ThreeIsland_EventScript_BattleBikersTriggerRight" } ], "bg_events": [ @@ -358,7 +358,7 @@ "x": 12, "y": 31, "elevation": 0, - "script": "ThreeIsland_EventScript_167C9C" + "script": "ThreeIsland_EventScript_IslandSign" }, { "type": "hidden_item", diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index a92ad452a..484d8dba0 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -1,379 +1,390 @@ +.equ LOCALID_ANTIBIKER1, 1 +.equ LOCALID_ANTIBIKER2, 2 +.equ LOCALID_PAXTON, 3 +.equ LOCALID_BIKER1, 5 +.equ LOCALID_BIKER2, 7 +.equ LOCALID_BIKER3, 4 +.equ LOCALID_BIKER4, 6 +.equ LOCALID_BIKER5, 8 +.equ LOCALID_BIKER6, 14 + ThreeIsland_MapScripts:: @ 81677AD map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_OnTransition .byte 0 ThreeIsland_OnTransition:: @ 81677B3 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND - call_if_set FLAG_RESCUED_LOSTELLE, EventScript_1677CB + call_if_set FLAG_RESCUED_LOSTELLE, ThreeIsland_EventScript_HideAntiBikers compare VAR_MAP_SCENE_THREE_ISLAND, 4 - call_if_eq EventScript_1677CF + call_if_eq ThreeIsland_EventScript_SetAntiBikersMovementAfterBikers end -EventScript_1677CB:: @ 81677CB +ThreeIsland_EventScript_HideAntiBikers:: @ 81677CB setflag FLAG_HIDE_THREE_ISLAND_ANTIBIKERS return -EventScript_1677CF:: @ 81677CF - setobjectmovementtype 1, 1 - setobjectmovementtype 2, 1 +ThreeIsland_EventScript_SetAntiBikersMovementAfterBikers:: @ 81677CF + setobjectmovementtype LOCALID_ANTIBIKER1, MOVEMENT_TYPE_LOOK_AROUND + setobjectmovementtype LOCALID_ANTIBIKER2, MOVEMENT_TYPE_LOOK_AROUND return -ThreeIsland_EventScript_1677D8:: @ 81677D8 +ThreeIsland_EventScript_Biker:: @ 81677D8 lock setvar VAR_TEMP_1, 2 - call EventScript_16786F + call ThreeIsland_EventScript_BikerArgumentScene release end -ThreeIsland_EventScript_1677E5:: @ 81677E5 +ThreeIsland_EventScript_AntiBiker1:: @ 81677E5 lock - goto_if_set FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER, EventScript_167806 + goto_if_set FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER, ThreeIsland_EventScript_AntiBiker1GotFullRestore compare VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if_eq EventScript_16781A + goto_if_eq ThreeIsland_EventScript_GiveFullRestore setvar VAR_TEMP_1, 0 - call EventScript_16786F + call ThreeIsland_EventScript_BikerArgumentScene release end -EventScript_167806:: @ 8167806 - applymovement 1, Movement_FacePlayer +ThreeIsland_EventScript_AntiBiker1GotFullRestore:: @ 8167806 + applymovement LOCALID_ANTIBIKER1, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81827F1 + msgbox ThreeIsland_Text_YouveGotImpressiveMons release end -EventScript_16781A:: @ 816781A - applymovement 1, Movement_FacePlayer +ThreeIsland_EventScript_GiveFullRestore:: @ 816781A + applymovement LOCALID_ANTIBIKER1, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_818275A + msgbox ThreeIsland_Text_ThankYouOhYourMonGotHurt checkitemspace ITEM_FULL_RESTORE, 1 compare VAR_RESULT, FALSE - goto_if_eq EventScript_167865 - msgreceiveditem gUnknown_81827BE, ITEM_FULL_RESTORE + goto_if_eq ThreeIsland_EventScript_NoRoomForFullRestore + msgreceiveditem ThreeIsland_Text_GivenFullRestore, ITEM_FULL_RESTORE additem ITEM_FULL_RESTORE setflag FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER - msgbox gUnknown_81827F1 + msgbox ThreeIsland_Text_YouveGotImpressiveMons release end -EventScript_167865:: @ 8167865 - msgbox gUnknown_81827DB +ThreeIsland_EventScript_NoRoomForFullRestore:: @ 8167865 + msgbox ThreeIsland_Text_OhYourBagIsFull release end -EventScript_16786F:: @ 816786F +ThreeIsland_EventScript_BikerArgumentScene:: @ 816786F compare VAR_TEMP_1, 1 - call_if_eq EventScript_167947 + call_if_eq ThreeIsland_EventScript_PlayerFaceLeft compare VAR_TEMP_1, 2 - call_if_eq EventScript_167947 - applymovement 1, Movement_167A1B + call_if_eq ThreeIsland_EventScript_PlayerFaceLeft + applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight waitmovement 0 - msgbox gUnknown_81820C0 + msgbox ThreeIsland_Text_GoBackToKanto compare VAR_TEMP_1, 0 - call_if_eq EventScript_167952 + call_if_eq ThreeIsland_EventScript_PlayerFaceRight compare VAR_TEMP_1, 1 - call_if_eq EventScript_167952 + call_if_eq ThreeIsland_EventScript_PlayerFaceRight compare VAR_TEMP_1, 2 - call_if_eq EventScript_16795D - applymovement 5, Movement_167A19 + call_if_eq ThreeIsland_EventScript_PlayerFaceBiker + applymovement LOCALID_BIKER1, ThreeIsland_Movement_SpeakLeft waitmovement 0 - msgbox gUnknown_8182125 + msgbox ThreeIsland_Text_BossIsOnHisWay compare VAR_TEMP_1, 0 - call_if_eq EventScript_167931 + call_if_eq ThreeIsland_EventScript_PlayerFaceUp compare VAR_TEMP_1, 1 - call_if_eq EventScript_167931 + call_if_eq ThreeIsland_EventScript_PlayerFaceUp compare VAR_TEMP_1, 2 - call_if_eq EventScript_167973 - applymovement 2, Movement_167A1B + call_if_eq ThreeIsland_EventScript_PlayerFaceAntiBiker + applymovement LOCALID_ANTIBIKER2, ThreeIsland_Movement_SpeakRight waitmovement 0 - msgbox gUnknown_81821A9 + msgbox ThreeIsland_Text_GetOffIslandNow compare VAR_TEMP_1, 0 - call_if_eq EventScript_167952 + call_if_eq ThreeIsland_EventScript_PlayerFaceRight compare VAR_TEMP_1, 1 - call_if_eq EventScript_167952 + call_if_eq ThreeIsland_EventScript_PlayerFaceRight compare VAR_TEMP_1, 2 - call_if_eq EventScript_16795D - applymovement 4, Movement_167A19 + call_if_eq ThreeIsland_EventScript_PlayerFaceBiker + applymovement LOCALID_BIKER3, ThreeIsland_Movement_SpeakLeft waitmovement 0 - msgbox gUnknown_81821DC + msgbox ThreeIsland_Text_WhosGonnaMakeMe return -EventScript_167931:: @ 8167931 +ThreeIsland_EventScript_PlayerFaceUp:: @ 8167931 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_16793C:: @ 816793C +@ Unused +ThreeIsland_EventScript_PlayerFaceDown:: @ 816793C applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -EventScript_167947:: @ 8167947 +ThreeIsland_EventScript_PlayerFaceLeft:: @ 8167947 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_167952:: @ 8167952 +ThreeIsland_EventScript_PlayerFaceRight:: @ 8167952 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return -EventScript_16795D:: @ 816795D +ThreeIsland_EventScript_PlayerFaceBiker:: @ 816795D getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 9 - goto_if_ge EventScript_167931 - goto EventScript_167952 + goto_if_ge ThreeIsland_EventScript_PlayerFaceUp + goto ThreeIsland_EventScript_PlayerFaceRight end -EventScript_167973:: @ 8167973 +ThreeIsland_EventScript_PlayerFaceAntiBiker:: @ 8167973 getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 9 - goto_if_ge EventScript_167947 - goto EventScript_167931 + goto_if_ge ThreeIsland_EventScript_PlayerFaceLeft + goto ThreeIsland_EventScript_PlayerFaceUp end -ThreeIsland_EventScript_167989:: @ 8167989 +ThreeIsland_EventScript_AntiBiker2:: @ 8167989 lock compare VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if_eq EventScript_1679A1 + goto_if_eq ThreeIsland_EventScript_AntiBiker2BikersGone setvar VAR_TEMP_1, 1 - call EventScript_16786F + call ThreeIsland_EventScript_BikerArgumentScene release end -EventScript_1679A1:: @ 81679A1 - applymovement 2, Movement_FacePlayer +ThreeIsland_EventScript_AntiBiker2BikersGone:: @ 81679A1 + applymovement LOCALID_ANTIBIKER2, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_8182823 + msgbox ThreeIsland_Text_LostelleWentOffTowardsBondBridge release end -ThreeIsland_EventScript_1679B5:: @ 81679B5 +ThreeIsland_EventScript_BikerBossIntroTrigger:: @ 81679B5 lockall textcolor 0 - applymovement 1, Movement_167A1B + applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight waitmovement 0 - msgbox gUnknown_81821F1 - applymovement 3, Movement_167A19 + msgbox ThreeIsland_Text_AreYouBossGoBackToKanto + applymovement LOCALID_PAXTON, ThreeIsland_Movement_SpeakLeft waitmovement 0 - msgbox gUnknown_818221F - applymovement 1, Movement_167A1B + msgbox ThreeIsland_Text_JustGotHerePal + applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight waitmovement 0 - msgbox gUnknown_8182275 - applymovement 3, Movement_167A19 + msgbox ThreeIsland_Text_FollowersRaisingHavoc + applymovement LOCALID_PAXTON, ThreeIsland_Movement_SpeakLeft waitmovement 0 - msgbox gUnknown_81822FB - applymovement 1, Movement_167A1B + msgbox ThreeIsland_Text_OughtToBeThankingUs + applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight waitmovement 0 - msgbox gUnknown_81823C7 + msgbox ThreeIsland_Text_YouCowardsToughInPack setvar VAR_MAP_SCENE_THREE_ISLAND, 3 releaseall end -Movement_167A19:: @ 8167A19 +ThreeIsland_Movement_SpeakLeft:: @ 8167A19 walk_in_place_left step_end -Movement_167A1B:: @ 8167A1B +ThreeIsland_Movement_SpeakRight:: @ 8167A1B walk_in_place_right step_end -ThreeIsland_EventScript_167A1D:: @ 8167A1D +ThreeIsland_EventScript_BattleBikersTriggerLeft:: @ 8167A1D lockall setvar VAR_TEMP_1, 0 - goto EventScript_167A59 + goto ThreeIsland_EventScript_BattleBikersScene end -ThreeIsland_EventScript_167A29:: @ 8167A29 +ThreeIsland_EventScript_BattleBikersTriggerMidLeft:: @ 8167A29 lockall setvar VAR_TEMP_1, 1 - goto EventScript_167A59 + goto ThreeIsland_EventScript_BattleBikersScene end -ThreeIsland_EventScript_167A35:: @ 8167A35 +ThreeIsland_EventScript_BattleBikersTriggerMid:: @ 8167A35 lockall setvar VAR_TEMP_1, 2 - goto EventScript_167A59 + goto ThreeIsland_EventScript_BattleBikersScene end -ThreeIsland_EventScript_167A41:: @ 8167A41 +ThreeIsland_EventScript_BattleBikersTriggerMidRight:: @ 8167A41 lockall setvar VAR_TEMP_1, 3 - goto EventScript_167A59 + goto ThreeIsland_EventScript_BattleBikersScene end -ThreeIsland_EventScript_167A4D:: @ 8167A4D +ThreeIsland_EventScript_BattleBikersTriggerRight:: @ 8167A4D lockall setvar VAR_TEMP_1, 4 - goto EventScript_167A59 + goto ThreeIsland_EventScript_BattleBikersScene end -EventScript_167A59:: @ 8167A59 +ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 textcolor 0 - applymovement 5, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER1, Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN - applymovement 5, Movement_ExclamationMark + applymovement LOCALID_BIKER1, Movement_ExclamationMark waitmovement 0 - applymovement 5, Movement_Delay48 + applymovement LOCALID_BIKER1, Movement_Delay48 waitmovement 0 - applymovement 5, Movement_167C57 + applymovement LOCALID_BIKER1, ThreeIsland_Movement_BikerApproach waitmovement 0 playbgm MUS_SHOUNEN, 0 - msgbox gUnknown_81823ED, MSGBOX_YESNO + msgbox ThreeIsland_Text_WannaMakeSomethingOfYourStaring, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_167C35 - msgbox gUnknown_818247D - setvar VAR_LAST_TALKED, 5 - trainerbattle_no_intro TRAINER_BIKER_GOON, Text_1824B7 - applymovement 5, Movement_167C5C + goto_if_eq ThreeIsland_EventScript_LeaveBikersAlone + msgbox ThreeIsland_Text_Biker1Intro + setvar VAR_LAST_TALKED, LOCALID_BIKER1 + trainerbattle_no_intro TRAINER_BIKER_GOON, ThreeIsland_Text_Biker1Defeat + applymovement LOCALID_BIKER1, ThreeIsland_Movement_BikerSpeak waitmovement 0 - msgbox gUnknown_81824CF + msgbox ThreeIsland_Text_Biker1PostBattle closemessage - applymovement 7, Movement_167C57 + applymovement LOCALID_BIKER2, ThreeIsland_Movement_BikerApproach waitmovement 0 playbgm MUS_SHOUNEN, 0 - msgbox gUnknown_81824EF - setvar VAR_LAST_TALKED, 7 - trainerbattle_no_intro TRAINER_BIKER_GOON_2, Text_182521 - applymovement 7, Movement_167C5C + msgbox ThreeIsland_Text_Biker2Intro + setvar VAR_LAST_TALKED, LOCALID_BIKER2 + trainerbattle_no_intro TRAINER_BIKER_GOON_2, ThreeIsland_Text_Biker2Defeat + applymovement LOCALID_BIKER2, ThreeIsland_Movement_BikerSpeak waitmovement 0 - msgbox gUnknown_8182536 + msgbox ThreeIsland_Text_Biker2PostBattle closemessage - applymovement 4, Movement_167C57 + applymovement LOCALID_BIKER3, ThreeIsland_Movement_BikerApproach waitmovement 0 playbgm MUS_SHOUNEN, 0 - msgbox gUnknown_8182582 - setvar VAR_LAST_TALKED, 4 - trainerbattle_no_intro TRAINER_BIKER_GOON_3, Text_1825D4 - applymovement 4, Movement_WalkInPlaceFastestLeft + msgbox ThreeIsland_Text_Biker3Intro + setvar VAR_LAST_TALKED, LOCALID_BIKER3 + trainerbattle_no_intro TRAINER_BIKER_GOON_3, ThreeIsland_Text_Biker3Defeat + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement 6, Movement_WalkInPlaceFastestDown - applymovement 8, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER4, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BIKER5, Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox gUnknown_81825E2 + msgbox ThreeIsland_Text_Biker3PostBattle closemessage delay 45 compare VAR_TEMP_1, 0 - call_if_eq EventScript_167BC6 + call_if_eq ThreeIsland_EventScript_PaxtonApproachLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_167BD8 + call_if_eq ThreeIsland_EventScript_PaxtonApproachMidLeft compare VAR_TEMP_1, 2 - call_if_eq EventScript_167BEA + call_if_eq ThreeIsland_EventScript_PaxtonApproachMid compare VAR_TEMP_1, 3 - call_if_eq EventScript_167C03 + call_if_eq ThreeIsland_EventScript_PaxtonApproachMidRight compare VAR_TEMP_1, 4 - call_if_eq EventScript_167C1C + call_if_eq ThreeIsland_EventScript_PaxtonApproachRight playbgm MUS_SHOUNEN, 0 - msgbox gUnknown_8182623 - setvar VAR_LAST_TALKED, 3 - trainerbattle_no_intro TRAINER_CUE_BALL_PAXTON, Text_1826B7 - msgbox gUnknown_818271D + msgbox ThreeIsland_Text_PaxtonIntro + setvar VAR_LAST_TALKED, LOCALID_PAXTON + trainerbattle_no_intro TRAINER_CUE_BALL_PAXTON, ThreeIsland_Text_PaxtonDefeat + msgbox ThreeIsland_Text_PaxtonPostBattle closemessage fadescreen FADE_TO_BLACK - removeobject 3 - removeobject 5 - removeobject 7 - removeobject 4 - removeobject 6 - removeobject 8 - removeobject 14 + removeobject LOCALID_PAXTON + removeobject LOCALID_BIKER1 + removeobject LOCALID_BIKER2 + removeobject LOCALID_BIKER3 + removeobject LOCALID_BIKER4 + removeobject LOCALID_BIKER5 + removeobject LOCALID_BIKER6 fadescreen FADE_FROM_BLACK setvar VAR_MAP_SCENE_THREE_ISLAND, 4 releaseall end -EventScript_167BC6:: @ 8167BC6 - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement 3, Movement_167C5E +ThreeIsland_EventScript_PaxtonApproachLeft:: @ 8167BC6 + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachLeft waitmovement 0 return -EventScript_167BD8:: @ 8167BD8 - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement 3, Movement_167C62 +ThreeIsland_EventScript_PaxtonApproachMidLeft:: @ 8167BD8 + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidLeft waitmovement 0 return -EventScript_167BEA:: @ 8167BEA - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement 3, Movement_167C64 - applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68 +ThreeIsland_EventScript_PaxtonApproachMid:: @ 8167BEA + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMid + applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton waitmovement 0 return -EventScript_167C03:: @ 8167C03 - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68 - applymovement 3, Movement_167C6C +ThreeIsland_EventScript_PaxtonApproachMidRight:: @ 8167C03 + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton + applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidRight waitmovement 0 return -EventScript_167C1C:: @ 8167C1C - applymovement 4, Movement_WalkInPlaceFastestDown - applymovement OBJ_EVENT_ID_PLAYER, Movement_167C68 - applymovement 3, Movement_167C71 +ThreeIsland_EventScript_PaxtonApproachRight:: @ 8167C1C + applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton + applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachRight waitmovement 0 return -EventScript_167C35:: @ 8167C35 - msgbox gUnknown_8182453 +ThreeIsland_EventScript_LeaveBikersAlone:: @ 8167C35 + msgbox ThreeIsland_Text_ThatsSmart closemessage - applymovement OBJ_EVENT_ID_PLAYER, Movement_167C55 + applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerLeaveBikers waitmovement 0 - applymovement 5, Movement_167C59 + applymovement LOCALID_BIKER1, ThreeIsland_Movement_Biker1ReturnToPack waitmovement 0 fadedefaultbgm releaseall end -Movement_167C55:: @ 8167C55 +ThreeIsland_Movement_PlayerLeaveBikers:: @ 8167C55 walk_down step_end -Movement_167C57:: @ 8167C57 +ThreeIsland_Movement_BikerApproach:: @ 8167C57 walk_down step_end -Movement_167C59:: @ 8167C59 +ThreeIsland_Movement_Biker1ReturnToPack:: @ 8167C59 walk_up walk_in_place_fastest_left step_end -Movement_167C5C:: @ 8167C5C +ThreeIsland_Movement_BikerSpeak:: @ 8167C5C walk_in_place_down step_end -Movement_167C5E:: @ 8167C5E +ThreeIsland_Movement_PaxtonApproachLeft:: @ 8167C5E walk_down walk_left walk_in_place_fastest_down step_end -Movement_167C62:: @ 8167C62 +ThreeIsland_Movement_PaxtonApproachMidLeft:: @ 8167C62 walk_down step_end -Movement_167C64:: @ 8167C64 +ThreeIsland_Movement_PaxtonApproachMid:: @ 8167C64 walk_down walk_down walk_in_place_fastest_right step_end -Movement_167C68:: @ 8167C68 +ThreeIsland_Movement_PlayerFacePaxton:: @ 8167C68 delay_16 delay_16 walk_in_place_fastest_left step_end -Movement_167C6C:: @ 8167C6C +ThreeIsland_Movement_PaxtonApproachMidRight:: @ 8167C6C walk_down walk_down walk_right walk_in_place_fastest_right step_end -Movement_167C71:: @ 8167C71 +ThreeIsland_Movement_PaxtonApproachRight:: @ 8167C71 walk_down walk_down walk_right @@ -381,28 +392,28 @@ Movement_167C71:: @ 8167C71 walk_in_place_fastest_right step_end -ThreeIsland_EventScript_167C77:: @ 8167C77 - msgbox gUnknown_81828EB, MSGBOX_NPC +ThreeIsland_EventScript_Woman:: @ 8167C77 + msgbox ThreeIsland_Text_WouldntWantToSeeBikersHereAgain, MSGBOX_NPC end -ThreeIsland_EventScript_167C80:: @ 8167C80 - msgbox gUnknown_818298A, MSGBOX_NPC +ThreeIsland_EventScript_LittleBoy:: @ 8167C80 + msgbox ThreeIsland_Text_WhenDodouEvolvesGoingToPlayGame, MSGBOX_NPC end -ThreeIsland_EventScript_167C89:: @ 8167C89 +ThreeIsland_EventScript_Doduo:: @ 8167C89 lock faceplayer waitse playmoncry SPECIES_DODUO, 0 - msgbox gUnknown_81829F4 + msgbox ThreeIsland_Text_Doduo waitmoncry release end -ThreeIsland_EventScript_167C9C:: @ 8167C9C - msgbox gUnknown_8182061, MSGBOX_SIGN +ThreeIsland_EventScript_IslandSign:: @ 8167C9C + msgbox ThreeIsland_Text_IslandSign, MSGBOX_SIGN end -ThreeIsland_EventScript_167CA5:: @ 8167CA5 - msgbox gUnknown_818208B, MSGBOX_NPC +ThreeIsland_EventScript_Biker6:: @ 8167CA5 + msgbox ThreeIsland_Text_IslandBelongsToUs, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland/text.inc b/data/maps/ThreeIsland/text.inc index 31e058a67..6f18aab9d 100644 --- a/data/maps/ThreeIsland/text.inc +++ b/data/maps/ThreeIsland/text.inc @@ -1,50 +1,50 @@ -gUnknown_8182061:: @ 8182061 +ThreeIsland_Text_IslandSign:: @ 8182061 .string "THREE ISLAND\n" .string "Kin Island of Family Bonding$" -gUnknown_818208B:: @ 818208B +ThreeIsland_Text_IslandBelongsToUs:: @ 818208B .string "Hyahoo!\p" .string "From this day on, this island\n" .string "belongs to us!$" -gUnknown_81820C0:: @ 81820C0 +ThreeIsland_Text_GoBackToKanto:: @ 81820C0 .string "We don't need you people bringing\n" .string "your noise and trouble here!\p" .string "We're asking you to go back to\n" .string "KANTO!$" -gUnknown_8182125:: @ 8182125 +ThreeIsland_Text_BossIsOnHisWay:: @ 8182125 .string "Hey, go cry somewhere else.\n" .string "Our boss is on his way.\p" .string "When he gets here, we'll give you\n" .string "a k-rad motorbike show you won't\l" .string "soon forget!$" -gUnknown_81821A9:: @ 81821A9 +ThreeIsland_Text_GetOffIslandNow:: @ 81821A9 .string "W-what!? Not on your life!\n" .string "Get off the island now!$" -gUnknown_81821DC:: @ 81821DC +ThreeIsland_Text_WhosGonnaMakeMe:: @ 81821DC .string "Who's gonna make me?$" -gUnknown_81821F1:: @ 81821F1 +ThreeIsland_Text_AreYouBossGoBackToKanto:: @ 81821F1 .string "Are you the boss?\n" .string "Go back to KANTO right now!$" -gUnknown_818221F:: @ 818221F +ThreeIsland_Text_JustGotHerePal:: @ 818221F .string "Hah?\p" .string "I just got here, pal.\p" .string "What's with the hostile attitude?\n" .string "It's mighty cold of you!$" -gUnknown_8182275:: @ 8182275 +ThreeIsland_Text_FollowersRaisingHavoc:: @ 8182275 .string "Your gang of followers have been\n" .string "raising havoc on their bikes.\p" .string "Do you have any idea how much\n" .string "trouble they've caused us on the\l" .string "island?$" -gUnknown_81822FB:: @ 81822FB +ThreeIsland_Text_OughtToBeThankingUs:: @ 81822FB .string "No, man, I don't get it at all.\p" .string "Look at this place.\n" .string "What do you do for entertainment?\p" @@ -53,57 +53,57 @@ gUnknown_81822FB:: @ 81822FB .string "But hey, if you insist, you can try\n" .string "making us leave.$" -gUnknown_81823C7:: @ 81823C7 +ThreeIsland_Text_YouCowardsToughInPack:: @ 81823C7 .string "Grr… You cowards…\n" .string "So tough in a pack…$" -gUnknown_81823ED:: @ 81823ED +ThreeIsland_Text_WannaMakeSomethingOfYourStaring:: @ 81823ED .string "You, what are you staring at?\n" .string "Don't you know it's not polite?\p" .string "You wanna make something of it\n" .string "or what?$" -gUnknown_8182453:: @ 8182453 +ThreeIsland_Text_ThatsSmart:: @ 8182453 .string "That's smart.\n" .string "Keep your nose out of this.$" -gUnknown_818247D:: @ 818247D +ThreeIsland_Text_Biker1Intro:: @ 818247D .string "Heh, I like your guts.\n" .string "You'll be losing money to me, but…$" -Text_1824B7:: @ 81824B7 +ThreeIsland_Text_Biker1Defeat:: @ 81824B7 .string "Wha…\n" .string "What is this kid?!$" -gUnknown_81824CF:: @ 81824CF +ThreeIsland_Text_Biker1PostBattle:: @ 81824CF .string "Aww, man…\n" .string "Don't you dare laugh!$" -gUnknown_81824EF:: @ 81824EF +ThreeIsland_Text_Biker2Intro:: @ 81824EF .string "Aren't you from KANTO?\n" .string "You should be on our side!$" -Text_182521:: @ 8182521 +ThreeIsland_Text_Biker2Defeat:: @ 8182521 .string "Stop fooling around!$" -gUnknown_8182536:: @ 8182536 +ThreeIsland_Text_Biker2PostBattle:: @ 8182536 .string "What's the matter with you,\n" .string "getting all hot like that?\p" .string "Totally uncool, man!$" -gUnknown_8182582:: @ 8182582 +ThreeIsland_Text_Biker3Intro:: @ 8182582 .string "We invited the boss out here,\n" .string "but you had to mess it up!\p" .string "You embarrassed us, man!$" -Text_1825D4:: @ 81825D4 +ThreeIsland_Text_Biker3Defeat:: @ 81825D4 .string "… … … … … …$" -gUnknown_81825E2:: @ 81825E2 +ThreeIsland_Text_Biker3PostBattle:: @ 81825E2 .string "Boss, I'm telling you, you've gotta\n" .string "do something about this kid!$" -gUnknown_8182623:: @ 8182623 +ThreeIsland_Text_PaxtonIntro:: @ 8182623 .string "I've been watching you, and I'd say\n" .string "you've done enough.\p" .string "What are you, their friend or\n" @@ -111,35 +111,35 @@ gUnknown_8182623:: @ 8182623 .string "Then I guess you'll be battling me\n" .string "in their place.$" -Text_1826B7:: @ 81826B7 +ThreeIsland_Text_PaxtonDefeat:: @ 81826B7 .string "All right, enough!\n" .string "We'll leave like you wanted!\p" .string "We'll be happy to see the last of\n" .string "this boring island!$" -gUnknown_818271D:: @ 818271D +ThreeIsland_Text_PaxtonPostBattle:: @ 818271D .string "Humph! Yeah, go right on hanging\n" .string "around with these hayseeds!$" -gUnknown_818275A:: @ 818275A +ThreeIsland_Text_ThankYouOhYourMonGotHurt:: @ 818275A .string "Thank you! Those goons were\n" .string "nothing but bad trouble.\p" .string "Oh, look, your POKéMON got hurt\n" .string "on my account.$" -gUnknown_81827BE:: @ 81827BE +ThreeIsland_Text_GivenFullRestore:: @ 81827BE .string "{PLAYER} was given\n" .string "a FULL RESTORE.$" -gUnknown_81827DB:: @ 81827DB +ThreeIsland_Text_OhYourBagIsFull:: @ 81827DB .string "Oh?\n" .string "Your BAG is full.$" -gUnknown_81827F1:: @ 81827F1 +ThreeIsland_Text_YouveGotImpressiveMons:: @ 81827F1 .string "You've got seriously impressive\n" .string "POKéMON with you.$" -gUnknown_8182823:: @ 8182823 +ThreeIsland_Text_LostelleWentOffTowardsBondBridge:: @ 8182823 .string "It'd be fantastic if someone as\n" .string "strong as you lived here.\p" .string "I hope you'll at least stay here\n" @@ -149,19 +149,19 @@ gUnknown_8182823:: @ 8182823 .string "LOSTELLE went off towards BOND\n" .string "BRIDGE a while ago.$" -gUnknown_81828EB:: @ 81828EB +ThreeIsland_Text_WouldntWantToSeeBikersHereAgain:: @ 81828EB .string "THREE ISLAND is actually the most\n" .string "populous of the islands here.\p" .string "Still, it could be less sleepy.\p" .string "But I wouldn't want to see goons\n" .string "like those BIKERS here again.$" -gUnknown_818298A:: @ 818298A +ThreeIsland_Text_WhenDodouEvolvesGoingToPlayGame:: @ 818298A .string "I'm going to train my DODUO in the\n" .string "BERRY FOREST.\p" .string "When it evolves, I'm going to play\n" .string "a game on TWO ISLAND.$" -gUnknown_81829F4:: @ 81829F4 +ThreeIsland_Text_Doduo:: @ 81829F4 .string "DODUO: Gigiih!$" diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 446dc2074..db32d0122 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_163C83", + "script": "ThreeIsland_BerryForest_EventScript_Lostelle", "flag": "FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST" }, { @@ -228,14 +228,14 @@ "x": 7, "y": 27, "elevation": 0, - "script": "ThreeIsland_BerryForest_EventScript_163D31" + "script": "ThreeIsland_BerryForest_EventScript_BewareSign" }, { "type": "bg_event_type_0", "x": 39, "y": 35, "elevation": 0, - "script": "ThreeIsland_BerryForest_EventScript_163D28" + "script": "ThreeIsland_BerryForest_EventScript_WelcomeSign" }, { "type": "hidden_item", diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index cf1693258..cc750f1f4 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -7,16 +7,16 @@ ThreeIsland_BerryForest_OnTransition:: @ 8163C77 setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 255, 12, 6 end -ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 +ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83 lock faceplayer - msgbox gUnknown_817ADD6 + msgbox ThreeIsland_BerryForest_Text_HelpScaryPokemon playse SE_PIN applymovement 1, Movement_ExclamationMark waitmovement 0 - applymovement 1, Movement_163D22 + applymovement 1, ThreeIsland_BerryForest_Movement_LostelleLookAround waitmovement 0 - msgbox gUnknown_817AE8E + msgbox ThreeIsland_BerryForest_Text_HereItComesAgain goto_if_questlog EventScript_ReleaseEnd waitse playmoncry SPECIES_HYPNO, 2 @@ -26,12 +26,12 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 special sub_8112364 applymovement 1, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_817AEE1 + msgbox ThreeIsland_BerryForest_Text_ThankYouHaveThis giveitem ITEM_IAPAPA_BERRY - compare VAR_RESULT, 0 - call_if_eq EventScript_163D19 + compare VAR_RESULT, FALSE + call_if_eq ThreeIsland_BerryForest_EventScript_NoRoomForBerry special Special_BufferBigGuyOrBigGirlString - msgbox gUnknown_817AF3B + msgbox ThreeIsland_BerryForest_Text_LetsGoHome closemessage setflag FLAG_RESCUED_LOSTELLE setflag FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST @@ -42,11 +42,11 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 release end -EventScript_163D19:: @ 8163D19 - msgbox gUnknown_817AF9F +ThreeIsland_BerryForest_EventScript_NoRoomForBerry:: @ 8163D19 + msgbox ThreeIsland_BerryForest_Text_BerryPouchIsFull return -Movement_163D22:: @ 8163D22 +ThreeIsland_BerryForest_Movement_LostelleLookAround:: @ 8163D22 walk_in_place_fastest_left delay_16 walk_in_place_fastest_right @@ -54,10 +54,10 @@ Movement_163D22:: @ 8163D22 walk_in_place_fastest_left step_end -ThreeIsland_BerryForest_EventScript_163D28:: @ 8163D28 - msgbox gUnknown_817AFD6, MSGBOX_SIGN +ThreeIsland_BerryForest_EventScript_WelcomeSign:: @ 8163D28 + msgbox ThreeIsland_BerryForest_Text_WelcomeToBerryForest, MSGBOX_SIGN end -ThreeIsland_BerryForest_EventScript_163D31:: @ 8163D31 - msgbox gUnknown_817B029, MSGBOX_SIGN +ThreeIsland_BerryForest_EventScript_BewareSign:: @ 8163D31 + msgbox ThreeIsland_BerryForest_Text_BewareWildBerryLovingMons, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_BerryForest/text.inc b/data/maps/ThreeIsland_BerryForest/text.inc index 807df9c30..fdb08e3c6 100644 --- a/data/maps/ThreeIsland_BerryForest/text.inc +++ b/data/maps/ThreeIsland_BerryForest/text.inc @@ -1,4 +1,4 @@ -gUnknown_817ADD6:: @ 817ADD6 +ThreeIsland_BerryForest_Text_HelpScaryPokemon:: @ 817ADD6 .string "LOSTELLE: Whimper… Sniff…\n" .string "Oh! Please, help!\p" .string "A scary POKéMON appeared there\n" @@ -8,36 +8,36 @@ gUnknown_817ADD6:: @ 817ADD6 .string "I'm too scared to move!\n" .string "But I want to go home…$" -gUnknown_817AE8E:: @ 817AE8E +ThreeIsland_BerryForest_Text_HereItComesAgain:: @ 817AE8E .string "Oh! Here it comes again!\n" .string "No! Go away! It's scaring me!\p" .string "Waaaaaaah!\n" .string "I want my daddy!$" -gUnknown_817AEE1:: @ 817AEE1 +ThreeIsland_BerryForest_Text_ThankYouHaveThis:: @ 817AEE1 .string "Ohh! That was so scary!\n" .string "Thank you!\p" .string "LOSTELLE came to pick some\n" .string "BERRIES.\p" .string "You can have this!$" -gUnknown_817AF3B:: @ 817AF3B +ThreeIsland_BerryForest_Text_LetsGoHome:: @ 817AF3B .string "What's your name?\p" .string "LOSTELLE's scared, so can I go\n" .string "with you to my daddy's house?\p" .string "Okay!\n" .string "Let's go home!$" -gUnknown_817AF9F:: @ 817AF9F +ThreeIsland_BerryForest_Text_BerryPouchIsFull:: @ 817AF9F .string "Your BERRY POUCH is full.\n" .string "I guess you don't want this.$" -gUnknown_817AFD6:: @ 817AFD6 +ThreeIsland_BerryForest_Text_WelcomeToBerryForest:: @ 817AFD6 .string "Welcome to the BERRY FOREST\p" .string "Be friendly and share BERRIES with\n" .string "others and POKéMON.$" -gUnknown_817B029:: @ 817B029 +ThreeIsland_BerryForest_Text_BewareWildBerryLovingMons:: @ 817B029 .string "Beware of wild, BERRY-loving\n" .string "POKéMON!$" diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index e4e05fb76..d9041df2d 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "ThreeIsland_BondBridge_EventScript_1ABF65", + "script": "ThreeIsland_BondBridge_EventScript_Nikki", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "ThreeIsland_BondBridge_EventScript_1ABFA3", + "script": "ThreeIsland_BondBridge_EventScript_Violet", "flag": "0" }, { @@ -57,7 +57,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "ThreeIsland_BondBridge_EventScript_1ABFE1", + "script": "ThreeIsland_BondBridge_EventScript_Amira", "flag": "0" }, { @@ -70,7 +70,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "ThreeIsland_BondBridge_EventScript_1AC01F", + "script": "ThreeIsland_BondBridge_EventScript_Alexis", "flag": "0" }, { @@ -83,7 +83,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "ThreeIsland_BondBridge_EventScript_1AC05D", + "script": "ThreeIsland_BondBridge_EventScript_Tisha", "flag": "0" }, { @@ -96,7 +96,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "ThreeIsland_BondBridge_EventScript_1AC09B", + "script": "ThreeIsland_BondBridge_EventScript_Joy", "flag": "0" }, { @@ -109,7 +109,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "ThreeIsland_BondBridge_EventScript_1AC0E1", + "script": "ThreeIsland_BondBridge_EventScript_Meg", "flag": "0" }, { @@ -162,7 +162,7 @@ "x": 14, "y": 7, "elevation": 0, - "script": "ThreeIsland_BondBridge_EventScript_168777" + "script": "ThreeIsland_BondBridge_EventScript_BerryForestSign" }, { "type": "hidden_item", @@ -199,7 +199,7 @@ "x": 91, "y": 9, "elevation": 0, - "script": "ThreeIsland_BondBridge_EventScript_168780" + "script": "ThreeIsland_BondBridge_EventScript_BondBridgeSign" } ] } diff --git a/data/maps/ThreeIsland_BondBridge/scripts.inc b/data/maps/ThreeIsland_BondBridge/scripts.inc index f36889d04..7c3210ba8 100644 --- a/data/maps/ThreeIsland_BondBridge/scripts.inc +++ b/data/maps/ThreeIsland_BondBridge/scripts.inc @@ -1,10 +1,10 @@ ThreeIsland_BondBridge_MapScripts:: @ 8168776 .byte 0 -ThreeIsland_BondBridge_EventScript_168777:: @ 8168777 - msgbox gUnknown_818A210, MSGBOX_SIGN +ThreeIsland_BondBridge_EventScript_BerryForestSign:: @ 8168777 + msgbox ThreeIsland_BondBridge_Text_BerryForestAhead, MSGBOX_SIGN end -ThreeIsland_BondBridge_EventScript_168780:: @ 8168780 - msgbox gUnknown_818A223, MSGBOX_SIGN +ThreeIsland_BondBridge_EventScript_BondBridgeSign:: @ 8168780 + msgbox ThreeIsland_BondBridge_Text_BondBridgeSign, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_BondBridge/text.inc b/data/maps/ThreeIsland_BondBridge/text.inc index dbf984c85..57f96b6d8 100644 --- a/data/maps/ThreeIsland_BondBridge/text.inc +++ b/data/maps/ThreeIsland_BondBridge/text.inc @@ -1,100 +1,100 @@ -Text_189E42:: @ 8189E42 +ThreeIsland_BondBridge_Text_NikkiIntro:: @ 8189E42 .string "The salty tang of the sea…\n" .string "It tickles my heart.$" -Text_189E72:: @ 8189E72 +ThreeIsland_BondBridge_Text_NikkiDefeat:: @ 8189E72 .string "…Sniff, sniff…\n" .string "Something smells unpleasant…$" -Text_189E9E:: @ 8189E9E +ThreeIsland_BondBridge_Text_NikkiPostBattle:: @ 8189E9E .string "Perhaps that reek is your sweaty\n" .string "POKéMON's body odor…$" -Text_189ED4:: @ 8189ED4 +ThreeIsland_BondBridge_Text_VioletIntro:: @ 8189ED4 .string "Where are you off to in such\n" .string "a hurry?$" -Text_189EFA:: @ 8189EFA +ThreeIsland_BondBridge_Text_VioletDefeat:: @ 8189EFA .string "You're raising some wonderful\n" .string "POKéMON.$" -Text_189F21:: @ 8189F21 +ThreeIsland_BondBridge_Text_VioletPostBattle:: @ 8189F21 .string "If you keep going this way, you'll\n" .string "eventually reach BERRY FOREST.$" -Text_189F63:: @ 8189F63 +ThreeIsland_BondBridge_Text_AmiraIntro:: @ 8189F63 .string "My mommy said that I can't swim\n" .string "without my float ring.$" -Text_189F9A:: @ 8189F9A +ThreeIsland_BondBridge_Text_AmiraDefeat:: @ 8189F9A .string "Waaah!\n" .string "Waaah!$" -Text_189FA8:: @ 8189FA8 +ThreeIsland_BondBridge_Text_AmiraPostBattle:: @ 8189FA8 .string "This year, I'm going to finally\n" .string "learn how to swim!$" -Text_189FDB:: @ 8189FDB +ThreeIsland_BondBridge_Text_AlexisIntro:: @ 8189FDB .string "Yay, yay!\n" .string "POKéMON!$" -Text_189FEE:: @ 8189FEE +ThreeIsland_BondBridge_Text_AlexisDefeat:: @ 8189FEE .string "What happens now?$" -Text_18A000:: @ 818A000 +ThreeIsland_BondBridge_Text_AlexisPostBattle:: @ 818A000 .string "Did I just win?\n" .string "Or did I lose?$" -Text_18A01F:: @ 818A01F +ThreeIsland_BondBridge_Text_TishaIntro:: @ 818A01F .string "Oh, no, don't come here!\n" .string "Please, stay away from me!$" -Text_18A053:: @ 818A053 +ThreeIsland_BondBridge_Text_TishaDefeat:: @ 818A053 .string "Okay, you've won!\n" .string "Now will you please go away?$" -Text_18A082:: @ 818A082 +ThreeIsland_BondBridge_Text_TishaPostBattle:: @ 818A082 .string "A POKéMON bit through my \n" .string "swimsuit.\p" .string "I can't get out of the water!$" -Text_18A0C4:: @ 818A0C4 +ThreeIsland_BondBridge_Text_JoyIntro:: @ 818A0C4 .string "JOY: We'll teach you what our\n" .string "favorite POKéMON is!$" -Text_18A0F7:: @ 818A0F7 +ThreeIsland_BondBridge_Text_JoyDefeat:: @ 818A0F7 .string "JOY: Ohh…\n" .string "MEG!$" -Text_18A106:: @ 818A106 +ThreeIsland_BondBridge_Text_JoyPostBattle:: @ 818A106 .string "JOY: Wasn't that fun?\n" .string "I hope we can battle again!$" -Text_18A138:: @ 818A138 +ThreeIsland_BondBridge_Text_JoyNotEnoughMons:: @ 818A138 .string "JOY: I really want to battle with\n" .string "MEG.\p" .string "One POKéMON isn't enough.$" -Text_18A179:: @ 818A179 +ThreeIsland_BondBridge_Text_MegIntro:: @ 818A179 .string "MEG: We'll show you our favorite\n" .string "POKéMON.$" -Text_18A1A3:: @ 818A1A3 +ThreeIsland_BondBridge_Text_MegDefeat:: @ 818A1A3 .string "MEG: Ohh…\n" .string "JOY!$" -Text_18A1B2:: @ 818A1B2 +ThreeIsland_BondBridge_Text_MegPostBattle:: @ 818A1B2 .string "MEG: JOY, wasn't that fun?$" -Text_18A1CD:: @ 818A1CD +ThreeIsland_BondBridge_Text_MegNotEnoughMons:: @ 818A1CD .string "MEG: I want to battle together\n" .string "with JOY.\p" .string "One POKéMON isn't enough.$" -gUnknown_818A210:: @ 818A210 +ThreeIsland_BondBridge_Text_BerryForestAhead:: @ 818A210 .string "BERRY FOREST AHEAD$" -gUnknown_818A223:: @ 818A223 +ThreeIsland_BondBridge_Text_BondBridgeSign:: @ 818A223 .string "BOND BRIDGE\n" .string "Please be quiet when crossing.\p" .string "BERRY FOREST AHEAD$" diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index 5864be00c..412177921 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Harbor_EventScript_171EAA", + "script": "ThreeIsland_Harbor_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_Harbor/scripts.inc b/data/maps/ThreeIsland_Harbor/scripts.inc index 6705741cb..473b8b368 100644 --- a/data/maps/ThreeIsland_Harbor/scripts.inc +++ b/data/maps/ThreeIsland_Harbor/scripts.inc @@ -1,7 +1,7 @@ ThreeIsland_Harbor_MapScripts:: @ 8171EA9 .byte 0 -ThreeIsland_Harbor_EventScript_171EAA:: @ 8171EAA +ThreeIsland_Harbor_EventScript_Sailor:: @ 8171EAA lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index 2174a571d..c06ba0e44 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_House1_EventScript_17181A", + "script": "ThreeIsland_House1_EventScript_Lostelle", "flag": "FLAG_HIDE_LOSTELLE_IN_HER_HOME" } ], @@ -45,7 +45,7 @@ "x": 2, "y": 1, "elevation": 0, - "script": "ThreeIsland_House1_EventScript_171829" + "script": "ThreeIsland_House1_EventScript_DisplayCase" } ] } diff --git a/data/maps/ThreeIsland_House1/scripts.inc b/data/maps/ThreeIsland_House1/scripts.inc index 007f7d4be..d05416f9d 100644 --- a/data/maps/ThreeIsland_House1/scripts.inc +++ b/data/maps/ThreeIsland_House1/scripts.inc @@ -1,14 +1,14 @@ ThreeIsland_House1_MapScripts:: @ 8171819 .byte 0 -ThreeIsland_House1_EventScript_17181A:: @ 817181A +ThreeIsland_House1_EventScript_Lostelle:: @ 817181A lock faceplayer special Special_BufferBigGuyOrBigGirlString - msgbox gUnknown_81A2F3E + msgbox ThreeIsland_House1_Text_YoureAlwaysSoCool release end -ThreeIsland_House1_EventScript_171829:: @ 8171829 - msgbox gUnknown_81A2F92, MSGBOX_SIGN +ThreeIsland_House1_EventScript_DisplayCase:: @ 8171829 + msgbox ThreeIsland_House1_Text_RareRocksGemsDisplayed, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_House1/text.inc b/data/maps/ThreeIsland_House1/text.inc index 250671619..2e6a51b36 100644 --- a/data/maps/ThreeIsland_House1/text.inc +++ b/data/maps/ThreeIsland_House1/text.inc @@ -1,9 +1,9 @@ -gUnknown_81A2F3E:: @ 81A2F3E +ThreeIsland_House1_Text_YoureAlwaysSoCool:: @ 81A2F3E .string "LOSTELLE: Hi, {PLAYER}!\n" .string "You're always so cool!\p" .string "I'll make lunch for you, too, one\n" .string "day, {PLAYER}.$" -gUnknown_81A2F92:: @ 81A2F92 +ThreeIsland_House1_Text_RareRocksGemsDisplayed:: @ 81A2F92 .string "Rare rocks and gems are displayed.$" diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index a2fc4f7e3..c8dfc26ff 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_House2_EventScript_1718F9", + "script": "ThreeIsland_House2_EventScript_Rocker", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_House2_EventScript_1718E0", + "script": "ThreeIsland_House2_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_House2/scripts.inc b/data/maps/ThreeIsland_House2/scripts.inc index a9fd52298..d66a13530 100644 --- a/data/maps/ThreeIsland_House2/scripts.inc +++ b/data/maps/ThreeIsland_House2/scripts.inc @@ -1,14 +1,14 @@ ThreeIsland_House2_MapScripts:: @ 81718DF .byte 0 -ThreeIsland_House2_EventScript_1718E0:: @ 81718E0 +ThreeIsland_House2_EventScript_Man:: @ 81718E0 lock faceplayer famechecker FAMECHECKER_SABRINA, 1 - msgbox gUnknown_81A32CA + msgbox ThreeIsland_House2_Text_IAdmireSabrina release end -ThreeIsland_House2_EventScript_1718F9:: @ 81718F9 - msgbox gUnknown_81A3245, MSGBOX_NPC +ThreeIsland_House2_EventScript_Rocker:: @ 81718F9 + msgbox ThreeIsland_House2_Text_CantMakeThisSpoonBend, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_House2/text.inc b/data/maps/ThreeIsland_House2/text.inc index cae2b9055..c265b2805 100644 --- a/data/maps/ThreeIsland_House2/text.inc +++ b/data/maps/ThreeIsland_House2/text.inc @@ -1,4 +1,4 @@ -gUnknown_81A3245:: @ 81A3245 +ThreeIsland_House2_Text_CantMakeThisSpoonBend:: @ 81A3245 .string "Urrrrrrrrgggghhhh…\n" .string "Kwaaaaah!\p" .string "…It's useless! I can't make this\n" @@ -6,7 +6,7 @@ gUnknown_81A3245:: @ 81A3245 .string "Maybe I really don't have any\n" .string "psychic powers.$" -gUnknown_81A32CA:: @ 81A32CA +ThreeIsland_House2_Text_IAdmireSabrina:: @ 81A32CA .string "You know about a girl GYM LEADER\n" .string "in SAFFRON CITY?\p" .string "She uses PSYCHIC-type POKéMON,\n" diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 684e06a68..7234a9af6 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_House3_EventScript_171903", + "script": "ThreeIsland_House3_EventScript_Beauty", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_House3/scripts.inc b/data/maps/ThreeIsland_House3/scripts.inc index b1c336d79..414761426 100644 --- a/data/maps/ThreeIsland_House3/scripts.inc +++ b/data/maps/ThreeIsland_House3/scripts.inc @@ -1,6 +1,6 @@ ThreeIsland_House3_MapScripts:: @ 8171902 .byte 0 -ThreeIsland_House3_EventScript_171903:: @ 8171903 - msgbox gUnknown_81A3379, MSGBOX_NPC +ThreeIsland_House3_EventScript_Beauty:: @ 8171903 + msgbox ThreeIsland_House3_Text_WantedToLiveSomewhereQuiet, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_House3/text.inc b/data/maps/ThreeIsland_House3/text.inc index 24b2c86c9..2a36d1ab1 100644 --- a/data/maps/ThreeIsland_House3/text.inc +++ b/data/maps/ThreeIsland_House3/text.inc @@ -1,4 +1,4 @@ -gUnknown_81A3379:: @ 81A3379 +ThreeIsland_House3_Text_WantedToLiveSomewhereQuiet:: @ 81A3379 .string "I bought this house because I\n" .string "wanted to live somewhere quiet.\p" .string "Today, I think I'll go out fishing.$" diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index c8aae0640..79aa8eedc 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_House4_EventScript_17190D", + "script": "ThreeIsland_House4_EventScript_BaldingMan", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_House4_EventScript_171916", + "script": "ThreeIsland_House4_EventScript_LittleBoy", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_House4/scripts.inc b/data/maps/ThreeIsland_House4/scripts.inc index d0facf443..d33f7a6ad 100644 --- a/data/maps/ThreeIsland_House4/scripts.inc +++ b/data/maps/ThreeIsland_House4/scripts.inc @@ -1,10 +1,10 @@ ThreeIsland_House4_MapScripts:: @ 817190C .byte 0 -ThreeIsland_House4_EventScript_17190D:: @ 817190D - msgbox gUnknown_81A33DB, MSGBOX_NPC +ThreeIsland_House4_EventScript_BaldingMan:: @ 817190D + msgbox ThreeIsland_House4_Text_GhostsInBerryForest, MSGBOX_NPC end -ThreeIsland_House4_EventScript_171916:: @ 8171916 - msgbox gUnknown_81A342F, MSGBOX_NPC +ThreeIsland_House4_EventScript_LittleBoy:: @ 8171916 + msgbox ThreeIsland_House4_Text_PapaKeepsLyingToMe, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_House4/text.inc b/data/maps/ThreeIsland_House4/text.inc index a32fb6a5f..f636555e5 100644 --- a/data/maps/ThreeIsland_House4/text.inc +++ b/data/maps/ThreeIsland_House4/text.inc @@ -1,10 +1,10 @@ -gUnknown_81A33DB:: @ 81A33DB +ThreeIsland_House4_Text_GhostsInBerryForest:: @ 81A33DB .string "You must never, ever go out to\n" .string "the BERRY FOREST alone.\p" .string "Why?\n" .string "There are ghosts there.$" -gUnknown_81A342F:: @ 81A342F +ThreeIsland_House4_Text_PapaKeepsLyingToMe:: @ 81A342F .string "Papa keeps lying to me, and won't\n" .string "let me go out and play!$" diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index 209fca3f8..f5c10efdf 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_House5_EventScript_171920", + "script": "ThreeIsland_House5_EventScript_LittleGirl", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_House5/scripts.inc b/data/maps/ThreeIsland_House5/scripts.inc index 4a2b4f370..f8d72e35b 100644 --- a/data/maps/ThreeIsland_House5/scripts.inc +++ b/data/maps/ThreeIsland_House5/scripts.inc @@ -1,15 +1,15 @@ ThreeIsland_House5_MapScripts:: @ 817191F .byte 0 -ThreeIsland_House5_EventScript_171920:: @ 8171920 +ThreeIsland_House5_EventScript_LittleGirl:: @ 8171920 lock faceplayer - goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_171935 - msgbox gUnknown_81A3469 + goto_if_set FLAG_RESCUED_LOSTELLE, ThreeIsland_House5_EventScript_LittleGirlLostelleFound + msgbox ThreeIsland_House5_Text_ImNotLostelle release end -EventScript_171935:: @ 8171935 - msgbox gUnknown_81A34DB +ThreeIsland_House5_EventScript_LittleGirlLostelleFound:: @ 8171935 + msgbox ThreeIsland_House5_Text_IllGoPlayWithLostelle release end diff --git a/data/maps/ThreeIsland_House5/text.inc b/data/maps/ThreeIsland_House5/text.inc index 16a034922..85ba66658 100644 --- a/data/maps/ThreeIsland_House5/text.inc +++ b/data/maps/ThreeIsland_House5/text.inc @@ -1,4 +1,4 @@ -gUnknown_81A3469:: @ 81A3469 +ThreeIsland_House5_Text_ImNotLostelle:: @ 81A3469 .string "Me?\n" .string "I'm not LOSTELLE.\p" .string "She's probably gone to the\n" @@ -6,7 +6,7 @@ gUnknown_81A3469:: @ 81A3469 .string "She picks BERRIES there for making\n" .string "lunch.$" -gUnknown_81A34DB:: @ 81A34DB +ThreeIsland_House5_Text_IllGoPlayWithLostelle:: @ 81A34DB .string "I think I'll go play with LOSTELLE\n" .string "today.$" diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index 84c4d70c5..d46aaa0f0 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Mart_EventScript_17188D", + "script": "ThreeIsland_Mart_EventScript_Clerk", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Mart_EventScript_1718C4", + "script": "ThreeIsland_Mart_EventScript_Picnicker", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Mart_EventScript_1718CD", + "script": "ThreeIsland_Mart_EventScript_BugCatcher", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Mart_EventScript_1718D6", + "script": "ThreeIsland_Mart_EventScript_Youngster", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index 02afb8eb4..337bb2709 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -1,19 +1,19 @@ ThreeIsland_Mart_MapScripts:: @ 817188C .byte 0 -ThreeIsland_Mart_EventScript_17188D:: @ 817188D +ThreeIsland_Mart_EventScript_Clerk:: @ 817188D goto_if_questlog EventScript_ReleaseEnd lock faceplayer message Text_MayIHelpYou waitmessage - pokemart Items_1718B4 + pokemart ThreeIsland_Mart_Items msgbox Text_PleaseComeAgain release end .align 2 -Items_1718B4:: @ 81718B4 +ThreeIsland_Mart_Items:: @ 81718B4 .2byte ITEM_ULTRA_BALL .2byte ITEM_HYPER_POTION .2byte ITEM_REVIVE @@ -24,14 +24,14 @@ Items_1718B4:: @ 81718B4 release end -ThreeIsland_Mart_EventScript_1718C4:: @ 81718C4 - msgbox gUnknown_81A3114, MSGBOX_NPC +ThreeIsland_Mart_EventScript_Picnicker:: @ 81718C4 + msgbox ThreeIsland_Mart_Text_TrueThatCeldadonDeptStoreBigger, MSGBOX_NPC end -ThreeIsland_Mart_EventScript_1718CD:: @ 81718CD - msgbox gUnknown_81A315C, MSGBOX_NPC +ThreeIsland_Mart_EventScript_BugCatcher:: @ 81718CD + msgbox ThreeIsland_Mart_Text_PeopleHealWithBerriesFromForest, MSGBOX_NPC end -ThreeIsland_Mart_EventScript_1718D6:: @ 81718D6 - msgbox gUnknown_81A31F0, MSGBOX_NPC +ThreeIsland_Mart_EventScript_Youngster:: @ 81718D6 + msgbox ThreeIsland_Mart_Text_BikersWereAboutToTrashMart, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_Mart/text.inc b/data/maps/ThreeIsland_Mart/text.inc index 2618bf28e..8123f1e9c 100644 --- a/data/maps/ThreeIsland_Mart/text.inc +++ b/data/maps/ThreeIsland_Mart/text.inc @@ -1,16 +1,16 @@ -gUnknown_81A3114:: @ 81A3114 +ThreeIsland_Mart_Text_TrueThatCeldadonDeptStoreBigger:: @ 81A3114 .string "Is it true?\p" .string "CELADON DEPT. STORE is several\n" .string "times bigger than this shop?$" -gUnknown_81A315C:: @ 81A315C +ThreeIsland_Mart_Text_PeopleHealWithBerriesFromForest:: @ 81A315C .string "I sometimes buy medicine here.\p" .string "But a lot of people heal POKéMON\n" .string "with BERRIES from BERRY FOREST.\p" .string "After all, BERRIES are free and\n" .string "they never run out.$" -gUnknown_81A31F0:: @ 81A31F0 +ThreeIsland_Mart_Text_BikersWereAboutToTrashMart:: @ 81A31F0 .string "Those BIKERS were about to trash\n" .string "this POKéMON MART.\p" .string "Am I glad they decided to leave!$" diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 65c74d9d8..596ea41cb 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_1F_EventScript_171841", + "script": "ThreeIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_1F_EventScript_17185C", + "script": "ThreeIsland_PokemonCenter_1F_EventScript_Rocker", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_1F_EventScript_171853", + "script": "ThreeIsland_PokemonCenter_1F_EventScript_Lass", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_PokemonCenter_1F_EventScript_17184A", + "script": "ThreeIsland_PokemonCenter_1F_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index 15d568a6f..1f66b557d 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -7,21 +7,21 @@ ThreeIsland_PokemonCenter_1F_OnTransition:: @ 817183D setrespawn SPAWN_THREE_ISLAND end -ThreeIsland_PokemonCenter_1F_EventScript_171841:: @ 8171841 +ThreeIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171841 lock faceplayer call EventScript_PkmnCenterNurse release end -ThreeIsland_PokemonCenter_1F_EventScript_17184A:: @ 817184A - msgbox gUnknown_81A303B, MSGBOX_NPC +ThreeIsland_PokemonCenter_1F_EventScript_Sailor:: @ 817184A + msgbox ThreeIsland_PokemonCenter_1F_Text_ImpossibleToSurfBetweenIslands, MSGBOX_NPC end -ThreeIsland_PokemonCenter_1F_EventScript_171853:: @ 8171853 - msgbox gUnknown_81A30A3, MSGBOX_NPC +ThreeIsland_PokemonCenter_1F_EventScript_Lass:: @ 8171853 + msgbox ThreeIsland_PokemonCenter_1F_Text_AlwaysBerriesInBerryForest, MSGBOX_NPC end -ThreeIsland_PokemonCenter_1F_EventScript_17185C:: @ 817185C - msgbox gUnknown_81A2FB5, MSGBOX_NPC +ThreeIsland_PokemonCenter_1F_EventScript_Rocker:: @ 817185C + msgbox ThreeIsland_PokemonCenter_1F_Text_PCNetworkCanLinkWithKanto, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/text.inc b/data/maps/ThreeIsland_PokemonCenter_1F/text.inc index 449f80d70..a9d553efd 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/text.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/text.inc @@ -1,17 +1,17 @@ -gUnknown_81A2FB5:: @ 81A2FB5 +ThreeIsland_PokemonCenter_1F_Text_PCNetworkCanLinkWithKanto:: @ 81A2FB5 .string "Hey, did you hear the news?\p" .string "The PC network here can now link\n" .string "with PCs in KANTO.\p" .string "I don't know how that came about,\n" .string "but it's fantastic!$" -gUnknown_81A303B:: @ 81A303B +ThreeIsland_PokemonCenter_1F_Text_ImpossibleToSurfBetweenIslands:: @ 81A303B .string "It's impossible to SURF between the\n" .string "islands around these parts.\p" .string "The tides are too fast and\n" .string "treacherous.$" -gUnknown_81A30A3:: @ 81A30A3 +ThreeIsland_PokemonCenter_1F_Text_AlwaysBerriesInBerryForest:: @ 81A30A3 .string "Let's crush BERRIES!\n" .string "…That'd be wasting BERRIES?\p" .string "You can always find some BERRIES\n" diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index 40b6fab36..c469fee53 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Port_EventScript_168796", + "script": "ThreeIsland_Port_EventScript_Woman", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Port_EventScript_1687CC", + "script": "ThreeIsland_Port_EventScript_Biker1", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { @@ -57,7 +57,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_Port_EventScript_1687D5", + "script": "ThreeIsland_Port_EventScript_Biker2", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" } ], diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index f7aa40e76..0a664b07d 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -7,33 +7,33 @@ ThreeIsland_Port_OnTransition:: @ 816878F setflag FLAG_SEVII_DETOUR_FINISHED end -ThreeIsland_Port_EventScript_168796:: @ 8168796 +ThreeIsland_Port_EventScript_Woman:: @ 8168796 lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 - goto_if_ge EventScript_1687B8 + goto_if_ge ThreeIsland_Port_EventScript_WomanLostelleFound compare VAR_MAP_SCENE_THREE_ISLAND, 4 - goto_if_ge EventScript_1687C2 - msgbox gUnknown_818A307 + goto_if_ge ThreeIsland_Port_EventScript_WomanBikersGone + msgbox ThreeIsland_Port_Text_IllCallThePolice release end -EventScript_1687B8:: @ 81687B8 - msgbox gUnknown_818A38B +ThreeIsland_Port_EventScript_WomanLostelleFound:: @ 81687B8 + msgbox ThreeIsland_Port_Text_EverythingTurnedOutForBest release end -EventScript_1687C2:: @ 81687C2 - msgbox gUnknown_818A339 +ThreeIsland_Port_EventScript_WomanBikersGone:: @ 81687C2 + msgbox ThreeIsland_Port_Text_ThankGoodnessBikersGone release end -ThreeIsland_Port_EventScript_1687CC:: @ 81687CC - msgbox gUnknown_818A261, MSGBOX_NPC +ThreeIsland_Port_EventScript_Biker1:: @ 81687CC + msgbox ThreeIsland_Port_Text_WereKantoRiderFederation, MSGBOX_NPC end -ThreeIsland_Port_EventScript_1687D5:: @ 81687D5 +ThreeIsland_Port_EventScript_Biker2:: @ 81687D5 lock - msgbox gUnknown_818A2D8 + msgbox ThreeIsland_Port_Text_ForkOverMoney release end diff --git a/data/maps/ThreeIsland_Port/text.inc b/data/maps/ThreeIsland_Port/text.inc index e98d5f53c..72026b353 100644 --- a/data/maps/ThreeIsland_Port/text.inc +++ b/data/maps/ThreeIsland_Port/text.inc @@ -1,25 +1,25 @@ -gUnknown_818A261:: @ 818A261 +ThreeIsland_Port_Text_WereKantoRiderFederation:: @ 818A261 .string "We're the KANTO RIDER FEDERATION!\n" .string "Vroom! Vavavavooom! Vroom!\p" .string "My bike's wimpy, so I have to\n" .string "make exhaust noises myself!$" -gUnknown_818A2D8:: @ 818A2D8 +ThreeIsland_Port_Text_ForkOverMoney:: @ 818A2D8 .string "Hey, hey, lady!\n" .string "Fork over some spending money!$" -gUnknown_818A307:: @ 818A307 +ThreeIsland_Port_Text_IllCallThePolice:: @ 818A307 .string "Aiyeeh!\p" .string "Wh-who are you?!\n" .string "I… I'll call the police!$" -gUnknown_818A339:: @ 818A339 +ThreeIsland_Port_Text_ThankGoodnessBikersGone:: @ 818A339 .string "Those BIKERS…\n" .string "Are they gone?\p" .string "Oh, thank goodness!\n" .string "They certainly had me terrified!$" -gUnknown_818A38B:: @ 818A38B +ThreeIsland_Port_Text_EverythingTurnedOutForBest:: @ 818A38B .string "Those BIKERS ran off, and\n" .string "LOSTELLE was found safe.\p" .string "Everything turned out for the best!$" diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index 78a4137fb..3815294f5 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -27,11 +27,11 @@ EventScript_1ACDB5:: @ 81ACDB5 release end -FourIsland_PokemonCenter_1F_EventScript_1ACDD0:: @ 81ACDD0 +FourIsland_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81ACDD0 lockall famechecker FAMECHECKER_DAISY, 5 textcolor 3 - msgbox gUnknown_81B1B3D + msgbox PokemonJournal_Text_SpecialFeatureDaisyOak releaseall end @@ -143,11 +143,11 @@ FiveIsland_ResortGorgeous_House_EventScript_1ACF2C:: @ 81ACF2C releaseall end -FourIsland_Mart_EventScript_1ACF46:: @ 81ACF46 +FourIsland_Mart_EventScript_OldMan:: @ 81ACF46 lock faceplayer famechecker FAMECHECKER_LORELEI, 2 - msgbox Text_1A3A60 + msgbox FourIsland_Mart_Text_LoreleiGrewUpOnThisIsland release end diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index 906744fa8..39589cffa 100644 --- a/data/scripts/trainer_card.inc +++ b/data/scripts/trainer_card.inc @@ -1,79 +1,79 @@ CeladonCity_GameCorner_EventScript_PhotoPrinter:: @ 81B2867 lockall showmoneybox 0, 0, 0 - msgbox gUnknown_81B1D7D, MSGBOX_YESNO + msgbox CeladonCity_GameCorner_Text_TryPokemonPrinter, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_1B2926 + goto_if_eq CeladonCity_GameCorner_EventScript_DeclinePhoto checkmoney 50, 0 compare VAR_RESULT, FALSE - goto_if_eq EventScript_1B292B + goto_if_eq CeladonCity_GameCorner_EventScript_NotEnoughMoneyForPhoto playse SE_SHOP removemoney 50, 0 updatemoneybox 0, 0, 0 waitse - message gUnknown_81B1E24 + message CeladonCity_GameCorner_Text_ChoosePrintType waitmessage multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE switch VAR_RESULT - case 0, EventScript_1B28DB - case 1, EventScript_1B28E6 - case 2, EventScript_1B28F1 - case 3, EventScript_1B28FC + case 0, CeladonCity_GameCorner_EventScript_PrintTypeNormal + case 1, CeladonCity_GameCorner_EventScript_PrintTypeBlack + case 2, CeladonCity_GameCorner_EventScript_PrintTypePink + case 3, CeladonCity_GameCorner_EventScript_PrintTypeSepia end -EventScript_1B28DB:: @ 81B28DB - setvar VAR_0x8004, 0 - goto EventScript_1B2907 +CeladonCity_GameCorner_EventScript_PrintTypeNormal:: @ 81B28DB + setvar VAR_0x8004, MON_ICON_TINT_NORMAL + goto CeladonCity_GameCorner_EventScript_PrintPhoto end -EventScript_1B28E6:: @ 81B28E6 - setvar VAR_0x8004, 1 - goto EventScript_1B2907 +CeladonCity_GameCorner_EventScript_PrintTypeBlack:: @ 81B28E6 + setvar VAR_0x8004, MON_ICON_TINT_BLACK + goto CeladonCity_GameCorner_EventScript_PrintPhoto end -EventScript_1B28F1:: @ 81B28F1 - setvar VAR_0x8004, 2 - goto EventScript_1B2907 +CeladonCity_GameCorner_EventScript_PrintTypePink:: @ 81B28F1 + setvar VAR_0x8004, MON_ICON_TINT_PINK + goto CeladonCity_GameCorner_EventScript_PrintPhoto end -EventScript_1B28FC:: @ 81B28FC - setvar VAR_0x8004, 3 - goto EventScript_1B2907 +CeladonCity_GameCorner_EventScript_PrintTypeSepia:: @ 81B28FC + setvar VAR_0x8004, MON_ICON_TINT_SEPIA + goto CeladonCity_GameCorner_EventScript_PrintPhoto end -EventScript_1B2907:: @ 81B2907 - message gUnknown_81B1E42 +CeladonCity_GameCorner_EventScript_PrintPhoto:: @ 81B2907 + message CeladonCity_GameCorner_Text_BigSmileForPhoto waitmessage playse MUS_ME_PHOTO dofieldeffect FLDEFF_UNK_45 delay 60 special Special_UpdateTrainerCardPhotoIcons - msgbox gUnknown_81B1E7D + msgbox CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard hidemoneybox 0, 0 releaseall end -EventScript_1B2926:: @ 81B2926 +CeladonCity_GameCorner_EventScript_DeclinePhoto:: @ 81B2926 hidemoneybox 0, 0 releaseall end -EventScript_1B292B:: @ 81B292B - msgbox gUnknown_81B1E07 +CeladonCity_GameCorner_EventScript_NotEnoughMoneyForPhoto:: @ 81B292B + msgbox CeladonCity_GameCorner_Text_DontHaveEnoughMoney hidemoneybox 0, 0 releaseall end -FourIsland_House2_EventScript_1B2938:: @ 81B2938 +FourIsland_House2_EventScript_StickerMan:: @ 81B2938 lock - specialvar VAR_0x8008, Special_StickerLadyGetBragFlags - goto_if_unset FLAG_MET_STICKER_LADY, EventScript_1B2951 - goto_if_set FLAG_MET_STICKER_LADY, EventScript_1B2994 + specialvar VAR_0x8008, StickerManGetBragFlags + goto_if_unset FLAG_MET_STICKER_MAN, FourIsland_House2_EventScript_MeetStickerMan + goto_if_set FLAG_MET_STICKER_MAN, EventScript_1B2994 end -EventScript_1B2951:: @ 81B2951 - setflag FLAG_MET_STICKER_LADY - msgbox gUnknown_81B1EB3 +FourIsland_House2_EventScript_MeetStickerMan:: @ 81B2951 + setflag FLAG_MET_STICKER_MAN + msgbox FourIsland_House2_Text_WishICouldShowOffStickers applymovement 1, Movement_FacePlayer waitmovement 0 playse SE_PIN @@ -82,10 +82,10 @@ EventScript_1B2951:: @ 81B2951 applymovement 1, Movement_Delay48 waitmovement 0 compare VAR_0x8008, 0 - goto_if_eq EventScript_1B2B8E - message gUnknown_81B1EF8 + goto_if_eq FourIsland_House2_EventScript_StickerManNothingToBrag + message FourIsland_House2_Text_GiveYouStickerIfYouBrag waitmessage - goto EventScript_1B29D0 + goto FourIsland_House2_EventScript_ChooseBrag end EventScript_1B2994:: @ 81B2994 @@ -95,290 +95,282 @@ EventScript_1B2994:: @ 81B2994 special sub_8112364 compare VAR_0x8008, 0 goto_if_eq EventScript_1B29C6 - message gUnknown_81B2025 + message FourIsland_House2_Text_BragAboutWhatToday waitmessage - goto EventScript_1B29D0 + goto FourIsland_House2_EventScript_ChooseBrag end EventScript_1B29C6:: @ 81B29C6 - msgbox gUnknown_81B1FEF + msgbox FourIsland_House2_Text_BragAboutSomethingForMe release end -EventScript_1B29D0:: @ 81B29D0 +FourIsland_House2_EventScript_ChooseBrag:: @ 81B29D0 switch VAR_0x8008 - case 1, EventScript_1B2A23 - case 2, EventScript_1B2A4F - case 4, EventScript_1B2A7B - case 3, EventScript_1B2AA7 - case 5, EventScript_1B2ADE - case 6, EventScript_1B2B15 - case 7, EventScript_1B2B4C + case 1, FourIsland_House2_EventScript_ChooseBragHoF + case 2, FourIsland_House2_EventScript_ChooseBragEggs + case 4, FourIsland_House2_EventScript_ChooseBragLinkWins + case 3, FourIsland_House2_EventScript_ChooseBragHoFEggs + case 5, FourIsland_House2_EventScript_ChooseBragHoFLinkWins + case 6, FourIsland_House2_EventScript_ChooseBragEggsLinkWins + case 7, FourIsland_House2_EventScript_ChooseBragHofEggsLinkWins end -EventScript_1B2A23:: @ 81B2A23 +FourIsland_House2_EventScript_ChooseBragHoF:: @ 81B2A23 multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE switch VAR_RESULT - case 0, EventScript_1B2B98 - case 1, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 + case 0, FourIsland_House2_EventScript_BragHoF + case 1, FourIsland_House2_EventScript_QuitBrag + case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -EventScript_1B2A4F:: @ 81B2A4F +FourIsland_House2_EventScript_ChooseBragEggs:: @ 81B2A4F multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE switch VAR_RESULT - case 0, EventScript_1B2C62 - case 1, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 + case 0, FourIsland_House2_EventScript_BragEggs + case 1, FourIsland_House2_EventScript_QuitBrag + case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -EventScript_1B2A7B:: @ 81B2A7B +FourIsland_House2_EventScript_ChooseBragLinkWins:: @ 81B2A7B multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE switch VAR_RESULT - case 0, EventScript_1B2D2C - case 1, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 + case 0, FourIsland_House2_EventScript_BragLinkWins + case 1, FourIsland_House2_EventScript_QuitBrag + case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -EventScript_1B2AA7:: @ 81B2AA7 +FourIsland_House2_EventScript_ChooseBragHoFEggs:: @ 81B2AA7 multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE switch VAR_RESULT - case 0, EventScript_1B2B98 - case 1, EventScript_1B2C62 - case 2, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 + case 0, FourIsland_House2_EventScript_BragHoF + case 1, FourIsland_House2_EventScript_BragEggs + case 2, FourIsland_House2_EventScript_QuitBrag + case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -EventScript_1B2ADE:: @ 81B2ADE +FourIsland_House2_EventScript_ChooseBragHoFLinkWins:: @ 81B2ADE multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE switch VAR_RESULT - case 0, EventScript_1B2B98 - case 1, EventScript_1B2D2C - case 2, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 + case 0, FourIsland_House2_EventScript_BragHoF + case 1, FourIsland_House2_EventScript_BragLinkWins + case 2, FourIsland_House2_EventScript_QuitBrag + case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -EventScript_1B2B15:: @ 81B2B15 +FourIsland_House2_EventScript_ChooseBragEggsLinkWins:: @ 81B2B15 multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE switch VAR_RESULT - case 0, EventScript_1B2C62 - case 1, EventScript_1B2D2C - case 2, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 + case 0, FourIsland_House2_EventScript_BragEggs + case 1, FourIsland_House2_EventScript_BragLinkWins + case 2, FourIsland_House2_EventScript_QuitBrag + case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -EventScript_1B2B4C:: @ 81B2B4C +FourIsland_House2_EventScript_ChooseBragHofEggsLinkWins:: @ 81B2B4C multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE switch VAR_RESULT - case 0, EventScript_1B2B98 - case 1, EventScript_1B2C62 - case 2, EventScript_1B2D2C - case 3, EventScript_1B2DF6 - case SCR_MENU_CANCEL, EventScript_1B2DF6 + case 0, FourIsland_House2_EventScript_BragHoF + case 1, FourIsland_House2_EventScript_BragEggs + case 2, FourIsland_House2_EventScript_BragLinkWins + case 3, FourIsland_House2_EventScript_QuitBrag + case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -EventScript_1B2B8E:: @ 81B2B8E - msgbox gUnknown_81B1EF8 +FourIsland_House2_EventScript_StickerManNothingToBrag:: @ 81B2B8E + msgbox FourIsland_House2_Text_GiveYouStickerIfYouBrag release end -EventScript_1B2B98:: @ 81B2B98 +FourIsland_House2_EventScript_BragHoF:: @ 81B2B98 compare VAR_0x8004, 39 - goto_if_le EventScript_1B2BC5 + goto_if_le FourIsland_House2_EventScript_BragHoFLowest compare VAR_0x8004, 99 - goto_if_le EventScript_1B2BE3 + goto_if_le FourIsland_House2_EventScript_BragHoFLow compare VAR_0x8004, 199 - goto_if_le EventScript_1B2C01 + goto_if_le FourIsland_House2_EventScript_BragHoFHigh compare VAR_0x8004, 200 - goto_if_ge EventScript_1B2C1F + goto_if_ge FourIsland_House2_EventScript_BragHoFHighest end -EventScript_1B2BC5:: @ 81B2BC5 +FourIsland_House2_EventScript_BragHoFLowest:: @ 81B2BC5 compare VAR_HOF_BRAG_STATE, 1 - goto_if_eq EventScript_1B2C3D + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoF setvar VAR_HOF_BRAG_STATE, 1 - msgbox gUnknown_81B206E - goto EventScript_1B2C51 - -EventScript_1B2BE2:: @ 81B2BE2 + msgbox FourIsland_House2_Text_WowHoFLowest + goto FourIsland_House2_EventScript_BraggedHoF end -EventScript_1B2BE3:: @ 81B2BE3 +FourIsland_House2_EventScript_BragHoFLow:: @ 81B2BE3 compare VAR_HOF_BRAG_STATE, 2 - goto_if_eq EventScript_1B2C3D + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoF setvar VAR_HOF_BRAG_STATE, 2 - msgbox gUnknown_81B20CF - goto EventScript_1B2C51 - -EventScript_1B2C00:: @ 81B2C00 + msgbox FourIsland_House2_Text_WowHoFLow + goto FourIsland_House2_EventScript_BraggedHoF end -EventScript_1B2C01:: @ 81B2C01 +FourIsland_House2_EventScript_BragHoFHigh:: @ 81B2C01 compare VAR_HOF_BRAG_STATE, 3 - goto_if_eq EventScript_1B2C3D + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoF setvar VAR_HOF_BRAG_STATE, 3 - msgbox gUnknown_81B2133 - goto EventScript_1B2C51 - -EventScript_1B2C1E:: @ 81B2C1E + msgbox FourIsland_House2_Text_WowHoFHigh + goto FourIsland_House2_EventScript_BraggedHoF end -EventScript_1B2C1F:: @ 81B2C1F +FourIsland_House2_EventScript_BragHoFHighest:: @ 81B2C1F compare VAR_HOF_BRAG_STATE, 4 - goto_if_eq EventScript_1B2C47 + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoFMax setvar VAR_HOF_BRAG_STATE, 4 - msgbox gUnknown_81B21C4 - goto EventScript_1B2C51 - -EventScript_1B2C3C:: @ 81B2C3C + msgbox FourIsland_House2_Text_WowHoFHighest + goto FourIsland_House2_EventScript_BraggedHoF end -EventScript_1B2C3D:: @ 81B2C3D - msgbox gUnknown_81B227C +FourIsland_House2_EventScript_AlreadyBraggedHoF:: @ 81B2C3D + msgbox FourIsland_House2_Text_ComeBackWithBetterStoryHoF release end -EventScript_1B2C47:: @ 81B2C47 - msgbox gUnknown_81B22B0 +FourIsland_House2_EventScript_AlreadyBraggedHoFMax:: @ 81B2C47 + msgbox FourIsland_House2_Text_LivingLegendHoF release end -EventScript_1B2C51:: @ 81B2C51 +FourIsland_House2_EventScript_BraggedHoF:: @ 81B2C51 textcolor 3 playfanfare MUS_FANFA1 - message gUnknown_81B2242 + message FourIsland_House2_Text_HoFStickerApplied waitmessage waitfanfare delay 90 release end -EventScript_1B2C62:: @ 81B2C62 +FourIsland_House2_EventScript_BragEggs:: @ 81B2C62 compare VAR_0x8005, 99 - goto_if_le EventScript_1B2C8F + goto_if_le FourIsland_House2_EventScript_BragEggsLowest compare VAR_0x8005, 199 - goto_if_le EventScript_1B2CAD + goto_if_le FourIsland_House2_EventScript_BragEggsLow compare VAR_0x8005, 299 - goto_if_le EventScript_1B2CCB + goto_if_le FourIsland_House2_EventScript_BragEggsHigh compare VAR_0x8005, 300 - goto_if_ge EventScript_1B2CE9 + goto_if_ge FourIsland_House2_EventScript_BragEggsHighest end -EventScript_1B2C8F:: @ 81B2C8F +FourIsland_House2_EventScript_BragEggsLowest:: @ 81B2C8F compare VAR_EGG_BRAG_STATE, 1 - goto_if_eq EventScript_1B2D07 + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggs setvar VAR_EGG_BRAG_STATE, 1 - msgbox gUnknown_81B2308 - goto EventScript_1B2D1B + msgbox FourIsland_House2_Text_WowEggsLowest + goto FourIsland_House2_EventScript_BraggedEggs end -EventScript_1B2CAD:: @ 81B2CAD +FourIsland_House2_EventScript_BragEggsLow:: @ 81B2CAD compare VAR_EGG_BRAG_STATE, 2 - goto_if_eq EventScript_1B2D07 + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggs setvar VAR_EGG_BRAG_STATE, 2 - msgbox gUnknown_81B2372 - goto EventScript_1B2D1B + msgbox FourIsland_House2_Text_WowEggsLow + goto FourIsland_House2_EventScript_BraggedEggs end -EventScript_1B2CCB:: @ 81B2CCB +FourIsland_House2_EventScript_BragEggsHigh:: @ 81B2CCB compare VAR_EGG_BRAG_STATE, 3 - goto_if_eq EventScript_1B2D07 + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggs setvar VAR_EGG_BRAG_STATE, 3 - msgbox gUnknown_81B23E0 - goto EventScript_1B2D1B + msgbox FourIsland_House2_Text_WowEggsHigh + goto FourIsland_House2_EventScript_BraggedEggs end -EventScript_1B2CE9:: @ 81B2CE9 +FourIsland_House2_EventScript_BragEggsHighest:: @ 81B2CE9 compare VAR_EGG_BRAG_STATE, 4 - goto_if_eq EventScript_1B2D11 + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggsMax setvar VAR_EGG_BRAG_STATE, 4 - msgbox gUnknown_81B2448 - goto EventScript_1B2D1B + msgbox FourIsland_House2_Text_WowEggsHighest + goto FourIsland_House2_EventScript_BraggedEggs end -EventScript_1B2D07:: @ 81B2D07 - msgbox gUnknown_81B251B +FourIsland_House2_EventScript_AlreadyBraggedEggs:: @ 81B2D07 + msgbox FourIsland_House2_Text_ComeBackWithBetterStoryEggs release end -EventScript_1B2D11:: @ 81B2D11 - msgbox gUnknown_81B254F +FourIsland_House2_EventScript_AlreadyBraggedEggsMax:: @ 81B2D11 + msgbox FourIsland_House2_Text_LivingLegendEggs release end -EventScript_1B2D1B:: @ 81B2D1B +FourIsland_House2_EventScript_BraggedEggs:: @ 81B2D1B textcolor 3 playfanfare MUS_FANFA1 - message gUnknown_81B24EA + message FourIsland_House2_Text_EggStickerApplied waitmessage waitfanfare delay 90 release end -EventScript_1B2D2C:: @ 81B2D2C +FourIsland_House2_EventScript_BragLinkWins:: @ 81B2D2C compare VAR_0x8006, 19 - goto_if_le EventScript_1B2D59 + goto_if_le FourIsland_House2_EventScript_BragLinkWinsLowest compare VAR_0x8006, 49 - goto_if_le EventScript_1B2D77 + goto_if_le FourIsland_House2_EventScript_BragLinkWinsLow compare VAR_0x8006, 99 - goto_if_le EventScript_1B2D95 + goto_if_le FourIsland_House2_EventScript_BragLinkWinsHigh compare VAR_0x8006, 100 - goto_if_ge EventScript_1B2DB3 + goto_if_ge FourIsland_House2_EventScript_BragLinkWinsHighest end -EventScript_1B2D59:: @ 81B2D59 +FourIsland_House2_EventScript_BragLinkWinsLowest:: @ 81B2D59 compare VAR_LINK_WIN_BRAG_STATE, 1 - goto_if_eq EventScript_1B2DD1 + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWins setvar VAR_LINK_WIN_BRAG_STATE, 1 - msgbox gUnknown_81B25A7 - goto EventScript_1B2DE5 + msgbox FourIsland_House2_Text_WowLinkWinsLowest + goto FourIsland_House2_EventScript_BraggedLinkWins end -EventScript_1B2D77:: @ 81B2D77 +FourIsland_House2_EventScript_BragLinkWinsLow:: @ 81B2D77 compare VAR_LINK_WIN_BRAG_STATE, 2 - goto_if_eq EventScript_1B2DD1 + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWins setvar VAR_LINK_WIN_BRAG_STATE, 2 - msgbox gUnknown_81B2609 - goto EventScript_1B2DE5 + msgbox FourIsland_House2_Text_WowLinkWinsLow + goto FourIsland_House2_EventScript_BraggedLinkWins end -EventScript_1B2D95:: @ 81B2D95 +FourIsland_House2_EventScript_BragLinkWinsHigh:: @ 81B2D95 compare VAR_LINK_WIN_BRAG_STATE, 3 - goto_if_eq EventScript_1B2DD1 + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWins setvar VAR_LINK_WIN_BRAG_STATE, 3 - msgbox gUnknown_81B267B - goto EventScript_1B2DE5 + msgbox FourIsland_House2_Text_WowLinkWinsHigh + goto FourIsland_House2_EventScript_BraggedLinkWins end -EventScript_1B2DB3:: @ 81B2DB3 +FourIsland_House2_EventScript_BragLinkWinsHighest:: @ 81B2DB3 compare VAR_LINK_WIN_BRAG_STATE, 4 - goto_if_eq EventScript_1B2DDB + goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWinsMax setvar VAR_LINK_WIN_BRAG_STATE, 4 - msgbox gUnknown_81B26F6 - goto EventScript_1B2DE5 + msgbox FourIsland_House2_Text_WowLinkWinsHighest + goto FourIsland_House2_EventScript_BraggedLinkWins end -EventScript_1B2DD1:: @ 81B2DD1 - msgbox gUnknown_81B27DB +FourIsland_House2_EventScript_AlreadyBraggedLinkWins:: @ 81B2DD1 + msgbox FourIsland_House2_Text_ComeBackWithBetterStoryLinkWins release end -EventScript_1B2DDB:: @ 81B2DDB - msgbox gUnknown_81B280F +FourIsland_House2_EventScript_AlreadyBraggedLinkWinsMax:: @ 81B2DDB + msgbox FourIsland_House2_Text_LivingLegendLinkWins release end -EventScript_1B2DE5:: @ 81B2DE5 +FourIsland_House2_EventScript_BraggedLinkWins:: @ 81B2DE5 textcolor 3 playfanfare MUS_FANFA1 - message gUnknown_81B27A6 + message FourIsland_House2_Text_VictoryStickerApplied waitmessage waitfanfare delay 90 release end -EventScript_1B2DF6:: @ 81B2DF6 +FourIsland_House2_EventScript_QuitBrag:: @ 81B2DF6 release end diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index 379235143..74f006566 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -2312,95 +2312,95 @@ OneIsland_TreasureBeach_EventScript_AmaraRematch:: @ 81ABF4E msgbox OneIsland_TreasureBeach_Text_AmaraPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 - trainerbattle_single TRAINER_AROMA_LADY_NIKKI, Text_189E42, Text_189E72 +ThreeIsland_BondBridge_EventScript_Nikki:: @ 81ABF65 + trainerbattle_single TRAINER_AROMA_LADY_NIKKI, ThreeIsland_BondBridge_Text_NikkiIntro, ThreeIsland_BondBridge_Text_NikkiDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABF8C - msgbox Text_189E9E, MSGBOX_AUTOCLOSE + goto_if_eq ThreeIsland_BondBridge_EventScript_NikkiRematch + msgbox ThreeIsland_BondBridge_Text_NikkiPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABF8C:: @ 81ABF8C - trainerbattle_rematch TRAINER_AROMA_LADY_NIKKI, Text_1C3AA7, Text_189E72 - msgbox Text_189E9E, MSGBOX_AUTOCLOSE +ThreeIsland_BondBridge_EventScript_NikkiRematch:: @ 81ABF8C + trainerbattle_rematch TRAINER_AROMA_LADY_NIKKI, ThreeIsland_BondBridge_Text_NikkiRematchIntro, ThreeIsland_BondBridge_Text_NikkiDefeat + msgbox ThreeIsland_BondBridge_Text_NikkiPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 - trainerbattle_single TRAINER_AROMA_LADY_VIOLET, Text_189ED4, Text_189EFA +ThreeIsland_BondBridge_EventScript_Violet:: @ 81ABFA3 + trainerbattle_single TRAINER_AROMA_LADY_VIOLET, ThreeIsland_BondBridge_Text_VioletIntro, ThreeIsland_BondBridge_Text_VioletDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1ABFCA - msgbox Text_189F21, MSGBOX_AUTOCLOSE + goto_if_eq ThreeIsland_BondBridge_EventScript_VioletRematch + msgbox ThreeIsland_BondBridge_Text_VioletPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1ABFCA:: @ 81ABFCA - trainerbattle_rematch TRAINER_AROMA_LADY_VIOLET, Text_1C3ABF, Text_189EFA - msgbox Text_189F21, MSGBOX_AUTOCLOSE +ThreeIsland_BondBridge_EventScript_VioletRematch:: @ 81ABFCA + trainerbattle_rematch TRAINER_AROMA_LADY_VIOLET, ThreeIsland_BondBridge_Text_VioletRematchIntro, ThreeIsland_BondBridge_Text_VioletDefeat + msgbox ThreeIsland_BondBridge_Text_VioletPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 - trainerbattle_single TRAINER_TUBER_AMIRA, Text_189F63, Text_189F9A +ThreeIsland_BondBridge_EventScript_Amira:: @ 81ABFE1 + trainerbattle_single TRAINER_TUBER_AMIRA, ThreeIsland_BondBridge_Text_AmiraIntro, ThreeIsland_BondBridge_Text_AmiraDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC008 - msgbox Text_189FA8, MSGBOX_AUTOCLOSE + goto_if_eq ThreeIsland_BondBridge_EventScript_AmiraRematch + msgbox ThreeIsland_BondBridge_Text_AmiraPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC008:: @ 81AC008 - trainerbattle_rematch TRAINER_TUBER_AMIRA, Text_1C3AF2, Text_189F9A - msgbox Text_189FA8, MSGBOX_AUTOCLOSE +ThreeIsland_BondBridge_EventScript_AmiraRematch:: @ 81AC008 + trainerbattle_rematch TRAINER_TUBER_AMIRA, ThreeIsland_BondBridge_Text_AmiraRematchIntro, ThreeIsland_BondBridge_Text_AmiraDefeat + msgbox ThreeIsland_BondBridge_Text_AmiraPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F - trainerbattle_single TRAINER_TUBER_ALEXIS, Text_189FDB, Text_189FEE +ThreeIsland_BondBridge_EventScript_Alexis:: @ 81AC01F + trainerbattle_single TRAINER_TUBER_ALEXIS, ThreeIsland_BondBridge_Text_AlexisIntro, ThreeIsland_BondBridge_Text_AlexisDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC046 - msgbox Text_18A000, MSGBOX_AUTOCLOSE + goto_if_eq ThreeIsland_BondBridge_EventScript_AlexisRematch + msgbox ThreeIsland_BondBridge_Text_AlexisPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC046:: @ 81AC046 - trainerbattle_rematch TRAINER_TUBER_ALEXIS, Text_1C3B1D, Text_189FEE - msgbox Text_18A000, MSGBOX_AUTOCLOSE +ThreeIsland_BondBridge_EventScript_AlexisRematch:: @ 81AC046 + trainerbattle_rematch TRAINER_TUBER_ALEXIS, ThreeIsland_BondBridge_Text_AlexisRematchIntro, ThreeIsland_BondBridge_Text_AlexisDefeat + msgbox ThreeIsland_BondBridge_Text_AlexisPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D - trainerbattle_single TRAINER_SWIMMER_FEMALE_TISHA, Text_18A01F, Text_18A053 +ThreeIsland_BondBridge_EventScript_Tisha:: @ 81AC05D + trainerbattle_single TRAINER_SWIMMER_FEMALE_TISHA, ThreeIsland_BondBridge_Text_TishaIntro, ThreeIsland_BondBridge_Text_TishaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC084 - msgbox Text_18A082, MSGBOX_AUTOCLOSE + goto_if_eq ThreeIsland_BondBridge_EventScript_TishaRematch + msgbox ThreeIsland_BondBridge_Text_TishaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC084:: @ 81AC084 - trainerbattle_rematch TRAINER_SWIMMER_FEMALE_TISHA, Text_1C3B30, Text_18A053 - msgbox Text_18A082, MSGBOX_AUTOCLOSE +ThreeIsland_BondBridge_EventScript_TishaRematch:: @ 81AC084 + trainerbattle_rematch TRAINER_SWIMMER_FEMALE_TISHA, ThreeIsland_BondBridge_Text_TishaRematchIntro, ThreeIsland_BondBridge_Text_TishaDefeat + msgbox ThreeIsland_BondBridge_Text_TishaPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B - trainerbattle_double TRAINER_TWINS_JOY_MEG, Text_18A0C4, Text_18A0F7, Text_18A138 +ThreeIsland_BondBridge_EventScript_Joy:: @ 81AC09B + trainerbattle_double TRAINER_TWINS_JOY_MEG, ThreeIsland_BondBridge_Text_JoyIntro, ThreeIsland_BondBridge_Text_JoyDefeat, ThreeIsland_BondBridge_Text_JoyNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC0C6 - msgbox Text_18A106, MSGBOX_AUTOCLOSE + goto_if_eq ThreeIsland_BondBridge_EventScript_JoyRematch + msgbox ThreeIsland_BondBridge_Text_JoyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC0C6:: @ 81AC0C6 - trainerbattle_rematch_double TRAINER_TWINS_JOY_MEG, Text_1C3B6E, Text_18A0F7, Text_18A138 - msgbox Text_18A106, MSGBOX_AUTOCLOSE +ThreeIsland_BondBridge_EventScript_JoyRematch:: @ 81AC0C6 + trainerbattle_rematch_double TRAINER_TWINS_JOY_MEG, ThreeIsland_BondBridge_Text_JoyRematchIntro, ThreeIsland_BondBridge_Text_JoyDefeat, ThreeIsland_BondBridge_Text_JoyNotEnoughMons + msgbox ThreeIsland_BondBridge_Text_JoyPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 - trainerbattle_double TRAINER_TWINS_JOY_MEG, Text_18A179, Text_18A1A3, Text_18A1CD +ThreeIsland_BondBridge_EventScript_Meg:: @ 81AC0E1 + trainerbattle_double TRAINER_TWINS_JOY_MEG, ThreeIsland_BondBridge_Text_MegIntro, ThreeIsland_BondBridge_Text_MegDefeat, ThreeIsland_BondBridge_Text_MegNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC10C - msgbox Text_18A1B2, MSGBOX_AUTOCLOSE + goto_if_eq ThreeIsland_BondBridge_EventScript_MegRematch + msgbox ThreeIsland_BondBridge_Text_MegPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC10C:: @ 81AC10C - trainerbattle_rematch_double TRAINER_TWINS_JOY_MEG, Text_1C3B99, Text_18A1A3, Text_18A1CD - msgbox Text_18A1B2, MSGBOX_AUTOCLOSE +ThreeIsland_BondBridge_EventScript_MegRematch:: @ 81AC10C + trainerbattle_rematch_double TRAINER_TWINS_JOY_MEG, ThreeIsland_BondBridge_Text_MegRematchIntro, ThreeIsland_BondBridge_Text_MegDefeat, ThreeIsland_BondBridge_Text_MegNotEnoughMons + msgbox ThreeIsland_BondBridge_Text_MegPostBattle, MSGBOX_AUTOCLOSE end FiveIsland_ResortGorgeous_EventScript_Daisy:: @ 81AC127 diff --git a/data/specials.inc b/data/specials.inc index d995179c8..032e693ff 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -38,12 +38,12 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special TryBattleLinkup def_special TryTradeLinkup - def_special sub_80810F4 + def_special TryRecordMixLinkup def_special CloseLink def_special EnterColosseumPlayerSpot def_special EnterTradeSeat - def_special sub_80819B8 - def_special sub_808130C + def_special Special_WiredCableClubTrade + def_special Special_CableClub_AskSaveTheGame def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 @@ -368,7 +368,7 @@ gSpecials:: @ 815FD60 def_special ShouldShowBoxWasFullMessage def_special ChangeBoxPokemonNickname def_special Special_UpdateTrainerCardPhotoIcons - def_special Special_StickerLadyGetBragFlags + def_special StickerManGetBragFlags def_special SetUsedPkmnCenterQuestLogEvent def_special IsWirelessAdapterConnected def_special TryBecomeLinkLeader diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index e6acb6877..e080792e0 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -1468,7 +1468,7 @@ PokemonJournal_Text_SpecialFeatureProfOak:: @ 81B1AB9 .string "PROF. OAK reportedly lives with his\n" .string "grandchildren DAISY and {RIVAL}.$" -gUnknown_81B1B3D:: @ 81B1B3D +PokemonJournal_Text_SpecialFeatureDaisyOak:: @ 81B1B3D .string "This is a POKéMON JOURNAL from\n" .string "years ago…\p" .string "POKéMON JOURNAL\n" diff --git a/data/text/trainer_card.inc b/data/text/trainer_card.inc index 3a6557cca..4a54e5b5b 100644 --- a/data/text/trainer_card.inc +++ b/data/text/trainer_card.inc @@ -1,31 +1,31 @@ -gUnknown_81B1D7D:: @ 81B1D7D +CeladonCity_GameCorner_Text_TryPokemonPrinter:: @ 81B1D7D .string "It's a POKéMON PRINTER!\p" .string "It can put a print of your POKéMON\n" .string "on the back of your TRAINER CARD.\p" .string "It costs only ¥50.\n" .string "Would you like to try it?$" -gUnknown_81B1E07:: @ 81B1E07 +CeladonCity_GameCorner_Text_DontHaveEnoughMoney:: @ 81B1E07 .string "You don't have enough money.$" -gUnknown_81B1E24:: @ 81B1E24 +CeladonCity_GameCorner_Text_ChoosePrintType:: @ 81B1E24 .string "Please choose the print type.$" -gUnknown_81B1E42:: @ 81B1E42 +CeladonCity_GameCorner_Text_BigSmileForPhoto:: @ 81B1E42 .string "A big smile for the photo, please!\n" .string "Three… Two… One…\p" .string "Flash!$" -gUnknown_81B1E7D:: @ 81B1E7D +CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard:: @ 81B1E7D .string "Your POKéMON print is ready!\n" .string "Check your TRAINER CARD.$" -gUnknown_81B1EB3:: @ 81B1EB3 +FourIsland_House2_Text_WishICouldShowOffStickers:: @ 81B1EB3 .string "Giggle…\n" .string "I collected a ton of STICKERS.\l" .string "I wish I could show them off…$" -gUnknown_81B1EF8:: @ 81B1EF8 +FourIsland_House2_Text_GiveYouStickerIfYouBrag:: @ 81B1EF8 .string "Oh, excellent!\n" .string "You've come to the right place!\p" .string "Look, look! See? See?\n" @@ -38,113 +38,113 @@ gUnknown_81B1EF8:: @ 81B1EF8 .string "yourself.\p" .string "What will you brag about?$" -gUnknown_81B1FEF:: @ 81B1FEF +FourIsland_House2_Text_BragAboutSomethingForMe:: @ 81B1FEF .string "Brag about something for me.\n" .string "I'll give you a STICKER.$" -gUnknown_81B2025:: @ 81B2025 +FourIsland_House2_Text_BragAboutWhatToday:: @ 81B2025 .string "Oh, hi!\n" .string "Here comes the braggart.\p" .string "What are you going to brag about\n" .string "today?$" -gUnknown_81B206E:: @ 81B206E +FourIsland_House2_Text_WowHoFLowest:: @ 81B206E .string "Oh, wow, you made it into the\n" .string "HALL OF FAME.\p" .string "That's pretty good, yup!\n" .string "I'll give you one of these.$" -gUnknown_81B20CF:: @ 81B20CF +FourIsland_House2_Text_WowHoFLow:: @ 81B20CF .string "Oh, wow, you've entered the\n" .string "HALL OF FAME often!\p" .string "That's impressive, yup!\n" .string "I'll give you one of these.$" -gUnknown_81B2133:: @ 81B2133 +FourIsland_House2_Text_WowHoFHigh:: @ 81B2133 .string "Whoa! You've made it into the\n" .string "HALL OF FAME that often?\l" .string "That's seriously incredible, yup!\p" .string "You own the POKéMON LEAGUE!\n" .string "I'll give you one of these.$" -gUnknown_81B21C4:: @ 81B21C4 +FourIsland_House2_Text_WowHoFHighest:: @ 81B21C4 .string "No way! You've gone into the\n" .string "HALL OF FAME that many times?\p" .string "You're beyond incredible, yup!\n" .string "That's it, I have to give you this.$" -gUnknown_81B2242:: @ 81B2242 +FourIsland_House2_Text_HoFStickerApplied:: @ 81B2242 .string "The HALL OF FAME STICKER was\n" .string "applied to the TRAINER CARD.$" -gUnknown_81B227C:: @ 81B227C +FourIsland_House2_Text_ComeBackWithBetterStoryHoF:: @ 81B227C .string "Hmm…\p" .string "Come back with a better story next\n" .string "time, okay?$" -gUnknown_81B22B0:: @ 81B22B0 +FourIsland_House2_Text_LivingLegendHoF:: @ 81B22B0 .string "Oh, no, no can do.\p" .string "You're practically a living legend.\n" .string "I have no SITCKERS left to give.$" -gUnknown_81B2308:: @ 81B2308 +FourIsland_House2_Text_WowEggsLowest:: @ 81B2308 .string "Oh, wow, there are POKéMON EGGS?\n" .string "I didn't know that!\p" .string "That's pretty good, yup!\n" .string "I'll give you one of these.$" -gUnknown_81B2372:: @ 81B2372 +FourIsland_House2_Text_WowEggsLow:: @ 81B2372 .string "You've hatched that many EGGS?\n" .string "You really must like them!\p" .string "That's impressive, yup!\n" .string "I'll give you one of these.$" -gUnknown_81B23E0:: @ 81B23E0 +FourIsland_House2_Text_WowEggsHigh:: @ 81B23E0 .string "Whoa! You've hatched a whole\n" .string "bunch of EGGS!\p" .string "You're an EGG-hatching machine!\n" .string "I'll give you one of these.$" -gUnknown_81B2448:: @ 81B2448 +FourIsland_House2_Text_WowEggsHighest:: @ 81B2448 .string "Wh… You hatched that many EGGS?\p" .string "What's behind your love of EGGS?\n" .string "It's beyond incredible, yup!\p" .string "You're too awesome, I tell you.\n" .string "That's it, I have to give you this.$" -gUnknown_81B24EA:: @ 81B24EA +FourIsland_House2_Text_EggStickerApplied:: @ 81B24EA .string "The EGG STICKER was applied\n" .string "to the TRAINER CARD.$" -gUnknown_81B251B:: @ 81B251B +FourIsland_House2_Text_ComeBackWithBetterStoryEggs:: @ 81B251B .string "Hmm…\p" .string "Come back with a better story next\n" .string "time, okay?$" -gUnknown_81B254F:: @ 81B254F +FourIsland_House2_Text_LivingLegendEggs:: @ 81B254F .string "Oh, no, no can do.\p" .string "You're practically a living legend.\n" .string "I have no SITCKERS left to give.$" -gUnknown_81B25A7:: @ 81B25A7 +FourIsland_House2_Text_WowLinkWinsLowest:: @ 81B25A7 .string "Oh, wow, you've had success\n" .string "link battling?\p" .string "You're pretty strong, yup!\n" .string "I'll give you one of these.$" -gUnknown_81B2609:: @ 81B2609 +FourIsland_House2_Text_WowLinkWinsLow:: @ 81B2609 .string "You've beaten your friends a lot\n" .string "link battling, huh?\p" .string "You're impressively strong, yup!\n" .string "I'll give you one of these.$" -gUnknown_81B267B:: @ 81B267B +FourIsland_House2_Text_WowLinkWinsHigh:: @ 81B267B .string "Whoa! You've beaten your friends\n" .string "a frightful number of times.\p" .string "Have you lost friends over this?\n" .string "I'll give you one of these.$" -gUnknown_81B26F6:: @ 81B26F6 +FourIsland_House2_Text_WowLinkWinsHighest:: @ 81B26F6 .string "Wh… Wickedly whoa!\n" .string "You've won mind-blowingly often!\p" .string "It just knocks me out thinking\n" @@ -152,16 +152,16 @@ gUnknown_81B26F6:: @ 81B26F6 .string "You're the stuff of nightmares!\n" .string "That's it, I have to give you this.$" -gUnknown_81B27A6:: @ 81B27A6 +FourIsland_House2_Text_VictoryStickerApplied:: @ 81B27A6 .string "The VICTORY STICKER was applied\n" .string "to the TRAINER CARD.$" -gUnknown_81B27DB:: @ 81B27DB +FourIsland_House2_Text_ComeBackWithBetterStoryLinkWins:: @ 81B27DB .string "Hmm…\p" .string "Come back with a better story next\n" .string "time, okay?$" -gUnknown_81B280F:: @ 81B280F +FourIsland_House2_Text_LivingLegendLinkWins:: @ 81B280F .string "Oh, no, no can do.\p" .string "You're practically a living legend.\n" .string "I have no SITCKERS left to give.$" diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 23fcbc2dc..74071aeef 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -765,30 +765,30 @@ OneIsland_KindleRoad_Text_MikRematchIntro:: @ 81C3A55 .string "afraid of nothing!\p" .string "We'll prove it to you this time!$" -Text_1C3AA7:: @ 81C3AA7 +ThreeIsland_BondBridge_Text_NikkiRematchIntro:: @ 81C3AA7 .string "Are we to battle again?$" -Text_1C3ABF:: @ 81C3ABF +ThreeIsland_BondBridge_Text_VioletRematchIntro:: @ 81C3ABF .string "From where have you come, and\n" .string "where are you bound?$" -Text_1C3AF2:: @ 81C3AF2 +ThreeIsland_BondBridge_Text_AmiraRematchIntro:: @ 81C3AF2 .string "I want to swim without my float\n" .string "ring soon.$" -Text_1C3B1D:: @ 81C3B1D +ThreeIsland_BondBridge_Text_AlexisRematchIntro:: @ 81C3B1D .string "Yay, yay!\n" .string "POKéMON!$" -Text_1C3B30:: @ 81C3B30 +ThreeIsland_BondBridge_Text_TishaRematchIntro:: @ 81C3B30 .string "Oh, no, didn't I tell you already?\n" .string "Please, stay away from me!$" -Text_1C3B6E:: @ 81C3B6E +ThreeIsland_BondBridge_Text_JoyRematchIntro:: @ 81C3B6E .string "JOY: We've gotten stronger!\n" .string "Lots and lots!$" -Text_1C3B99:: @ 81C3B99 +ThreeIsland_BondBridge_Text_MegRematchIntro:: @ 81C3B99 .string "MEG: You can't beat us today!$" FiveIsland_WaterLabyrinth_Text_AlizeRematchIntro:: @ 81C3BB7 |