diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-23 02:52:56 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-23 02:52:56 -0500 |
| commit | d4f32c10a832899d4a28e658d1d48356ec4fa29e (patch) | |
| tree | a641fc9d0bafd3a2eab4660bb925c5100696aa01 | |
| parent | c2bf9898a533a0b0cd2bba346e3df8c6f300f016 (diff) | |
Document SS Anne scripts
73 files changed, 350 insertions, 355 deletions
diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index bf4c1e004..eab4e822a 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_1F_Corridor_EventScript_1608D5", + "script": "SSAnne_1F_Corridor_EventScript_Sailor", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_1F_Corridor_EventScript_1608CC", + "script": "SSAnne_1F_Corridor_EventScript_WorkerM", "flag": "0" } ], diff --git a/data/maps/SSAnne_1F_Corridor/scripts.inc b/data/maps/SSAnne_1F_Corridor/scripts.inc index 21967cf04..bc116f99b 100644 --- a/data/maps/SSAnne_1F_Corridor/scripts.inc +++ b/data/maps/SSAnne_1F_Corridor/scripts.inc @@ -1,10 +1,10 @@ SSAnne_1F_Corridor_MapScripts:: @ 81608CB .byte 0 -SSAnne_1F_Corridor_EventScript_1608CC:: @ 81608CC - msgbox gUnknown_8172EE7, MSGBOX_NPC +SSAnne_1F_Corridor_EventScript_WorkerM:: @ 81608CC + msgbox SSAnne_1F_Corridor_Text_LeStrongSilentType, MSGBOX_NPC end -SSAnne_1F_Corridor_EventScript_1608D5:: @ 81608D5 - msgbox gUnknown_8172F60, MSGBOX_NPC +SSAnne_1F_Corridor_EventScript_Sailor:: @ 81608D5 + msgbox SSAnne_1F_Corridor_Text_PassengersAreRestless, MSGBOX_NPC end diff --git a/data/maps/SSAnne_1F_Corridor/text.inc b/data/maps/SSAnne_1F_Corridor/text.inc index dff534c9a..f720e2ed9 100644 --- a/data/maps/SSAnne_1F_Corridor/text.inc +++ b/data/maps/SSAnne_1F_Corridor/text.inc @@ -1,4 +1,4 @@ -gUnknown_8172EE7:: @ 8172EE7 +SSAnne_1F_Corridor_Text_LeStrongSilentType:: @ 8172EE7 .string "Bonjour!\n" .string "I am le waiter on this ship!\p" .string "I will be happy to serve you\n" @@ -6,7 +6,7 @@ gUnknown_8172EE7:: @ 8172EE7 .string "… … …\n" .string "Ah! Le strong silent type!$" -gUnknown_8172F60:: @ 8172F60 +SSAnne_1F_Corridor_Text_PassengersAreRestless:: @ 8172F60 .string "The passengers are restless from\n" .string "this long voyage.\p" .string "You might be challenged by the\n" diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index e8547d2e3..42c95079b 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_1F_Room1_EventScript_160BDC", + "script": "SSAnne_1F_Room1_EventScript_Gentleman", "flag": "0" } ], diff --git a/data/maps/SSAnne_1F_Room1/scripts.inc b/data/maps/SSAnne_1F_Room1/scripts.inc index 5f610c830..8cbf9edb7 100644 --- a/data/maps/SSAnne_1F_Room1/scripts.inc +++ b/data/maps/SSAnne_1F_Room1/scripts.inc @@ -1,6 +1,6 @@ SSAnne_1F_Room1_MapScripts:: @ 8160BDB .byte 0 -SSAnne_1F_Room1_EventScript_160BDC:: @ 8160BDC - msgbox gUnknown_817393B, MSGBOX_NPC +SSAnne_1F_Room1_EventScript_Gentleman:: @ 8160BDC + msgbox SSAnne_1F_Room1_Text_ImAGlobalPoliceAgent, MSGBOX_NPC end diff --git a/data/maps/SSAnne_1F_Room1/text.inc b/data/maps/SSAnne_1F_Room1/text.inc index 252ab2283..1466bcfe8 100644 --- a/data/maps/SSAnne_1F_Room1/text.inc +++ b/data/maps/SSAnne_1F_Room1/text.inc @@ -1,4 +1,4 @@ -gUnknown_817393B:: @ 817393B +SSAnne_1F_Room1_Text_ImAGlobalPoliceAgent:: @ 817393B .string "Ssh…!\n" .string "I'm a GLOBAL POLICE agent.\p" .string "I'm on the trail of TEAM ROCKET.\n" diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index db08152f0..8a779f450 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SSAnne_1F_Room2_EventScript_160BEF", + "script": "SSAnne_1F_Room2_EventScript_Ann", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_1F_Room2_EventScript_160C06", + "script": "SSAnne_1F_Room2_EventScript_Tyler", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 1, - "script": "SSAnne_1F_Room2_EventScript_160BE6", + "script": "SSAnne_1F_Room2_EventScript_Woman", "flag": "0" }, { diff --git a/data/maps/SSAnne_1F_Room2/scripts.inc b/data/maps/SSAnne_1F_Room2/scripts.inc index 3a80d3cfe..10154e734 100644 --- a/data/maps/SSAnne_1F_Room2/scripts.inc +++ b/data/maps/SSAnne_1F_Room2/scripts.inc @@ -1,16 +1,16 @@ SSAnne_1F_Room2_MapScripts:: @ 8160BE5 .byte 0 -SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6 - msgbox gUnknown_8173AC5, MSGBOX_NPC +SSAnne_1F_Room2_EventScript_Woman:: @ 8160BE6 + msgbox SSAnne_1F_Room2_Text_CruisingAroundWorld, MSGBOX_NPC end -SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF - trainerbattle_single TRAINER_LASS_ANN, Text_173A1A, Text_173A4F - msgbox gUnknown_8173A7A, MSGBOX_AUTOCLOSE +SSAnne_1F_Room2_EventScript_Ann:: @ 8160BEF + trainerbattle_single TRAINER_LASS_ANN, SSAnne_1F_Room2_Text_AnnIntro, SSAnne_1F_Room2_Text_AnnDefeat + msgbox SSAnne_1F_Room2_Text_AnnPostBattle, MSGBOX_AUTOCLOSE end -SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06 - trainerbattle_single TRAINER_YOUNGSTER_TYLER, Text_173999, Text_1739B1 - msgbox gUnknown_81739C5, MSGBOX_AUTOCLOSE +SSAnne_1F_Room2_EventScript_Tyler:: @ 8160C06 + trainerbattle_single TRAINER_YOUNGSTER_TYLER, SSAnne_1F_Room2_Text_TylerIntro, SSAnne_1F_Room2_Text_TylerDefeat + msgbox SSAnne_1F_Room2_Text_TylerPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_1F_Room2/text.inc b/data/maps/SSAnne_1F_Room2/text.inc index 92dc9a93c..55daa017f 100644 --- a/data/maps/SSAnne_1F_Room2/text.inc +++ b/data/maps/SSAnne_1F_Room2/text.inc @@ -1,31 +1,31 @@ -Text_173999:: @ 8173999 +SSAnne_1F_Room2_Text_TylerIntro:: @ 8173999 .string "I love POKéMON!\n" .string "Do you?$" -Text_1739B1:: @ 81739B1 +SSAnne_1F_Room2_Text_TylerDefeat:: @ 81739B1 .string "Wow! \n" .string "You're great!$" -gUnknown_81739C5:: @ 81739C5 +SSAnne_1F_Room2_Text_TylerPostBattle:: @ 81739C5 .string "Listen, listen!\n" .string "Let me be your friend, okay?\p" .string "Then we can trade POKéMON and\n" .string "do stuff.$" -Text_173A1A:: @ 8173A1A +SSAnne_1F_Room2_Text_AnnIntro:: @ 8173A1A .string "I collected these POKéMON\n" .string "from all around the world!$" -Text_173A4F:: @ 8173A4F +SSAnne_1F_Room2_Text_AnnDefeat:: @ 8173A4F .string "Oh, no!\n" .string "I went around the world for these!$" -gUnknown_8173A7A:: @ 8173A7A +SSAnne_1F_Room2_Text_AnnPostBattle:: @ 8173A7A .string "You hurt my poor POKéMON!\p" .string "I demand that you heal them at a\n" .string "POKéMON CENTER!$" -gUnknown_8173AC5:: @ 8173AC5 +SSAnne_1F_Room2_Text_CruisingAroundWorld:: @ 8173AC5 .string "We are cruising around the world,\n" .string "my children and I.$" diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index 71febbbf9..d610ee30a 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -23,7 +23,7 @@ "movement_range_y": 3, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_1F_Room3_EventScript_160C1E", + "script": "SSAnne_1F_Room3_EventScript_LittleGirl", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_1F_Room3_EventScript_160C30", + "script": "SSAnne_1F_Room3_EventScript_Wigglytuff", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_1F_Room3_EventScript_160C27", + "script": "SSAnne_1F_Room3_EventScript_BaldingMan", "flag": "0" } ], diff --git a/data/maps/SSAnne_1F_Room3/scripts.inc b/data/maps/SSAnne_1F_Room3/scripts.inc index 7b9651040..446106c4e 100644 --- a/data/maps/SSAnne_1F_Room3/scripts.inc +++ b/data/maps/SSAnne_1F_Room3/scripts.inc @@ -1,20 +1,20 @@ SSAnne_1F_Room3_MapScripts:: @ 8160C1D .byte 0 -SSAnne_1F_Room3_EventScript_160C1E:: @ 8160C1E - msgbox gUnknown_8173B21, MSGBOX_NPC +SSAnne_1F_Room3_EventScript_LittleGirl:: @ 8160C1E + msgbox SSAnne_1F_Room3_Text_AlwaysTravelWithWigglytuff, MSGBOX_NPC end -SSAnne_1F_Room3_EventScript_160C27:: @ 8160C27 - msgbox gUnknown_8173AFA, MSGBOX_NPC +SSAnne_1F_Room3_EventScript_BaldingMan:: @ 8160C27 + msgbox SSAnne_1F_Room3_Text_CruiseIsElegantAndCozy, MSGBOX_NPC end -SSAnne_1F_Room3_EventScript_160C30:: @ 8160C30 +SSAnne_1F_Room3_EventScript_Wigglytuff:: @ 8160C30 lock faceplayer waitse playmoncry SPECIES_WIGGLYTUFF, 0 - msgbox gUnknown_8173B61 + msgbox SSAnne_1F_Room3_Text_Wigglytuff waitmoncry release end diff --git a/data/maps/SSAnne_1F_Room3/text.inc b/data/maps/SSAnne_1F_Room3/text.inc index 32709c631..d79d495e9 100644 --- a/data/maps/SSAnne_1F_Room3/text.inc +++ b/data/maps/SSAnne_1F_Room3/text.inc @@ -1,11 +1,11 @@ -gUnknown_8173AFA:: @ 8173AFA +SSAnne_1F_Room3_Text_CruiseIsElegantAndCozy:: @ 8173AFA .string "A world cruise is so elegant yet\n" .string "cozy!$" -gUnknown_8173B21:: @ 8173B21 +SSAnne_1F_Room3_Text_AlwaysTravelWithWigglytuff:: @ 8173B21 .string "I always travel with WIGGLYTUFF.\n" .string "I never leave home without it.$" -gUnknown_8173B61:: @ 8173B61 +SSAnne_1F_Room3_Text_Wigglytuff:: @ 8173B61 .string "WIGGLYTUFF: Puup pupuu!$" diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index a97e88fcc..262a1a089 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_1F_Room4_EventScript_160C44", + "script": "SSAnne_1F_Room4_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/SSAnne_1F_Room4/scripts.inc b/data/maps/SSAnne_1F_Room4/scripts.inc index 9e6f3fdc2..7a4dfde80 100644 --- a/data/maps/SSAnne_1F_Room4/scripts.inc +++ b/data/maps/SSAnne_1F_Room4/scripts.inc @@ -1,17 +1,17 @@ SSAnne_1F_Room4_MapScripts:: @ 8160C43 .byte 0 -SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44 +SSAnne_1F_Room4_EventScript_Woman:: @ 8160C44 lock faceplayer checkplayergender compare VAR_RESULT, MALE - goto_if_eq EventScript_160C5C - msgbox gUnknown_8173BA4 + goto_if_eq SSAnne_1F_Room4_EventScript_WomanPlayerMale + msgbox SSAnne_1F_Room4_Text_WaitressCherryPiePlease release end -EventScript_160C5C:: @ 8160C5C - msgbox gUnknown_8173B79 +SSAnne_1F_Room4_EventScript_WomanPlayerMale:: @ 8160C5C + msgbox SSAnne_1F_Room4_Text_WaiterCherryPiePlease release end diff --git a/data/maps/SSAnne_1F_Room4/text.inc b/data/maps/SSAnne_1F_Room4/text.inc index 8b3f4c775..e0eb0bcce 100644 --- a/data/maps/SSAnne_1F_Room4/text.inc +++ b/data/maps/SSAnne_1F_Room4/text.inc @@ -1,8 +1,8 @@ -gUnknown_8173B79:: @ 8173B79 +SSAnne_1F_Room4_Text_WaiterCherryPiePlease:: @ 8173B79 .string "Waiter, I would like a cherry pie,\n" .string "please!$" -gUnknown_8173BA4:: @ 8173BA4 +SSAnne_1F_Room4_Text_WaitressCherryPiePlease:: @ 8173BA4 .string "Waitress, I would like a cherry\n" .string "pie, please!$" diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 7d3c24e5b..6cdd3d088 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SSAnne_1F_Room5_EventScript_160C67", + "script": "SSAnne_1F_Room5_EventScript_Arthur", "flag": "0" } ], diff --git a/data/maps/SSAnne_1F_Room5/scripts.inc b/data/maps/SSAnne_1F_Room5/scripts.inc index 028442449..e91e35bf6 100644 --- a/data/maps/SSAnne_1F_Room5/scripts.inc +++ b/data/maps/SSAnne_1F_Room5/scripts.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room5_MapScripts:: @ 8160C66 .byte 0 -SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67 - trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, Text_173BD1, Text_173BFA - msgbox gUnknown_8173C30, MSGBOX_AUTOCLOSE +SSAnne_1F_Room5_EventScript_Arthur:: @ 8160C67 + trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, SSAnne_1F_Room5_Text_ArthurIntro, SSAnne_1F_Room5_Text_ArthurDefeat + msgbox SSAnne_1F_Room5_Text_ArthurPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_1F_Room5/text.inc b/data/maps/SSAnne_1F_Room5/text.inc index 09d582707..dd2f80262 100644 --- a/data/maps/SSAnne_1F_Room5/text.inc +++ b/data/maps/SSAnne_1F_Room5/text.inc @@ -1,12 +1,12 @@ -Text_173BD1:: @ 8173BD1 +SSAnne_1F_Room5_Text_ArthurIntro:: @ 8173BD1 .string "You insolent pup!\n" .string "How dare you barge in!$" -Text_173BFA:: @ 8173BFA +SSAnne_1F_Room5_Text_ArthurDefeat:: @ 8173BFA .string "Humph! You rude child!\n" .string "You have no sense of courtesy!$" -gUnknown_8173C30:: @ 8173C30 +SSAnne_1F_Room5_Text_ArthurPostBattle:: @ 8173C30 .string "I wish to be left alone!\n" .string "Get out!$" diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index 881554a8d..b9b25ff45 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_1F_Room6_EventScript_160DF3", + "script": "SSAnne_1F_Room6_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index 42c69fb3b..dec1181bf 100644 --- a/data/maps/SSAnne_1F_Room6/scripts.inc +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -1,27 +1,27 @@ SSAnne_1F_Room6_MapScripts:: @ 8160DF2 .byte 0 -SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 +SSAnne_1F_Room6_EventScript_Woman:: @ 8160DF3 lock faceplayer - msgbox gUnknown_817445B, MSGBOX_YESNO + msgbox SSAnne_1F_Room6_Text_TakeAShortRest, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_160E18 + goto_if_eq SSAnne_1F_Room6_EventScript_DeclineHeal closemessage call EventScript_OutOfCenterPartyHeal - msgbox gUnknown_8174490 + msgbox SSAnne_1F_Room6_Text_GladEveryoneIsRefreshed release end -EventScript_160E18:: @ 8160E18 +SSAnne_1F_Room6_EventScript_DeclineHeal:: @ 8160E18 checkplayergender compare VAR_RESULT, MALE - goto_if_eq EventScript_160E2E - msgbox gUnknown_8174515 + goto_if_eq SSAnne_1F_Room6_EventScript_DeclineHealMale + msgbox SSAnne_1F_Room6_Text_SorryYouLookLikeMySister release end -EventScript_160E2E:: @ 8160E2E - msgbox gUnknown_81744D0 +SSAnne_1F_Room6_EventScript_DeclineHealMale:: @ 8160E2E + msgbox SSAnne_1F_Room6_Text_SorryYouLookLikeMyBrother release end diff --git a/data/maps/SSAnne_1F_Room6/text.inc b/data/maps/SSAnne_1F_Room6/text.inc index 442992f02..6d4d98ff5 100644 --- a/data/maps/SSAnne_1F_Room6/text.inc +++ b/data/maps/SSAnne_1F_Room6/text.inc @@ -1,16 +1,16 @@ -gUnknown_817445B:: @ 817445B +SSAnne_1F_Room6_Text_TakeAShortRest:: @ 817445B .string "You look tired. Would you like to\n" .string "take a short rest?$" -gUnknown_8174490:: @ 8174490 +SSAnne_1F_Room6_Text_GladEveryoneIsRefreshed:: @ 8174490 .string "I'm glad to see that everyone is\n" .string "looking refreshed and chipper.$" -gUnknown_81744D0:: @ 81744D0 +SSAnne_1F_Room6_Text_SorryYouLookLikeMyBrother:: @ 81744D0 .string "Oh, I'm sorry for fussing over you.\n" .string "You look like my little brother…$" -gUnknown_8174515:: @ 8174515 +SSAnne_1F_Room6_Text_SorryYouLookLikeMySister:: @ 8174515 .string "Oh, I'm sorry for fussing over you.\n" .string "You look like my little sister…$" diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index 887022650..98496a947 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_1F_Room7_EventScript_160C7F", + "script": "SSAnne_1F_Room7_EventScript_Thomas", "flag": "0" } ], diff --git a/data/maps/SSAnne_1F_Room7/scripts.inc b/data/maps/SSAnne_1F_Room7/scripts.inc index 5901ee65b..60e26dc73 100644 --- a/data/maps/SSAnne_1F_Room7/scripts.inc +++ b/data/maps/SSAnne_1F_Room7/scripts.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room7_MapScripts:: @ 8160C7E .byte 0 -SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F - trainerbattle_single TRAINER_GENTLEMAN_THOMAS, Text_173C52, Text_173CB4 - msgbox gUnknown_8173CC4, MSGBOX_AUTOCLOSE +SSAnne_1F_Room7_EventScript_Thomas:: @ 8160C7F + trainerbattle_single TRAINER_GENTLEMAN_THOMAS, SSAnne_1F_Room7_Text_ThomasIntro, SSAnne_1F_Room7_Text_ThomasDefeat + msgbox SSAnne_1F_Room7_Text_ThomasPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_1F_Room7/text.inc b/data/maps/SSAnne_1F_Room7/text.inc index d4fed83fb..3a8ce2f28 100644 --- a/data/maps/SSAnne_1F_Room7/text.inc +++ b/data/maps/SSAnne_1F_Room7/text.inc @@ -1,11 +1,11 @@ -Text_173C52:: @ 8173C52 +SSAnne_1F_Room7_Text_ThomasIntro:: @ 8173C52 .string "I am but a solitary traveler…\p" .string "My sole companions and friends are\n" .string "POKéMON I caught on my journeys…$" -Text_173CB4:: @ 8173CB4 +SSAnne_1F_Room7_Text_ThomasDefeat:: @ 8173CB4 .string "My, my friends…$" -gUnknown_8173CC4:: @ 8173CC4 +SSAnne_1F_Room7_Text_ThomasPostBattle:: @ 8173CC4 .string "You should be nice to friends!$" diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index 850b63fc4..e3b506027 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -36,7 +36,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Corridor_EventScript_160A54", + "script": "SSAnne_2F_Corridor_EventScript_Sailor", "flag": "0" } ], @@ -113,7 +113,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR", "var_value": 0, - "script": "SSAnne_2F_Corridor_EventScript_1608DF" + "script": "SSAnne_2F_Corridor_EventScript_RivalTriggerLeft" }, { "type": "trigger", @@ -122,7 +122,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR", "var_value": 0, - "script": "SSAnne_2F_Corridor_EventScript_1608EB" + "script": "SSAnne_2F_Corridor_EventScript_RivalTriggerMid" }, { "type": "trigger", @@ -131,7 +131,7 @@ "elevation": 3, "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR", "var_value": 0, - "script": "SSAnne_2F_Corridor_EventScript_1608F7" + "script": "SSAnne_2F_Corridor_EventScript_RivalTriggerRight" } ], "bg_events": [] diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 02b06920a..ed0ddd056 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -1,31 +1,25 @@ SSAnne_2F_Corridor_MapScripts:: @ 81608DE .byte 0 -SSAnne_2F_Corridor_EventScript_1608DF:: @ 81608DF +SSAnne_2F_Corridor_EventScript_RivalTriggerLeft:: @ 81608DF lockall setvar VAR_TEMP_1, 0 - goto EventScript_160903 - -EventScript_1608EA:: @ 81608EA + goto SSAnne_2F_Corridor_EventScript_RivalTrigger end -SSAnne_2F_Corridor_EventScript_1608EB:: @ 81608EB +SSAnne_2F_Corridor_EventScript_RivalTriggerMid:: @ 81608EB lockall setvar VAR_TEMP_1, 1 - goto EventScript_160903 - -EventScript_1608F6:: @ 81608F6 + goto SSAnne_2F_Corridor_EventScript_RivalTrigger end -SSAnne_2F_Corridor_EventScript_1608F7:: @ 81608F7 +SSAnne_2F_Corridor_EventScript_RivalTriggerRight:: @ 81608F7 lockall setvar VAR_TEMP_1, 2 - goto EventScript_160903 - -EventScript_160902:: @ 8160902 + goto SSAnne_2F_Corridor_EventScript_RivalTrigger end -EventScript_160903:: @ 8160903 +SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903 textcolor 0 playse SE_KAIDAN delay 5 @@ -36,80 +30,80 @@ EventScript_160903:: @ 8160903 waitmovement 0 delay 20 compare VAR_TEMP_1, 0 - call_if_eq EventScript_1609AD + call_if_eq SSAnne_2F_Corridor_EventScript_RivalApproachLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_1609B8 + call_if_eq SSAnne_2F_Corridor_EventScript_RivalApproachMid compare VAR_TEMP_1, 2 - call_if_eq EventScript_1609CA - msgbox gUnknown_8173035 + call_if_eq SSAnne_2F_Corridor_EventScript_RivalApproachRight + msgbox SSAnne_2F_Corridor_Text_RivalIntro setvar VAR_LAST_TALKED, 1 compare VAR_STARTER_MON, 2 - call_if_eq EventScript_1609DC + call_if_eq SSAnne_2F_Corridor_EventScript_RivalSquirtle compare VAR_STARTER_MON, 1 - call_if_eq EventScript_1609E7 + call_if_eq SSAnne_2F_Corridor_EventScript_RivalBulbasaur compare VAR_STARTER_MON, 0 - call_if_eq EventScript_1609F2 - msgbox gUnknown_8173164 + call_if_eq SSAnne_2F_Corridor_EventScript_RivalCharmander + msgbox SSAnne_2F_Corridor_Text_RivalPostBattle closemessage delay 10 playbgm MUS_RIVAL2, 0 compare VAR_TEMP_1, 0 - call_if_eq EventScript_1609FD + call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitLeft compare VAR_TEMP_1, 1 - call_if_eq EventScript_160A08 + call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitMid compare VAR_TEMP_1, 2 - call_if_eq EventScript_160A13 + call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitRight fadedefaultbgm removeobject 1 setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 releaseall end -EventScript_1609AD:: @ 81609AD - applymovement 1, Movement_160A2A +SSAnne_2F_Corridor_EventScript_RivalApproachLeft:: @ 81609AD + applymovement 1, SSAnne_2F_Corridor_Movement_RivalApproachLeft waitmovement 0 return -EventScript_1609B8:: @ 81609B8 - applymovement 1, Movement_160A2E - applymovement OBJ_EVENT_ID_PLAYER, Movement_160A24 +SSAnne_2F_Corridor_EventScript_RivalApproachMid:: @ 81609B8 + applymovement 1, SSAnne_2F_Corridor_Movement_RivalApproachMid + applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid waitmovement 0 return -EventScript_1609CA:: @ 81609CA - applymovement OBJ_EVENT_ID_PLAYER, Movement_160A1E - applymovement 1, Movement_160A34 +SSAnne_2F_Corridor_EventScript_RivalApproachRight:: @ 81609CA + applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight + applymovement 1, SSAnne_2F_Corridor_Movement_RivalApproachRight waitmovement 0 return -EventScript_1609DC:: @ 81609DC - trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_SQUIRTLE, Text_173110 +SSAnne_2F_Corridor_EventScript_RivalSquirtle:: @ 81609DC + trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_SQUIRTLE, SSAnne_2F_Corridor_Text_RivalDefeat return -EventScript_1609E7:: @ 81609E7 - trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_BULBASAUR, Text_173110 +SSAnne_2F_Corridor_EventScript_RivalBulbasaur:: @ 81609E7 + trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_BULBASAUR, SSAnne_2F_Corridor_Text_RivalDefeat return -EventScript_1609F2:: @ 81609F2 - trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_CHARMANDER, Text_173110 +SSAnne_2F_Corridor_EventScript_RivalCharmander:: @ 81609F2 + trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_CHARMANDER, SSAnne_2F_Corridor_Text_RivalDefeat return -EventScript_1609FD:: @ 81609FD - applymovement 1, Movement_160A3B +SSAnne_2F_Corridor_EventScript_RivalExitLeft:: @ 81609FD + applymovement 1, SSAnne_2F_Corridor_Movement_RivalExitLeft waitmovement 0 return -EventScript_160A08:: @ 8160A08 - applymovement 1, Movement_160A44 +SSAnne_2F_Corridor_EventScript_RivalExitMid:: @ 8160A08 + applymovement 1, SSAnne_2F_Corridor_Movement_RivalExitMid waitmovement 0 return -EventScript_160A13:: @ 8160A13 - applymovement 1, Movement_160A4C +SSAnne_2F_Corridor_EventScript_RivalExitRight:: @ 8160A13 + applymovement 1, SSAnne_2F_Corridor_Movement_RivalExitRight waitmovement 0 return -Movement_160A1E:: @ 8160A1E +SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight:: @ 8160A1E delay_16 delay_16 delay_16 @@ -117,7 +111,7 @@ Movement_160A1E:: @ 8160A1E walk_in_place_fastest_left step_end -Movement_160A24:: @ 8160A24 +SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid:: @ 8160A24 delay_16 delay_16 delay_16 @@ -125,13 +119,13 @@ Movement_160A24:: @ 8160A24 walk_in_place_fastest_left step_end -Movement_160A2A:: @ 8160A2A +SSAnne_2F_Corridor_Movement_RivalApproachLeft:: @ 8160A2A walk_down walk_down walk_down step_end -Movement_160A2E:: @ 8160A2E +SSAnne_2F_Corridor_Movement_RivalApproachMid:: @ 8160A2E walk_down walk_down walk_down @@ -139,7 +133,7 @@ Movement_160A2E:: @ 8160A2E walk_in_place_fastest_right step_end -Movement_160A34:: @ 8160A34 +SSAnne_2F_Corridor_Movement_RivalApproachRight:: @ 8160A34 walk_down walk_down walk_down @@ -148,7 +142,7 @@ Movement_160A34:: @ 8160A34 delay_4 step_end -Movement_160A3B:: @ 8160A3B +SSAnne_2F_Corridor_Movement_RivalExitLeft:: @ 8160A3B walk_right walk_down walk_down @@ -159,7 +153,7 @@ Movement_160A3B:: @ 8160A3B walk_down step_end -Movement_160A44:: @ 8160A44 +SSAnne_2F_Corridor_Movement_RivalExitMid:: @ 8160A44 walk_down walk_down walk_down @@ -169,7 +163,7 @@ Movement_160A44:: @ 8160A44 walk_down step_end -Movement_160A4C:: @ 8160A4C +SSAnne_2F_Corridor_Movement_RivalExitRight:: @ 8160A4C walk_down walk_down walk_down @@ -179,6 +173,6 @@ Movement_160A4C:: @ 8160A4C walk_down step_end -SSAnne_2F_Corridor_EventScript_160A54:: @ 8160A54 - msgbox gUnknown_8172FC3, MSGBOX_NPC +SSAnne_2F_Corridor_EventScript_Sailor:: @ 8160A54 + msgbox SSAnne_2F_Corridor_Text_ThisShipIsLuxuryLiner, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Corridor/text.inc b/data/maps/SSAnne_2F_Corridor/text.inc index fde6846f2..2f830479d 100644 --- a/data/maps/SSAnne_2F_Corridor/text.inc +++ b/data/maps/SSAnne_2F_Corridor/text.inc @@ -1,10 +1,10 @@ -gUnknown_8172FC3:: @ 8172FC3 +SSAnne_2F_Corridor_Text_ThisShipIsLuxuryLiner:: @ 8172FC3 .string "This ship, she is a luxury liner for\n" .string "TRAINERS of the world!\p" .string "At every port, we hold parties with\n" .string "invited TRAINERS.$" -gUnknown_8173035:: @ 8173035 +SSAnne_2F_Corridor_Text_RivalIntro:: @ 8173035 .string "{RIVAL}: Bonjour!\n" .string "{PLAYER}!\p" .string "Imagine seeing you here!\n" @@ -15,18 +15,18 @@ gUnknown_8173035:: @ 8173035 .string "Crawl around in grassy areas, and\n" .string "look hard for them.$" -Text_173110:: @ 8173110 +SSAnne_2F_Corridor_Text_RivalDefeat:: @ 8173110 .string "Humph!\p" .string "At least you're raising your\n" .string "POKéMON!$" -Text_17313D:: @ 817313D +SSAnne_2F_Corridor_Text_RivalVictory:: @ 817313D .string "{PLAYER}‥！\n" .string "ふなよい してるのか！\p" .string "もっと からだ\n" .string "きたえた ほうが いいぜ！$" -gUnknown_8173164:: @ 8173164 +SSAnne_2F_Corridor_Text_RivalPostBattle:: @ 8173164 .string "{RIVAL}: I heard there was a CUT\n" .string "master on board.\p" .string "But he was just a seasick old man!\p" diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index eacfe5c91..20e221a85 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Room1_EventScript_160C97", + "script": "SSAnne_2F_Room1_EventScript_Gentleman", "flag": "0" } ], diff --git a/data/maps/SSAnne_2F_Room1/scripts.inc b/data/maps/SSAnne_2F_Room1/scripts.inc index 9748777c7..a31c914c1 100644 --- a/data/maps/SSAnne_2F_Room1/scripts.inc +++ b/data/maps/SSAnne_2F_Room1/scripts.inc @@ -1,10 +1,10 @@ SSAnne_2F_Room1_MapScripts:: @ 8160C96 .byte 0 -SSAnne_2F_Room1_EventScript_160C97:: @ 8160C97 +SSAnne_2F_Room1_EventScript_Gentleman:: @ 8160C97 lock faceplayer - message Text_173CE3 + message SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis waitmessage setvar VAR_0x8004, SPECIES_SNORLAX special Special_SetSeenMon diff --git a/data/maps/SSAnne_2F_Room1/text.inc b/data/maps/SSAnne_2F_Room1/text.inc index 5a18af424..c75f4adb7 100644 --- a/data/maps/SSAnne_2F_Room1/text.inc +++ b/data/maps/SSAnne_2F_Room1/text.inc @@ -1,4 +1,4 @@ -Text_173CE3:: @ 8173CE3 +SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis:: @ 8173CE3 .string "I've journeyed far and wide, but in\n" .string "all my travels I've never seen\l" .string "any POKéMON sleep like this one!\p" diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index e01f65eb5..df5cf4bc8 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_2F_Room2_EventScript_160CB1", + "script": "SSAnne_2F_Room2_EventScript_Dale", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SSAnne_2F_Room2_EventScript_160CC8", + "script": "SSAnne_2F_Room2_EventScript_Brooks", "flag": "0" }, { diff --git a/data/maps/SSAnne_2F_Room2/scripts.inc b/data/maps/SSAnne_2F_Room2/scripts.inc index 6568baa0e..3968c2726 100644 --- a/data/maps/SSAnne_2F_Room2/scripts.inc +++ b/data/maps/SSAnne_2F_Room2/scripts.inc @@ -1,12 +1,12 @@ SSAnne_2F_Room2_MapScripts:: @ 8160CB0 .byte 0 -SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1 - trainerbattle_single TRAINER_FISHERMAN_DALE, Text_173DDB, Text_173DF7 - msgbox gUnknown_8173E04, MSGBOX_AUTOCLOSE +SSAnne_2F_Room2_EventScript_Dale:: @ 8160CB1 + trainerbattle_single TRAINER_FISHERMAN_DALE, SSAnne_2F_Room2_Text_DaleIntro, SSAnne_2F_Room2_Text_DaleDefeat + msgbox SSAnne_2F_Room2_Text_DalePostBattle, MSGBOX_AUTOCLOSE end -SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8 - trainerbattle_single TRAINER_GENTLEMAN_BROOKS, Text_173D63, Text_173D92 - msgbox gUnknown_8173DB6, MSGBOX_AUTOCLOSE +SSAnne_2F_Room2_EventScript_Brooks:: @ 8160CC8 + trainerbattle_single TRAINER_GENTLEMAN_BROOKS, SSAnne_2F_Room2_Text_BrooksIntro, SSAnne_2F_Room2_Text_BrooksDefeat + msgbox SSAnne_2F_Room2_Text_BrooksPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_2F_Room2/text.inc b/data/maps/SSAnne_2F_Room2/text.inc index a931a8e47..e7fb8ea8a 100644 --- a/data/maps/SSAnne_2F_Room2/text.inc +++ b/data/maps/SSAnne_2F_Room2/text.inc @@ -1,22 +1,22 @@ -Text_173D63:: @ 8173D63 +SSAnne_2F_Room2_Text_BrooksIntro:: @ 8173D63 .string "Competing against the young keeps\n" .string "me youthful.$" -Text_173D92:: @ 8173D92 +SSAnne_2F_Room2_Text_BrooksDefeat:: @ 8173D92 .string "Good match!\n" .string "Ah, I feel young again!$" -gUnknown_8173DB6:: @ 8173DB6 +SSAnne_2F_Room2_Text_BrooksPostBattle:: @ 8173DB6 .string "Fifteen years ago, I would\n" .string "have won!$" -Text_173DDB:: @ 8173DDB +SSAnne_2F_Room2_Text_DaleIntro:: @ 8173DDB .string "Check out what I fished up!$" -Text_173DF7:: @ 8173DF7 +SSAnne_2F_Room2_Text_DaleDefeat:: @ 8173DF7 .string "I'm all out!$" -gUnknown_8173E04:: @ 8173E04 +SSAnne_2F_Room2_Text_DalePostBattle:: @ 8173E04 .string "Party?\p" .string "The cruise ship's party should be\n" .string "over by now.$" diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index 7cc2af8e7..8dbb1e408 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Room3_EventScript_160CE0", + "script": "SSAnne_2F_Room3_EventScript_Gentleman", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Room3_EventScript_160CE9", + "script": "SSAnne_2F_Room3_EventScript_OldMan", "flag": "0" } ], diff --git a/data/maps/SSAnne_2F_Room3/scripts.inc b/data/maps/SSAnne_2F_Room3/scripts.inc index 33924805b..8de8f47f3 100644 --- a/data/maps/SSAnne_2F_Room3/scripts.inc +++ b/data/maps/SSAnne_2F_Room3/scripts.inc @@ -1,10 +1,10 @@ SSAnne_2F_Room3_MapScripts:: @ 8160CDF .byte 0 -SSAnne_2F_Room3_EventScript_160CE0:: @ 8160CE0 - msgbox gUnknown_8173E3A, MSGBOX_NPC +SSAnne_2F_Room3_EventScript_Gentleman:: @ 8160CE0 + msgbox SSAnne_2F_Room3_Text_SeenMonsFerryPeople, MSGBOX_NPC end -SSAnne_2F_Room3_EventScript_160CE9:: @ 8160CE9 - msgbox gUnknown_8173E7B, MSGBOX_NPC +SSAnne_2F_Room3_EventScript_OldMan:: @ 8160CE9 + msgbox SSAnne_2F_Room3_Text_SomeTreesCanBeCutDown, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Room3/text.inc b/data/maps/SSAnne_2F_Room3/text.inc index c87c96ae0..680267ced 100644 --- a/data/maps/SSAnne_2F_Room3/text.inc +++ b/data/maps/SSAnne_2F_Room3/text.inc @@ -1,8 +1,8 @@ -gUnknown_8173E3A:: @ 8173E3A +SSAnne_2F_Room3_Text_SeenMonsFerryPeople:: @ 8173E3A .string "Ah, yes, I have seen some POKéMON\n" .string "ferry people across the water!$" -gUnknown_8173E7B:: @ 8173E7B +SSAnne_2F_Room3_Text_SomeTreesCanBeCutDown:: @ 8173E7B .string "Small trees can be chopped down\n" .string "using the move CUT.\p" .string "But remember this!\n" diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 9b15b4707..dca8226dd 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_2F_Room4_EventScript_160CF3", + "script": "SSAnne_2F_Room4_EventScript_Lamar", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_2F_Room4_EventScript_160D0A", + "script": "SSAnne_2F_Room4_EventScript_Dawn", "flag": "0" }, { diff --git a/data/maps/SSAnne_2F_Room4/scripts.inc b/data/maps/SSAnne_2F_Room4/scripts.inc index 85ecb21bf..13694bcfb 100644 --- a/data/maps/SSAnne_2F_Room4/scripts.inc +++ b/data/maps/SSAnne_2F_Room4/scripts.inc @@ -1,12 +1,12 @@ SSAnne_2F_Room4_MapScripts:: @ 8160CF2 .byte 0 -SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3 - trainerbattle_single TRAINER_GENTLEMAN_LAMAR, Text_173F07, Text_173F42 - msgbox gUnknown_8173F55, MSGBOX_AUTOCLOSE +SSAnne_2F_Room4_EventScript_Lamar:: @ 8160CF3 + trainerbattle_single TRAINER_GENTLEMAN_LAMAR, SSAnne_2F_Room4_Text_LamarIntro, SSAnne_2F_Room4_Text_LamarDefeat + msgbox SSAnne_2F_Room4_Text_LamarPostBattle, MSGBOX_AUTOCLOSE end -SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A - trainerbattle_single TRAINER_LASS_DAWN, Text_173F83, Text_173FAB - msgbox gUnknown_8173FB9, MSGBOX_AUTOCLOSE +SSAnne_2F_Room4_EventScript_Dawn:: @ 8160D0A + trainerbattle_single TRAINER_LASS_DAWN, SSAnne_2F_Room4_Text_DawnIntro, SSAnne_2F_Room4_Text_DawnDefeat + msgbox SSAnne_2F_Room4_Text_DawnPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_2F_Room4/text.inc b/data/maps/SSAnne_2F_Room4/text.inc index 69e7a7b0d..9eb19a2b4 100644 --- a/data/maps/SSAnne_2F_Room4/text.inc +++ b/data/maps/SSAnne_2F_Room4/text.inc @@ -1,22 +1,22 @@ -Text_173F07:: @ 8173F07 +SSAnne_2F_Room4_Text_LamarIntro:: @ 8173F07 .string "Which do you find more worthy,\n" .string "a strong or a rare POKéMON?$" -Text_173F42:: @ 8173F42 +SSAnne_2F_Room4_Text_LamarDefeat:: @ 8173F42 .string "I must salute you!$" -gUnknown_8173F55:: @ 8173F55 +SSAnne_2F_Room4_Text_LamarPostBattle:: @ 8173F55 .string "Personally, I prefer strong and\n" .string "rare POKéMON.$" -Text_173F83:: @ 8173F83 +SSAnne_2F_Room4_Text_DawnIntro:: @ 8173F83 .string "I don't believe I saw you at the\n" .string "party?$" -Text_173FAB:: @ 8173FAB +SSAnne_2F_Room4_Text_DawnDefeat:: @ 8173FAB .string "Take it easy!$" -gUnknown_8173FB9:: @ 8173FB9 +SSAnne_2F_Room4_Text_DawnPostBattle:: @ 8173FB9 .string "Oh, I adore your strong POKéMON!\n" .string "Oh, how I envy you for them!$" diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index 87a4b8adc..0821d13bd 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Room5_EventScript_160D22", + "script": "SSAnne_2F_Room5_EventScript_Gentleman", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Room5_EventScript_160D2B", + "script": "SSAnne_2F_Room5_EventScript_LittleBoy", "flag": "0" } ], diff --git a/data/maps/SSAnne_2F_Room5/scripts.inc b/data/maps/SSAnne_2F_Room5/scripts.inc index 9635b4bf7..2a02c6d91 100644 --- a/data/maps/SSAnne_2F_Room5/scripts.inc +++ b/data/maps/SSAnne_2F_Room5/scripts.inc @@ -1,10 +1,10 @@ SSAnne_2F_Room5_MapScripts:: @ 8160D21 .byte 0 -SSAnne_2F_Room5_EventScript_160D22:: @ 8160D22 - msgbox gUnknown_8173FF7, MSGBOX_NPC +SSAnne_2F_Room5_EventScript_Gentleman:: @ 8160D22 + msgbox SSAnne_2F_Room5_Text_HaveYouGoneToSafariZone, MSGBOX_NPC end -SSAnne_2F_Room5_EventScript_160D2B:: @ 8160D2B - msgbox gUnknown_817404F, MSGBOX_NPC +SSAnne_2F_Room5_EventScript_LittleBoy:: @ 8160D2B + msgbox SSAnne_2F_Room5_Text_WeThinkSafariZoneIsAwesome, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Room5/text.inc b/data/maps/SSAnne_2F_Room5/text.inc index 75d44d3a5..7aa3e2ade 100644 --- a/data/maps/SSAnne_2F_Room5/text.inc +++ b/data/maps/SSAnne_2F_Room5/text.inc @@ -1,10 +1,10 @@ -gUnknown_8173FF7:: @ 8173FF7 +SSAnne_2F_Room5_Text_HaveYouGoneToSafariZone:: @ 8173FF7 .string "Have you gone to the SAFARI ZONE\n" .string "in FUCHSIA CITY?\p" .string "There are many kinds of rare\n" .string "POKéMON.$" -gUnknown_817404F:: @ 817404F +SSAnne_2F_Room5_Text_WeThinkSafariZoneIsAwesome:: @ 817404F .string "Me and my daddy think the SAFARI\n" .string "ZONE is awesome!\l" .string "I wish we could go there again.$" diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index 8e79519a0..56b6e6201 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Room6_EventScript_160D3E", + "script": "SSAnne_2F_Room6_EventScript_Woman2", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Room6_EventScript_160D35", + "script": "SSAnne_2F_Room6_EventScript_Woman1", "flag": "0" } ], diff --git a/data/maps/SSAnne_2F_Room6/scripts.inc b/data/maps/SSAnne_2F_Room6/scripts.inc index e92a5501e..458e7c35b 100644 --- a/data/maps/SSAnne_2F_Room6/scripts.inc +++ b/data/maps/SSAnne_2F_Room6/scripts.inc @@ -1,10 +1,10 @@ SSAnne_2F_Room6_MapScripts:: @ 8160D34 .byte 0 -SSAnne_2F_Room6_EventScript_160D35:: @ 8160D35 - msgbox gUnknown_81740A1, MSGBOX_NPC +SSAnne_2F_Room6_EventScript_Woman1:: @ 8160D35 + msgbox SSAnne_2F_Room6_Text_CaptainIsAwfullySick, MSGBOX_NPC end -SSAnne_2F_Room6_EventScript_160D3E:: @ 8160D3E - msgbox gUnknown_81740D6, MSGBOX_NPC +SSAnne_2F_Room6_EventScript_Woman2:: @ 8160D3E + msgbox SSAnne_2F_Room6_Text_ManyPeopleGetSeasick, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Room6/text.inc b/data/maps/SSAnne_2F_Room6/text.inc index 6f5b0abff..9820c1870 100644 --- a/data/maps/SSAnne_2F_Room6/text.inc +++ b/data/maps/SSAnne_2F_Room6/text.inc @@ -1,7 +1,7 @@ -gUnknown_81740A1:: @ 81740A1 +SSAnne_2F_Room6_Text_CaptainIsAwfullySick:: @ 81740A1 .string "The CAPTAIN said he's awfully sick.\n" .string "He was all pale.$" -gUnknown_81740D6:: @ 81740D6 +SSAnne_2F_Room6_Text_ManyPeopleGetSeasick:: @ 81740D6 .string "I hear many people get seasick.$" diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index 78aa22911..7c11905f1 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_3F_Corridor_EventScript_160A5E", + "script": "SSAnne_3F_Corridor_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/SSAnne_3F_Corridor/scripts.inc b/data/maps/SSAnne_3F_Corridor/scripts.inc index 5e67f5532..549fe8f84 100644 --- a/data/maps/SSAnne_3F_Corridor/scripts.inc +++ b/data/maps/SSAnne_3F_Corridor/scripts.inc @@ -1,6 +1,6 @@ SSAnne_3F_Corridor_MapScripts:: @ 8160A5D .byte 0 -SSAnne_3F_Corridor_EventScript_160A5E:: @ 8160A5E - msgbox gUnknown_817320C, MSGBOX_NPC +SSAnne_3F_Corridor_EventScript_Sailor:: @ 8160A5E + msgbox SSAnne_3F_Corridor_Text_CaptainTeachesCutToMons, MSGBOX_NPC end diff --git a/data/maps/SSAnne_3F_Corridor/text.inc b/data/maps/SSAnne_3F_Corridor/text.inc index 7d4a71bb4..a76f43a11 100644 --- a/data/maps/SSAnne_3F_Corridor/text.inc +++ b/data/maps/SSAnne_3F_Corridor/text.inc @@ -1,4 +1,4 @@ -gUnknown_817320C:: @ 817320C +SSAnne_3F_Corridor_Text_CaptainTeachesCutToMons:: @ 817320C .string "Our CAPTAIN is a sword master.\n" .string "He's awesome at using CUT.\p" .string "They say he even teaches CUT\n" diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index a5fa829d4..4608e6c9a 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SSAnne_B1F_Room1_EventScript_160D48", + "script": "SSAnne_B1F_Room1_EventScript_Barny", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SSAnne_B1F_Room1_EventScript_160D5F", + "script": "SSAnne_B1F_Room1_EventScript_Phillip", "flag": "0" } ], diff --git a/data/maps/SSAnne_B1F_Room1/scripts.inc b/data/maps/SSAnne_B1F_Room1/scripts.inc index 44cb7d2d1..eb35be89e 100644 --- a/data/maps/SSAnne_B1F_Room1/scripts.inc +++ b/data/maps/SSAnne_B1F_Room1/scripts.inc @@ -1,12 +1,12 @@ SSAnne_B1F_Room1_MapScripts:: @ 8160D47 .byte 0 -SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48 - trainerbattle_single TRAINER_FISHERMAN_BARNY, Text_174177, Text_1741EF - msgbox gUnknown_817420E, MSGBOX_AUTOCLOSE +SSAnne_B1F_Room1_EventScript_Barny:: @ 8160D48 + trainerbattle_single TRAINER_FISHERMAN_BARNY, SSAnne_B1F_Room1_Text_BarnyIntro, SSAnne_B1F_Room1_Text_BarnyDefeat + msgbox SSAnne_B1F_Room1_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE end -SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F - trainerbattle_single TRAINER_SAILOR_PHILLIP, Text_1740F6, Text_174123 - msgbox gUnknown_817413A, MSGBOX_AUTOCLOSE +SSAnne_B1F_Room1_EventScript_Phillip:: @ 8160D5F + trainerbattle_single TRAINER_SAILOR_PHILLIP, SSAnne_B1F_Room1_Text_PhillipIntro, SSAnne_B1F_Room1_Text_PhillipDefeat + msgbox SSAnne_B1F_Room1_Text_PhillipPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room1/text.inc b/data/maps/SSAnne_B1F_Room1/text.inc index 2802e4a84..bdd4b753c 100644 --- a/data/maps/SSAnne_B1F_Room1/text.inc +++ b/data/maps/SSAnne_B1F_Room1/text.inc @@ -1,26 +1,26 @@ -Text_1740F6:: @ 81740F6 +SSAnne_B1F_Room1_Text_PhillipIntro:: @ 81740F6 .string "Matey, you're walking the plank if\n" .string "you lose!$" -Text_174123:: @ 8174123 +SSAnne_B1F_Room1_Text_PhillipDefeat:: @ 8174123 .string "Argh!\n" .string "Beaten by a kid!$" -gUnknown_817413A:: @ 817413A +SSAnne_B1F_Room1_Text_PhillipPostBattle:: @ 817413A .string "When we're out at sea, jellyfish\n" .string "POKéMON sometimes drift by.$" -Text_174177:: @ 8174177 +SSAnne_B1F_Room1_Text_BarnyIntro:: @ 8174177 .string "Hello, stranger!\p" .string "I can't tell if you're from the seas\n" .string "or mountains, but stop and chat.\p" .string "All my POKéMON are from the sea.$" -Text_1741EF:: @ 81741EF +SSAnne_B1F_Room1_Text_BarnyDefeat:: @ 81741EF .string "Darn!\n" .string "I let that one get away!$" -gUnknown_817420E:: @ 817420E +SSAnne_B1F_Room1_Text_BarnyPostBattle:: @ 817420E .string "I was going to make you my\n" .string "assistant, too!$" diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index 462ce7098..31c7d6eb7 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SSAnne_B1F_Room2_EventScript_160D77", + "script": "SSAnne_B1F_Room2_EventScript_Huey", "flag": "0" }, { diff --git a/data/maps/SSAnne_B1F_Room2/scripts.inc b/data/maps/SSAnne_B1F_Room2/scripts.inc index db9f37fe3..011950863 100644 --- a/data/maps/SSAnne_B1F_Room2/scripts.inc +++ b/data/maps/SSAnne_B1F_Room2/scripts.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room2_MapScripts:: @ 8160D76 .byte 0 -SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77 - trainerbattle_single TRAINER_SAILOR_HUEY, Text_174239, Text_17425C - msgbox gUnknown_8174272, MSGBOX_AUTOCLOSE +SSAnne_B1F_Room2_EventScript_Huey:: @ 8160D77 + trainerbattle_single TRAINER_SAILOR_HUEY, SSAnne_B1F_Room2_Text_HueyIntro, SSAnne_B1F_Room2_Text_HueyDefeat + msgbox SSAnne_B1F_Room2_Text_HueyPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room2/text.inc b/data/maps/SSAnne_B1F_Room2/text.inc index df94d6351..852bf55b1 100644 --- a/data/maps/SSAnne_B1F_Room2/text.inc +++ b/data/maps/SSAnne_B1F_Room2/text.inc @@ -1,10 +1,10 @@ -Text_174239:: @ 8174239 +SSAnne_B1F_Room2_Text_HueyIntro:: @ 8174239 .string "Even us sailors have POKéMON, too!$" -Text_17425C:: @ 817425C +SSAnne_B1F_Room2_Text_HueyDefeat:: @ 817425C .string "Okay, you're not bad.$" -gUnknown_8174272:: @ 8174272 +SSAnne_B1F_Room2_Text_HueyPostBattle:: @ 8174272 .string "We caught all our POKéMON while\n" .string "we were out at sea.$" diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index 78786691b..70237229c 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_B1F_Room3_EventScript_160D8F", + "script": "SSAnne_B1F_Room3_EventScript_Dylan", "flag": "0" }, { diff --git a/data/maps/SSAnne_B1F_Room3/scripts.inc b/data/maps/SSAnne_B1F_Room3/scripts.inc index df90031ac..9d0ffc95e 100644 --- a/data/maps/SSAnne_B1F_Room3/scripts.inc +++ b/data/maps/SSAnne_B1F_Room3/scripts.inc @@ -1,7 +1,7 @@ SSAnne_B1F_Room3_MapScripts:: @ 8160D8E .byte 0 -SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F - trainerbattle_single TRAINER_SAILOR_DYLAN, Text_1742A6, Text_1742C3 - msgbox gUnknown_81742D2, MSGBOX_AUTOCLOSE +SSAnne_B1F_Room3_EventScript_Dylan:: @ 8160D8F + trainerbattle_single TRAINER_SAILOR_DYLAN, SSAnne_B1F_Room3_Text_DylanIntro, SSAnne_B1F_Room3_Text_DylanDefeat + msgbox SSAnne_B1F_Room3_Text_DylanPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room3/text.inc b/data/maps/SSAnne_B1F_Room3/text.inc index f74b96052..cec2b5ec6 100644 --- a/data/maps/SSAnne_B1F_Room3/text.inc +++ b/data/maps/SSAnne_B1F_Room3/text.inc @@ -1,11 +1,11 @@ -Text_1742A6:: @ 81742A6 +SSAnne_B1F_Room3_Text_DylanIntro:: @ 81742A6 .string "I like feisty kids like you!$" -Text_1742C3:: @ 81742C3 +SSAnne_B1F_Room3_Text_DylanDefeat:: @ 81742C3 .string "Argh!\n" .string "Lost it!$" -gUnknown_81742D2:: @ 81742D2 +SSAnne_B1F_Room3_Text_DylanPostBattle:: @ 81742D2 .string "Sea POKéMON live in deep water.\n" .string "You'll need a ROD to fish them up!$" diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index ff6030afb..8222e4dbc 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_B1F_Room4_EventScript_160DBE", + "script": "SSAnne_B1F_Room4_EventScript_Duncan", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SSAnne_B1F_Room4_EventScript_160DA7", + "script": "SSAnne_B1F_Room4_EventScript_Leonard", "flag": "0" } ], diff --git a/data/maps/SSAnne_B1F_Room4/scripts.inc b/data/maps/SSAnne_B1F_Room4/scripts.inc index c84b55b07..66b928b4c 100644 --- a/data/maps/SSAnne_B1F_Room4/scripts.inc +++ b/data/maps/SSAnne_B1F_Room4/scripts.inc @@ -1,12 +1,12 @@ SSAnne_B1F_Room4_MapScripts:: @ 8160DA6 .byte 0 -SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7 - trainerbattle_single TRAINER_SAILOR_LEONARD, Text_174315, Text_174348 - msgbox gUnknown_8174362, MSGBOX_AUTOCLOSE +SSAnne_B1F_Room4_EventScript_Leonard:: @ 8160DA7 + trainerbattle_single TRAINER_SAILOR_LEONARD, SSAnne_B1F_Room4_Text_LeonardIntro, SSAnne_B1F_Room4_Text_LeonardDefeat + msgbox SSAnne_B1F_Room4_Text_LeonardPostBattle, MSGBOX_AUTOCLOSE end -SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE - trainerbattle_single TRAINER_SAILOR_DUNCAN, Text_174385, Text_1743B3 - msgbox gUnknown_81743C8, MSGBOX_AUTOCLOSE +SSAnne_B1F_Room4_EventScript_Duncan:: @ 8160DBE + trainerbattle_single TRAINER_SAILOR_DUNCAN, SSAnne_B1F_Room4_Text_DuncanIntro, SSAnne_B1F_Room4_Text_DuncanDefeat + msgbox SSAnne_B1F_Room4_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room4/text.inc b/data/maps/SSAnne_B1F_Room4/text.inc index d2f19f49f..fa6d7eb2e 100644 --- a/data/maps/SSAnne_B1F_Room4/text.inc +++ b/data/maps/SSAnne_B1F_Room4/text.inc @@ -1,23 +1,23 @@ -Text_174315:: @ 8174315 +SSAnne_B1F_Room4_Text_LeonardIntro:: @ 8174315 .string "You know what they say about\n" .string "sailors and battling!$" -Text_174348:: @ 8174348 +SSAnne_B1F_Room4_Text_LeonardDefeat:: @ 8174348 .string "Right!\n" .string "Good battle, mate!$" -gUnknown_8174362:: @ 8174362 +SSAnne_B1F_Room4_Text_LeonardPostBattle:: @ 8174362 .string "Hahaha!\n" .string "Want to be a sailor, mate?$" -Text_174385:: @ 8174385 +SSAnne_B1F_Room4_Text_DuncanIntro:: @ 8174385 .string "Come on, then!\n" .string "My sailor's pride is at stake!$" -Text_1743B3:: @ 81743B3 +SSAnne_B1F_Room4_Text_DuncanDefeat:: @ 81743B3 .string "Your spirit sank me!$" -gUnknown_81743C8:: @ 81743C8 +SSAnne_B1F_Room4_Text_DuncanPostBattle:: @ 81743C8 .string "Did you see the FISHING GURU in\n" .string "VERMILION CITY?$" diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index 8896c897f..5ed5383ea 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_B1F_Room5_EventScript_160DD6", + "script": "SSAnne_B1F_Room5_EventScript_Boy", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_B1F_Room5_EventScript_160DDF", + "script": "SSAnne_B1F_Room5_EventScript_Machoke", "flag": "0" }, { diff --git a/data/maps/SSAnne_B1F_Room5/scripts.inc b/data/maps/SSAnne_B1F_Room5/scripts.inc index 37d26661b..320f233fd 100644 --- a/data/maps/SSAnne_B1F_Room5/scripts.inc +++ b/data/maps/SSAnne_B1F_Room5/scripts.inc @@ -1,16 +1,16 @@ SSAnne_B1F_Room5_MapScripts:: @ 8160DD5 .byte 0 -SSAnne_B1F_Room5_EventScript_160DD6:: @ 8160DD6 - msgbox gUnknown_81743F8, MSGBOX_NPC +SSAnne_B1F_Room5_EventScript_Boy:: @ 8160DD6 + msgbox SSAnne_B1F_Room5_Text_MachokeHasStrengthToMoveRocks, MSGBOX_NPC end -SSAnne_B1F_Room5_EventScript_160DDF:: @ 8160DDF +SSAnne_B1F_Room5_EventScript_Machoke:: @ 8160DDF lock faceplayer waitse playmoncry SPECIES_MACHOKE, 0 - msgbox gUnknown_8174444 + msgbox SSAnne_B1F_Room5_Text_Machoke waitmoncry release end diff --git a/data/maps/SSAnne_B1F_Room5/text.inc b/data/maps/SSAnne_B1F_Room5/text.inc index ac30dbe95..3126f97e3 100644 --- a/data/maps/SSAnne_B1F_Room5/text.inc +++ b/data/maps/SSAnne_B1F_Room5/text.inc @@ -1,8 +1,8 @@ -gUnknown_81743F8:: @ 81743F8 +SSAnne_B1F_Room5_Text_MachokeHasStrengthToMoveRocks:: @ 81743F8 .string "My buddy MACHOKE is super strong!\p" .string "He has enough STRENGTH to move\n" .string "big rocks!$" -gUnknown_8174444:: @ 8174444 +SSAnne_B1F_Room5_Text_Machoke:: @ 8174444 .string "MACHOKE: Gwoh! Goggoh!$" diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index 8ec955624..0f79b1014 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_CaptainsOffice_EventScript_160B3A", + "script": "SSAnne_CaptainsOffice_EventScript_Captain", "flag": "0" } ], @@ -43,21 +43,21 @@ "x": 2, "y": 4, "elevation": 0, - "script": "SSAnne_CaptainsOffice_EventScript_160BD2" + "script": "SSAnne_CaptainsOffice_EventScript_Book" }, { "type": "bg_event_type_0", "x": 5, "y": 3, "elevation": 0, - "script": "SSAnne_CaptainsOffice_EventScript_160BC9" + "script": "SSAnne_CaptainsOffice_EventScript_TrashCan" }, { "type": "bg_event_type_0", "x": 2, "y": 3, "elevation": 0, - "script": "SSAnne_CaptainsOffice_EventScript_160BD2" + "script": "SSAnne_CaptainsOffice_EventScript_Book" } ] } diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 7171cae6d..d5d976e21 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -1,12 +1,12 @@ SSAnne_CaptainsOffice_MapScripts:: @ 8160B39 .byte 0 -SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A +SSAnne_CaptainsOffice_EventScript_Captain:: @ 8160B3A lock - goto_if_set FLAG_GOT_HM01, EventScript_160BB5 - msgbox gUnknown_8173646 + goto_if_set FLAG_GOT_HM01, SSAnne_CaptainsOffice_EventScript_AlreadyGotCut + msgbox SSAnne_CaptainsOffice_Text_CaptainIFeelSeasick textcolor 3 - message Text_173676 + message SSAnne_CaptainsOffice_Text_RubbedCaptainsBack waitmessage playfanfare MUS_ME_ASA waitfanfare @@ -14,33 +14,34 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A delay 50 applymovement 1, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_81736A6 - giveitem_msg gUnknown_81737AF, ITEM_HM01, 1, MUS_FAN5 - msgbox gUnknown_81737D2 + msgbox SSAnne_CaptainsOffice_Text_ThankYouHaveHMForCut + giveitem_msg SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain, ITEM_HM01, 1, MUS_FAN5 + msgbox SSAnne_CaptainsOffice_Text_ExplainCut setflag FLAG_GOT_HM01 setvar VAR_MAP_SCENE_VERMILION_CITY, 1 release end -EventScript_160BA0:: @ 8160BA0 - msgbox gUnknown_81738C3 +@ Unused +SSAnne_CaptainsOffice_EventScript_NoRoomForCut:: @ 8160BA0 + msgbox SSAnne_CaptainsOffice_Text_YouHaveNoRoomForThis closemessage applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end -EventScript_160BB5:: @ 8160BB5 +SSAnne_CaptainsOffice_EventScript_AlreadyGotCut:: @ 8160BB5 applymovement 1, Movement_FacePlayer waitmovement 0 - msgbox gUnknown_8173831 + msgbox SSAnne_CaptainsOffice_Text_SSAnneWillSetSailSoon release end -SSAnne_CaptainsOffice_EventScript_160BC9:: @ 8160BC9 - msgbox gUnknown_81738E6, MSGBOX_SIGN +SSAnne_CaptainsOffice_EventScript_TrashCan:: @ 8160BC9 + msgbox SSAnne_CaptainsOffice_Text_YuckShouldntHaveLooked, MSGBOX_SIGN end -SSAnne_CaptainsOffice_EventScript_160BD2:: @ 8160BD2 - msgbox gUnknown_8173903, MSGBOX_SIGN +SSAnne_CaptainsOffice_EventScript_Book:: @ 8160BD2 + msgbox SSAnne_CaptainsOffice_Text_HowToConquerSeasickness, MSGBOX_SIGN end diff --git a/data/maps/SSAnne_CaptainsOffice/text.inc b/data/maps/SSAnne_CaptainsOffice/text.inc index eab68b9bd..f4860b998 100644 --- a/data/maps/SSAnne_CaptainsOffice/text.inc +++ b/data/maps/SSAnne_CaptainsOffice/text.inc @@ -1,15 +1,15 @@ -gUnknown_8173646:: @ 8173646 +SSAnne_CaptainsOffice_Text_CaptainIFeelSeasick:: @ 8173646 .string "CAPTAIN: Ooargh…\n" .string "I feel hideous…\l" .string "Urrp! Seasick…$" -Text_173676:: @ 8173676 +SSAnne_CaptainsOffice_Text_RubbedCaptainsBack:: @ 8173676 .string "{PLAYER} rubbed the CAPTAIN's\n" .string "back!\p" .string "Rub-rub…\n" .string "Rub-rub…$" -gUnknown_81736A6:: @ 81736A6 +SSAnne_CaptainsOffice_Text_ThankYouHaveHMForCut:: @ 81736A6 .string "CAPTAIN: Whew! Thank you!\n" .string "I'm feeling much better now.\p" .string "You want to see my hidden CUT\n" @@ -21,17 +21,17 @@ gUnknown_81736A6:: @ 81736A6 .string "Teach CUT to your POKéMON, and\n" .string "you can see it CUT anytime!$" -gUnknown_81737AF:: @ 81737AF +SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain:: @ 81737AF .string "{PLAYER} obtained HM01\n" .string "from the CAPTAIN!$" -gUnknown_81737D2:: @ 81737D2 +SSAnne_CaptainsOffice_Text_ExplainCut:: @ 81737D2 .string "Using CUT, you can chop down\n" .string "small trees.\p" .string "Why not try it with the trees\n" .string "around VERMILION CITY?$" -gUnknown_8173831:: @ 8173831 +SSAnne_CaptainsOffice_Text_SSAnneWillSetSailSoon:: @ 8173831 .string "CAPTAIN: …Whew!\p" .string "Now that I'm not sick anymore,\n" .string "I guess it's time.\p" @@ -39,15 +39,15 @@ gUnknown_8173831:: @ 8173831 .string "Farewell, until our return to\n" .string "VERMILION CITY!$" -gUnknown_81738C3:: @ 81738C3 +SSAnne_CaptainsOffice_Text_YouHaveNoRoomForThis:: @ 81738C3 .string "Oh, no!\n" .string "You have no room for this!$" -gUnknown_81738E6:: @ 81738E6 +SSAnne_CaptainsOffice_Text_YuckShouldntHaveLooked:: @ 81738E6 .string "Yuck!\n" .string "Shouldn't have looked!$" -gUnknown_8173903:: @ 8173903 +SSAnne_CaptainsOffice_Text_HowToConquerSeasickness:: @ 8173903 .string "How to Conquer Seasickness…\n" .string "The CAPTAIN's reading this!$" diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index 43fcf5c4d..617a770b3 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SSAnne_Deck_EventScript_160A9B", + "script": "SSAnne_Deck_EventScript_Trevor", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Deck_EventScript_160A72", + "script": "SSAnne_Deck_EventScript_BaldingMan", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Deck_EventScript_160A7B", + "script": "SSAnne_Deck_EventScript_Sailor", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SSAnne_Deck_EventScript_160A84", + "script": "SSAnne_Deck_EventScript_Edmond", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Deck_EventScript_160A69", + "script": "SSAnne_Deck_EventScript_Youngster", "flag": "0" } ], diff --git a/data/maps/SSAnne_Deck/scripts.inc b/data/maps/SSAnne_Deck/scripts.inc index d61b65d87..feee8040c 100644 --- a/data/maps/SSAnne_Deck/scripts.inc +++ b/data/maps/SSAnne_Deck/scripts.inc @@ -1,24 +1,24 @@ SSAnne_Deck_MapScripts:: @ 8160A68 .byte 0 -SSAnne_Deck_EventScript_160A69:: @ 8160A69 - msgbox gUnknown_817326F, MSGBOX_NPC +SSAnne_Deck_EventScript_Youngster:: @ 8160A69 + msgbox SSAnne_Deck_Text_ShipDepartingSoon, MSGBOX_NPC end -SSAnne_Deck_EventScript_160A72:: @ 8160A72 - msgbox gUnknown_81732C6, MSGBOX_NPC +SSAnne_Deck_EventScript_BaldingMan:: @ 8160A72 + msgbox SSAnne_Deck_Text_FeelSeasick, MSGBOX_NPC end -SSAnne_Deck_EventScript_160A7B:: @ 8160A7B - msgbox gUnknown_81732A2, MSGBOX_NPC +SSAnne_Deck_EventScript_Sailor:: @ 8160A7B + msgbox SSAnne_Deck_Text_ScrubbingDecksHardWork, MSGBOX_NPC end -SSAnne_Deck_EventScript_160A84:: @ 8160A84 - trainerbattle_single TRAINER_SAILOR_EDMOND, Text_173308, Text_17332B - msgbox gUnknown_817333E, MSGBOX_AUTOCLOSE +SSAnne_Deck_EventScript_Edmond:: @ 8160A84 + trainerbattle_single TRAINER_SAILOR_EDMOND, SSAnne_Deck_Text_EdmondIntro, SSAnne_Deck_Text_EdmondDefeat + msgbox SSAnne_Deck_Text_EdmondPostBattle, MSGBOX_AUTOCLOSE end -SSAnne_Deck_EventScript_160A9B:: @ 8160A9B - trainerbattle_single TRAINER_SAILOR_TREVOR, Text_173382, Text_1733A0 - msgbox gUnknown_81733B5, MSGBOX_AUTOCLOSE +SSAnne_Deck_EventScript_Trevor:: @ 8160A9B + trainerbattle_single TRAINER_SAILOR_TREVOR, SSAnne_Deck_Text_TrevorIntro, SSAnne_Deck_Text_TrevorDefeat + msgbox SSAnne_Deck_Text_TrevorPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_Deck/text.inc b/data/maps/SSAnne_Deck/text.inc index 08be9fc7d..73c4f42e5 100644 --- a/data/maps/SSAnne_Deck/text.inc +++ b/data/maps/SSAnne_Deck/text.inc @@ -1,35 +1,35 @@ -gUnknown_817326F:: @ 817326F +SSAnne_Deck_Text_ShipDepartingSoon:: @ 817326F .string "The party's over.\n" .string "The ship will be departing soon.$" -gUnknown_81732A2:: @ 81732A2 +SSAnne_Deck_Text_ScrubbingDecksHardWork:: @ 81732A2 .string "Whew!\n" .string "Scrubbing decks is hard work!$" -gUnknown_81732C6:: @ 81732C6 +SSAnne_Deck_Text_FeelSeasick:: @ 81732C6 .string "Urf… I feel ill…\p" .string "I got seasick, so I stepped out to\n" .string "get some air…$" -Text_173308:: @ 8173308 +SSAnne_Deck_Text_EdmondIntro:: @ 8173308 .string "Hey, matey!\p" .string "Let's do a little jig!$" -Text_17332B:: @ 817332B +SSAnne_Deck_Text_EdmondDefeat:: @ 817332B .string "You're impressive!$" -gUnknown_817333E:: @ 817333E +SSAnne_Deck_Text_EdmondPostBattle:: @ 817333E .string "How many kinds of POKéMON do you\n" .string "think there are in this big world?$" -Text_173382:: @ 8173382 +SSAnne_Deck_Text_TrevorIntro:: @ 8173382 .string "Ahoy, there!\n" .string "Are you seasick?$" -Text_1733A0:: @ 81733A0 +SSAnne_Deck_Text_TrevorDefeat:: @ 81733A0 .string "I was just careless!$" -gUnknown_81733B5:: @ 81733B5 +SSAnne_Deck_Text_TrevorPostBattle:: @ 81733B5 .string "My pa said there are 100 kinds of\n" .string "POKéMON. I think there are more.$" diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index a8ad24173..416c98cd6 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -8,22 +8,22 @@ SSAnne_Exterior_OnTransition:: @ 816084B end SSAnne_Exterior_OnFrame:: @ 816084F - map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 1, SSAnne_Exterior_160859 + map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 1, SSAnne_Exterior_ExitSSAnne .2byte 0 -SSAnne_Exterior_160859:: @ 8160859 +SSAnne_Exterior_ExitSSAnne:: @ 8160859 lockall getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8005, 6 - call_if_le EventScript_1608A1 + call_if_le SSAnne_Exterior_WalkDown compare VAR_0x8005, 7 - call_if_ge EventScript_1608AC + call_if_ge SSAnne_Exterior_WalkInPlaceDown fadenewbgm MUS_NAMINORI delay 50 special Special_SSAnneDepartureCutscene waitstate removeobject 1 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1608B7 + applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_Exit waitmovement 0 setvar VAR_MAP_SCENE_VERMILION_CITY, 2 setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0 @@ -32,17 +32,17 @@ SSAnne_Exterior_160859:: @ 8160859 releaseall end -EventScript_1608A1:: @ 81608A1 - applymovement OBJ_EVENT_ID_PLAYER, Movement_1608C1 +SSAnne_Exterior_WalkDown:: @ 81608A1 + applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_WalkDown waitmovement 0 return -EventScript_1608AC:: @ 81608AC +SSAnne_Exterior_WalkInPlaceDown:: @ 81608AC applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -Movement_1608B7:: @ 81608B7 +SSAnne_Exterior_Movement_Exit:: @ 81608B7 walk_up walk_up walk_up @@ -54,7 +54,7 @@ Movement_1608B7:: @ 81608B7 walk_up step_end -Movement_1608C1:: @ 81608C1 +SSAnne_Exterior_Movement_WalkDown:: @ 81608C1 walk_down walk_down walk_down diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 25cc15fad..579f9e9b0 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Kitchen_EventScript_160AB3", + "script": "SSAnne_Kitchen_EventScript_Chef1", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Kitchen_EventScript_160ABC", + "script": "SSAnne_Kitchen_EventScript_Chef2", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Kitchen_EventScript_160AC5", + "script": "SSAnne_Kitchen_EventScript_Chef3", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Kitchen_EventScript_160ACE", + "script": "SSAnne_Kitchen_EventScript_Chef4", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Kitchen_EventScript_160B1E", + "script": "SSAnne_Kitchen_EventScript_Chef5", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Kitchen_EventScript_160B27", + "script": "SSAnne_Kitchen_EventScript_Chef6", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_Kitchen_EventScript_160B30", + "script": "SSAnne_Kitchen_EventScript_Chef7", "flag": "0" }, { diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index 565efd607..2f3d0ee06 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -1,53 +1,53 @@ SSAnne_Kitchen_MapScripts:: @ 8160AB2 .byte 0 -SSAnne_Kitchen_EventScript_160AB3:: @ 8160AB3 - msgbox gUnknown_81733F8, MSGBOX_NPC +SSAnne_Kitchen_EventScript_Chef1:: @ 8160AB3 + msgbox SSAnne_Kitchen_Text_BusyOutOfTheWay, MSGBOX_NPC end -SSAnne_Kitchen_EventScript_160ABC:: @ 8160ABC - msgbox gUnknown_8173429, MSGBOX_NPC +SSAnne_Kitchen_EventScript_Chef2:: @ 8160ABC + msgbox SSAnne_Kitchen_Text_SawOddBerryInTrash, MSGBOX_NPC end -SSAnne_Kitchen_EventScript_160AC5:: @ 8160AC5 - msgbox gUnknown_8173462, MSGBOX_NPC +SSAnne_Kitchen_EventScript_Chef3:: @ 8160AC5 + msgbox SSAnne_Kitchen_Text_SoBusyImDizzy, MSGBOX_NPC end -SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE +SSAnne_Kitchen_EventScript_Chef4:: @ 8160ACE lock faceplayer - msgbox gUnknown_8173570 + msgbox SSAnne_Kitchen_Text_IAmLeChefMainCourseIs random 3 copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 0 - call_if_eq EventScript_160B03 + call_if_eq SSAnne_Kitchen_EventScript_SalmonDuSalad compare VAR_0x8008, 1 - call_if_eq EventScript_160B0C + call_if_eq SSAnne_Kitchen_EventScript_EelsAuBarbecue compare VAR_0x8008, 2 - call_if_eq EventScript_160B15 + call_if_eq SSAnne_Kitchen_EventScript_PrimeBeefsteak release end -EventScript_160B03:: @ 8160B03 - msgbox gUnknown_817359F +SSAnne_Kitchen_EventScript_SalmonDuSalad:: @ 8160B03 + msgbox SSAnne_Kitchen_Text_SalmonDuSalad return -EventScript_160B0C:: @ 8160B0C - msgbox gUnknown_81735DF +SSAnne_Kitchen_EventScript_EelsAuBarbecue:: @ 8160B0C + msgbox SSAnne_Kitchen_Text_EelsAuBarbecue return -EventScript_160B15:: @ 8160B15 - msgbox gUnknown_8173611 +SSAnne_Kitchen_EventScript_PrimeBeefsteak:: @ 8160B15 + msgbox SSAnne_Kitchen_Text_PrimeBeefsteak return -SSAnne_Kitchen_EventScript_160B1E:: @ 8160B1E - msgbox gUnknown_81734A0, MSGBOX_NPC +SSAnne_Kitchen_EventScript_Chef5:: @ 8160B1E + msgbox SSAnne_Kitchen_Text_PeelSpudsEveryDay, MSGBOX_NPC end -SSAnne_Kitchen_EventScript_160B27:: @ 8160B27 - msgbox gUnknown_81734D3, MSGBOX_NPC +SSAnne_Kitchen_EventScript_Chef6:: @ 8160B27 + msgbox SSAnne_Kitchen_Text_HearAboutSnorlaxItsAGlutton, MSGBOX_NPC end -SSAnne_Kitchen_EventScript_160B30:: @ 8160B30 - msgbox gUnknown_817353E, MSGBOX_NPC +SSAnne_Kitchen_EventScript_Chef7:: @ 8160B30 + msgbox SSAnne_Kitchen_Text_OnlyGetToPeelOnions, MSGBOX_NPC end diff --git a/data/maps/SSAnne_Kitchen/text.inc b/data/maps/SSAnne_Kitchen/text.inc index edd115076..24146ac8a 100644 --- a/data/maps/SSAnne_Kitchen/text.inc +++ b/data/maps/SSAnne_Kitchen/text.inc @@ -1,47 +1,47 @@ -gUnknown_81733F8:: @ 81733F8 +SSAnne_Kitchen_Text_BusyOutOfTheWay:: @ 81733F8 .string "You, mon petit!\n" .string "We're busy here!\l" .string "Out of the way!$" -gUnknown_8173429:: @ 8173429 +SSAnne_Kitchen_Text_SawOddBerryInTrash:: @ 8173429 .string "I saw an odd BERRY in the trash.\n" .string "I wonder what that was?$" -gUnknown_8173462:: @ 8173462 +SSAnne_Kitchen_Text_SoBusyImDizzy:: @ 8173462 .string "I'm so busy I'm getting dizzy!\n" .string "You have to give me room here!$" -gUnknown_81734A0:: @ 81734A0 +SSAnne_Kitchen_Text_PeelSpudsEveryDay:: @ 81734A0 .string "Hum-de-hum-de-ho…\p" .string "I peel spuds every day!\n" .string "Hum-hum…$" -gUnknown_81734D3:: @ 81734D3 +SSAnne_Kitchen_Text_HearAboutSnorlaxItsAGlutton:: @ 81734D3 .string "Did you hear about SNORLAX?\n" .string "It's a glutton.\p" .string "No other POKéMON eats and sleeps\n" .string "the way SNORLAX can and does!$" -gUnknown_817353E:: @ 817353E +SSAnne_Kitchen_Text_OnlyGetToPeelOnions:: @ 817353E .string "Snivel… Sniff…\p" .string "I only get to peel onions…\n" .string "Snivel…$" -gUnknown_8173570:: @ 8173570 +SSAnne_Kitchen_Text_IAmLeChefMainCourseIs:: @ 8173570 .string "Er-hem!\n" .string "Indeed I am le CHEF!\p" .string "Le main course is$" -gUnknown_817359F:: @ 817359F +SSAnne_Kitchen_Text_SalmonDuSalad:: @ 817359F .string "Salmon du Salad!\p" .string "Les guests may gripe it's fish\n" .string "again, however!$" -gUnknown_81735DF:: @ 81735DF +SSAnne_Kitchen_Text_EelsAuBarbecue:: @ 81735DF .string "Eels au Barbecue!\p" .string "Les guests will mutiny, I fear.$" -gUnknown_8173611:: @ 8173611 +SSAnne_Kitchen_Text_PrimeBeefsteak:: @ 8173611 .string "Prime Beefsteak!\p" .string "But, have I enough fillets du\n" .string "beef?$" |