From 464d89c59e2b96d23d46ef0209f1ebc166240f3d Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Sun, 26 Oct 2014 19:37:15 -0600 Subject: [PATCH] Labels for day of week siblings. --- maps/BlackthornCity.asm | 61 +++++++++++++-------------------- maps/LakeofRage.asm | 61 +++++++++++++-------------------- maps/Route29.asm | 66 +++++++++++++++-------------------- maps/Route32.asm | 61 +++++++++++++-------------------- maps/Route36.asm | 61 +++++++++++++-------------------- maps/Route37.asm | 76 ++++++++++++++++------------------------- maps/Route40.asm | 61 +++++++++++++-------------------- 7 files changed, 177 insertions(+), 270 deletions(-) diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 7cd37057f..e2a28527d 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -9,25 +9,22 @@ BlackthornCity_MapScriptHeader: ; 0x1a46d0 dbw 5, UnknownScript_0x1a46d8 - dbw 2, UnknownScript_0x1a46dc -; 0x1a46d8 + dbw 2, SantosCallback UnknownScript_0x1a46d8: ; 0x1a46d8 setflag $004b return ; 0x1a46dc -UnknownScript_0x1a46dc: ; 0x1a46dc +SantosCallback: checkcode $b - if_equal SATURDAY, UnknownScript_0x1a46e5 + if_equal SATURDAY, .SantosAppears disappear $9 return -; 0x1a46e5 -UnknownScript_0x1a46e5: ; 0x1a46e5 +.SantosAppears appear $9 return -; 0x1a46e8 SuperNerdScript_0x1a46e8: ; 0x1a46e8 faceplayer @@ -94,44 +91,41 @@ CooltrainerFScript_0x1a4728: ; 0x1a4728 jumptextfaceplayer UnknownText_0x1a4b1e ; 0x1a472b -YoungsterScript_0x1a472b: ; 0x1a472b +SantosScript: faceplayer loadfont checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS - iftrue UnknownScript_0x1a4759 + iftrue SantosSaturdayScript checkcode $b - if_not_equal SATURDAY, UnknownScript_0x1a475f + if_not_equal SATURDAY, SantosNotSaturdayScript checkevent EVENT_MET_SANTOS_OF_SATURDAY - iftrue UnknownScript_0x1a4746 - 2writetext UnknownText_0x1a4a27 + iftrue .MetSantos + 2writetext MeetSantosText keeptextopen setevent EVENT_MET_SANTOS_OF_SATURDAY -UnknownScript_0x1a4746: ; 0x1a4746 - 2writetext UnknownText_0x1a4a57 +.MetSantos + 2writetext SantosGivesGiftText keeptextopen verbosegiveitem SPELL_TAG, 1 - iffalse UnknownScript_0x1a475d + iffalse SantosDoneScript setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS - 2writetext UnknownText_0x1a4a6b + 2writetext SantosGaveGiftText closetext loadmovesprites end -; 0x1a4759 -UnknownScript_0x1a4759: ; 0x1a4759 - 2writetext UnknownText_0x1a4ab6 +SantosSaturdayScript: + 2writetext SantosSaturdayText closetext -UnknownScript_0x1a475d: ; 0x1a475d +SantosDoneScript: loadmovesprites end -; 0x1a475f -UnknownScript_0x1a475f: ; 0x1a475f - 2writetext UnknownText_0x1a4b00 +SantosNotSaturdayScript: + 2writetext SantosNotSaturdayText closetext loadmovesprites end -; 0x1a4765 MapBlackthornCitySignpost0Script: ; 0x1a4765 jumptext UnknownText_0x1a4b67 @@ -252,7 +246,7 @@ UnknownText_0x1a49f1: ; 0x1a49f1 done ; 0x1a4a27 -UnknownText_0x1a4a27: ; 0x1a4a27 +MeetSantosText: text "SANTOS: …" para "It's Saturday…" @@ -260,14 +254,12 @@ UnknownText_0x1a4a27: ; 0x1a4a27 para "I'm SANTOS of" line "Saturday…" done -; 0x1a4a57 -UnknownText_0x1a4a57: ; 0x1a4a57 +SantosGivesGiftText: text "You can have this…" done -; 0x1a4a6b -UnknownText_0x1a4a6b: ; 0x1a4a6b +SantosGaveGiftText: text "SANTOS: …" para "SPELL TAG…" @@ -278,9 +270,8 @@ UnknownText_0x1a4a6b: ; 0x1a4a6b para "It will frighten" line "you…" done -; 0x1a4ab6 -UnknownText_0x1a4ab6: ; 0x1a4ab6 +SantosSaturdayText: text "SANTOS: …" para "See you again on" @@ -289,13 +280,11 @@ UnknownText_0x1a4ab6: ; 0x1a4ab6 para "I won't have any" line "more gifts…" done -; 0x1a4b00 -UnknownText_0x1a4b00: ; 0x1a4b00 +SantosNotSaturdayText: text "SANTOS: Today's" line "not Saturday…" done -; 0x1a4b1e UnknownText_0x1a4b1e: ; 0x1a4b1e text "Wow, you came" @@ -386,7 +375,5 @@ BlackthornCity_MapEventHeader: ; 0x1a4c57 person_event SPRITE_BLACK_BELT, 35, 28, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x1a470e, $ffff person_event SPRITE_COOLTRAINER_F, 29, 13, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1a4722, $ffff person_event SPRITE_YOUNGSTER, 19, 17, $5, $1, 255, 255, $0, 0, YoungsterScript_0x1a4725, $ffff - person_event SPRITE_YOUNGSTER, 24, 26, $6, $0, 255, 255, $0, 0, YoungsterScript_0x1a472b, $075d + person_event SPRITE_YOUNGSTER, 24, 26, $6, $0, 255, 255, $0, 0, SantosScript, $075d person_event SPRITE_COOLTRAINER_F, 23, 39, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1a4728, $ffff -; 0x1a4d1d - diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index fcd052968..0e3d6a1df 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -13,8 +13,7 @@ LakeofRage_MapScriptHeader: ; 0x70000 dbw 5, UnknownScript_0x70012 - dbw 2, UnknownScript_0x70016 -; 0x70010 + dbw 2, WesleyCallback UnknownScript_0x70010: ; 0x70010 end @@ -29,17 +28,15 @@ UnknownScript_0x70012: ; 0x70012 return ; 0x70016 -UnknownScript_0x70016: ; 0x70016 +WesleyCallback: checkcode $b - if_equal WEDNESDAY, UnknownScript_0x7001f + if_equal WEDNESDAY, .WesleyAppears disappear $b return -; 0x7001f -UnknownScript_0x7001f: ; 0x7001f +.WesleyAppears appear $b return -; 0x70022 LanceScript_0x70022: ; 0x70022 checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE @@ -270,44 +267,41 @@ CooltrainerfLoisScript: ; 0x70106 end ; 0x7010e -SuperNerdScript_0x7010e: ; 0x7010e +WesleyScript: faceplayer loadfont checkevent EVENT_GOT_BLACKBELT_FROM_WESLEY - iftrue UnknownScript_0x7013c + iftrue WesleyWednesdayScript checkcode $b - if_not_equal WEDNESDAY, UnknownScript_0x70142 + if_not_equal WEDNESDAY, WesleyNotWednesdayScript checkevent EVENT_MET_WESLEY_OF_WEDNESDAY - iftrue UnknownScript_0x70129 - 2writetext UnknownText_0x70784 + iftrue .MetWesley + 2writetext MeetWesleyText keeptextopen setevent EVENT_MET_WESLEY_OF_WEDNESDAY -UnknownScript_0x70129: ; 0x70129 - 2writetext UnknownText_0x707dd +.MetWesley + 2writetext WesleyGivesGiftText keeptextopen verbosegiveitem BLACKBELT, 1 - iffalse UnknownScript_0x70140 + iffalse WesleyDoneScript setevent EVENT_GOT_BLACKBELT_FROM_WESLEY - 2writetext UnknownText_0x7080b + 2writetext WesleyGaveGiftText closetext loadmovesprites end -; 0x7013c -UnknownScript_0x7013c: ; 0x7013c - 2writetext UnknownText_0x70844 +WesleyWednesdayScript: + 2writetext WesleyWednesdayText closetext -UnknownScript_0x70140: ; 0x70140 +WesleyDoneScript: loadmovesprites end -; 0x70142 -UnknownScript_0x70142: ; 0x70142 - 2writetext UnknownText_0x708a9 +WesleyNotWednesdayScript: + 2writetext WesleyNotWednesdayText closetext loadmovesprites end -; 0x70148 ItemFragment_0x70148: ; 0x70148 db ELIXER, 1 @@ -561,7 +555,7 @@ UnknownText_0x70752: ; 0x70752 done ; 0x70784 -UnknownText_0x70784: ; 0x70784 +MeetWesleyText: text "WESLEY: Well, how" line "do you do?" @@ -571,23 +565,20 @@ UnknownText_0x70784: ; 0x70784 para "I'm WESLEY of" line "Wednesday." done -; 0x707dd -UnknownText_0x707dd: ; 0x707dd +WesleyGivesGiftText: text "Pleased to meet" line "you. Please take a" cont "souvenir." done -; 0x7080b -UnknownText_0x7080b: ; 0x7080b +WesleyGaveGiftText: text "WESLEY: BLACKBELT" line "beefs up the power" cont "of fighting moves." done -; 0x70844 -UnknownText_0x70844: ; 0x70844 +WesleyWednesdayText: text "WESLEY: Since you" line "found me, you must" @@ -597,14 +588,12 @@ UnknownText_0x70844: ; 0x70844 para "Or did you just" line "get lucky?" done -; 0x708a9 -UnknownText_0x708a9: ; 0x708a9 +WesleyNotWednesdayText: text "WESLEY: Today's" line "not Wednesday." cont "That's too bad." done -; 0x708d7 UnknownText_0x708d7: ; 0x708d7 text "LAKE OF RAGE," @@ -650,8 +639,6 @@ LakeofRage_MapEventHeader: ; 0x70919 person_event SPRITE_COOLTRAINER_M, 19, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermAaron, $0735 person_event SPRITE_COOLTRAINER_F, 11, 40, $8, $0, 255, 255, $82, 0, TrainerCooltrainerfLois, $0735 person_event SPRITE_GYARADOS, 26, 22, $16, $0, 255, 255, $80, 0, GyaradosScript_0x70063, $0751 - person_event SPRITE_SUPER_NERD, 8, 8, $6, $0, 255, 255, $0, 0, SuperNerdScript_0x7010e, $075c + person_event SPRITE_SUPER_NERD, 8, 8, $6, $0, 255, 255, $0, 0, WesleyScript, $075c person_event SPRITE_POKE_BALL, 14, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x70148, $0645 person_event SPRITE_POKE_BALL, 6, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7014a, $0646 -; 0x709de - diff --git a/maps/Route29.asm b/maps/Route29.asm index f3b95ae7c..355e84fe0 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -11,8 +11,7 @@ Route29_MapScriptHeader: ; 0x1a0f4c ; callbacks - dbw 2, UnknownScript_0x1a0f5b -; 0x1a0f59 + dbw 2, TuscanyCallback UnknownScript_0x1a0f59: ; 0x1a0f59 end @@ -22,20 +21,19 @@ UnknownScript_0x1a0f5a: ; 0x1a0f5a end ; 0x1a0f5b -UnknownScript_0x1a0f5b: ; 0x1a0f5b +TuscanyCallback: checkflag $001b - iftrue UnknownScript_0x1a0f64 -UnknownScript_0x1a0f61: ; 0x1a0f61 + iftrue .DoesTuscanyAppear + +.TuscanyDisappears disappear $8 return -; 0x1a0f64 -UnknownScript_0x1a0f64: ; 0x1a0f64 +.DoesTuscanyAppear checkcode $b - if_not_equal TUESDAY, UnknownScript_0x1a0f61 + if_not_equal TUESDAY, .TuscanyDisappears appear $8 return -; 0x1a0f6d UnknownScript_0x1a0f6d: ; 0x1a0f6d spriteface $2, $1 @@ -177,44 +175,41 @@ UnknownScript_0x1a1043: ; 0x1a1043 end ; 0x1a1049 -TeacherScript_0x1a1049: ; 0x1a1049 +TuscanyScript: faceplayer loadfont checkevent EVENT_GOT_PINK_BOW_FROM_TUSCANY - iftrue UnknownScript_0x1a1077 + iftrue TuscanyTuesdayScript checkcode $b - if_not_equal TUESDAY, UnknownScript_0x1a107d + if_not_equal TUESDAY, TuscanyNotTuesdayScript checkevent EVENT_MET_TUSCANY_OF_TUESDAY - iftrue UnknownScript_0x1a1064 - 2writetext UnknownText_0x1a13b2 + iftrue .MetTuscany + 2writetext MeetTuscanyText keeptextopen setevent EVENT_MET_TUSCANY_OF_TUESDAY -UnknownScript_0x1a1064: ; 0x1a1064 - 2writetext UnknownText_0x1a142f +.MetTuscany + 2writetext TuscanyGivesGiftText keeptextopen verbosegiveitem PINK_BOW, 1 - iffalse UnknownScript_0x1a107b + iffalse TuscanyDoneScript setevent EVENT_GOT_PINK_BOW_FROM_TUSCANY - 2writetext UnknownText_0x1a146f + 2writetext TuscanyGaveGiftText closetext loadmovesprites end -; 0x1a1077 -UnknownScript_0x1a1077: ; 0x1a1077 - 2writetext UnknownText_0x1a14e7 +TuscanyTuesdayScript: + 2writetext TuscanyTuesdayText closetext -UnknownScript_0x1a107b: ; 0x1a107b +TuscanyDoneScript: loadmovesprites end -; 0x1a107d -UnknownScript_0x1a107d: ; 0x1a107d - 2writetext UnknownText_0x1a1559 +TuscanyNotTuesdayScript: + 2writetext TuscanyNotTuesdayText closetext loadmovesprites end -; 0x1a1083 MapRoute29Signpost0Script: ; 0x1a1083 jumptext UnknownText_0x1a158e @@ -382,7 +377,7 @@ UnknownText_0x1a137c: ; 0x1a137c done ; 0x1a13b2 -UnknownText_0x1a13b2: ; 0x1a13b2 +MeetTuscanyText: text "TUSCANY: I do be-" line "lieve that this is" @@ -395,18 +390,16 @@ UnknownText_0x1a13b2: ; 0x1a13b2 para "I am TUSCANY of" line "Tuesday." done -; 0x1a142f -UnknownText_0x1a142f: ; 0x1a142f +TuscanyGivesGiftText: text "By way of intro-" line "duction, please" para "accept this gift," line "a PINK BOW." done -; 0x1a146f -UnknownText_0x1a146f: ; 0x1a146f +TuscanyGaveGiftText: text "TUSCANY: Wouldn't" line "you agree that it" cont "is most adorable?" @@ -417,9 +410,8 @@ UnknownText_0x1a146f: ; 0x1a146f para "I am certain it" line "will be of use." done -; 0x1a14e7 -UnknownText_0x1a14e7: ; 0x1a14e7 +TuscanyTuesdayText: text "TUSCANY: Have you" line "met MONICA, my" cont "older sister?" @@ -430,14 +422,12 @@ UnknownText_0x1a14e7: ; 0x1a14e7 para "I am the second of" line "seven children." done -; 0x1a1559 -UnknownText_0x1a1559: ; 0x1a1559 +TuscanyNotTuesdayText: text "TUSCANY: Today is" line "not Tuesday. That" cont "is unfortunate…" done -; 0x1a158e UnknownText_0x1a158e: ; 0x1a158e text "ROUTE 29" @@ -481,7 +471,5 @@ Route29_MapEventHeader: ; 0x1a15e4 person_event SPRITE_FRUIT_TREE, 6, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1089, $ffff person_event SPRITE_FISHER, 7, 29, $7, $0, 255, 255, $90, 0, FisherScript_0x1a102e, $ffff person_event SPRITE_COOLTRAINER_M, 8, 17, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a1031, $ffff - person_event SPRITE_TEACHER, 16, 33, $3, $0, 255, 255, $0, 0, TeacherScript_0x1a1049, $0759 + person_event SPRITE_TEACHER, 16, 33, $3, $0, 255, 255, $0, 0, TuscanyScript, $0759 person_event SPRITE_POKE_BALL, 6, 52, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a108b, $06ad -; 0x1a1671 - diff --git a/maps/Route32.asm b/maps/Route32.asm index 88c3a01bc..62ea20e77 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -12,8 +12,7 @@ Route32_MapScriptHeader: ; 0x19044f ; callbacks - dbw 2, UnknownScript_0x190463 -; 0x190460 + dbw 2, FriedaCallback UnknownScript_0x190460: ; 0x190460 end @@ -27,17 +26,15 @@ UnknownScript_0x190462: ; 0x190462 end ; 0x190463 -UnknownScript_0x190463: ; 0x190463 +FriedaCallback: checkcode $b - if_equal FRIDAY, UnknownScript_0x19046c + if_equal FRIDAY, .FriedaAppears disappear $e return -; 0x19046c -UnknownScript_0x19046c: ; 0x19046c +.FriedaAppears appear $e return -; 0x19046f CooltrainerMScript_0x19046f: ; 0x19046f faceplayer @@ -627,44 +624,41 @@ Bird_keeperPeterScript: ; 0x190731 end ; 0x190739 -LassScript_0x190739: ; 0x190739 +FriedaScript: faceplayer loadfont checkevent EVENT_GOT_POISON_BARB_FROM_FRIEDA - iftrue UnknownScript_0x190767 + iftrue FriedaFridayScript checkcode $b - if_not_equal FRIDAY, UnknownScript_0x19076d + if_not_equal FRIDAY, FriedaNotFridayScript checkevent EVENT_MET_FRIEDA_OF_FRIDAY - iftrue UnknownScript_0x190754 - 2writetext UnknownText_0x1911c1 + iftrue .MetFrieda + 2writetext MeetFriedaText keeptextopen setevent EVENT_MET_FRIEDA_OF_FRIDAY -UnknownScript_0x190754: ; 0x190754 - 2writetext UnknownText_0x191204 +.MetFrieda + 2writetext FriedaGivesGiftText keeptextopen verbosegiveitem POISON_BARB, 1 - iffalse UnknownScript_0x19076b + iffalse FriedaDoneScript setevent EVENT_GOT_POISON_BARB_FROM_FRIEDA - 2writetext UnknownText_0x191222 + 2writetext FriedaGaveGiftText closetext loadmovesprites end -; 0x190767 -UnknownScript_0x190767: ; 0x190767 - 2writetext UnknownText_0x19129a +FriedaFridayScript: + 2writetext FriedaFridayText closetext -UnknownScript_0x19076b: ; 0x19076b +FriedaDoneScript: loadmovesprites end -; 0x19076d -UnknownScript_0x19076d: ; 0x19076d - 2writetext UnknownText_0x1912ff +FriedaNotFridayScript: + 2writetext FriedaNotFridayText closetext loadmovesprites end -; 0x190773 ItemFragment_0x190773: ; 0x190773 db GREAT_BALL, 1 @@ -1100,7 +1094,7 @@ UnknownText_0x19118c: ; 0x19118c done ; 0x1911c1 -UnknownText_0x1911c1: ; 0x1911c1 +MeetFriedaText: text "FRIEDA: Yahoo!" line "It's Friday!" @@ -1109,15 +1103,13 @@ UnknownText_0x1911c1: ; 0x1911c1 para "Nice to meet you!" done -; 0x191204 -UnknownText_0x191204: ; 0x191204 +FriedaGivesGiftText: text "Here's a POISON" line "BARB for you!" done -; 0x191222 -UnknownText_0x191222: ; 0x191222 +FriedaGaveGiftText: text "FRIEDA: Give it to" line "a #MON that has" cont "poison-type moves." @@ -1130,9 +1122,8 @@ UnknownText_0x191222: ; 0x191222 line "how good it makes" cont "poison moves!" done -; 0x19129a -UnknownText_0x19129a: ; 0x19129a +FriedaFridayText: text "FRIEDA: Hiya! What" line "day do you like?" @@ -1142,16 +1133,14 @@ UnknownText_0x19129a: ; 0x19129a para "Don't you think" line "it's great too?" done -; 0x1912ff -UnknownText_0x1912ff: ; 0x1912ff +FriedaNotFridayText: text "FRIEDA: Isn't it" line "Friday today?" para "It's so boring" line "when it's not!" done -; 0x19133a UnknownText_0x19133a: ; 0x19133a text "ROUTE 32" @@ -1212,7 +1201,5 @@ Route32_MapEventHeader: ; 0x19138d person_event SPRITE_FISHER, 74, 11, $6, $0, 255, 255, $0, 0, FisherScript_0x1904f2, $06fc person_event SPRITE_POKE_BALL, 57, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x190773, $06b0 person_event SPRITE_FISHER, 17, 19, $9, $0, 255, 255, $0, 0, FisherScript_0x1904ce, $ffff - person_event SPRITE_LASS, 71, 16, $8, $0, 255, 255, $0, 0, LassScript_0x190739, $0758 + person_event SPRITE_LASS, 71, 16, $8, $0, 255, 255, $0, 0, FriedaScript, $0758 person_event SPRITE_POKE_BALL, 34, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x190775, $06b1 -; 0x19148b - diff --git a/maps/Route36.asm b/maps/Route36.asm index 7f29e415c..e95ff6d4e 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -11,8 +11,7 @@ Route36_MapScriptHeader: ; 0x194000 ; callbacks - dbw 2, UnknownScript_0x19400f -; 0x19400d + dbw 2, ArthurCallback UnknownScript_0x19400d: ; 0x19400d end @@ -22,17 +21,15 @@ UnknownScript_0x19400e: ; 0x19400e end ; 0x19400f -UnknownScript_0x19400f: ; 0x19400f +ArthurCallback: checkcode $b - if_equal THURSDAY, UnknownScript_0x194018 + if_equal THURSDAY, .ArthurAppears disappear $8 return -; 0x194018 -UnknownScript_0x194018: ; 0x194018 +.ArthurAppears appear $8 return -; 0x19401b UnknownScript_0x19401b: ; 0x19401b showemote $0, $0, 15 @@ -381,44 +378,41 @@ PsychicMarkScript: ; 0x1941f9 end ; 0x194201 -YoungsterScript_0x194201: ; 0x194201 +ArthurScript: faceplayer loadfont checkevent EVENT_GOT_HARD_STONE_FROM_ARTHUR - iftrue UnknownScript_0x19422f + iftrue ArthurThursdayScript checkcode $b - if_not_equal THURSDAY, UnknownScript_0x194235 + if_not_equal THURSDAY, ArthurNotThursdayScript checkevent EVENT_MET_ARTHUR_OF_THURSDAY - iftrue UnknownScript_0x19421c - 2writetext UnknownText_0x194800 + iftrue .MetArthur + 2writetext MeetArthurText keeptextopen setevent EVENT_MET_ARTHUR_OF_THURSDAY -UnknownScript_0x19421c: ; 0x19421c - 2writetext UnknownText_0x19482d +.MetArthur + 2writetext ArthurGivesGiftText keeptextopen verbosegiveitem HARD_STONE, 1 - iffalse UnknownScript_0x194233 + iffalse ArthurDoneScript setevent EVENT_GOT_HARD_STONE_FROM_ARTHUR - 2writetext UnknownText_0x194847 + 2writetext ArthurGaveGiftText closetext loadmovesprites end -; 0x19422f -UnknownScript_0x19422f: ; 0x19422f - 2writetext UnknownText_0x1948aa +ArthurThursdayScript: + 2writetext ArthurThursdayText closetext -UnknownScript_0x194233: ; 0x194233 +ArthurDoneScript: loadmovesprites end -; 0x194235 -UnknownScript_0x194235: ; 0x194235 - 2writetext UnknownText_0x1948f3 +ArthurNotThursdayScript: + 2writetext ArthurNotThursdayText closetext loadmovesprites end -; 0x19423b MapRoute36Signpost2Script: ; 0x19423b jumptext UnknownText_0x194924 @@ -678,22 +672,20 @@ UnknownText_0x1947aa: ; 0x1947aa done ; 0x194800 -UnknownText_0x194800: ; 0x194800 +MeetArthurText: text "ARTHUR: Who are" line "you?" para "I'm ARTHUR of" line "Thursday." done -; 0x19482d -UnknownText_0x19482d: ; 0x19482d +ArthurGivesGiftText: text "Here. You can have" line "this." done -; 0x194847 -UnknownText_0x194847: ; 0x194847 +ArthurGaveGiftText: text "ARTHUR: A #MON" line "that uses rock-" @@ -703,23 +695,20 @@ UnknownText_0x194847: ; 0x194847 para "It pumps up rock-" line "type attacks." done -; 0x1948aa -UnknownText_0x1948aa: ; 0x1948aa +ArthurThursdayText: text "ARTHUR: I'm ARTHUR" line "of Thursday. I'm" para "the second son out" line "of seven children." done -; 0x1948f3 -UnknownText_0x1948f3: ; 0x1948f3 +ArthurNotThursdayText: text "ARTHUR: Today's" line "not Thursday. How" cont "disappointing." done -; 0x194924 UnknownText_0x194924: ; 0x194924 text "ROUTE 36" @@ -796,8 +785,6 @@ Route36_MapEventHeader: ; 0x194a66 person_event SPRITE_LASS, 12, 55, $5, $2, 255, 255, $0, 0, LassScript_0x1940e0, $ffff person_event SPRITE_FISHER, 13, 48, $8, $0, 255, 255, $0, 0, FisherScript_0x1940b9, $ffff person_event SPRITE_FRUIT_TREE, 8, 25, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194247, $ffff - person_event SPRITE_YOUNGSTER, 10, 50, $2, $11, 255, 255, $0, 0, YoungsterScript_0x194201, $075a + person_event SPRITE_YOUNGSTER, 10, 50, $2, $11, 255, 255, $0, 0, ArthurScript, $075a person_event SPRITE_LASS, 16, 37, $6, $0, 255, 255, $90, 0, LassScript_0x19408c, $0769 person_event SPRITE_SUICUNE, 10, 25, $1, $0, 255, 255, $90, 0, ObjectEvent, $07b0 -; 0x194b19 - diff --git a/maps/Route37.asm b/maps/Route37.asm index ca2298c26..f732f0a90 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -7,20 +7,17 @@ Route37_MapScriptHeader: ; 0x1a8d72 ; callbacks - dbw 2, UnknownScript_0x1a8d77 -; 0x1a8d77 + dbw 2, SunnyCallback -UnknownScript_0x1a8d77: ; 0x1a8d77 +SunnyCallback: checkcode $b - if_equal SUNDAY, UnknownScript_0x1a8d80 + if_equal SUNDAY, .SunnyAppears disappear $6 return -; 0x1a8d80 -UnknownScript_0x1a8d80: ; 0x1a8d80 +.SunnyAppears appear $6 return -; 0x1a8d83 TrainerTwinsAnnandanne1: ; 0x1a8d83 ; bit/flag number @@ -109,53 +106,48 @@ PsychicGregScript: ; 0x1a8db7 end ; 0x1a8dbf -BugCatcherScript_0x1a8dbf: ; 0x1a8dbf +SunnyScript: faceplayer loadfont checkevent EVENT_GOT_MAGNET_FROM_SUNNY - iftrue UnknownScript_0x1a8dfa + iftrue SunnySundayScript checkcode $b - if_not_equal SUNDAY, UnknownScript_0x1a8e00 + if_not_equal SUNDAY, SunnyNotSundayScript checkevent EVENT_MET_SUNNY_OF_SUNDAY - iftrue UnknownScript_0x1a8dda - 2writetext UnknownText_0x1a8fc8 + iftrue .MetSunny + 2writetext MeetSunnyText keeptextopen setevent EVENT_MET_SUNNY_OF_SUNDAY -UnknownScript_0x1a8dda: ; 0x1a8dda +.MetSunny checkflag $0063 - iftrue UnknownScript_0x1a8de7 - 2writetext UnknownText_0x1a9004 + iftrue .Kris + 2writetext SunnyGivesGiftText1 keeptextopen - 2jump UnknownScript_0x1a8deb -; 0x1a8de7 - -UnknownScript_0x1a8de7: ; 0x1a8de7 - 2writetext UnknownText_0x1a902f + 2jump .next +.Kris + 2writetext SunnyGivesGiftText2 keeptextopen -UnknownScript_0x1a8deb: ; 0x1a8deb +.next verbosegiveitem MAGNET, 1 - iffalse UnknownScript_0x1a8dfe + iffalse SunnyDoneScript setevent EVENT_GOT_MAGNET_FROM_SUNNY - 2writetext UnknownText_0x1a905a + 2writetext SunnyGaveGiftText closetext loadmovesprites end -; 0x1a8dfa -UnknownScript_0x1a8dfa: ; 0x1a8dfa - 2writetext UnknownText_0x1a90fc +SunnySundayScript: + 2writetext SunnySundayText closetext -UnknownScript_0x1a8dfe: ; 0x1a8dfe +SunnyDoneScript: loadmovesprites end -; 0x1a8e00 -UnknownScript_0x1a8e00: ; 0x1a8e00 - 2writetext UnknownText_0x1a916e +SunnyNotSundayScript: + 2writetext SunnyNotSundayText closetext loadmovesprites end -; 0x1a8e06 MapRoute37Signpost0Script: ; 0x1a8e06 jumptext UnknownText_0x1a9197 @@ -245,30 +237,27 @@ UnknownText_0x1a8f80: ; 0x1a8f80 done ; 0x1a8fc8 -UnknownText_0x1a8fc8: ; 0x1a8fc8 +MeetSunnyText: text "SUNNY: Hi!" para "I'm SUNNY of Sun-" line "day, meaning it's" cont "Sunday today!" done -; 0x1a9004 -UnknownText_0x1a9004: ; 0x1a9004 +SunnyGivesGiftText1: text "I was told to give" line "you this if I saw" cont "you!" done -; 0x1a902f -UnknownText_0x1a902f: ; 0x1a902f +SunnyGivesGiftText2: text "I was told to give" line "you this if I saw" cont "you!" done -; 0x1a905a -UnknownText_0x1a905a: ; 0x1a905a +SunnyGaveGiftText: text "SUNNY: That thing…" para "Um…" @@ -290,9 +279,8 @@ UnknownText_0x1a905a: ; 0x1a905a line "it powers up" cont "electric moves!" done -; 0x1a90fc -UnknownText_0x1a90fc: ; 0x1a90fc +SunnySundayText: text "SUNNY: My sisters" line "and brothers are" cont "MONICA, TUSCANY," @@ -302,14 +290,12 @@ UnknownText_0x1a90fc: ; 0x1a90fc para "They're all older" line "than me!" done -; 0x1a916e -UnknownText_0x1a916e: ; 0x1a916e +SunnyNotSundayText: text "SUNNY: Isn't today" line "Sunday?" cont "Um… I forgot!" done -; 0x1a9197 UnknownText_0x1a9197: ; 0x1a9197 text "ROUTE 37" @@ -337,8 +323,6 @@ Route37_MapEventHeader: ; 0x1a91a1 person_event SPRITE_WEIRD_TREE, 16, 11, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne2, $ffff person_event SPRITE_YOUNGSTER, 10, 10, $a, $0, 255, 255, $92, 1, TrainerPsychicGreg, $ffff person_event SPRITE_FRUIT_TREE, 9, 17, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e09, $ffff - person_event SPRITE_BUG_CATCHER, 12, 20, $2, $11, 255, 255, $0, 0, BugCatcherScript_0x1a8dbf, $075b + person_event SPRITE_BUG_CATCHER, 12, 20, $2, $11, 255, 255, $0, 0, SunnyScript, $075b person_event SPRITE_FRUIT_TREE, 9, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0b, $ffff person_event SPRITE_FRUIT_TREE, 11, 19, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0d, $ffff -; 0x1a920c - diff --git a/maps/Route40.asm b/maps/Route40.asm index fe7bd2610..1110356a4 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -7,21 +7,18 @@ Route40_MapScriptHeader: ; 0x1a6160 ; callbacks - dbw 2, UnknownScript_0x1a6165 -; 0x1a6165 + dbw 2, MonicaCallback -UnknownScript_0x1a6165: ; 0x1a6165 +MonicaCallback: clearevent $07cf checkcode $b - if_equal MONDAY, UnknownScript_0x1a6171 + if_equal MONDAY, .MonicaAppears disappear $a return -; 0x1a6171 -UnknownScript_0x1a6171: ; 0x1a6171 +.MonicaAppears appear $a return -; 0x1a6174 TrainerSwimmerfElaine: ; 0x1a6174 ; bit/flag number @@ -161,44 +158,41 @@ StandingYoungsterScript_0x1a61d6: ; 0x1a61d6 jumptextfaceplayer UnknownText_0x1a6564 ; 0x1a61d9 -BuenaScript_0x1a61d9: ; 0x1a61d9 +MonicaScript: faceplayer loadfont checkevent EVENT_GOT_SHARP_BEAK_FROM_MONICA - iftrue UnknownScript_0x1a6207 + iftrue MonicaMondayScript checkcode $b - if_not_equal MONDAY, UnknownScript_0x1a620d + if_not_equal MONDAY, MonicaNotMondayScript checkevent EVENT_MET_MONICA_OF_MONDAY - iftrue UnknownScript_0x1a61f4 - 2writetext UnknownText_0x1a6606 + iftrue .MetMonica + 2writetext MeetMonicaText keeptextopen setevent EVENT_MET_MONICA_OF_MONDAY -UnknownScript_0x1a61f4: ; 0x1a61f4 - 2writetext UnknownText_0x1a6636 +.MetMonica + 2writetext MonicaGivesGiftText keeptextopen verbosegiveitem SHARP_BEAK, 1 - iffalse UnknownScript_0x1a620b + iffalse MonicaDoneScript setevent EVENT_GOT_SHARP_BEAK_FROM_MONICA - 2writetext UnknownText_0x1a666c + 2writetext MonicaGaveGiftText closetext loadmovesprites end -; 0x1a6207 -UnknownScript_0x1a6207: ; 0x1a6207 - 2writetext UnknownText_0x1a66dc +MonicaMondayScript: + 2writetext MonicaMondayText closetext -UnknownScript_0x1a620b: ; 0x1a620b +MonicaDoneScript: loadmovesprites end -; 0x1a620d -UnknownScript_0x1a620d: ; 0x1a620d - 2writetext UnknownText_0x1a6737 +MonicaNotMondayScript: + 2writetext MonicaNotMondayText closetext loadmovesprites end -; 0x1a6213 MapRoute40Signpost0Script: ; 0x1a6213 jumptext UnknownText_0x1a6767 @@ -384,22 +378,20 @@ UnknownText_0x1a6564: ; 0x1a6564 done ; 0x1a6606 -UnknownText_0x1a6606: ; 0x1a6606 +MeetMonicaText: text "MONICA: Glad to" line "meet you. I'm" para "MONICA of Monday." done -; 0x1a6636 -UnknownText_0x1a6636: ; 0x1a6636 +MonicaGivesGiftText: text "As a token of our" line "friendship, I have" cont "a gift for you!" done -; 0x1a666c -UnknownText_0x1a666c: ; 0x1a666c +MonicaGaveGiftText: text "MONICA: It's an" line "item that raises" @@ -410,9 +402,8 @@ UnknownText_0x1a666c: ; 0x1a666c line "bird #MON with" cont "that item." done -; 0x1a66dc -UnknownText_0x1a66dc: ; 0x1a66dc +MonicaMondayText: text "MONICA: My broth-" line "ers and sisters" @@ -422,14 +413,12 @@ UnknownText_0x1a66dc: ; 0x1a66dc para "See if you could" line "find them all!" done -; 0x1a6737 -UnknownText_0x1a6737: ; 0x1a6737 +MonicaNotMondayText: text "MONICA: I don't" line "think today is" cont "Monday. How sad…" done -; 0x1a6767 UnknownText_0x1a6767: ; 0x1a6767 text "ROUTE 40" @@ -465,9 +454,7 @@ Route40_MapEventHeader: ; 0x1a678e person_event SPRITE_ROCK, 13, 10, $18, $0, 255, 255, $0, 0, RockScript_0x1a6216, $ffff person_event SPRITE_ROCK, 12, 11, $18, $0, 255, 255, $0, 0, RockScript_0x1a6216, $ffff person_event SPRITE_LASS, 17, 15, $6, $0, 255, 255, $0, 0, LassScript_0x1a61c4, $ffff - person_event SPRITE_BUENA, 14, 12, $3, $0, 255, 255, $0, 0, BuenaScript_0x1a61d9, $075e + person_event SPRITE_BUENA, 14, 12, $3, $0, 255, 255, $0, 0, MonicaScript, $075e person_event SPRITE_POKEFAN_M, 10, 11, $9, $0, 255, 255, $0, 0, PokefanMScript_0x1a61c7, $ffff person_event SPRITE_LASS, 8, 17, $3, $0, 255, 255, $a0, 0, LassScript_0x1a61d3, $ffff person_event SPRITE_STANDING_YOUNGSTER, 13, 20, $3, $0, 255, 255, $90, 0, StandingYoungsterScript_0x1a61d6, $07cf -; 0x1a683f -