From 1ae38be0a46d1d901a2d9e5bb22938a0cecf6b7f Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 15:19:55 -0500 Subject: do some renaming and reorganizing --- data/scripts/mauville_man.inc | 350 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 350 insertions(+) create mode 100644 data/scripts/mauville_man.inc (limited to 'data/scripts/mauville_man.inc') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc new file mode 100644 index 000000000..f406d33fe --- /dev/null +++ b/data/scripts/mauville_man.inc @@ -0,0 +1,350 @@ +@ From mauville_old_man.h +@ TODO: Put these in a header + +MAUVILLE_MAN_BARD = 0 +MAUVILLE_MAN_HIPSTER = 1 +MAUVILLE_MAN_TRADER = 2 +MAUVILLE_MAN_STORYTELLER = 3 +MAUVILLE_MAN_GIDDY = 4 + +MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744 + special ScrSpecial_GetCurrentMauvilleMan + switch RESULT + case MAUVILLE_MAN_BARD, speak_to_bard + case MAUVILLE_MAN_HIPSTER, speak_to_hipster + case MAUVILLE_MAN_TRADER, speak_to_trader + case MAUVILLE_MAN_STORYTELLER, speak_to_storyteller + case MAUVILLE_MAN_GIDDY, MauvilleCity_PokemonCenter_1F_EventScript_1B09EB + end + +@------------------------------------------------------------------------------- +@ Bard +@------------------------------------------------------------------------------- + +speak_to_bard: + lock + faceplayer + msgbox gTextBard_HiImTheBard, MSGBOX_YESNO + compare RESULT, YES + jumpeq yes_hear_song + compare RESULT, NO + jumpeq dont_hear_song + end +yes_hear_song: + setvar 0x8004, 0 + special ScrSpecial_PlayBardSong + pause 60 + special ScrSpecial_HasBardSongBeenChanged + compare RESULT, FALSE + jumpeq prompt_write_lyrics @ Prompt new lyrics only if song hasn't been changed + msgbox gTextBard_OhWhatAMovingSong, 4 + release + end +dont_hear_song: + msgbox gTextBard_OhYouveLeftMe, 4 + release + end +prompt_write_lyrics: + msgbox gTextBard_SoHowDoYouLikeMySong, MSGBOX_YESNO + compare RESULT, YES + jumpeq write_lyrics + compare RESULT, NO + jumpeq dont_write_lyrics + end +write_lyrics: + setvar 0x8004, 6 + call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3 + lock + faceplayer + compare RESULT, NO + jumpeq dont_write_lyrics + msgbox gTextBard_ThankYouKindly, 4 + setvar 0x8004, 1 + special ScrSpecial_PlayBardSong + pause 60 + msgbox gTextBard_WasThatHowYouWanted, MSGBOX_YESNO + compare RESULT, NO + jumpeq write_lyrics @ Keep looping until player responds YES + special ScrSpecial_SaveBardSongLyrics + msgbox gTextBard_OkayThatsIt, 4 + release + end +dont_write_lyrics: + msgbox gTextBard_OhYouveLeftMe2, 4 + release + end + +@------------------------------------------------------------------------------- +@ Hipster +@------------------------------------------------------------------------------- + +speak_to_hipster:: @ 81AE845 + lock + faceplayer + setflag 2054 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C5B, 4 + special sub_80F7C70 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE86A + msgbox MauvilleCity_PokemonCenter_1F_Text_1B0CA7, 4 + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AE86A:: @ 81AE86A + special sub_80F7C90 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE882 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D11, 4 + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AE882:: @ 81AE882 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D75, 4 + special ScrSpecial_SetHipsterSpokenFlag + release + end + +@------------------------------------------------------------------------------- +@ Trader +@------------------------------------------------------------------------------- + + .include "data/text/trader.inc" + +speak_to_trader:: @ 81AEBAB + lock + faceplayer + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE88F, 5 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA + special sub_8109C44 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3 + message MauvilleCity_PokemonCenter_1F_Text_1AE910 + waittext + jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA:: @ 81AEBDA + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8C6, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3:: @ 81AEBE3 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8DF, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC:: @ 81AEBEC + special sub_8109E34 + waitstate + compare 0x8004, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D + compare 0x8004, 65535 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC36 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE97C, 5 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC42 + special sub_8109C58 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E + jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D:: @ 81AEC2D + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE950, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEC36:: @ 81AEC36 + message MauvilleCity_PokemonCenter_1F_Text_1AEB31 + waittext + jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEC42:: @ 81AEC42 + message MauvilleCity_PokemonCenter_1F_Text_1AE910 + waittext + jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E:: @ 81AEC4E + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9B6, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEC57:: @ 81AEC57 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9F8, 4 + special sub_8109CF0 + waitstate + compare 0x8006, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECA6 + compare 0x8006, 65535 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECAF + special sub_8109C90 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECBD + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA9B, 5 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 + special sub_8109DE0 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAFB, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AECA6:: @ 81AECA6 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA2B, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AECAF:: @ 81AECAF + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAC3, 4 + jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AECBD:: @ 81AECBD + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA57, 2 + end + +@------------------------------------------------------------------------------- +@ Storyteller +@------------------------------------------------------------------------------- + + .include "data/text/storyteller.inc" + +speak_to_storyteller:: @ 81B0816 + setvar 0x8008, 0 + setvar 0x8009, 0 + setvar 0x800a, 0 + setvar 0x800b, 0 + lock + faceplayer + msgbox MauvilleCity_PokemonCenter_1F_Text_1AECC6, 5 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + specialval RESULT, sub_80F889C + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B08D3 + +MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F + message MauvilleCity_PokemonCenter_1F_Text_1AED35 + waittext + special sub_80F8874 + waitstate + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0883 + setvar 0x8008, 1 + special sub_80F8888 + waittext + waitbutton + specialval RESULT, sub_80F88AC + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0893 + jump MauvilleCity_PokemonCenter_1F_EventScript_1B0909 + +MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883 + compare 0x8008, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + jump MauvilleCity_PokemonCenter_1F_EventScript_1B08AE + +MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEE50, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, 5 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F + +MauvilleCity_PokemonCenter_1F_EventScript_1B08AE:: @ 81B08AE + specialval RESULT, sub_80F88E0 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F + specialval RESULT, sub_80F889C + compare RESULT, 4 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F + jump MauvilleCity_PokemonCenter_1F_EventScript_1B08DB + +MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AED70, 4 + +MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, 5 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + specialval RESULT, sub_80F88FC + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0909 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF49, 4 + closebutton + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0909:: @ 81B0909 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEDE8, 4 + closebutton + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0914:: @ 81B0914 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AED1D, 4 + closebutton + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEFA5, 4 + closebutton + release + end + +@------------------------------------------------------------------------------- +@ Giddy +@------------------------------------------------------------------------------- + + .include "data/text/giddy.inc" + +MauvilleCity_PokemonCenter_1F_EventScript_1B09EB:: @ 81B09EB + lock + faceplayer + msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, 5 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C:: @ 81B0A0C + special sub_80F7CC8 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A26:: @ 81B0A26 + special sub_80F7CC8 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A40 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A40:: @ 81B0A40 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B0998, 4 + jump MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E:: @ 81B0A4E + special ScrSpecial_GenerateGiddyLine + special ShowFieldMessageStringVar4 + waittext + yesnobox 20, 8 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F:: @ 81B0A6F + msgbox MauvilleCity_PokemonCenter_1F_Text_1B097C, 4 + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A79:: @ 81B0A79 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B09B0, 4 + release + end + + .include "data/text/bard.inc" + .include "data/text/hipster.inc" \ No newline at end of file -- cgit v1.2.3 From 1b715eb7ba38ff408acf5e5e0a9ea88642f912bb Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 16:52:49 -0500 Subject: more Mauville man labeling --- data/scripts/mauville_man.inc | 160 ++++++++++++++++++++---------------------- 1 file changed, 75 insertions(+), 85 deletions(-) (limited to 'data/scripts/mauville_man.inc') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index f406d33fe..780017442 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -32,11 +32,13 @@ speak_to_bard: end yes_hear_song: setvar 0x8004, 0 + @ Give the player ear rape special ScrSpecial_PlayBardSong pause 60 special ScrSpecial_HasBardSongBeenChanged compare RESULT, FALSE - jumpeq prompt_write_lyrics @ Prompt new lyrics only if song hasn't been changed + @ Prompt new lyrics only if song hasn't been changed + jumpeq prompt_write_lyrics msgbox gTextBard_OhWhatAMovingSong, 4 release end @@ -60,6 +62,7 @@ write_lyrics: jumpeq dont_write_lyrics msgbox gTextBard_ThankYouKindly, 4 setvar 0x8004, 1 + @ Give the player ear rape again special ScrSpecial_PlayBardSong pause 60 msgbox gTextBard_WasThatHowYouWanted, MSGBOX_YESNO @@ -78,28 +81,26 @@ dont_write_lyrics: @ Hipster @------------------------------------------------------------------------------- -speak_to_hipster:: @ 81AE845 +speak_to_hipster: lock faceplayer setflag 2054 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C5B, 4 - special sub_80F7C70 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE86A - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0CA7, 4 + msgbox gTextHipster_TheyCallMeTheHipster, 4 + special ScrSpecial_GetHipsterSpokenFlag + compare RESULT, FALSE + jumpeq hipster_first_time + msgbox gTextHipster_TaughtYouAlready, 4 release end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE86A:: @ 81AE86A - special sub_80F7C90 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE882 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D11, 4 +hipster_first_time: + special ScrSpecial_HipsterTeachWord + compare RESULT, TRUE @ TRUE if player learned a new word + jumpeq teach_new_word + msgbox gTextHipster_YouAlreadyKnowALot, 4 release end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE882:: @ 81AE882 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D75, 4 +teach_new_word: + msgbox gTextHipster_HaveYouHeardAbout, 4 special ScrSpecial_SetHipsterSpokenFlag release end @@ -110,93 +111,82 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE882:: @ 81AE882 .include "data/text/trader.inc" -speak_to_trader:: @ 81AEBAB +speak_to_trader: lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE88F, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA - special sub_8109C44 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3 - message MauvilleCity_PokemonCenter_1F_Text_1AE910 + msgbox gTextTrader_Introduction, MSGBOX_YESNO + compare RESULT, NO + jumpeq dont_want_to_trade + special ScrSpecial_GetTraderTradedFlag + compare RESULT, TRUE + jumpeq already_traded + message gTextTrader_MenuPrompt waittext - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + jump do_trader_menu_get end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA:: @ 81AEBDA - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8C6, 2 +dont_want_to_trade: + msgbox gTextTrader_FeelUnwanted1, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3:: @ 81AEBE3 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8DF, 2 +already_traded: + msgbox gTextTrader_TradedAlready, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC:: @ 81AEBEC - special sub_8109E34 +do_trader_menu_get: + special ScrSpecial_TraderMenuGetDecoration waitstate compare 0x8004, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D + jumpeq cancelled_get_menu compare 0x8004, 65535 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC36 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE97C, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC42 - special sub_8109C58 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 + jumpeq rare_item_cant_trade_away + msgbox gTextTrader_ItemOnceBelongedTo, MSGBOX_YESNO + compare RESULT, NO + jumpeq dont_want_item + special ScrSpecial_DoesPlayerHaveNoDecorations + compare RESULT, TRUE + jumpeq player_has_no_decorations + jump do_trader_menu_give end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D:: @ 81AEC2D - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE950, 2 +cancelled_get_menu:: @ 81AEC2D + msgbox gTextTrader_DontWantAnything, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC36:: @ 81AEC36 - message MauvilleCity_PokemonCenter_1F_Text_1AEB31 +rare_item_cant_trade_away:: @ 81AEC36 + message gTextTrader_ICantTradeThatOneAway waittext - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + jump do_trader_menu_get end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC42:: @ 81AEC42 - message MauvilleCity_PokemonCenter_1F_Text_1AE910 +dont_want_item: + message gTextTrader_MenuPrompt waittext - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + jump do_trader_menu_get end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E:: @ 81AEC4E - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9B6, 2 +player_has_no_decorations:: @ 81AEC4E + msgbox gTextTrader_YouDontHaveDecorations, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC57:: @ 81AEC57 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9F8, 4 - special sub_8109CF0 +do_trader_menu_give:: @ 81AEC57 + msgbox gTextTrader_PickDecorationYoullTrade, 4 + special ScrSpecial_TraderMenuGiveDecoration waitstate compare 0x8006, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECA6 + jumpeq cancelled_give_menu compare 0x8006, 65535 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECAF - special sub_8109C90 + jumpeq decoration_is_in_use + special ScrSpecial_IsDecorationFull compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECBD - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA9B, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 - special sub_8109DE0 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAFB, 2 + jumpeq decorations_full + msgbox gTextTrader_SoWellTrade, MSGBOX_YESNO + compare RESULT, NO + jumpeq do_trader_menu_give + special ScrSpecial_TraderDoDecorationTrade + msgbox gTextTrader_ThenWellTrade, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AECA6:: @ 81AECA6 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA2B, 2 +cancelled_give_menu:: @ 81AECA6 + msgbox gTextTrader_FeelUnwanted2, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AECAF:: @ 81AECAF - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAC3, 4 - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 +decoration_is_in_use:: @ 81AECAF + msgbox gTextTrader_InUseYouCantTradeIt, 4 + jump do_trader_menu_give end - -MauvilleCity_PokemonCenter_1F_EventScript_1AECBD:: @ 81AECBD - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA57, 2 +decorations_full:: @ 81AECBD + msgbox gTextTrader_NoRoomForThis, 2 end @------------------------------------------------------------------------------- @@ -212,8 +202,8 @@ speak_to_storyteller:: @ 81B0816 setvar 0x800b, 0 lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1AECC6, 5 - compare RESULT, 0 + msgbox gTextStoryteller_Introduction, MSGBOX_YESNO + compare RESULT, NO jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 specialval RESULT, sub_80F889C compare RESULT, 0 @@ -242,7 +232,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883 MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893 msgbox MauvilleCity_PokemonCenter_1F_Text_1AEE50, 4 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, MSGBOX_YESNO compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F @@ -259,7 +249,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3 msgbox MauvilleCity_PokemonCenter_1F_Text_1AED70, 4 MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, MSGBOX_YESNO compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 specialval RESULT, sub_80F88FC @@ -297,7 +287,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F MauvilleCity_PokemonCenter_1F_EventScript_1B09EB:: @ 81B09EB lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, MSGBOX_YESNO compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C compare RESULT, 0 -- cgit v1.2.3 From 19e06e09c9579c8230c66d6d0d267c5b722637e5 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 19:37:36 -0500 Subject: actually fix build --- data/scripts/mauville_man.inc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'data/scripts/mauville_man.inc') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 780017442..6a8f5f051 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -204,13 +204,13 @@ speak_to_storyteller:: @ 81B0816 faceplayer msgbox gTextStoryteller_Introduction, MSGBOX_YESNO compare RESULT, NO - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + jumpeq dont_hear_tale specialval RESULT, sub_80F889C compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B08D3 MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F - message MauvilleCity_PokemonCenter_1F_Text_1AED35 + message gTextStoryteller_WhichTale waittext special sub_80F8874 waitstate @@ -227,12 +227,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883 compare 0x8008, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + jumpeq dont_hear_tale jump MauvilleCity_PokemonCenter_1F_EventScript_1B08AE MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEE50, 4 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, MSGBOX_YESNO + msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4 + msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F @@ -246,34 +246,34 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B08AE:: @ 81B08AE jump MauvilleCity_PokemonCenter_1F_EventScript_1B08DB MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AED70, 4 + msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4 MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, MSGBOX_YESNO + msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + jumpeq dont_hear_tale specialval RESULT, sub_80F88FC compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0909 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF49, 4 + msgbox gTextStoryteller_ImNotSatisfied, 4 closebutton release end MauvilleCity_PokemonCenter_1F_EventScript_1B0909:: @ 81B0909 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEDE8, 4 + msgbox gTextStoryteller_BirthOfANewLegend, 4 closebutton release end -MauvilleCity_PokemonCenter_1F_EventScript_1B0914:: @ 81B0914 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AED1D, 4 +dont_hear_tale:: @ 81B0914 + msgbox gTextStoryteller_OhIFeelStifled, 4 closebutton release end MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEFA5, 4 + msgbox gTextStoryteller_WishMorePeopleWould, 4 closebutton release end -- cgit v1.2.3 From 8c57ef0fad270bc795d0b64a75d96fafc0f63513 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 20:50:39 -0500 Subject: finish labeling script --- data/scripts/mauville_man.inc | 161 +++++++++++++++++++----------------------- 1 file changed, 73 insertions(+), 88 deletions(-) (limited to 'data/scripts/mauville_man.inc') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 6a8f5f051..239c360dc 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -14,7 +14,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744 case MAUVILLE_MAN_HIPSTER, speak_to_hipster case MAUVILLE_MAN_TRADER, speak_to_trader case MAUVILLE_MAN_STORYTELLER, speak_to_storyteller - case MAUVILLE_MAN_GIDDY, MauvilleCity_PokemonCenter_1F_EventScript_1B09EB + case MAUVILLE_MAN_GIDDY, speak_to_giddy end @------------------------------------------------------------------------------- @@ -145,10 +145,10 @@ do_trader_menu_get: jumpeq player_has_no_decorations jump do_trader_menu_give end -cancelled_get_menu:: @ 81AEC2D +cancelled_get_menu: msgbox gTextTrader_DontWantAnything, 2 end -rare_item_cant_trade_away:: @ 81AEC36 +rare_item_cant_trade_away: message gTextTrader_ICantTradeThatOneAway waittext jump do_trader_menu_get @@ -158,10 +158,10 @@ dont_want_item: waittext jump do_trader_menu_get end -player_has_no_decorations:: @ 81AEC4E +player_has_no_decorations: msgbox gTextTrader_YouDontHaveDecorations, 2 end -do_trader_menu_give:: @ 81AEC57 +do_trader_menu_give: msgbox gTextTrader_PickDecorationYoullTrade, 4 special ScrSpecial_TraderMenuGiveDecoration waitstate @@ -178,14 +178,14 @@ do_trader_menu_give:: @ 81AEC57 special ScrSpecial_TraderDoDecorationTrade msgbox gTextTrader_ThenWellTrade, 2 end -cancelled_give_menu:: @ 81AECA6 +cancelled_give_menu: msgbox gTextTrader_FeelUnwanted2, 2 end -decoration_is_in_use:: @ 81AECAF +decoration_is_in_use: msgbox gTextTrader_InUseYouCantTradeIt, 4 jump do_trader_menu_give end -decorations_full:: @ 81AECBD +decorations_full: msgbox gTextTrader_NoRoomForThis, 2 end @@ -195,7 +195,7 @@ decorations_full:: @ 81AECBD .include "data/text/storyteller.inc" -speak_to_storyteller:: @ 81B0816 +speak_to_storyteller: setvar 0x8008, 0 setvar 0x8009, 0 setvar 0x800a, 0 @@ -204,75 +204,66 @@ speak_to_storyteller:: @ 81B0816 faceplayer msgbox gTextStoryteller_Introduction, MSGBOX_YESNO compare RESULT, NO - jumpeq dont_hear_tale - specialval RESULT, sub_80F889C - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B08D3 - -MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F + jumpeq dont_hear_story + specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot + compare RESULT, 0 @ If slot is 0, then the list is empty + jumpeq no_stories_recorded +choose_story: message gTextStoryteller_WhichTale waittext - special sub_80F8874 + special ScrSpecial_StorytellerStoryListMenu waitstate - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0883 + compare RESULT, FALSE + jumpeq cancel_story_menu setvar 0x8008, 1 - special sub_80F8888 + special ScrSpecial_StorytellerDisplayStory waittext waitbutton - specialval RESULT, sub_80F88AC - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0893 - jump MauvilleCity_PokemonCenter_1F_EventScript_1B0909 - -MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883 + specialval RESULT, ScrSpecial_StorytellerUpdateStat + compare RESULT, FALSE + jumpeq no_stat_update + jump stat_update +cancel_story_menu: compare 0x8008, 0 - jumpeq dont_hear_tale - jump MauvilleCity_PokemonCenter_1F_EventScript_1B08AE - -MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893 + jumpeq dont_hear_story + jump yes_hear_story +no_stat_update: msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4 msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F - -MauvilleCity_PokemonCenter_1F_EventScript_1B08AE:: @ 81B08AE - specialval RESULT, sub_80F88E0 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F - specialval RESULT, sub_80F889C + compare RESULT, YES + jumpeq choose_story +yes_hear_story: + specialval RESULT, ScrSpecial_HasStorytellerAlreadyRecorded + compare RESULT, TRUE + jumpeq cant_record_story @ already recorded story + specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot compare RESULT, 4 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F - jump MauvilleCity_PokemonCenter_1F_EventScript_1B08DB - -MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3 + jumpeq cant_record_story @ story list is full + jump prompt_record_story +no_stories_recorded: msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4 - -MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB +prompt_record_story: msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO - compare RESULT, 0 - jumpeq dont_hear_tale - specialval RESULT, sub_80F88FC - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0909 + compare RESULT, NO + jumpeq dont_hear_story + specialval RESULT, ScrSpecial_StorytellerInitializeRandomStat + compare RESULT, TRUE + jumpeq stat_update msgbox gTextStoryteller_ImNotSatisfied, 4 closebutton release end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0909:: @ 81B0909 +stat_update: msgbox gTextStoryteller_BirthOfANewLegend, 4 closebutton release end - -dont_hear_tale:: @ 81B0914 +dont_hear_story: msgbox gTextStoryteller_OhIFeelStifled, 4 closebutton release end - -MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F +cant_record_story: msgbox gTextStoryteller_WishMorePeopleWould, 4 closebutton release @@ -284,55 +275,49 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F .include "data/text/giddy.inc" -MauvilleCity_PokemonCenter_1F_EventScript_1B09EB:: @ 81B09EB +speak_to_giddy: lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, MSGBOX_YESNO - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F + msgbox gTextGiddy_Introduction, MSGBOX_YESNO + compare RESULT, YES + jumpeq yes_hear_giddy + compare RESULT, NO + jumpeq dont_hear_giddy end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C:: @ 81B0A0C - special sub_80F7CC8 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79 +yes_hear_giddy: + special ScrSpecial_GiddyShouldTellAnotherTale + compare RESULT, TRUE + jumpeq tell_giddy_tale + compare RESULT, FALSE + jumpeq bye_bye end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A26:: @ 81B0A26 - special sub_80F7CC8 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A40 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79 +tell_another_giddy_tale: + special ScrSpecial_GiddyShouldTellAnotherTale + compare RESULT, TRUE + jumpeq also_i_was_thinking + compare RESULT, FALSE + jumpeq bye_bye end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A40:: @ 81B0A40 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0998, 4 - jump MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E +also_i_was_thinking: + msgbox gTextGiddy_AlsoIWasThinking, 4 + jump tell_giddy_tale end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E:: @ 81B0A4E +tell_giddy_tale: special ScrSpecial_GenerateGiddyLine special ShowFieldMessageStringVar4 waittext yesnobox 20, 8 compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26 + jumpeq tell_another_giddy_tale compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26 + jumpeq tell_another_giddy_tale end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F:: @ 81B0A6F - msgbox MauvilleCity_PokemonCenter_1F_Text_1B097C, 4 +dont_hear_giddy: + msgbox gTextGiddy_YouveDeflatedMe, 4 release end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A79:: @ 81B0A79 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B09B0, 4 +bye_bye: + msgbox gTextGiddy_ByeBye, 4 release end -- cgit v1.2.3 From b6ea4d9a77cdb6b416d3dd94eef68ce8a56cd4eb Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 21:18:07 -0500 Subject: label more stuff in mauville_old_man.c --- data/scripts/mauville_man.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/mauville_man.inc') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 239c360dc..159d729f6 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -322,4 +322,4 @@ bye_bye: end .include "data/text/bard.inc" - .include "data/text/hipster.inc" \ No newline at end of file + .include "data/text/hipster.inc" -- cgit v1.2.3 From 2bc843ccbbf3baa9b69e544e4f23e1d02b597fd8 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 28 Aug 2017 21:41:57 -0500 Subject: clean up mauville man script --- data/scripts/mauville_man.inc | 52 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 10 deletions(-) (limited to 'data/scripts/mauville_man.inc') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 159d729f6..997b5a31c 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -10,18 +10,19 @@ MAUVILLE_MAN_GIDDY = 4 MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744 special ScrSpecial_GetCurrentMauvilleMan switch RESULT - case MAUVILLE_MAN_BARD, speak_to_bard - case MAUVILLE_MAN_HIPSTER, speak_to_hipster - case MAUVILLE_MAN_TRADER, speak_to_trader - case MAUVILLE_MAN_STORYTELLER, speak_to_storyteller - case MAUVILLE_MAN_GIDDY, speak_to_giddy + case MAUVILLE_MAN_BARD, SpeakToBard + case MAUVILLE_MAN_HIPSTER, SpeakToHipster + case MAUVILLE_MAN_TRADER, SpeakToTrader + case MAUVILLE_MAN_STORYTELLER, SpeakToStoryteller + case MAUVILLE_MAN_GIDDY, SpeakToGiddy end + @------------------------------------------------------------------------------- @ Bard @------------------------------------------------------------------------------- -speak_to_bard: +SpeakToBard: lock faceplayer msgbox gTextBard_HiImTheBard, MSGBOX_YESNO @@ -30,6 +31,7 @@ speak_to_bard: compare RESULT, NO jumpeq dont_hear_song end + yes_hear_song: setvar 0x8004, 0 @ Give the player ear rape @@ -42,10 +44,12 @@ yes_hear_song: msgbox gTextBard_OhWhatAMovingSong, 4 release end + dont_hear_song: msgbox gTextBard_OhYouveLeftMe, 4 release end + prompt_write_lyrics: msgbox gTextBard_SoHowDoYouLikeMySong, MSGBOX_YESNO compare RESULT, YES @@ -53,6 +57,7 @@ prompt_write_lyrics: compare RESULT, NO jumpeq dont_write_lyrics end + write_lyrics: setvar 0x8004, 6 call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3 @@ -72,16 +77,18 @@ write_lyrics: msgbox gTextBard_OkayThatsIt, 4 release end + dont_write_lyrics: msgbox gTextBard_OhYouveLeftMe2, 4 release end + @------------------------------------------------------------------------------- @ Hipster @------------------------------------------------------------------------------- -speak_to_hipster: +SpeakToHipster: lock faceplayer setflag 2054 @@ -92,6 +99,7 @@ speak_to_hipster: msgbox gTextHipster_TaughtYouAlready, 4 release end + hipster_first_time: special ScrSpecial_HipsterTeachWord compare RESULT, TRUE @ TRUE if player learned a new word @@ -99,19 +107,21 @@ hipster_first_time: msgbox gTextHipster_YouAlreadyKnowALot, 4 release end + teach_new_word: msgbox gTextHipster_HaveYouHeardAbout, 4 special ScrSpecial_SetHipsterSpokenFlag release end + @------------------------------------------------------------------------------- @ Trader @------------------------------------------------------------------------------- .include "data/text/trader.inc" -speak_to_trader: +SpeakToTrader: lock faceplayer msgbox gTextTrader_Introduction, MSGBOX_YESNO @@ -124,12 +134,15 @@ speak_to_trader: waittext jump do_trader_menu_get end + dont_want_to_trade: msgbox gTextTrader_FeelUnwanted1, 2 end + already_traded: msgbox gTextTrader_TradedAlready, 2 end + do_trader_menu_get: special ScrSpecial_TraderMenuGetDecoration waitstate @@ -145,22 +158,27 @@ do_trader_menu_get: jumpeq player_has_no_decorations jump do_trader_menu_give end + cancelled_get_menu: msgbox gTextTrader_DontWantAnything, 2 end + rare_item_cant_trade_away: message gTextTrader_ICantTradeThatOneAway waittext jump do_trader_menu_get end + dont_want_item: message gTextTrader_MenuPrompt waittext jump do_trader_menu_get end + player_has_no_decorations: msgbox gTextTrader_YouDontHaveDecorations, 2 end + do_trader_menu_give: msgbox gTextTrader_PickDecorationYoullTrade, 4 special ScrSpecial_TraderMenuGiveDecoration @@ -178,24 +196,28 @@ do_trader_menu_give: special ScrSpecial_TraderDoDecorationTrade msgbox gTextTrader_ThenWellTrade, 2 end + cancelled_give_menu: msgbox gTextTrader_FeelUnwanted2, 2 end + decoration_is_in_use: msgbox gTextTrader_InUseYouCantTradeIt, 4 jump do_trader_menu_give end + decorations_full: msgbox gTextTrader_NoRoomForThis, 2 end + @------------------------------------------------------------------------------- @ Storyteller @------------------------------------------------------------------------------- .include "data/text/storyteller.inc" -speak_to_storyteller: +SpeakToStoryteller: setvar 0x8008, 0 setvar 0x8009, 0 setvar 0x800a, 0 @@ -253,29 +275,33 @@ prompt_record_story: closebutton release end + stat_update: msgbox gTextStoryteller_BirthOfANewLegend, 4 closebutton release end + dont_hear_story: msgbox gTextStoryteller_OhIFeelStifled, 4 closebutton release end + cant_record_story: msgbox gTextStoryteller_WishMorePeopleWould, 4 closebutton release end + @------------------------------------------------------------------------------- @ Giddy @------------------------------------------------------------------------------- .include "data/text/giddy.inc" -speak_to_giddy: +SpeakToGiddy: lock faceplayer msgbox gTextGiddy_Introduction, MSGBOX_YESNO @@ -284,6 +310,7 @@ speak_to_giddy: compare RESULT, NO jumpeq dont_hear_giddy end + yes_hear_giddy: special ScrSpecial_GiddyShouldTellAnotherTale compare RESULT, TRUE @@ -291,6 +318,7 @@ yes_hear_giddy: compare RESULT, FALSE jumpeq bye_bye end + tell_another_giddy_tale: special ScrSpecial_GiddyShouldTellAnotherTale compare RESULT, TRUE @@ -298,10 +326,12 @@ tell_another_giddy_tale: compare RESULT, FALSE jumpeq bye_bye end + also_i_was_thinking: msgbox gTextGiddy_AlsoIWasThinking, 4 jump tell_giddy_tale end + tell_giddy_tale: special ScrSpecial_GenerateGiddyLine special ShowFieldMessageStringVar4 @@ -312,10 +342,12 @@ tell_giddy_tale: compare RESULT, 0 jumpeq tell_another_giddy_tale end + dont_hear_giddy: msgbox gTextGiddy_YouveDeflatedMe, 4 release end + bye_bye: msgbox gTextGiddy_ByeBye, 4 release -- cgit v1.2.3