diff options
-rw-r--r-- | engine/phone_scripts.asm | 36 | ||||
-rwxr-xr-x | event/sweet_scent.asm | 12 | ||||
-rw-r--r-- | maps/BurnedTowerB1F.asm | 8 | ||||
-rw-r--r-- | maps/CeladonCafe.asm | 68 | ||||
-rw-r--r-- | maps/CeruleanMart.asm | 20 | ||||
-rw-r--r-- | maps/CianwoodCity.asm | 80 | ||||
-rw-r--r-- | maps/EcruteakGym.asm | 24 | ||||
-rw-r--r-- | maps/FuchsiaCity.asm | 28 | ||||
-rw-r--r-- | maps/FuchsiaGym.asm | 150 | ||||
-rw-r--r-- | maps/MahoganyGym.asm | 40 | ||||
-rw-r--r-- | maps/OlivineGym.asm | 34 | ||||
-rw-r--r-- | maps/Route39.asm | 64 | ||||
-rw-r--r-- | maps/Route39Farmhouse.asm | 82 | ||||
-rw-r--r-- | maps/Route43Gate.asm | 142 | ||||
-rw-r--r-- | maps/ViridianCity.asm | 8 | ||||
-rw-r--r-- | maps/ViridianGym.asm | 4 | ||||
-rw-r--r-- | text/phone/mom.asm | 8 |
17 files changed, 404 insertions, 404 deletions
diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index f57404cb1..8beee58c6 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -22,16 +22,16 @@ MomPhoneScript: ; 0xbceaa buttonsound mapnametotext $0 checkcode VAR_ROOFPALETTE - if_equal $1, UnknownScript_0xbcee7 - if_equal $2, UnknownScript_0xbcf27 + if_equal $1, MomPhonePalette1 + if_equal $2, MomPhonePalette2 jump UnknownScript_0xbcf2f -UnknownScript_0xbcedf: ; 0xbcedf - farwritetext UnknownText_0x1b4021 +MomPhoneLandmark: ; 0xbcedf + farwritetext MomPhoneLandmarkText buttonsound jump UnknownScript_0xbcf37 -UnknownScript_0xbcee7: ; 0xbcee7 +MomPhonePalette1: ; 0xbcee7 checkcode VAR_MAPGROUP if_equal GROUP_NEW_BARK_TOWN, .newbark if_equal GROUP_CHERRYGROVE_CITY, .cherrygrove @@ -54,39 +54,39 @@ UnknownScript_0xbcee7: ; 0xbcee7 .violet ; 0xbcf15 landmarktotext SPROUT_TOWER, 1 - jump UnknownScript_0xbcedf + jump MomPhoneLandmark .azalea ; 0xbcf1b landmarktotext SLOWPOKE_WELL, 1 - jump UnknownScript_0xbcedf + jump MomPhoneLandmark .goldenrod ; 0xbcf21 landmarktotext RADIO_TOWER, 1 - jump UnknownScript_0xbcedf + jump MomPhoneLandmark -UnknownScript_0xbcf27: ; 0xbcf27 - farwritetext UnknownText_0x1b411c +MomPhonePalette2: ; 0xbcf27 + farwritetext MomOtherAreaText buttonsound jump UnknownScript_0xbcf37 UnknownScript_0xbcf2f: ; 0xbcf2f - farwritetext UnknownText_0x1b4150 + farwritetext MomDeterminedText buttonsound jump UnknownScript_0xbcf37 UnknownScript_0xbcf37: ; 0xbcf37 checkflag ENGINE_MOM_SAVING_MONEY - iffalse UnknownScript_0xbcf49 + iffalse CheckIfMomHasMoney checkmoney $1, 0 if_equal $0, UnknownScript_0xbcf55 jump UnknownScript_0xbcf63 -UnknownScript_0xbcf49: ; 0xbcf49 +CheckIfMomHasMoney: ; 0xbcf49 checkmoney $1, 0 - if_equal $0, UnknownScript_0xbcf79 - jump UnknownScript_0xbcf6e + if_equal $0, MomHasMoney + jump MomHasNoMoney UnknownScript_0xbcf55: ; 0xbcf55 readmoney $1, $0 - farwritetext UnknownText_0x1b41a7 + farwritetext MomCheckBalanceText yesorno iftrue MomPhoneSaveMoneyScript jump MomPhoneWontSaveMoneyScript @@ -97,13 +97,13 @@ UnknownScript_0xbcf63: ; 0xbcf63 iftrue MomPhoneSaveMoneyScript jump MomPhoneWontSaveMoneyScript -UnknownScript_0xbcf6e: ; 0xbcf6e +MomHasNoMoney: ; 0xbcf6e farwritetext UnknownText_0x1b420d yesorno iftrue MomPhoneSaveMoneyScript jump MomPhoneWontSaveMoneyScript -UnknownScript_0xbcf79: ; 0xbcf79 +MomHasMoney: ; 0xbcf79 readmoney $1, $0 farwritetext UnknownText_0x1b4249 yesorno diff --git a/event/sweet_scent.asm b/event/sweet_scent.asm index 01c43f8b9..63eec9922 100755 --- a/event/sweet_scent.asm +++ b/event/sweet_scent.asm @@ -1,32 +1,32 @@ SweetScentFromMenu: ; 506bc - ld hl, UnknownScript_0x506c8 + ld hl, .SweetScent call QueueScript ld a, $1 ld [wFieldMoveSucceeded], a ret ; 506c8 -UnknownScript_0x506c8: ; 0x506c8 +.SweetScent: ; 0x506c8 reloadmappart special UpdateTimePals callasm GetPartyNick writetext UnknownText_0x50726 waitbutton callasm SweetScentEncounter - iffalse UnknownScript_0x506e9 + iffalse SweetScentNothing checkflag ENGINE_BUG_CONTEST_TIMER - iftrue UnknownScript_0x506e5 + iftrue .BugCatchingContest randomwildmon startbattle reloadmapafterbattle end ; 0x506e5 -UnknownScript_0x506e5: ; 0x506e5 +.BugCatchingContest: ; 0x506e5 farjump BugCatchingContestBattleScript ; 0x506e9 -UnknownScript_0x506e9: ; 0x506e9 +SweetScentNothing: ; 0x506e9 writetext UnknownText_0x5072b waitbutton closetext diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 97b1a1531..ece68f7df 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -14,8 +14,8 @@ BurnedTowerB1F_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x18615e, 0 - dw UnknownScript_0x18615f, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 .MapCallbacks: db 1 @@ -24,10 +24,10 @@ BurnedTowerB1F_MapScriptHeader: dbw MAPCALLBACK_TILES, BurnedTowerB1FLadderCallback -UnknownScript_0x18615e: +.Trigger0: end -UnknownScript_0x18615f: +.Trigger1: end BurnedTowerB1FLadderCallback: diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index b64b76c2d..11b768765 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -12,76 +12,76 @@ CeladonCafe_MapScriptHeader: .MapCallbacks: db 0 -SuperNerdScript_0x73049: +CeladonCafeChef: faceplayer opentext - writetext UnknownText_0x730de + writetext ChefText_Eatathon waitbutton closetext end -FisherScript_0x73051: +CeladonCafeFisher1: opentext - writetext UnknownText_0x73129 + writetext Fisher1Text_Snarfle waitbutton closetext faceplayer opentext - writetext UnknownText_0x7313a + writetext Fisher1Text_Concentration waitbutton closetext spriteface CELADONCAFE_FISHER1, LEFT end -FisherScript_0x73062: +CeladonCafeFisher2: opentext - writetext UnknownText_0x7316a + writetext Fisher2Text_GulpChew waitbutton closetext faceplayer opentext - writetext UnknownText_0x73178 + writetext Fisher2Text_Quantity waitbutton closetext spriteface CELADONCAFE_FISHER2, RIGHT end -FisherScript_0x73073: +CeladonCafeFisher3: opentext - writetext UnknownText_0x731ae + writetext Fisher3Text_MunchMunch waitbutton closetext faceplayer opentext - writetext UnknownText_0x731bd + writetext Fisher3Text_GoldenrodIsBest waitbutton closetext spriteface CELADONCAFE_FISHER3, RIGHT end -TeacherScript_0x73084: +CeladonCafeTeacher: checkitem COIN_CASE - iftrue UnknownScript_0x7309a + iftrue .HasCoinCase opentext - writetext UnknownText_0x73201 + writetext TeacherText_CrunchCrunch waitbutton closetext faceplayer opentext - writetext UnknownText_0x73212 + writetext TeacherText_NoCoinCase waitbutton closetext spriteface CELADONCAFE_TEACHER, LEFT end -UnknownScript_0x7309a: +.HasCoinCase: opentext - writetext UnknownText_0x73254 + writetext TeacherText_KeepEating waitbutton closetext spriteface CELADONCAFE_TEACHER, RIGHT opentext - writetext UnknownText_0x73278 + writetext TeacherText_MoreChef waitbutton closetext spriteface CELADONCAFE_TEACHER, LEFT @@ -118,7 +118,7 @@ CeladonCafeTrashcan: .TrashEmpty: jumpstd trashcan -UnknownText_0x730de: +ChefText_Eatathon: text "Hi!" para "We're holding an" @@ -128,22 +128,22 @@ UnknownText_0x730de: line "right now. Sorry." done -UnknownText_0x73129: +Fisher1Text_Snarfle: text "…Snarfle, chew…" done -UnknownText_0x7313a: +Fisher1Text_Concentration: text "Don't talk to me!" para "You'll break my" line "concentration!" done -UnknownText_0x7316a: +Fisher2Text_GulpChew: text "…Gulp… Chew…" done -UnknownText_0x73178: +Fisher2Text_Quantity: text "I take quantity" line "over quality!" @@ -151,22 +151,22 @@ UnknownText_0x73178: line "full!" done -UnknownText_0x731ae: +Fisher3Text_MunchMunch: text "Munch, munch…" done -UnknownText_0x731bd: +Fisher3Text_GoldenrodIsBest: text "The food is good" line "here, but GOLDEN-" cont "ROD has the best" cont "food anywhere." done -UnknownText_0x73201: +TeacherText_CrunchCrunch: text "Crunch… Crunch…" done -UnknownText_0x73212: +TeacherText_NoCoinCase: text "Nobody here will" line "give you a COIN" @@ -174,13 +174,13 @@ UnknownText_0x73212: line "look in JOHTO." done -UnknownText_0x73254: +TeacherText_KeepEating: text "Crunch… Crunch…" para "I can keep eating!" done -UnknownText_0x73278: +TeacherText_MoreChef: text "More, CHEF!" done @@ -226,8 +226,8 @@ CeladonCafe_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_SUPER_NERD, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x73049, -1 - person_event SPRITE_FISHER, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x73051, -1 - person_event SPRITE_FISHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x73062, -1 - person_event SPRITE_FISHER, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x73073, -1 - person_event SPRITE_TEACHER, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x73084, -1 + person_event SPRITE_SUPER_NERD, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, CeladonCafeChef, -1 + person_event SPRITE_FISHER, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonCafeFisher1, -1 + person_event SPRITE_FISHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCafeFisher2, -1 + person_event SPRITE_FISHER, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonCafeFisher3, -1 + person_event SPRITE_TEACHER, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonCafeTeacher, -1 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 993b6b1af..abbab5b5a 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -10,19 +10,19 @@ CeruleanMart_MapScriptHeader: .MapCallbacks: db 0 -ClerkScript_0x188ac0: +CeruleanMart_Clerk: opentext pokemart MARTTYPE_STANDARD, MART_CERULEAN closetext end -CooltrainerMScript_0x188ac7: - jumptextfaceplayer UnknownText_0x188acd +CeruleanMart_CooltrainerM: + jumptextfaceplayer CeruleanMart_CooltrainerMText -CooltrainerFScript_0x188aca: - jumptextfaceplayer UnknownText_0x188b46 +CeruleanMart_CooltrainerF: + jumptextfaceplayer CeruleanMart_CooltrainerFText -UnknownText_0x188acd: +CeruleanMart_CooltrainerMText: text "You'll run into" line "many trainers on" @@ -36,7 +36,7 @@ UnknownText_0x188acd: line "trainers." done -UnknownText_0x188b46: +CeruleanMart_CooltrainerFText: text "MISTY is about the" line "only person in" @@ -62,6 +62,6 @@ CeruleanMart_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x188ac0, -1 - person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x188ac7, -1 - person_event SPRITE_COOLTRAINER_F, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x188aca, -1 + person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1 + person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1 + person_event SPRITE_COOLTRAINER_F, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index bbb62dbf5..c6b2d8d28 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -36,12 +36,12 @@ CianwoodCity_MapScriptHeader: setflag ENGINE_FLYPOINT_CIANWOOD setevent EVENT_EUSINE_IN_BURNED_TOWER checkevent EVENT_FOUGHT_EUSINE - iffalse UnknownScript_0x1a001d + iffalse .Done disappear CIANWOODCITY_EUSINE -UnknownScript_0x1a001d: +.Done: return -UnknownScript_0x1a001e: +CianwoodCitySuicuneAndEusine: spriteface PLAYER, UP showemote EMOTE_SHOCK, PLAYER, 15 pause 15 @@ -63,10 +63,10 @@ UnknownScript_0x1a001e: appear CIANWOODCITY_EUSINE applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00e7 opentext - writetext UnknownText_0x1a0433 + writetext EusineSuicuneText waitbutton closetext - winlosstext UnknownText_0x1a05a1, 0 + winlosstext EusineBeatenText, 0 setlasttalked CIANWOODCITY_EUSINE loadtrainer MYSTICALMAN, EUSINE startbattle @@ -74,7 +74,7 @@ UnknownScript_0x1a001e: reloadmapafterbattle playmusic MUSIC_MYSTICALMAN_ENCOUNTER opentext - writetext UnknownText_0x1a05c3 + writetext EusineAfterText waitbutton closetext applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00ec @@ -86,43 +86,43 @@ UnknownScript_0x1a001e: .Done: end -PokefanFScript_0x1a0084: +CianwoodCityChucksWife: faceplayer opentext checkevent EVENT_GOT_HM02_FLY - iftrue UnknownScript_0x1a00ad - writetext UnknownText_0x1a00f1 + iftrue .GotFly + writetext ChucksWifeEasierToFlyText buttonsound checkevent EVENT_BEAT_CHUCK - iftrue UnknownScript_0x1a009c - writetext UnknownText_0x1a0163 + iftrue .BeatChuck + writetext ChucksWifeBeatChuckText waitbutton closetext end -UnknownScript_0x1a009c: - writetext UnknownText_0x1a01e3 +.BeatChuck: + writetext ChucksWifeGiveHMText buttonsound verbosegiveitem HM_FLY - iffalse UnknownScript_0x1a00b1 + iffalse .Done setevent EVENT_GOT_HM02_FLY - writetext UnknownText_0x1a021d + writetext ChucksWifeFlySpeechText buttonsound -UnknownScript_0x1a00ad: - writetext UnknownText_0x1a0277 +.GotFly: + writetext ChucksWifeChubbyText waitbutton -UnknownScript_0x1a00b1: +.Done: closetext end -StandingYoungsterScript_0x1a00b3: - jumptextfaceplayer UnknownText_0x1a02df +CianwoodCityYoungster: + jumptextfaceplayer CianwoodCityYoungsterText -PokefanMScript_0x1a00b6: - jumptextfaceplayer UnknownText_0x1a0319 +CianwoodCityPokefanM: + jumptextfaceplayer CianwoodCityPokefanMText -LassScript_0x1a00b9: - jumptextfaceplayer UnknownText_0x1a0394 +CianwoodCityLass: + jumptextfaceplayer CianwoodCityLassText UnknownScript_0x1a00bc: jumptextfaceplayer UnknownText_0x1a03cc @@ -185,7 +185,7 @@ MovementData_0x1a00ec: step DOWN step_end -UnknownText_0x1a00f1: +ChucksWifeEasierToFlyText: text "You crossed the" line "sea to get here?" @@ -199,7 +199,7 @@ UnknownText_0x1a00f1: line "to FLY…" done -UnknownText_0x1a0163: +ChucksWifeBeatChuckText: text "But you can't use" line "FLY without this" cont "city's GYM BADGE." @@ -212,7 +212,7 @@ UnknownText_0x1a0163: line "gift for you." done -UnknownText_0x1a01e3: +ChucksWifeGiveHMText: text "That's CIANWOOD's" line "GYM BADGE!" @@ -220,7 +220,7 @@ UnknownText_0x1a01e3: line "take this HM." done -UnknownText_0x1a021d: +ChucksWifeFlySpeechText: text "Teach FLY to your" line "#MON." @@ -231,7 +231,7 @@ UnknownText_0x1a021d: line "have visited." done -UnknownText_0x1a0277: +ChucksWifeChubbyText: text "My husband lost to" line "you, so he needs" cont "to train harder." @@ -241,7 +241,7 @@ UnknownText_0x1a0277: cont "little chubby." done -UnknownText_0x1a02df: +CianwoodCityYoungsterText: text "If you use FLY," line "you can get back" @@ -249,7 +249,7 @@ UnknownText_0x1a02df: line "stantly." done -UnknownText_0x1a0319: +CianwoodCityPokefanMText: text "Boulders to the" line "north of town can" cont "be crushed." @@ -262,7 +262,7 @@ UnknownText_0x1a0319: cont "break them." done -UnknownText_0x1a0394: +CianwoodCityLassText: text "CHUCK, the GYM" line "LEADER, spars with" @@ -281,7 +281,7 @@ UnknownText_0x1a03cc: cont "ly lives there." done -UnknownText_0x1a0433: +EusineSuicuneText: text "EUSINE: Yo," line "<PLAYER>." @@ -319,12 +319,12 @@ UnknownText_0x1a0433: line "Let's battle now!" done -UnknownText_0x1a05a1: +EusineBeatenText: text "I hate to admit" line "it, but you win." done -UnknownText_0x1a05c3: +EusineAfterText: text "You're amazing," line "<PLAYER>!" @@ -400,7 +400,7 @@ CianwoodCity_MapEventHeader: .XYTriggers: db 1 - xy_trigger 1, $10, $b, $0, UnknownScript_0x1a001e, $0, $0 + xy_trigger 1, $10, $b, $0, CianwoodCitySuicuneAndEusine, $0, $0 .Signposts: db 8 @@ -415,15 +415,15 @@ CianwoodCity_MapEventHeader: .PersonEvents: db 12 - person_event SPRITE_STANDING_YOUNGSTER, 37, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a00b3, -1 - person_event SPRITE_POKEFAN_M, 33, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1a00b6, -1 - person_event SPRITE_LASS, 42, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1a00b9, -1 + person_event SPRITE_STANDING_YOUNGSTER, 37, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CianwoodCityYoungster, -1 + person_event SPRITE_POKEFAN_M, 33, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1 + person_event SPRITE_LASS, 42, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityLass, -1 person_event SPRITE_ROCK, 16, 8, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 person_event SPRITE_ROCK, 17, 9, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 person_event SPRITE_ROCK, 25, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 person_event SPRITE_ROCK, 29, 5, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 person_event SPRITE_ROCK, 27, 10, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 person_event SPRITE_ROCK, 19, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 - person_event SPRITE_POKEFAN_F, 46, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x1a0084, -1 + person_event SPRITE_POKEFAN_F, 46, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityChucksWife, -1 person_event SPRITE_SUPER_NERD, 21, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE person_event SPRITE_SUICUNE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 265e502e8..b01e9af81 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -19,7 +19,7 @@ EcruteakGym_MapScriptHeader: db 0 UnknownScript_0x99d53: - priorityjump UnknownScript_0x99dc6 + priorityjump EcruteakGymClosed end UnknownScript_0x99d57: @@ -39,7 +39,7 @@ MortyScript_0x99d58: reloadmapafterbattle setevent EVENT_BEAT_MORTY opentext - writetext UnknownText_0x9a043 + writetext Text_ReceivedFogBadge playsound SFX_GET_BADGE waitsfx setflag ENGINE_FOGBADGE @@ -50,25 +50,25 @@ MortyScript_0x99d58: setevent EVENT_RANG_CLEAR_BELL_2 .FightDone: checkevent EVENT_GOT_TM30_SHADOW_BALL - iftrue UnknownScript_0x99db1 + iftrue .GotShadowBall setevent EVENT_BEAT_SAGE_JEFFREY setevent EVENT_BEAT_SAGE_PING setevent EVENT_BEAT_MEDIUM_MARTHA setevent EVENT_BEAT_MEDIUM_GRACE - writetext UnknownText_0x9a059 + writetext MortyText_FogBadgeSpeech buttonsound verbosegiveitem TM_SHADOW_BALL - iffalse UnknownScript_0x99db5 + iffalse .NoRoomForShadowBall setevent EVENT_GOT_TM30_SHADOW_BALL - writetext UnknownText_0x9a0ec + writetext MortyText_ShadowBallSpeech waitbutton closetext end -UnknownScript_0x99db1: +.GotShadowBall: writetext UnknownText_0x9a145 waitbutton -UnknownScript_0x99db5: +.NoRoomForShadowBall: closetext end @@ -83,7 +83,7 @@ EcruteakGymTriggerRockets: .RadioTowerRockets: jumpstd radiotowerrockets -UnknownScript_0x99dc6: +EcruteakGymClosed: applymovement PLAYER, MovementData_0x99e5d applymovement ECRUTEAKGYM_GRAMPS, MovementData_0x99e63 opentext @@ -230,12 +230,12 @@ UnknownText_0x9a00a: line "BADGE is yours." done -UnknownText_0x9a043: +Text_ReceivedFogBadge: text "<PLAYER> received" line "FOGBADGE." done -UnknownText_0x9a059: +MortyText_FogBadgeSpeech: text "By having FOG-" line "BADGE, #MON up" @@ -252,7 +252,7 @@ UnknownText_0x9a059: line "this too." done -UnknownText_0x9a0ec: +MortyText_ShadowBallSpeech: text "It's SHADOW BALL." line "It causes damage" diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 62215bd3d..13af9ee23 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -18,14 +18,14 @@ FuchsiaCity_MapScriptHeader: setflag ENGINE_FLYPOINT_FUCHSIA return -YoungsterScript_0x194b22: - jumptextfaceplayer UnknownText_0x194b45 +FuchsiaCityYoungster: + jumptextfaceplayer FuchsiaCityYoungsterText -PokefanMScript_0x194b25: - jumptextfaceplayer UnknownText_0x194b83 +FuchsiaCityPokefanM: + jumptextfaceplayer FuchsiaCityPokefanMText -TeacherScript_0x194b28: - jumptextfaceplayer UnknownText_0x194bd3 +FuchsiaCityTeacher: + jumptextfaceplayer FuchsiaCityTeacherText FuchsiaCitySign: jumptext FuchsiaCitySignText @@ -51,10 +51,10 @@ FuchsiaCityPokeCenterSign: FuchsiaCityMartSign: jumpstd martsign -FruitTreeScript_0x194b43: +FuchsiaCityFruitTree: fruittree FRUITTREE_FUCHSIA_CITY -UnknownText_0x194b45: +FuchsiaCityYoungsterText: text "One of the ELITE" line "FOUR used to be" @@ -62,7 +62,7 @@ UnknownText_0x194b45: line "FUCHSIA's GYM." done -UnknownText_0x194b83: +FuchsiaCityPokefanMText: text "KOGA's daughter" line "succeeded him as" @@ -71,7 +71,7 @@ UnknownText_0x194b83: cont "the ELITE FOUR." done -UnknownText_0x194bd3: +FuchsiaCityTeacherText: text "The SAFARI ZONE is" line "closed… It's sad," @@ -160,7 +160,7 @@ FuchsiaCity_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_YOUNGSTER, 18, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x194b22, -1 - person_event SPRITE_POKEFAN_M, 8, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x194b25, -1 - person_event SPRITE_TEACHER, 14, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x194b28, -1 - person_event SPRITE_FRUIT_TREE, 1, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x194b43, -1 + person_event SPRITE_YOUNGSTER, 18, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1 + person_event SPRITE_POKEFAN_M, 8, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 + person_event SPRITE_TEACHER, 14, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1 + person_event SPRITE_FRUIT_TREE, 1, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 05feb0245..b7660e9f1 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -13,16 +13,16 @@ FuchsiaGym_MapScriptHeader: .MapCallbacks: db 0 -JanineScript_0x195db9: +FuchsiaGymJanineScript: checkflag ENGINE_SOULBADGE iftrue .FightDone - applymovement FUCHSIAGYM_JANINE, MovementData_0x195f27 + applymovement FUCHSIAGYM_JANINE, Movement_NinjaSpin faceplayer opentext - writetext UnknownText_0x195f35 + writetext JanineText_DisappointYou waitbutton closetext - winlosstext UnknownText_0x195fa1, 0 + winlosstext JanineText_ToughOne, 0 loadtrainer JANINE, 1 startbattle reloadmapafterbattle @@ -37,159 +37,159 @@ JanineScript_0x195db9: variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER special MapCallbackSprites_LoadUsedSpritesGFX opentext - writetext UnknownText_0x195feb + writetext Text_ReceivedSoulBadge playsound SFX_GET_BADGE waitsfx setflag ENGINE_SOULBADGE - jump UnknownScript_0x195e02 + jump .AfterBattle .FightDone: faceplayer opentext -UnknownScript_0x195e02: +.AfterBattle: checkevent EVENT_GOT_TM06_TOXIC - iftrue UnknownScript_0x195e15 - writetext UnknownText_0x196002 + iftrue .AfterTM + writetext JanineText_ToxicSpeech buttonsound verbosegiveitem TM_TOXIC - iffalse UnknownScript_0x195e15 + iffalse .AfterTM setevent EVENT_GOT_TM06_TOXIC -UnknownScript_0x195e15: - writetext UnknownText_0x196074 +.AfterTM: + writetext JanineText_ApplyMyself waitbutton closetext end -FuschiaGym1Script_0x195e1b: +LassAliceScript: checkevent EVENT_BEAT_LASS_ALICE - iftrue UnknownScript_0x195e2c - applymovement FUCHSIAGYM_FUCHSIA_GYM_1, MovementData_0x195f27 + iftrue .AliceUnmasked + applymovement FUCHSIAGYM_FUCHSIA_GYM_1, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS special MapCallbackSprites_LoadUsedSpritesGFX -UnknownScript_0x195e2c: +.AliceUnmasked: faceplayer opentext checkevent EVENT_BEAT_LASS_ALICE - iftrue UnknownScript_0x195e4f - writetext UnknownText_0x1960e6 + iftrue .AliceAfterScript + writetext LassAliceBeforeText waitbutton closetext - winlosstext UnknownText_0x196126, 0 + winlosstext LassAliceBeatenText, 0 loadtrainer LASS, ALICE startbattle - iftrue UnknownScript_0x195e4a + iftrue .AliceBecomesJanine reloadmapafterbattle setevent EVENT_BEAT_LASS_ALICE end -UnknownScript_0x195e4a: +.AliceBecomesJanine: variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_JANINE reloadmapafterbattle end -UnknownScript_0x195e4f: - writetext UnknownText_0x196139 +.AliceAfterScript: + writetext LassAliceAfterText waitbutton closetext end -FuschiaGym2Script_0x195e55: +LassLindaScript: checkevent EVENT_BEAT_LASS_LINDA - iftrue UnknownScript_0x195e66 - applymovement FUCHSIAGYM_FUCHSIA_GYM_2, MovementData_0x195f27 + iftrue .LindaUnmasked + applymovement FUCHSIAGYM_FUCHSIA_GYM_2, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS special MapCallbackSprites_LoadUsedSpritesGFX -UnknownScript_0x195e66: +.LindaUnmasked: faceplayer opentext checkevent EVENT_BEAT_LASS_LINDA - iftrue UnknownScript_0x195e89 - writetext UnknownText_0x196166 + iftrue .LindaAfterScript + writetext LassLindaBeforeText waitbutton closetext - winlosstext UnknownText_0x19617b, 0 + winlosstext LassLindaBeatenText, 0 loadtrainer LASS, LINDA startbattle - iftrue UnknownScript_0x195e84 + iftrue .LindaBecomesJanine reloadmapafterbattle setevent EVENT_BEAT_LASS_LINDA end -UnknownScript_0x195e84: +.LindaBecomesJanine: variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_JANINE reloadmapafterbattle end -UnknownScript_0x195e89: - writetext UnknownText_0x196199 +.LindaAfterScript: + writetext LassLindaAfterText waitbutton closetext end -FuschiaGym3Script_0x195e8f: +PicnickerCindyScript: checkevent EVENT_BEAT_PICNICKER_CINDY - iftrue UnknownScript_0x195ea0 - applymovement FUCHSIAGYM_FUCHSIA_GYM_3, MovementData_0x195f27 + iftrue .CindyUnmasked + applymovement FUCHSIAGYM_FUCHSIA_GYM_3, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS special MapCallbackSprites_LoadUsedSpritesGFX -UnknownScript_0x195ea0: +.CindyUnmasked: faceplayer opentext checkevent EVENT_BEAT_PICNICKER_CINDY - iftrue UnknownScript_0x195ec3 - writetext UnknownText_0x1961bb + iftrue .CindyAfterScript + writetext PicnickerCindyBeforeText waitbutton closetext - winlosstext UnknownText_0x1961f1, 0 + winlosstext PicnickerCindyBeatenText, 0 loadtrainer PICNICKER, CINDY startbattle - iftrue UnknownScript_0x195ebe + iftrue .CindyBecomesJanine reloadmapafterbattle setevent EVENT_BEAT_PICNICKER_CINDY end -UnknownScript_0x195ebe: +.CindyBecomesJanine: variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_JANINE reloadmapafterbattle end -UnknownScript_0x195ec3: +.CindyAfterScript: writetext UnknownText_0x19620c waitbutton closetext end -FuschiaGym4Script_0x195ec9: +CamperBarryScript: checkevent EVENT_BEAT_CAMPER_BARRY - iftrue UnknownScript_0x195eda - applymovement FUCHSIAGYM_FUCHSIA_GYM_4, MovementData_0x195f27 + iftrue .BarryUnmasked + applymovement FUCHSIAGYM_FUCHSIA_GYM_4, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER special MapCallbackSprites_LoadUsedSpritesGFX -UnknownScript_0x195eda: +.BarryUnmasked: faceplayer opentext checkevent EVENT_BEAT_CAMPER_BARRY - iftrue UnknownScript_0x195efd - writetext UnknownText_0x196228 + iftrue .BarryAfterScript + writetext CamperBarryBeforeText waitbutton closetext - winlosstext UnknownText_0x19624a, 0 + winlosstext CamperBarryBeatenText, 0 loadtrainer CAMPER, BARRY startbattle - iftrue UnknownScript_0x195ef8 + iftrue .BarryBecomesJanine reloadmapafterbattle setevent EVENT_BEAT_CAMPER_BARRY end -UnknownScript_0x195ef8: +.BarryBecomesJanine: variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_JANINE reloadmapafterbattle end -UnknownScript_0x195efd: +.BarryAfterScript: writetext UnknownText_0x19626b waitbutton closetext @@ -219,7 +219,7 @@ FuchsiaGymStatue: trainertotext JANINE, 1, $1 jumpstd gymstatue2 -MovementData_0x195f27: +Movement_NinjaSpin: turn_head DOWN turn_head LEFT turn_head UP @@ -235,7 +235,7 @@ MovementData_0x195f27: turn_head DOWN step_end -UnknownText_0x195f35: +JanineText_DisappointYou: text "Fufufufu…" para "I'm sorry to dis-" @@ -249,7 +249,7 @@ UnknownText_0x195f35: line "GYM, that's me!" done -UnknownText_0x195fa1: +JanineText_ToughOne: text "JANINE: You're a" line "tough one. You" cont "definitely won…" @@ -258,12 +258,12 @@ UnknownText_0x195fa1: line "Take it." done -UnknownText_0x195feb: +Text_ReceivedSoulBadge: text "<PLAYER> received" line "SOULBADGE." done -UnknownText_0x196002: +JanineText_ToxicSpeech: text "JANINE: You're so" line "tough! I have a" cont "special gift!" @@ -275,7 +275,7 @@ UnknownText_0x196002: line "victim's HP." done -UnknownText_0x196074: +JanineText_ApplyMyself: text "JANINE: I'm going" line "to really apply" @@ -287,7 +287,7 @@ UnknownText_0x196074: cont "Father and you!" done -UnknownText_0x1960e6: +LassAliceBeforeText: text "Fufufu!" para "I'm JANINE, the" @@ -297,32 +297,32 @@ UnknownText_0x1960e6: line "Gotcha, sucker!" done -UnknownText_0x196126: +LassAliceBeatenText: text "I had you fooled…" done -UnknownText_0x196139: +LassAliceAfterText: text "How will you dis-" line "tinguish our real" cont "LEADER?" done -UnknownText_0x196166: +LassLindaBeforeText: text "Fooled you!" line "Hahaha!" done -UnknownText_0x19617b: +LassLindaBeatenText: text "Ooh… I lost…" line "You're not weak…" done -UnknownText_0x196199: +LassLindaAfterText: text "Well? Wasn't my" line "disguise perfect?" done -UnknownText_0x1961bb: +PicnickerCindyBeforeText: text "I'm JANINE!" para "How did you know I" @@ -331,7 +331,7 @@ UnknownText_0x1961bb: para "Let's battle!" done -UnknownText_0x1961f1: +PicnickerCindyBeatenText: text "Darn it!" line "I wanted to win!" done @@ -341,14 +341,14 @@ UnknownText_0x19620c: line "getting tired." done -UnknownText_0x196228: +CamperBarryBeforeText: text "Wahahaha!" para "You betcha!" line "I'm JANINE!" done -UnknownText_0x19624a: +CamperBarryBeatenText: text "My disguise was" line "right on! Dang!" done @@ -399,9 +399,9 @@ FuchsiaGym_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_JANINE, 10, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, JanineScript_0x195db9, -1 - person_event SPRITE_FUCHSIA_GYM_1, 7, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FuschiaGym1Script_0x195e1b, -1 - person_event SPRITE_FUCHSIA_GYM_2, 11, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FuschiaGym2Script_0x195e55, -1 - person_event SPRITE_FUCHSIA_GYM_3, 4, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FuschiaGym3Script_0x195e8f, -1 - person_event SPRITE_FUCHSIA_GYM_4, 2, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FuschiaGym4Script_0x195ec9, -1 + person_event SPRITE_JANINE, 10, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1 + person_event SPRITE_FUCHSIA_GYM_1, 7, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassAliceScript, -1 + person_event SPRITE_FUCHSIA_GYM_2, 11, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassLindaScript, -1 + person_event SPRITE_FUCHSIA_GYM_3, 4, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PicnickerCindyScript, -1 + person_event SPRITE_FUCHSIA_GYM_4, 2, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CamperBarryScript, -1 person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index c30e647e6..5ac4ef61b 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -19,16 +19,16 @@ PryceScript_0x199a9e: opentext checkevent EVENT_BEAT_PRYCE iftrue .FightDone - writetext UnknownText_0x199b8d + writetext PryceText_Intro waitbutton closetext - winlosstext UnknownText_0x199cb3, 0 + winlosstext PryceText_Impressed, 0 loadtrainer PRYCE, 1 startbattle reloadmapafterbattle setevent EVENT_BEAT_PRYCE opentext - writetext UnknownText_0x199d3b + writetext Text_ReceivedGlacierBadge playsound SFX_GET_BADGE waitsfx setflag ENGINE_GLACIERBADGE @@ -36,26 +36,26 @@ PryceScript_0x199a9e: scall MahoganyGymTriggerRockets .FightDone: checkevent EVENT_GOT_TM16_ICY_WIND - iftrue UnknownScript_0x199af0 + iftrue PryceScript_Defeat setevent EVENT_BEAT_SKIER_ROXANNE setevent EVENT_BEAT_SKIER_CLARISSA setevent EVENT_BEAT_BOARDER_RONALD setevent EVENT_BEAT_BOARDER_BRAD setevent EVENT_BEAT_BOARDER_DOUGLAS - writetext UnknownText_0x199d55 + writetext PryceText_GlacierBadgeSpeech buttonsound verbosegiveitem TM_ICY_WIND - iffalse UnknownScript_0x199af4 + iffalse MahoganyGym_NoRoomForIcyWind setevent EVENT_GOT_TM16_ICY_WIND - writetext UnknownText_0x199def + writetext PryceText_IcyWindSpeech waitbutton closetext end -UnknownScript_0x199af0: - writetext UnknownText_0x199e59 +PryceScript_Defeat: + writetext PryceText_CherishYourPokemon waitbutton -UnknownScript_0x199af4: +MahoganyGym_NoRoomForIcyWind: closetext end @@ -109,7 +109,7 @@ TrainerBoarderBrad: BoarderBradScript: end_if_just_battled opentext - writetext UnknownText_0x199fdd + writetext BorderBradTalkText waitbutton closetext end @@ -120,7 +120,7 @@ TrainerBoarderDouglas: BoarderDouglasScript: end_if_just_battled opentext - writetext UnknownText_0x19a047 + writetext BorderDouglasTalkText waitbutton closetext end @@ -149,7 +149,7 @@ MahoganyGymStatue: trainertotext PRYCE, 1, $1 jumpstd gymstatue2 -UnknownText_0x199b8d: +PryceText_Intro: text "#MON have many" line "experiences in" @@ -180,7 +180,7 @@ UnknownText_0x199b8d: line "my power!" done -UnknownText_0x199cb3: +PryceText_Impressed: text "Ah, I am impressed" line "by your prowess." @@ -194,12 +194,12 @@ UnknownText_0x199cb3: line "this BADGE!" done -UnknownText_0x199d3b: +Text_ReceivedGlacierBadge: text "<PLAYER> received" line "GLACIERBADGE." done -UnknownText_0x199d55: +PryceText_GlacierBadgeSpeech: text "That BADGE will" line "raise the SPECIAL" cont "stats of #MON." @@ -213,7 +213,7 @@ UnknownText_0x199d55: line "a gift from me!" done -UnknownText_0x199def: +PryceText_IcyWindSpeech: text "That TM contains" line "ICY WIND." @@ -225,7 +225,7 @@ UnknownText_0x199def: cont "winter." done -UnknownText_0x199e59: +PryceText_CherishYourPokemon: text "When the ice and" line "snow melt, spring" cont "arrives." @@ -276,7 +276,7 @@ BoarderBradBeatenText: line "serious we are?" done -UnknownText_0x199fdd: +BorderBradTalkText: text "This GYM is great." line "I love boarding" cont "with my #MON!" @@ -292,7 +292,7 @@ BoarderDouglasBeatenText: line "PRYCE's secret." done -UnknownText_0x19a047: +BorderDouglasTalkText: text "The secret behind" line "PRYCE's power…" diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index c8cf77196..a429b0fdc 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -14,16 +14,16 @@ JasmineScript_0x9c12f: opentext checkevent EVENT_BEAT_JASMINE iftrue .FightDone - writetext UnknownText_0x9c1b9 + writetext Jasmine_SteelTypeIntro waitbutton closetext - winlosstext UnknownText_0x9c2bb, 0 + winlosstext Jasmine_BetterTrainer, 0 loadtrainer JASMINE, 1 startbattle reloadmapafterbattle setevent EVENT_BEAT_JASMINE opentext - writetext UnknownText_0x9c33a + writetext Text_ReceivedMineralBadge playsound SFX_GET_BADGE waitsfx setflag ENGINE_MINERALBADGE @@ -31,21 +31,21 @@ JasmineScript_0x9c12f: scall OlivineGymTriggerRockets .FightDone: checkevent EVENT_GOT_TM23_IRON_TAIL - iftrue UnknownScript_0x9c172 - writetext UnknownText_0x9c354 + iftrue .GotIronTail + writetext Jasmine_BadgeSpeech buttonsound verbosegiveitem TM_IRON_TAIL - iffalse UnknownScript_0x9c176 + iffalse .NoRoomForIronTail setevent EVENT_GOT_TM23_IRON_TAIL - writetext UnknownText_0x9c3a5 + writetext Jasmine_IronTailSpeech waitbutton closetext end -UnknownScript_0x9c172: - writetext UnknownText_0x9c3d1 +.GotIronTail: + writetext Jasmine_GoodLuck waitbutton -UnknownScript_0x9c176: +.NoRoomForIronTail: closetext end @@ -94,7 +94,7 @@ OlivineGymStatue: trainertotext JASMINE, 1, $1 jumpstd gymstatue2 -UnknownText_0x9c1b9: +Jasmine_SteelTypeIntro: text "…Thank you for" line "your help at the" cont "LIGHTHOUSE…" @@ -119,7 +119,7 @@ UnknownText_0x9c1b9: para "…Um… May I begin?" done -UnknownText_0x9c2bb: +Jasmine_BetterTrainer: text "…You are a better" line "trainer than me," @@ -133,12 +133,12 @@ UnknownText_0x9c2bb: line "this BADGE." done -UnknownText_0x9c33a: +Text_ReceivedMineralBadge: text "<PLAYER> received" line "MINERALBADGE." done -UnknownText_0x9c354: +Jasmine_BadgeSpeech: text "MINERALBADGE" line "raises #MON's" cont "DEFENSE." @@ -147,18 +147,18 @@ UnknownText_0x9c354: line "this too…" done -UnknownText_0x9c393: +Text_ReceivedTM09: text "<PLAYER> received" line "TM09." done -UnknownText_0x9c3a5: +Jasmine_IronTailSpeech: text "…You could use" line "that TM to teach" cont "IRON TAIL." done -UnknownText_0x9c3d1: +Jasmine_GoodLuck: text "Um… I don't know" line "how to say this," cont "but good luck…" diff --git a/maps/Route39.asm b/maps/Route39.asm index 10d548e0b..5f7d33279 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -33,74 +33,74 @@ PokefanmDerek1Script: end_if_just_battled opentext checkflag ENGINE_DEREK_HAS_NUGGET - iftrue UnknownScript_0x1a5b4a + iftrue PokefanMDerekHasNugget checkcellnum PHONE_POKEFANM_DEREK - iftrue UnknownScript_0x1a5b6e + iftrue PokefanMDerekAccepted checkpoke PIKACHU - iffalse UnknownScript_0x1a5b5c + iffalse PokefanMDerekWantsPikachu checkevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x1a5b33 - writetext UnknownText_0x1a5cf8 + iftrue PokefanMDerekWantsYourNumber + writetext PokefanMDerekText_NotBragging buttonsound setevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x1a5b62 - jump UnknownScript_0x1a5b36 + scall PokefanMDerekAsksNumber1 + jump PokefanMDerekAsksForPhoneNumber -UnknownScript_0x1a5b33: - scall UnknownScript_0x1a5b66 -UnknownScript_0x1a5b36: +PokefanMDerekWantsYourNumber: + scall PokefanMDerekAsksNumber2 +PokefanMDerekAsksForPhoneNumber: askforphonenumber PHONE_POKEFANM_DEREK - if_equal $1, UnknownScript_0x1a5b76 - if_equal $2, UnknownScript_0x1a5b72 + if_equal $1, PokefanMDerekPhoneFull + if_equal $2, PokefanMDerekDeclined trainertotext POKEFANM, DEREK1, $0 - scall UnknownScript_0x1a5b6a - jump UnknownScript_0x1a5b6e + scall PokefanMDerekRegistered + jump PokefanMDerekAccepted -UnknownScript_0x1a5b4a: - scall UnknownScript_0x1a5b7a +PokefanMDerekHasNugget: + scall PokefanMDerekGift verbosegiveitem NUGGET - iffalse UnknownScript_0x1a5b59 + iffalse .PackFull clearflag ENGINE_DEREK_HAS_NUGGET - jump UnknownScript_0x1a5b6e + jump PokefanMDerekAccepted -UnknownScript_0x1a5b59: - jump UnknownScript_0x1a5b7e +.PackFull: + jump PackIsFull -UnknownScript_0x1a5b5c: - writetext UnknownText_0x1a5dec +PokefanMDerekWantsPikachu: + writetext PokefanMDerekText_PikachuIsIt waitbutton closetext end -UnknownScript_0x1a5b62: +PokefanMDerekAsksNumber1: jumpstd asknumber1m end -UnknownScript_0x1a5b66: +PokefanMDerekAsksNumber2: jumpstd asknumber2m end -UnknownScript_0x1a5b6a: +PokefanMDerekRegistered: jumpstd registerednumberm end -UnknownScript_0x1a5b6e: +PokefanMDerekAccepted: jumpstd numberacceptedm end -UnknownScript_0x1a5b72: +PokefanMDerekDeclined: jumpstd numberdeclinedm end -UnknownScript_0x1a5b76: +PokefanMDerekPhoneFull: jumpstd phonefullm end -UnknownScript_0x1a5b7a: +PokefanMDerekGift: jumpstd giftm end -UnknownScript_0x1a5b7e: +PackIsFull: jumpstd packfullm end @@ -220,7 +220,7 @@ PokefanmDerek1BeatenText: line "show off PIKACHU…" done -UnknownText_0x1a5cf8: +PokefanMDerekText_NotBragging: text "I'm not listening" line "to your bragging!" @@ -253,7 +253,7 @@ UnknownText_0x1a5db2: line "adorable!" done -UnknownText_0x1a5dec: +PokefanMDerekText_PikachuIsIt: text "PIKACHU is it!" line "Don't you agree?" done diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index ca483c8cc..72a675718 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -9,91 +9,91 @@ Route39Farmhouse_MapScriptHeader: .MapCallbacks: db 0 -PokefanMScript_0x9ceb4: +PokefanM_DairyFarmer: faceplayer opentext checkevent EVENT_HEALED_MOOMOO - iftrue UnknownScript_0x9cec5 - writetext UnknownText_0x9cf38 + iftrue FarmerMScript_SellMilk + writetext FarmerMText_SickCow waitbutton closetext setevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO end -UnknownScript_0x9cec5: +FarmerMScript_SellMilk: checkitem MOOMOO_MILK - iftrue UnknownScript_0x9cf08 - writetext UnknownText_0x9cfe1 + iftrue FarmerMScript_Milking + writetext FarmerMText_BuyMilk special PlaceMoneyTopRight yesorno - iffalse UnknownScript_0x9cf02 + iffalse FarmerMScript_NoSale checkmoney $0, 500 - if_equal $2, UnknownScript_0x9cef6 + if_equal $2, FarmerMScript_NoMoney giveitem MOOMOO_MILK - iffalse UnknownScript_0x9cefc + iffalse FarmerMScript_NoRoom takemoney $0, 500 special PlaceMoneyTopRight waitsfx playsound SFX_TRANSACTION - writetext UnknownText_0x9d05d + writetext FarmerMText_GotMilk buttonsound itemnotify closetext end -UnknownScript_0x9cef6: - writetext UnknownText_0x9d07c +FarmerMScript_NoMoney: + writetext FarmerMText_NoMoney waitbutton closetext end -UnknownScript_0x9cefc: - writetext UnknownText_0x9d09d +FarmerMScript_NoRoom: + writetext FarmerMText_NoRoom waitbutton closetext end -UnknownScript_0x9cf02: - writetext UnknownText_0x9d0b7 +FarmerMScript_NoSale: + writetext FarmerMText_NoSale waitbutton closetext end -UnknownScript_0x9cf08: - writetext UnknownText_0x9d0dc +FarmerMScript_Milking: + writetext FarmerMText_Milking waitbutton closetext end -PokefanFScript_0x9cf0e: +PokefanF_SnoreFarmer: faceplayer opentext checkevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM - iftrue UnknownScript_0x9cf2f + iftrue FarmerFScript_GotSnore checkevent EVENT_HEALED_MOOMOO - iftrue UnknownScript_0x9cf22 - writetext UnknownText_0x9d0f6 + iftrue FarmerFScript_GiveSnore + writetext FarmerFText_InTrouble waitbutton closetext end -UnknownScript_0x9cf22: - writetext UnknownText_0x9d156 +FarmerFScript_GiveSnore: + writetext FarmerFText_HealedMiltank buttonsound verbosegiveitem TM_SNORE - iffalse UnknownScript_0x9cf33 + iffalse FarmerFScript_NoRoomForSnore setevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM -UnknownScript_0x9cf2f: - writetext UnknownText_0x9d1c7 +FarmerFScript_GotSnore: + writetext FarmerFText_SnoreSpeech waitbutton -UnknownScript_0x9cf33: +FarmerFScript_NoRoomForSnore: closetext end FarmhouseBookshelf: jumpstd picturebookshelf -UnknownText_0x9cf38: +FarmerMText_SickCow: text "My MILTANK ain't" line "givin' me milk" cont "n'more." @@ -111,7 +111,7 @@ UnknownText_0x9cf38: line "BERRIES, I reckon." done -UnknownText_0x9cfe1: +FarmerMText_BuyMilk: text "How'd you like my" line "MOOMOO MILK?" @@ -125,32 +125,32 @@ UnknownText_0x9cfe1: line "fer just ¥500." done -UnknownText_0x9d05d: +FarmerMText_GotMilk: text "Here ya go!" line "Drink up'n enjoy!" done -UnknownText_0x9d07c: +FarmerMText_NoMoney: text "Sorry, there." line "No cash, no sale!" done -UnknownText_0x9d09d: +FarmerMText_NoRoom: text "I reckon yer" line "PACK's full." done -UnknownText_0x9d0b7: +FarmerMText_NoSale: text "You don't want it?" line "Come again, hear?" done -UnknownText_0x9d0dc: +FarmerMText_Milking: text "I best go do my" line "milkin'." done -UnknownText_0x9d0f6: +FarmerFText_InTrouble: text "Our milk even goes" line "out to KANTO." @@ -161,7 +161,7 @@ UnknownText_0x9d0f6: line "in trouble." done -UnknownText_0x9d156: +FarmerFText_HealedMiltank: text "You fixed our" line "MILTANK, hon. Now" @@ -172,12 +172,12 @@ UnknownText_0x9d156: line "fer your trouble." done -UnknownText_0x9d1b5: +Text_ReceivedTM13: text "<PLAYER> received" line "TM13." done -UnknownText_0x9d1c7: +FarmerFText_SnoreSpeech: text "That there's" line "SNORE." @@ -211,5 +211,5 @@ Route39Farmhouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_POKEFAN_M, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x9ceb4, -1 - person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x9cf0e, -1 + person_event SPRITE_POKEFAN_M, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1 + person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 8cf2e73ff..ee54a42c7 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -8,134 +8,134 @@ Route43Gate_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x19abc5, 0 - dw UnknownScript_0x19abc9, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 .MapCallbacks: db 1 ; callbacks - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x19abca + dbw MAPCALLBACK_NEWMAP, GateScript_CheckIfRockets -UnknownScript_0x19abc5: - priorityjump UnknownScript_0x19abda +.Trigger0: + priorityjump GateScript_RocketTakeover end -UnknownScript_0x19abc9: +.Trigger1: end -UnknownScript_0x19abca: +GateScript_CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT - iftrue UnknownScript_0x19abd5 + iftrue GateScript_NoRockets domaptrigger ROUTE_43, $0 return -UnknownScript_0x19abd5: +GateScript_NoRockets: domaptrigger ROUTE_43, $1 return -UnknownScript_0x19abda: +GateScript_RocketTakeover: playmusic MUSIC_ROCKET_ENCOUNTER checkcode VAR_FACING - if_equal DOWN, UnknownScript_0x19abea - if_equal UP, UnknownScript_0x19ac38 + if_equal DOWN, RocketScript_Southbound + if_equal UP, RocketScript_Northbound dotrigger $1 end -UnknownScript_0x19abea: - applymovement PLAYER, MovementData_0x19aca2 +RocketScript_Southbound: + applymovement PLAYER, PlayerStepsIn showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15 - applymovement ROUTE43GATE_ROCKET2, MovementData_0x19acbb + applymovement ROUTE43GATE_ROCKET2, Rocket2Script_BlocksYouSouth spriteface ROUTE43GATE_ROCKET1, UP showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15 - applymovement ROUTE43GATE_ROCKET1, MovementData_0x19aca4 + applymovement ROUTE43GATE_ROCKET1, Rocket1Script_BlocksYouSouth opentext - writetext UnknownText_0x19acd2 + writetext RocketText_TollFee buttonsound checkmoney $0, 999 - if_equal $0, UnknownScript_0x19ac12 - jump UnknownScript_0x19ac1d + if_equal $0, RocketScript_TollSouth + jump RocketScript_YoureBrokeSouth -UnknownScript_0x19ac12: +RocketScript_TollSouth: takemoney $0, 1000 - writetext UnknownText_0x19ad0a - jump UnknownScript_0x19ac28 + writetext RocketText_ThankYou + jump RocketScript_ShakeDownSouth -UnknownScript_0x19ac1d: +RocketScript_YoureBrokeSouth: takemoney $0, 1000 - writetext UnknownText_0x19ad20 - jump UnknownScript_0x19ac28 + writetext RocketText_AllYouGot + jump RocketScript_ShakeDownSouth -UnknownScript_0x19ac28: +RocketScript_ShakeDownSouth: buttonsound closetext - applymovement ROUTE43GATE_ROCKET1, MovementData_0x19acaa - applymovement ROUTE43GATE_ROCKET2, MovementData_0x19acc1 + applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth + applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth dotrigger $1 special RestartMapMusic end -UnknownScript_0x19ac38: +RocketScript_Northbound: showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15 - applymovement ROUTE43GATE_ROCKET1, MovementData_0x19acaf + applymovement ROUTE43GATE_ROCKET1, Rocket1Script_BlocksYouNorth spriteface ROUTE43GATE_ROCKET2, DOWN showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15 - applymovement ROUTE43GATE_ROCKET2, MovementData_0x19acc7 + applymovement ROUTE43GATE_ROCKET2, Rocket2Script_BlocksYouNorth opentext - writetext UnknownText_0x19acd2 + writetext RocketText_TollFee buttonsound checkmoney $0, 999 - if_equal $0, UnknownScript_0x19ac5c - jump UnknownScript_0x19ac67 + if_equal $0, RocketScript_TollNorth + jump RocketScript_YoureBrokeNorth -UnknownScript_0x19ac5c: +RocketScript_TollNorth: takemoney $0, 1000 - writetext UnknownText_0x19ad0a - jump UnknownScript_0x19ac72 + writetext RocketText_ThankYou + jump RocketScript_ShakeDownNorth -UnknownScript_0x19ac67: +RocketScript_YoureBrokeNorth: takemoney $0, 1000 - writetext UnknownText_0x19ad20 - jump UnknownScript_0x19ac72 + writetext RocketText_AllYouGot + jump RocketScript_ShakeDownNorth -UnknownScript_0x19ac72: +RocketScript_ShakeDownNorth: buttonsound closetext - applymovement ROUTE43GATE_ROCKET2, MovementData_0x19accd - applymovement ROUTE43GATE_ROCKET1, MovementData_0x19acb5 + applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassNorth + applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassNorth dotrigger $1 special RestartMapMusic end -RocketScript_0x19ac82: - jumptextfaceplayer UnknownText_0x19ad41 +RocketScript_MakingABundle: + jumptextfaceplayer RocketText_MakingABundle -OfficerScript_0x19ac85: +OfficerScript_GuardWithSludgeBomb: faceplayer opentext checkevent EVENT_GOT_TM36_SLUDGE_BOMB - iftrue UnknownScript_0x19ac9c - writetext UnknownText_0x19ad9b + iftrue .GotSludgeBomb + writetext OfficerText_FoundTM buttonsound verbosegiveitem TM_SLUDGE_BOMB - iffalse UnknownScript_0x19aca0 + iffalse .NoRoomForSludgeBomb setevent EVENT_GOT_TM36_SLUDGE_BOMB closetext end -UnknownScript_0x19ac9c: - writetext UnknownText_0x19ae2d +.GotSludgeBomb: + writetext OfficerText_AvoidGrass waitbutton -UnknownScript_0x19aca0: +.NoRoomForSludgeBomb: closetext end -MovementData_0x19aca2: +PlayerStepsIn: step DOWN step_end -MovementData_0x19aca4: +Rocket1Script_BlocksYouSouth: big_step UP big_step UP big_step RIGHT @@ -143,14 +143,14 @@ MovementData_0x19aca4: turn_head UP step_end -MovementData_0x19acaa: +Rocket1Script_LetsYouPassSouth: big_step LEFT big_step LEFT big_step DOWN big_step DOWN step_end -MovementData_0x19acaf: +Rocket1Script_BlocksYouNorth: big_step DOWN big_step DOWN big_step RIGHT @@ -158,7 +158,7 @@ MovementData_0x19acaf: turn_head DOWN step_end -MovementData_0x19acb5: +Rocket1Script_LetsYouPassNorth: big_step LEFT big_step LEFT big_step UP @@ -166,7 +166,7 @@ MovementData_0x19acb5: turn_head DOWN step_end -MovementData_0x19acbb: +Rocket2Script_BlocksYouSouth: big_step UP big_step UP big_step LEFT @@ -174,7 +174,7 @@ MovementData_0x19acbb: turn_head UP step_end -MovementData_0x19acc1: +Rocket2Script_LetsYouPassSouth: big_step RIGHT big_step RIGHT big_step DOWN @@ -182,7 +182,7 @@ MovementData_0x19acc1: turn_head UP step_end -MovementData_0x19acc7: +Rocket2Script_BlocksYouNorth: big_step DOWN big_step DOWN big_step LEFT @@ -190,14 +190,14 @@ MovementData_0x19acc7: turn_head DOWN step_end -MovementData_0x19accd: +Rocket2Script_LetsYouPassNorth: big_step RIGHT big_step RIGHT big_step UP big_step UP step_end -UnknownText_0x19acd2: +RocketText_TollFee: text "Hold it there," line "kiddo!" @@ -205,17 +205,17 @@ UnknownText_0x19acd2: line "to go through." done -UnknownText_0x19ad0a: +RocketText_ThankYou: text "Thank you very" line "much!" done -UnknownText_0x19ad20: +RocketText_AllYouGot: text "Then pay what you" line "have, please." done -UnknownText_0x19ad41: +RocketText_MakingABundle: text "He-he-he. We're" line "making a bundle." @@ -226,7 +226,7 @@ UnknownText_0x19ad41: line "RAGE." done -UnknownText_0x19ad9b: +OfficerText_FoundTM: text "I got chased from" line "my post by these" cont "thugs in black." @@ -239,12 +239,12 @@ UnknownText_0x19ad9b: cont "you take it away?" done -UnknownText_0x19ae1b: +Text_ReceivedTM30: text "<PLAYER> received" line "TM30." done -UnknownText_0x19ae2d: +OfficerText_AvoidGrass: text "Use this gate to" line "avoid walking in" cont "the grass." @@ -269,6 +269,6 @@ Route43Gate_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19ac85, EVENT_LAKE_OF_RAGE_CIVILIANS - person_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS - person_event SPRITE_ROCKET, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS + person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS + person_event SPRITE_ROCKET, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index a1c2c0255..ced89061b 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -55,16 +55,16 @@ FisherScript_0x1a9a75: faceplayer opentext checkevent EVENT_GOT_TM42_DREAM_EATER - iftrue UnknownScript_0x1a9a8a + iftrue .GotDreamEater writetext UnknownText_0x1a9cc4 buttonsound verbosegiveitem TM_DREAM_EATER - iffalse UnknownScript_0x1a9a8e + iffalse .NoRoomForDreamEater setevent EVENT_GOT_TM42_DREAM_EATER -UnknownScript_0x1a9a8a: +.GotDreamEater: writetext UnknownText_0x1a9d86 waitbutton -UnknownScript_0x1a9a8e: +.NoRoomForDreamEater: closetext end diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index f8e4b8e77..f67289df9 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -9,7 +9,7 @@ ViridianGym_MapScriptHeader: .MapCallbacks: db 0 -BlueScript_0x9aa26: +ViridianGymBlueScript: faceplayer opentext checkflag ENGINE_EARTHBADGE @@ -188,5 +188,5 @@ ViridianGym_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_BLUE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlueScript_0x9aa26, EVENT_VIRIDIAN_GYM_BLUE + person_event SPRITE_BLUE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE diff --git a/text/phone/mom.asm b/text/phone/mom.asm index 6842728b7..961297fb5 100644 --- a/text/phone/mom.asm +++ b/text/phone/mom.asm @@ -5,7 +5,7 @@ MomPhoneGreetingText: ; 0x1b4000 line "Working hard?" done -UnknownText_0x1b4021: ; 0x1b4021 +MomPhoneLandmarkText: ; 0x1b4021 text "Oh, so you're in" line "@" text_from_ram StringBuffer3 @@ -50,7 +50,7 @@ MomPhoneCherrygroveText: ; 0x1b40e4 line "home for a bit?" done -UnknownText_0x1b411c: ; 0x1b411c +MomOtherAreaText: ; 0x1b411c text "Wow, you're in" line "@" text_from_ram StringBuffer3 @@ -60,7 +60,7 @@ UnknownText_0x1b411c: ; 0x1b411c line "#MON quest!" done -UnknownText_0x1b4150: ; 0x1b4150 +MomDeterminedText: ; 0x1b4150 text "That sounds really" line "tough." @@ -71,7 +71,7 @@ UnknownText_0x1b4150: ; 0x1b4150 line "be OK, right?" done -UnknownText_0x1b41a7: ; 0x1b41a7 +MomCheckBalanceText: ; 0x1b41a7 text "By the way, you've" line "saved up ¥@" text_from_ram StringBuffer3 |