diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-16 21:57:42 -0500 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-16 21:57:42 -0500 |
commit | 7203e9d2cc757a95bac02ec019ffa094f516c9dd (patch) | |
tree | e9cffc2a3d71ac4797600d05be242d740a90885f /maps | |
parent | 879b430fce7d2ad470512a21183586c78b81535f (diff) |
Map script and color shenanigans
Diffstat (limited to 'maps')
-rw-r--r-- | maps/AzaleaTown.asm | 150 | ||||
-rw-r--r-- | maps/CherrygroveCity.asm | 14 | ||||
-rw-r--r-- | maps/NewBarkTown.asm | 124 | ||||
-rw-r--r-- | maps/Route29.asm | 144 | ||||
-rw-r--r-- | maps/Route30.asm | 160 | ||||
-rw-r--r-- | maps/Route31.asm | 76 | ||||
-rw-r--r-- | maps/Route32.asm | 318 | ||||
-rw-r--r-- | maps/Route33.asm | 74 | ||||
-rw-r--r-- | maps/VioletCity.asm | 82 |
9 files changed, 571 insertions, 571 deletions
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index de6941334..41a73eb53 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -40,70 +40,70 @@ AzaleaTown_MapScriptHeader: setflag ENGINE_FLYPOINT_AZALEA return -UnknownScript_0x198018: +AzaleaTownRivalBattleTrigger1: moveperson AZALEATOWN_SILVER, $b, $b spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic pause 15 appear AZALEATOWN_SILVER - applymovement AZALEATOWN_SILVER, MovementData_0x198134 + applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1 spriteface PLAYER, DOWN - jump UnknownScript_0x198049 + jump AzaleaTownRivalBattleScript -UnknownScript_0x198034: +AzaleaTownRivalBattleTrigger2: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic pause 15 appear AZALEATOWN_SILVER - applymovement AZALEATOWN_SILVER, MovementData_0x19813c + applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement2 spriteface PLAYER, UP -UnknownScript_0x198049: +AzaleaTownRivalBattleScript: playmusic MUSIC_RIVAL_ENCOUNTER opentext - writetext UnknownText_0x19814d + writetext AzaleaTownRivalBeforeText waitbutton closetext setevent EVENT_RIVAL_AZALEA_TOWN checkevent EVENT_GOT_TOTODILE_FROM_ELM - iftrue UnknownScript_0x198071 + iftrue .Totodile checkevent EVENT_GOT_CHIKORITA_FROM_ELM - iftrue UnknownScript_0x198081 - winlosstext UnknownText_0x1981e6, UnknownText_0x19835b + iftrue .Chikorita + winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText setlasttalked AZALEATOWN_SILVER loadtrainer RIVAL1, RIVAL1_6 startbattle reloadmapmusic returnafterbattle - jump UnknownScript_0x198091 + jump .AfterBattle -UnknownScript_0x198071: - winlosstext UnknownText_0x1981e6, UnknownText_0x19835b +.Totodile: + winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText setlasttalked AZALEATOWN_SILVER loadtrainer RIVAL1, RIVAL1_4 startbattle reloadmapmusic returnafterbattle - jump UnknownScript_0x198091 + jump .AfterBattle -UnknownScript_0x198081: - winlosstext UnknownText_0x1981e6, UnknownText_0x19835b +.Chikorita: + winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText setlasttalked AZALEATOWN_SILVER loadtrainer RIVAL1, RIVAL1_5 startbattle reloadmapmusic returnafterbattle - jump UnknownScript_0x198091 + jump .AfterBattle -UnknownScript_0x198091: +.AfterBattle: playmusic MUSIC_RIVAL_AFTER opentext - writetext UnknownText_0x198233 + writetext AzaleaTownRivalAfterText waitbutton closetext spriteface PLAYER, LEFT - applymovement AZALEATOWN_SILVER, MovementData_0x198144 + applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement playsound SFX_EXIT_BUILDING disappear AZALEATOWN_SILVER dotrigger $0 @@ -111,39 +111,39 @@ UnknownScript_0x198091: playmapmusic end -AzaleaRocketScript_0x1980ab: - jumptextfaceplayer UnknownText_0x19837b +AzaleaTownRocket1Script: + jumptextfaceplayer GoodSamaritanRocketText -AzaleaRocketScript_0x1980ae: - jumptextfaceplayer UnknownText_0x1983c7 +AzaleaTownRocket2Script: + jumptextfaceplayer TastySlowpokeTailRocketText -GrampsScript_0x1980b1: +AzaleaTownGrampsScript: faceplayer opentext checkevent EVENT_CLEARED_SLOWPOKE_WELL - iftrue UnknownScript_0x1980bf - writetext UnknownText_0x19841b + iftrue .ClearedWell + writetext AzaleaTownGrampsTextBefore waitbutton closetext end -UnknownScript_0x1980bf: - writetext UnknownText_0x198473 +.ClearedWell: + writetext AzaleaTownGrampsTextAfter waitbutton closetext end -TeacherScript_0x1980c5: - jumptextfaceplayer UnknownText_0x1984ce +AzaleaTownTeacherScript: + jumptextfaceplayer AzaleaTownTeacherText -YoungsterScript_0x1980c8: - jumptextfaceplayer UnknownText_0x19851a +AzaleaTownYoungsterScript: + jumptextfaceplayer AzaleaTownYoungsterText -SlowpokeScript_0x1980cb: +AzaleaTownSlowpokeScript: opentext - writetext UnknownText_0x1985b0 + writetext AzaleaTownSlowpokeText1 pause 60 - writetext UnknownText_0x1985c3 + writetext AzaleaTownSlowpokeText2 cry SLOWPOKE waitbutton closetext @@ -159,15 +159,15 @@ WoosterScript: closetext end -UnknownScript_0x1980e5: - applymovement PLAYER, MovementData_0x198148 +AzaleaTown_CelebiEventScript: + applymovement PLAYER, Movement_PlayerWalksOutOfKurtsHouse opentext - writetext UnknownText_0x1985df + writetext IlexForestIsRestlessText buttonsound spriteface AZALEATOWN_KURT_OUTSIDE, RIGHT - writetext UnknownText_0x19860b + writetext HeresTheGSBallBackText buttonsound - writetext UnknownText_0x198628 + writetext PleaseInvestigateIlexForestText waitbutton verbosegiveitem GS_BALL spriteface AZALEATOWN_KURT_OUTSIDE, LEFT @@ -178,10 +178,10 @@ UnknownScript_0x1980e5: closetext end -KurtOutsideScript_0x19810c: +AzaleaTownKurtScript: faceplayer opentext - writetext UnknownText_0x198628 + writetext PleaseInvestigateIlexForestText waitbutton spriteface AZALEATOWN_KURT_OUTSIDE, LEFT closetext @@ -218,7 +218,7 @@ AzaleaTownHiddenFullHeal: dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL -MovementData_0x198134: +AzaleaTownRivalBattleApproachMovement1: step_left step_left step_left @@ -228,7 +228,7 @@ MovementData_0x198134: turn_head_up step_end -MovementData_0x19813c: +AzaleaTownRivalBattleApproachMovement2: step_left step_left step_left @@ -238,20 +238,20 @@ MovementData_0x19813c: turn_head_down step_end -MovementData_0x198144: +AzaleaTownRivalBattleExitMovement: step_left step_left step_left step_end -MovementData_0x198148: +Movement_PlayerWalksOutOfKurtsHouse: step_left step_left step_up turn_head_left step_end -UnknownText_0x19814d: +AzaleaTownRivalBeforeText: text "…Tell me some-" line "thing." @@ -268,7 +268,7 @@ UnknownText_0x19814d: cont "good you are." done -UnknownText_0x1981e6: +AzaleaTownRivalWinText: text "… Humph! Useless" line "#MON!" @@ -279,7 +279,7 @@ UnknownText_0x1981e6: line "weak." done -UnknownText_0x198233: +AzaleaTownRivalAfterText: text "I hate the weak." para "#MON, trainers." @@ -309,12 +309,12 @@ UnknownText_0x198233: line "distraction." done -UnknownText_0x19835b: +AzaleaTownRivalLossText: text "…Humph! I knew" line "you were lying." done -UnknownText_0x19837b: +GoodSamaritanRocketText: text "It's unsafe to go" line "in there, so I'm" cont "standing guard." @@ -323,7 +323,7 @@ UnknownText_0x19837b: line "Samaritan?" done -UnknownText_0x1983c7: +TastySlowpokeTailRocketText: text "Do you know about" line "SLOWPOKETAIL? I" cont "heard it's tasty!" @@ -332,7 +332,7 @@ UnknownText_0x1983c7: line "told you that?" done -UnknownText_0x19841b: +AzaleaTownGrampsTextBefore: text "The SLOWPOKE have" line "disappeared from" cont "town…" @@ -342,7 +342,7 @@ UnknownText_0x19841b: cont "sold somewhere." done -UnknownText_0x198473: +AzaleaTownGrampsTextAfter: text "The SLOWPOKE have" line "returned." @@ -353,7 +353,7 @@ UnknownText_0x198473: line "where." done -UnknownText_0x1984ce: +AzaleaTownTeacherText: text "Did you come to" line "get KURT to make" cont "some BALLS?" @@ -362,7 +362,7 @@ UnknownText_0x1984ce: line "just that." done -UnknownText_0x19851a: +AzaleaTownYoungsterText: text "Cut through AZALEA" line "and you'll be in" cont "ILEX FOREST." @@ -378,13 +378,13 @@ UnknownText_0x19851a: cont "down trees." done -UnknownText_0x1985b0: +AzaleaTownSlowpokeText1: text "SLOWPOKE: …" para "<......> <......> <......>" done -UnknownText_0x1985c3: +AzaleaTownSlowpokeText2: text "<......> <......>Yawn?" done @@ -392,19 +392,19 @@ WoosterText: text "WOOSTER: Gugyoo…" done -UnknownText_0x1985df: +IlexForestIsRestlessText: text "ILEX FOREST is" line "restless!" para "What is going on?" done -UnknownText_0x19860b: +HeresTheGSBallBackText: text "<PLAYER>, here's" line "your GS BALL back!" done -UnknownText_0x198628: +PleaseInvestigateIlexForestText: text "Could you go see" line "why ILEX FOREST is" cont "so restless?" @@ -477,9 +477,9 @@ AzaleaTown_MapEventHeader: .XYTriggers: db 3 - xy_trigger 1, $a, $5, $0, UnknownScript_0x198018, $0, $0 - xy_trigger 1, $b, $5, $0, UnknownScript_0x198034, $0, $0 - xy_trigger 2, $6, $9, $0, UnknownScript_0x1980e5, $0, $0 + xy_trigger 1, $a, $5, $0, AzaleaTownRivalBattleTrigger1, $0, $0 + xy_trigger 1, $b, $5, $0, AzaleaTownRivalBattleTrigger2, $0, $0 + xy_trigger 2, $6, $9, $0, AzaleaTown_CelebiEventScript, $0, $0 .Signposts: db 9 @@ -495,15 +495,15 @@ AzaleaTown_MapEventHeader: .PersonEvents: db 12 - person_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET - person_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1980b1, -1 - person_event SPRITE_TEACHER, 13, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1980c5, -1 - person_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1980c8, -1 - person_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES - person_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES - person_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES - person_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES + person_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET + person_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 + person_event SPRITE_TEACHER, 13, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1 + person_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1 + person_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + person_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + person_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + person_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES person_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WhiteApricornTree, -1 person_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN - person_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT + person_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index e709ba766..c7beadb17 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -112,7 +112,7 @@ CherrygroveSilverTriggerNorth: special Special_FadeOutMusic pause 15 appear CHERRYGROVECITY_SILVER - applymovement CHERRYGROVECITY_SILVER, MovementData_0x19c1ce + applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalWalksToYou spriteface PLAYER, RIGHT playmusic MUSIC_RIVAL_ENCOUNTER opentext @@ -171,9 +171,9 @@ CherrygroveSilverTriggerNorth: closetext .FinishRival: playsound SFX_TACKLE - applymovement PLAYER, MovementData_0x19c1d4 + applymovement PLAYER, CherrygroveCity_RivalPushesYouOutOfTheWay spriteface PLAYER, LEFT - applymovement CHERRYGROVECITY_SILVER, MovementData_0x19c1da + applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft disappear CHERRYGROVECITY_SILVER dotrigger $0 special HealParty @@ -310,7 +310,7 @@ GuideGentMovement6: step_up step_end -MovementData_0x19c1ce: +CherrygroveCity_RivalWalksToYou: step_left step_left step_left @@ -318,17 +318,17 @@ MovementData_0x19c1ce: step_left step_end -MovementData_0x19c1d4: +CherrygroveCity_RivalPushesYouOutOfTheWay: big_step_down turn_head_up step_end -MovementData_0x19c1d7: +CherrygroveCity_UnusedMovementData: step_left turn_head_down step_end -MovementData_0x19c1da: +CherrygroveCity_RivalExitsStageLeft: big_step_left big_step_left big_step_left diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 1743f4726..cf25d1a18 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -28,129 +28,129 @@ NewBarkTown_MapScriptHeader: clearevent EVENT_FIRST_TIME_BANKING_WITH_MOM return -UnknownScript_0x1a8016: +NewBarkTown_TeacherStopsYouTrigger1: playmusic MUSIC_MOM spriteface NEWBARKTOWN_TEACHER, LEFT opentext - writetext UnknownText_0x1a8134 + writetext Text_WaitPlayer waitbutton closetext spriteface PLAYER, RIGHT - applymovement NEWBARKTOWN_TEACHER, MovementData_0x1a80d4 + applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou1_NBT opentext - writetext UnknownText_0x1a813e + writetext Text_WhatDoYouThinkYoureDoing waitbutton closetext follow NEWBARKTOWN_TEACHER, PLAYER - applymovement NEWBARKTOWN_TEACHER, MovementData_0x1a80e0 + applymovement NEWBARKTOWN_TEACHER, Movement_TeacherBringsYouBack1_NBT stopfollow opentext - writetext UnknownText_0x1a815e + writetext Text_ItsDangerousToGoAlone waitbutton closetext special RestartMapMusic end -UnknownScript_0x1a8041: +NewBarkTown_TeacherStopsYouTrigger2: playmusic MUSIC_MOM spriteface NEWBARKTOWN_TEACHER, LEFT opentext - writetext UnknownText_0x1a8134 + writetext Text_WaitPlayer waitbutton closetext spriteface PLAYER, RIGHT - applymovement NEWBARKTOWN_TEACHER, MovementData_0x1a80d9 + applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou2_NBT spriteface PLAYER, UP opentext - writetext UnknownText_0x1a813e + writetext Text_WhatDoYouThinkYoureDoing waitbutton closetext follow NEWBARKTOWN_TEACHER, PLAYER - applymovement NEWBARKTOWN_TEACHER, MovementData_0x1a80e6 + applymovement NEWBARKTOWN_TEACHER, Movement_TeacherBringsYouBack2_NBT stopfollow opentext - writetext UnknownText_0x1a815e + writetext Text_ItsDangerousToGoAlone waitbutton closetext special RestartMapMusic end -TeacherScript_0x1a806f: +NewBarkTownTeacherScript: faceplayer opentext checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST - iftrue UnknownScript_0x1a8095 + iftrue .CallMom checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - iftrue UnknownScript_0x1a808f + iftrue .TellMomYoureLeaving checkevent EVENT_GOT_A_POKEMON_FROM_ELM - iftrue UnknownScript_0x1a8089 - writetext UnknownText_0x1a80f7 + iftrue .MonIsAdorable + writetext Text_GearIsImpressive waitbutton closetext end -UnknownScript_0x1a8089: - writetext UnknownText_0x1a81c4 +.MonIsAdorable: + writetext Text_YourMonIsAdorable waitbutton closetext end -UnknownScript_0x1a808f: - writetext UnknownText_0x1a81f2 +.TellMomYoureLeaving: + writetext Text_TellMomIfLeaving waitbutton closetext end -UnknownScript_0x1a8095: - writetext UnknownText_0x1a8236 +.CallMom: + writetext Text_CallMomOnGear waitbutton closetext end -FisherScript_0x1a809b: - jumptextfaceplayer UnknownText_0x1a8274 +NewBarkTownFisherScript: + jumptextfaceplayer Text_ElmDiscoveredNewMon -SilverScript_0x1a809e: +NewBarkTownSilverScript: opentext - writetext UnknownText_0x1a82a6 + writetext NewBarkTownRivalText1 waitbutton closetext spriteface NEWBARKTOWN_SILVER, LEFT opentext - writetext UnknownText_0x1a82cd + writetext NewBarkTownRivalText2 waitbutton closetext follow PLAYER, NEWBARKTOWN_SILVER - applymovement PLAYER, MovementData_0x1a80ed + applymovement PLAYER, Movement_SilverPushesYouAway_NBT stopfollow pause 5 spriteface NEWBARKTOWN_SILVER, DOWN pause 5 playsound SFX_TACKLE - applymovement PLAYER, MovementData_0x1a80f0 - applymovement NEWBARKTOWN_SILVER, MovementData_0x1a80f5 + applymovement PLAYER, Movement_SilverShovesYouOut_NBT + applymovement NEWBARKTOWN_SILVER, Movement_SilverReturnsToTheShadows_NBT end MapNewBarkTownSignpost0Script: - jumptext UnknownText_0x1a82e8 + jumptext NewBarkTownSignText MapNewBarkTownSignpost1Script: - jumptext UnknownText_0x1a8328 + jumptext PlayersHouseSignText MapNewBarkTownSignpost2Script: - jumptext UnknownText_0x1a8332 + jumptext ElmsLabSignText MapNewBarkTownSignpost3Script: - jumptext UnknownText_0x1a8340 + jumptext ElmsHouseSignText -MovementData_0x1a80d4: +Movement_TeacherRunsToYou1_NBT: step_left step_left step_left step_left step_end -MovementData_0x1a80d9: +Movement_TeacherRunsToYou2_NBT: step_left step_left step_left @@ -159,7 +159,7 @@ MovementData_0x1a80d9: turn_head_down step_end -MovementData_0x1a80e0: +Movement_TeacherBringsYouBack1_NBT: step_right step_right step_right @@ -167,7 +167,7 @@ MovementData_0x1a80e0: turn_head_left step_end -MovementData_0x1a80e6: +Movement_TeacherBringsYouBack2_NBT: step_right step_right step_right @@ -176,23 +176,23 @@ MovementData_0x1a80e6: turn_head_left step_end -MovementData_0x1a80ed: +Movement_SilverPushesYouAway_NBT: turn_head_up step_down step_end -MovementData_0x1a80f0: +Movement_SilverShovesYouOut_NBT: turn_head_up fix_facing jump_step_down remove_fixed_facing step_end -MovementData_0x1a80f5: +Movement_SilverReturnsToTheShadows_NBT: step_right step_end -UnknownText_0x1a80f7: +Text_GearIsImpressive: text "Wow, your #GEAR" line "is impressive!" @@ -200,16 +200,16 @@ UnknownText_0x1a80f7: line "it for you?" done -UnknownText_0x1a8134: +Text_WaitPlayer: text "Wait, <PLAY_G>!" done -UnknownText_0x1a813e: +Text_WhatDoYouThinkYoureDoing: text "What do you think" line "you're doing?" done -UnknownText_0x1a815e: +Text_ItsDangerousToGoAlone: text "It's dangerous to" line "go out without a" cont "#MON!" @@ -221,13 +221,13 @@ UnknownText_0x1a815e: line "to the next town." done -UnknownText_0x1a81c4: +Text_YourMonIsAdorable: text "Oh! Your #MON" line "is adorable!" cont "I wish I had one!" done -UnknownText_0x1a81f2: +Text_TellMomIfLeaving: text "Hi, <PLAY_G>!" line "Leaving again?" @@ -236,7 +236,7 @@ UnknownText_0x1a81f2: cont "are leaving." done -UnknownText_0x1a8236: +Text_CallMomOnGear: text "Call your mom on" line "your #GEAR to" @@ -244,7 +244,7 @@ UnknownText_0x1a8236: line "you're doing." done -UnknownText_0x1a8274: +Text_ElmDiscoveredNewMon: text "Yo, <PLAYER>!" para "I hear PROF.ELM" @@ -252,20 +252,20 @@ UnknownText_0x1a8274: cont "new #MON." done -UnknownText_0x1a82a6: - text $56 +NewBarkTownRivalText1: + text "<......>" para "So this is the" line "famous ELM #MON" cont "LAB…" done -UnknownText_0x1a82cd: +NewBarkTownRivalText2: text "…What are you" line "staring at?" done -UnknownText_0x1a82e8: +NewBarkTownSignText: text "NEW BARK TOWN" para "The Town Where the" @@ -273,15 +273,15 @@ UnknownText_0x1a82e8: cont "Beginning Blow" done -UnknownText_0x1a8328: +PlayersHouseSignText: text "<PLAYER>'s House" done -UnknownText_0x1a8332: +ElmsLabSignText: text "ELM #MON LAB" done -UnknownText_0x1a8340: +ElmsHouseSignText: text "ELM'S HOUSE" done @@ -298,8 +298,8 @@ NewBarkTown_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $8, $1, $0, UnknownScript_0x1a8016, $0, $0 - xy_trigger 0, $9, $1, $0, UnknownScript_0x1a8041, $0, $0 + xy_trigger 0, $8, $1, $0, NewBarkTown_TeacherStopsYouTrigger1, $0, $0 + xy_trigger 0, $9, $1, $0, NewBarkTown_TeacherStopsYouTrigger2, $0, $0 .Signposts: db 4 @@ -310,6 +310,6 @@ NewBarkTown_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_TEACHER, 8, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a806f, -1 - person_event SPRITE_FISHER, 9, 12, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a809b, -1 - person_event SPRITE_SILVER, 2, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SilverScript_0x1a809e, EVENT_RIVAL_NEW_BARK_TOWN + person_event SPRITE_TEACHER, 8, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1 + person_event SPRITE_FISHER, 9, 12, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1 + person_event SPRITE_SILVER, 2, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN diff --git a/maps/Route29.asm b/maps/Route29.asm index 846589b14..cdd5fc426 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -13,23 +13,23 @@ Route29_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x1a0f59, 0 - dw UnknownScript_0x1a0f5a, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 .MapCallbacks: db 1 ; callbacks - dbw 2, TuscanyCallback + dbw 2, .Tuscany -UnknownScript_0x1a0f59: +.Trigger0: end -UnknownScript_0x1a0f5a: +.Trigger1: end -TuscanyCallback: +.Tuscany: checkflag ENGINE_ZEPHYRBADGE iftrue .DoesTuscanyAppear @@ -43,130 +43,130 @@ TuscanyCallback: appear ROUTE29_TEACHER2 return -UnknownScript_0x1a0f6d: +Route29Tutorial1: spriteface ROUTE29_COOLTRAINER_M1, UP showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15 - applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a108d + applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1a spriteface PLAYER, LEFT setevent EVENT_DUDE_TALKED_TO_YOU opentext - writetext UnknownText_0x1a10df + writetext CatchingTutorialIntroText yesorno - iffalse UnknownScript_0x1a0fd9 + iffalse Script_RefusedTutorial1 closetext follow ROUTE29_COOLTRAINER_M1, PLAYER - applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a109a + applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b stopfollow loadwildmon RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL spriteface ROUTE29_COOLTRAINER_M1, UP opentext - writetext UnknownText_0x1a114d + writetext CatchingTutorialDebriefText waitbutton closetext dotrigger $0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end -UnknownScript_0x1a0fa3: +Route29Tutorial2: spriteface ROUTE29_COOLTRAINER_M1, UP showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15 - applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a1094 + applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2a spriteface PLAYER, LEFT setevent EVENT_DUDE_TALKED_TO_YOU opentext - writetext UnknownText_0x1a10df + writetext CatchingTutorialIntroText yesorno - iffalse UnknownScript_0x1a0fe5 + iffalse Script_RefusedTutorial2 closetext follow ROUTE29_COOLTRAINER_M1, PLAYER - applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a10a1 + applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b stopfollow loadwildmon RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL spriteface ROUTE29_COOLTRAINER_M1, UP opentext - writetext UnknownText_0x1a114d + writetext CatchingTutorialDebriefText waitbutton closetext dotrigger $0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end -UnknownScript_0x1a0fd9: - writetext UnknownText_0x1a1197 +Script_RefusedTutorial1: + writetext CatchingTutorialDeclinedText waitbutton closetext - applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a109a + applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b dotrigger $0 end -UnknownScript_0x1a0fe5: - writetext UnknownText_0x1a1197 +Script_RefusedTutorial2: + writetext CatchingTutorialDeclinedText waitbutton closetext - applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a10a1 + applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b dotrigger $0 end -CooltrainerMScript_0x1a0ff1: +CatchingTutorialDudeScript: faceplayer opentext checkcode VAR_BOXSPACE - if_equal $0, UnknownScript_0x1a101c + if_equal $0, .BoxFull checkevent EVENT_LEARNED_TO_CATCH_POKEMON - iftrue UnknownScript_0x1a101c + iftrue .BoxFull checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - iffalse UnknownScript_0x1a101c - writetext UnknownText_0x1a11e3 + iffalse .BoxFull + writetext CatchingTutorialRepeatText yesorno - iffalse UnknownScript_0x1a1022 + iffalse .Declined closetext loadwildmon RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL opentext - writetext UnknownText_0x1a114d + writetext CatchingTutorialDebriefText waitbutton closetext setevent EVENT_LEARNED_TO_CATCH_POKEMON end -UnknownScript_0x1a101c: +.BoxFull: writetext UnknownText_0x1a10a7 waitbutton closetext end -UnknownScript_0x1a1022: - writetext UnknownText_0x1a1197 +.Declined: + writetext CatchingTutorialDeclinedText waitbutton closetext end -YoungsterScript_0x1a1028: - jumptextfaceplayer UnknownText_0x1a1214 +Route29YoungsterScript: + jumptextfaceplayer Route29YoungsterText -TeacherScript_0x1a102b: - jumptextfaceplayer UnknownText_0x1a126c +Route29TeacherScript: + jumptextfaceplayer Route29TeacherText -FisherScript_0x1a102e: - jumptextfaceplayer UnknownText_0x1a12d9 +Route29FisherScript: + jumptextfaceplayer Route29FisherText CooltrainerMScript_0x1a1031: faceplayer opentext checkday - iftrue UnknownScript_0x1a103d + iftrue .day_morn checknite - iftrue UnknownScript_0x1a1043 -UnknownScript_0x1a103d: - writetext UnknownText_0x1a134c + iftrue .nite +.day_morn: + writetext Text_WaitingForNight waitbutton closetext end -UnknownScript_0x1a1043: - writetext UnknownText_0x1a137c +.nite: + writetext Text_WaitingForMorning waitbutton closetext end @@ -208,18 +208,18 @@ TuscanyNotTuesdayScript: end MapRoute29Signpost0Script: - jumptext UnknownText_0x1a158e + jumptext Route29SignText1 MapRoute29Signpost1Script: - jumptext UnknownText_0x1a15b9 + jumptext Route29SignText2 -FruitTreeScript_0x1a1089: +Route29FruitTree: fruittree FRUITTREE_ROUTE_29 Route29Potion: itemball POTION -MovementData_0x1a108d: +DudeMovementData1a: step_up step_up step_up @@ -228,7 +228,7 @@ MovementData_0x1a108d: step_right step_end -MovementData_0x1a1094: +DudeMovementData2a: step_up step_up step_up @@ -236,7 +236,7 @@ MovementData_0x1a1094: step_right step_end -MovementData_0x1a109a: +DudeMovementData1b: step_left step_left step_down @@ -245,7 +245,7 @@ MovementData_0x1a109a: step_down step_end -MovementData_0x1a10a1: +DudeMovementData2b: step_left step_left step_down @@ -261,7 +261,7 @@ UnknownText_0x1a10a7: line "pop out…" done -UnknownText_0x1a10df: +CatchingTutorialIntroText: text "I've seen you a" line "couple times. How" @@ -273,7 +273,7 @@ UnknownText_0x1a10df: cont "catch #MON?" done -UnknownText_0x1a114d: +CatchingTutorialDebriefText: text "That's how you do" line "it." @@ -282,7 +282,7 @@ UnknownText_0x1a114d: cont "easier to catch." done -UnknownText_0x1a1197: +CatchingTutorialDeclinedText: text "Oh. Fine, then." para "Anyway, if you" @@ -292,13 +292,13 @@ UnknownText_0x1a1197: line "to walk a lot." done -UnknownText_0x1a11e3: +CatchingTutorialRepeatText: text "Huh? You want me" line "to show you how to" cont "catch #MON?" done -UnknownText_0x1a1214: +Route29YoungsterText: text "Yo. How are your" line "#MON?" @@ -309,7 +309,7 @@ UnknownText_0x1a1214: line "of the grass." done -UnknownText_0x1a126c: +Route29TeacherText: text "See those ledges?" line "It's scary to jump" cont "off them." @@ -321,7 +321,7 @@ UnknownText_0x1a126c: line "the grass." done -UnknownText_0x1a12d9: +Route29FisherText: text "I wanted to take a" line "break, so I saved" @@ -330,7 +330,7 @@ UnknownText_0x1a12d9: done ; possibly unused -UnknownText_0x1a1316: +Text_WaitingForDay: text "I'm waiting for" line "#MON that" @@ -338,7 +338,7 @@ UnknownText_0x1a1316: line "daytime." done -UnknownText_0x1a134c: +Text_WaitingForNight: text "I'm waiting for" line "#MON that" @@ -346,7 +346,7 @@ UnknownText_0x1a134c: line "night." done -UnknownText_0x1a137c: +Text_WaitingForMorning: text "I'm waiting for" line "#MON that" @@ -406,14 +406,14 @@ TuscanyNotTuesdayText: cont "is unfortunate…" done -UnknownText_0x1a158e: +Route29SignText1: text "ROUTE 29" para "CHERRYGROVE CITY -" line "NEW BARK TOWN" done -UnknownText_0x1a15b9: +Route29SignText2: text "ROUTE 29" para "CHERRYGROVE CITY -" @@ -430,8 +430,8 @@ Route29_MapEventHeader: .XYTriggers: db 2 - xy_trigger 1, $8, $35, $0, UnknownScript_0x1a0f6d, $0, $0 - xy_trigger 1, $9, $35, $0, UnknownScript_0x1a0fa3, $0, $0 + xy_trigger 1, $8, $35, $0, Route29Tutorial1, $0, $0 + xy_trigger 1, $9, $35, $0, Route29Tutorial2, $0, $0 .Signposts: db 2 @@ -440,11 +440,11 @@ Route29_MapEventHeader: .PersonEvents: db 8 - person_event SPRITE_COOLTRAINER_M, 12, 50, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x1a0ff1, -1 - person_event SPRITE_YOUNGSTER, 16, 27, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a1028, -1 - person_event SPRITE_TEACHER, 11, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a102b, -1 - person_event SPRITE_FRUIT_TREE, 2, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a1089, -1 - person_event SPRITE_FISHER, 3, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a102e, -1 + person_event SPRITE_COOLTRAINER_M, 12, 50, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1 + person_event SPRITE_YOUNGSTER, 16, 27, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, Route29YoungsterScript, -1 + person_event SPRITE_TEACHER, 11, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, Route29TeacherScript, -1 + person_event SPRITE_FRUIT_TREE, 2, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route29FruitTree, -1 + person_event SPRITE_FISHER, 3, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Route29FisherScript, -1 person_event SPRITE_COOLTRAINER_M, 4, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1 person_event SPRITE_TEACHER, 12, 29, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY person_event SPRITE_POKE_BALL, 2, 48, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION diff --git a/maps/Route30.asm b/maps/Route30.asm index 31a278a75..56f3cf298 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -18,57 +18,57 @@ Route30_MapScriptHeader: .MapCallbacks: db 0 -YoungsterScript_0x1a1673: +YoungsterJoey_ImportantBattleScript: waitsfx playmusic MUSIC_JOHTO_TRAINER_BATTLE opentext - writetext UnknownText_0x1a1806 + writetext Text_UseTackle pause 30 closetext playsound SFX_TACKLE - applymovement ROUTE30_MONSTER2, MovementData_0x1a17fe + applymovement ROUTE30_MONSTER2, Route30_JoeysRattataAttacksMovement opentext faceplayer - writetext UnknownText_0x1a181c + writetext Text_ThisIsABigBattle waitbutton spriteface ROUTE30_YOUNGSTER1, UP closetext playsound SFX_TACKLE - applymovement ROUTE30_MONSTER1, MovementData_0x1a1802 + applymovement ROUTE30_MONSTER1, Route30_MikeysRattataAttacksMovement special RestartMapMusic end TrainerYoungsterJoey: - trainer EVENT_BEAT_YOUNGSTER_JOEY, YOUNGSTER, JOEY1, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, 0, YoungsterJoey1Script + trainer EVENT_BEAT_YOUNGSTER_JOEY, YOUNGSTER, JOEY1, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, 0, .Script -YoungsterJoey1Script: +.Script: writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY end_if_just_battled opentext checkflag ENGINE_JOEY - iftrue UnknownScript_0x1a16e0 + iftrue .Rematch checkcellnum PHONE_YOUNGSTER_JOEY - iftrue UnknownScript_0x1a178f + iftrue .NumberAccepted checkevent EVENT_JOEY_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x1a16c9 - writetext UnknownText_0x1a18c2 + iftrue .AskAgain + writetext YoungsterJoey1AfterText buttonsound setevent EVENT_JOEY_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x1a1783 - jump UnknownScript_0x1a16cc + scall .AskNumber1 + jump .RequestNumber -UnknownScript_0x1a16c9: - scall UnknownScript_0x1a1787 -UnknownScript_0x1a16cc: +.AskAgain: + scall .AskNumber2 +.RequestNumber: askforphonenumber PHONE_YOUNGSTER_JOEY - if_equal $1, UnknownScript_0x1a1797 - if_equal $2, UnknownScript_0x1a1793 + if_equal $1, .PhoneFull + if_equal $2, .NumberDeclined trainertotext YOUNGSTER, JOEY1, $0 - scall UnknownScript_0x1a178b - jump UnknownScript_0x1a178f + scall .RegisteredNumber + jump .NumberAccepted -UnknownScript_0x1a16e0: - scall UnknownScript_0x1a179b +.Rematch: + scall .RematchStd winlosstext YoungsterJoey1BeatenText, 0 copybytetovar wJoeyFightCount if_equal 4, .Fight4 @@ -126,150 +126,150 @@ UnknownScript_0x1a16e0: returnafterbattle clearflag ENGINE_JOEY checkevent EVENT_JOEY_HP_UP - iftrue UnknownScript_0x1a176f + iftrue .GiveHPUp checkevent EVENT_GOT_HP_UP_FROM_JOEY - iftrue UnknownScript_0x1a176e - scall UnknownScript_0x1a17a6 + iftrue .done + scall .RematchGift verbosegiveitem HP_UP - iffalse UnknownScript_0x1a179f + iffalse .PackFull setevent EVENT_GOT_HP_UP_FROM_JOEY - jump UnknownScript_0x1a178f + jump .NumberAccepted -UnknownScript_0x1a176e: +.done: end -UnknownScript_0x1a176f: +.GiveHPUp: opentext - writetext UnknownText_0x1a1bc0 + writetext YoungsterJoeyText_GiveHPUpAfterBattle waitbutton verbosegiveitem HP_UP - iffalse UnknownScript_0x1a179f + iffalse .PackFull clearevent EVENT_JOEY_HP_UP setevent EVENT_GOT_HP_UP_FROM_JOEY - jump UnknownScript_0x1a178f + jump .NumberAccepted -UnknownScript_0x1a1783: +.AskNumber1: jumpstd asknumber1m end -UnknownScript_0x1a1787: +.AskNumber2: jumpstd asknumber2m end -UnknownScript_0x1a178b: +.RegisteredNumber: jumpstd registerednumberm end -UnknownScript_0x1a178f: +.NumberAccepted: jumpstd numberacceptedm end -UnknownScript_0x1a1793: +.NumberDeclined: jumpstd numberdeclinedm end -UnknownScript_0x1a1797: +.PhoneFull: jumpstd phonefullm end -UnknownScript_0x1a179b: +.RematchStd: jumpstd rematchm end -UnknownScript_0x1a179f: +.PackFull: setevent EVENT_JOEY_HP_UP jumpstd packfullm end -UnknownScript_0x1a17a6: +.RematchGift: jumpstd rematchgiftm end TrainerYoungsterMikey: - trainer EVENT_BEAT_YOUNGSTER_MIKEY, YOUNGSTER, MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, YoungsterMikeyScript + trainer EVENT_BEAT_YOUNGSTER_MIKEY, YOUNGSTER, MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script -YoungsterMikeyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a197d + writetext YoungsterMikeyAfterText waitbutton closetext end TrainerBug_catcherDon: - trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, Bug_catcherDonSeenText, Bug_catcherDonBeatenText, 0, Bug_catcherDonScript + trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, Bug_catcherDonSeenText, Bug_catcherDonBeatenText, 0, .Script -Bug_catcherDonScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1a1a1c + writetext Bug_catcherDonAfterText waitbutton closetext end -YoungsterScript_0x1a17d2: +Route30YoungsterScript: faceplayer opentext checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - iftrue UnknownScript_0x1a17e0 - writetext UnknownText_0x1a1a6a + iftrue .CompletedEggQuest + writetext Route30YoungsterText_DirectionsToMrPokemonsHouse waitbutton closetext end -UnknownScript_0x1a17e0: - writetext UnknownText_0x1a1a94 +.CompletedEggQuest: + writetext Route30YoungsterText_EveryoneIsBattling waitbutton closetext end -CooltrainerFScript_0x1a17e6: - jumptextfaceplayer UnknownText_0x1a1ac4 +Route30CooltrainerFScript: + jumptextfaceplayer Route30CooltrainerFText MapRoute30Signpost0Script: - jumptext UnknownText_0x1a1b0b + jumptext Route30MapSignText MapRoute30Signpost1Script: - jumptext UnknownText_0x1a1b34 + jumptext Route30DirectionsToMrPokemonsHouseSignText MapRoute30Signpost2Script: - jumptext UnknownText_0x1a1b55 + jumptext Route30MrPokemonsHouseSignText MapRoute30Signpost3Script: - jumptext UnknownText_0x1a1b66 + jumptext Route30TrainerTipsSignText Route30Antidote: itemball ANTIDOTE -FruitTreeScript_0x1a17f7: +Route30FruitTree1: fruittree FRUITTREE_ROUTE_30_1 -FruitTreeScript_0x1a17f9: +Route30FruitTree2: fruittree FRUITTREE_ROUTE_30_2 Route30HiddenPotion: dwb EVENT_ROUTE_30_HIDDEN_POTION, POTION -MovementData_0x1a17fe: +Route30_JoeysRattataAttacksMovement: fix_facing big_step_up big_step_down step_end -MovementData_0x1a1802: +Route30_MikeysRattataAttacksMovement: fix_facing big_step_down big_step_up step_end -UnknownText_0x1a1806: +Text_UseTackle: text "Go, RATTATA!" para "TACKLE!" done -UnknownText_0x1a181c: +Text_ThisIsABigBattle: text "What? This is a" line "big battle!" cont "Leave me alone!" @@ -290,7 +290,7 @@ YoungsterJoey1BeatenText: line "Doggone it!" done -UnknownText_0x1a18c2: +YoungsterJoey1AfterText: text "Do I have to have" line "more #MON in" @@ -315,7 +315,7 @@ YoungsterMikeyBeatenText: line "I won before." done -UnknownText_0x1a197d: +YoungsterMikeyAfterText: text "Becoming a good" line "trainer is really" cont "tough." @@ -336,7 +336,7 @@ Bug_catcherDonBeatenText: line "strong!" done -UnknownText_0x1a1a1c: +Bug_catcherDonAfterText: text "I ran out of #" line "BALLS while I was" cont "catching #MON." @@ -345,19 +345,19 @@ UnknownText_0x1a1a1c: line "some more…" done -UnknownText_0x1a1a6a: +Route30YoungsterText_DirectionsToMrPokemonsHouse: text "MR.#MON's" line "house? It's a bit" cont "farther ahead." done -UnknownText_0x1a1a94: +Route30YoungsterText_EveryoneIsBattling: text "Everyone's having" line "fun battling!" cont "You should too!" done -UnknownText_0x1a1ac4: +Route30CooltrainerFText: text "I'm not a trainer." para "But if you look" @@ -365,23 +365,23 @@ UnknownText_0x1a1ac4: cont "prepare to battle." done -UnknownText_0x1a1b0b: +Route30MapSignText: text "ROUTE 30" para "VIOLET CITY -" line "CHERRYGROVE CITY" done -UnknownText_0x1a1b34: +Route30DirectionsToMrPokemonsHouseSignText: text "MR.#MON'S HOUSE" line "STRAIGHT AHEAD!" done -UnknownText_0x1a1b55: +Route30MrPokemonsHouseSignText: text "MR.#MON'S HOUSE" done -UnknownText_0x1a1b66: +Route30TrainerTipsSignText: text "TRAINER TIPS" para "No stealing other" @@ -392,7 +392,7 @@ UnknownText_0x1a1b66: cont "wild #MON!" done -UnknownText_0x1a1bc0: +YoungsterJoeyText_GiveHPUpAfterBattle: text "I lost again…" line "Gee, you're tough!" @@ -429,14 +429,14 @@ Route30_MapEventHeader: .PersonEvents: db 11 - person_event SPRITE_YOUNGSTER, 26, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a1673, EVENT_ROUTE_30_BATTLE + person_event SPRITE_YOUNGSTER, 26, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE person_event SPRITE_YOUNGSTER, 28, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY person_event SPRITE_YOUNGSTER, 23, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 person_event SPRITE_BUG_CATCHER, 7, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherDon, -1 - person_event SPRITE_YOUNGSTER, 30, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a17d2, -1 + person_event SPRITE_YOUNGSTER, 30, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Route30YoungsterScript, -1 person_event SPRITE_MONSTER, 24, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE person_event SPRITE_MONSTER, 25, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE - person_event SPRITE_FRUIT_TREE, 39, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a17f7, -1 - person_event SPRITE_FRUIT_TREE, 5, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a17f9, -1 - person_event SPRITE_COOLTRAINER_F, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1a17e6, -1 + person_event SPRITE_FRUIT_TREE, 39, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route30FruitTree1, -1 + person_event SPRITE_FRUIT_TREE, 5, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route30FruitTree2, -1 + person_event SPRITE_COOLTRAINER_F, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1 person_event SPRITE_POKE_BALL, 35, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE diff --git a/maps/Route31.asm b/maps/Route31.asm index 3c7f9379c..2b504797b 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -28,9 +28,9 @@ Route31_MapScriptHeader: return TrainerBug_catcherWade1: - trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, Bug_catcherWade1SeenText, Bug_catcherWade1BeatenText, 0, Bug_catcherWade1Script + trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, Bug_catcherWade1SeenText, Bug_catcherWade1BeatenText, 0, .Script -Bug_catcherWade1Script: +.Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE end_if_just_battled opentext @@ -42,7 +42,7 @@ Bug_catcherWade1Script: iftrue .AcceptedNumberSTD checkevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain - writetext UnknownText_0x1a5671 + writetext Bug_catcherWade1AfterText waitbutton setevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER scall .AskPhoneNumberSTD @@ -185,61 +185,61 @@ Bug_catcherWade1Script: jumpstd packfullm end -FisherScript_0x1a5570: +Route31MailRecipientScript: faceplayer opentext checkevent EVENT_GOT_TM50_NIGHTMARE iftrue .DescribeNightmare checkevent EVENT_GOT_KENYA iftrue .TryGiveKenya - writetext UnknownText_0x1a56d9 + writetext Text_Route31SleepyMan waitbutton closetext end .TryGiveKenya: - writetext UnknownText_0x1a5761 + writetext Text_Route31SleepyManGotMail buttonsound checkpokeitem ReceivedSpearowMailText if_equal $0, .WrongMail if_equal $2, .Refused if_equal $3, .NoMail if_equal $4, .LastMon - writetext UnknownText_0x1a5790 + writetext Text_Route31HandOverMailMon buttonsound - writetext UnknownText_0x1a57ba + writetext Text_Route31ReadingMail buttonsound setevent EVENT_GAVE_KENYA verbosegiveitem TM_NIGHTMARE iffalse .NoRoomForItems setevent EVENT_GOT_TM50_NIGHTMARE .DescribeNightmare: - writetext UnknownText_0x1a5896 + writetext Text_Route31DescribeNightmare waitbutton .NoRoomForItems: closetext end .WrongMail: - writetext UnknownText_0x1a5921 + writetext Text_Route31WrongMail waitbutton closetext end .NoMail: - writetext UnknownText_0x1a5939 + writetext Text_Route31MissingMail waitbutton closetext end .Refused: - writetext UnknownText_0x1a5972 + writetext Text_Route31DeclinedToHandOverMail waitbutton closetext end .LastMon: - writetext UnknownText_0x1a5991 + writetext Text_Route31CantTakeLastMon waitbutton closetext end @@ -248,19 +248,19 @@ ReceivedSpearowMailText: db "DARK CAVE leads" next "to another road@" -YoungsterScript_0x1a55ed: - jumptextfaceplayer UnknownText_0x1a59d5 +Route31YoungsterScript: + jumptextfaceplayer Route31YoungsterText MapRoute31Signpost0Script: - jumptext UnknownText_0x1a5a45 + jumptext Route31Signpost0Text MapRoute31Signpost1Script: - jumptext UnknownText_0x1a5a6e + jumptext Route31Signpost1Text -CooltrainerMScript_0x1a55f6: - jumptextfaceplayer UnknownText_0x1a55ff +Route31CooltrainerMScript: + jumptextfaceplayer Route31CooltrainerMText -FruitTreeScript_0x1a55f9: +Route31FruitTree: fruittree FRUITTREE_ROUTE_31 Route31Potion: @@ -269,7 +269,7 @@ Route31Potion: Route31PokeBall: itemball POKE_BALL -UnknownText_0x1a55ff: +Route31CooltrainerMText: text "DARK CAVE…" para "If #MON could" @@ -287,7 +287,7 @@ Bug_catcherWade1BeatenText: text "Awwwww…" done -UnknownText_0x1a5671: +Bug_catcherWade1AfterText: text "You can catch" line "#MON even if" @@ -299,7 +299,7 @@ UnknownText_0x1a5671: cont "BOX automatically." done -UnknownText_0x1a56d9: +Text_Route31SleepyMan: text "… Hnuurg… Huh?" para "I walked too far" @@ -316,20 +316,20 @@ UnknownText_0x1a56d9: para "…Zzzz…" done -UnknownText_0x1a5761: +Text_Route31SleepyManGotMail: text "…Zzzz… Huh?" para "What's that? You" line "have MAIL for me?" done -UnknownText_0x1a5790: +Text_Route31HandOverMailMon: text "<PLAYER> handed" line "over the #MON" cont "holding the MAIL." done -UnknownText_0x1a57ba: +Text_Route31ReadingMail: text "Let's see…" para "…DARK CAVE leads" @@ -353,7 +353,7 @@ UnknownText_0x1a57ba: line "to have this!" done -UnknownText_0x1a5896: +Text_Route31DescribeNightmare: text "TM50 is NIGHTMARE." para "It's a wicked move" @@ -369,12 +369,12 @@ UnknownText_0x1a5896: line "have bad dreams." done -UnknownText_0x1a5921: +Text_Route31WrongMail: text "This MAIL isn't" line "for me." done -UnknownText_0x1a5939: +Text_Route31MissingMail: text "Why is this #-" line "MON so special?" @@ -382,12 +382,12 @@ UnknownText_0x1a5939: line "any MAIL." done -UnknownText_0x1a5972: +Text_Route31DeclinedToHandOverMail: text "What? You don't" line "want anything?" done -UnknownText_0x1a5991: +Text_Route31CantTakeLastMon: text "If I take that" line "#MON from you," @@ -395,7 +395,7 @@ UnknownText_0x1a5991: line "to use in battle?" done -UnknownText_0x1a59d5: +Route31YoungsterText: text "I found a good" line "#MON in DARK" cont "CAVE." @@ -408,14 +408,14 @@ UnknownText_0x1a59d5: line "VIOLET CITY's GYM." done -UnknownText_0x1a5a45: +Route31Signpost0Text: text "ROUTE 31" para "VIOLET CITY -" line "CHERRYGROVE CITY" done -UnknownText_0x1a5a6e: +Route31Signpost1Text: text "DARK CAVE" done @@ -439,10 +439,10 @@ Route31_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_FISHER, 7, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a5570, -1 - person_event SPRITE_YOUNGSTER, 5, 9, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a55ed, -1 + person_event SPRITE_FISHER, 7, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route31MailRecipientScript, -1 + person_event SPRITE_YOUNGSTER, 5, 9, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route31YoungsterScript, -1 person_event SPRITE_BUG_CATCHER, 13, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 5, TrainerBug_catcherWade1, -1 - person_event SPRITE_COOLTRAINER_M, 8, 33, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x1a55f6, -1 - person_event SPRITE_FRUIT_TREE, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a55f9, -1 + person_event SPRITE_COOLTRAINER_M, 8, 33, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1 + person_event SPRITE_FRUIT_TREE, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route31FruitTree, -1 person_event SPRITE_POKE_BALL, 5, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION person_event SPRITE_POKE_BALL, 15, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL diff --git a/maps/Route32.asm b/maps/Route32.asm index d41d97abd..223745799 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -19,27 +19,27 @@ Route32_MapScriptHeader: db 3 ; triggers - dw UnknownScript_0x190460, 0 - dw UnknownScript_0x190461, 0 - dw UnknownScript_0x190462, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 1 ; callbacks - dbw 2, FriedaCallback + dbw 2, .Frieda -UnknownScript_0x190460: +.Trigger0: end -UnknownScript_0x190461: +.Trigger1: end -UnknownScript_0x190462: +.Trigger2: end -FriedaCallback: +.Frieda: checkcode VAR_WEEKDAY if_equal FRIDAY, .FriedaAppears disappear ROUTE32_LASS2 @@ -49,160 +49,160 @@ FriedaCallback: appear ROUTE32_LASS2 return -CooltrainerMScript_0x19046f: +Route32CooltrainerMScript: faceplayer -UnknownScript_0x190470: +Route32CooltrainerMTrigger: opentext checkevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 - iftrue UnknownScript_0x1904a5 + iftrue .GotMiracleSeed checkflag ENGINE_ZEPHYRBADGE - iffalse UnknownScript_0x19049f + iffalse .DontHaveZephyrBadge checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE - iftrue UnknownScript_0x19048f - writetext UnknownText_0x1907ab + iftrue .GiveMiracleSeed + writetext Route32CooltrainerMText_AideIsWaiting waitbutton closetext end -UnknownScript_0x190489: - writetext UnknownText_0x190820 +.Unused: + writetext Route32CooltrainerMText_UnusedSproutTower waitbutton closetext end -UnknownScript_0x19048f: - writetext UnknownText_0x190925 +.GiveMiracleSeed: + writetext Route32CooltrainerMText_HaveThisSeed buttonsound verbosegiveitem MIRACLE_SEED - iffalse UnknownScript_0x1904a9 + iffalse .BagFull setevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 - jump UnknownScript_0x1904a5 + jump .GotMiracleSeed -UnknownScript_0x19049f: - writetext UnknownText_0x1908b0 +.DontHaveZephyrBadge: + writetext Route32CooltrainerMText_VioletGym waitbutton closetext end -UnknownScript_0x1904a5: - writetext UnknownText_0x190a15 +.GotMiracleSeed: + writetext Route32CooltrainerMText_ExperiencesShouldBeUseful waitbutton -UnknownScript_0x1904a9: +.BagFull: closetext end -UnknownScript_0x1904ab: +Route32CooltrainerMStopsYou: spriteface ROUTE32_COOLTRAINER_M, LEFT spriteface PLAYER, RIGHT opentext - writetext UnknownText_0x190790 + writetext Route32CooltrainerMText_WhatsTheHurry waitbutton closetext follow PLAYER, ROUTE32_COOLTRAINER_M - applymovement PLAYER, MovementData_0x190789 + applymovement PLAYER, Movement_Route32CooltrainerMPushesYouBackToViolet stopfollow spriteface PLAYER, DOWN - scall UnknownScript_0x190470 - applymovement ROUTE32_COOLTRAINER_M, MovementData_0x19078c - applymovement ROUTE32_COOLTRAINER_M, MovementData_0x19078e + scall Route32CooltrainerMTrigger + applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset1 + applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset2 end -FisherScript_0x1904ce: +Route32RoarTMGuyScript: faceplayer opentext checkevent EVENT_GOT_TM05_ROAR - iftrue UnknownScript_0x1904e3 - writetext UnknownText_0x191133 + iftrue .AlreadyHaveRoar + writetext Text_RoarIntro buttonsound verbosegiveitem TM_ROAR - iffalse UnknownScript_0x1904e7 + iffalse .Finish setevent EVENT_GOT_TM05_ROAR -UnknownScript_0x1904e3: - writetext UnknownText_0x19118c +.AlreadyHaveRoar: + writetext Text_RoarOutro waitbutton -UnknownScript_0x1904e7: +.Finish: closetext end -UnknownScript_0x1904e9: +Route32WannaBuyASlowpokeTailScript: spriteface ROUTE32_FISHER4, DOWN spriteface PLAYER, UP - jump UnknownScript_0x1904f3 + jump _OfferToSellSlowpokeTail -FisherScript_0x1904f2: +SlowpokeTailSalesmanScript: faceplayer -UnknownScript_0x1904f3: +_OfferToSellSlowpokeTail: dotrigger $2 opentext - writetext UnknownText_0x190a59 + writetext Text_MillionDollarSlowpokeTail yesorno - iffalse UnknownScript_0x190503 - writetext UnknownText_0x190acf + iffalse .refused + writetext Text_ThoughtKidsWereLoaded waitbutton closetext end -UnknownScript_0x190503: - writetext UnknownText_0x190afc +.refused: + writetext Text_RefusedToBuySlowpokeTail waitbutton closetext end TrainerCamperRoland: - trainer EVENT_BEAT_CAMPER_ROLAND, CAMPER, ROLAND, CamperRolandSeenText, CamperRolandBeatenText, 0, CamperRolandScript + trainer EVENT_BEAT_CAMPER_ROLAND, CAMPER, ROLAND, CamperRolandSeenText, CamperRolandBeatenText, 0, .Script -CamperRolandScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x190faa + writetext CamperRolandAfterText waitbutton closetext end TrainerFisherJustin: - trainer EVENT_BEAT_FISHER_JUSTIN, FISHER, JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, 0, FisherJustinScript + trainer EVENT_BEAT_FISHER_JUSTIN, FISHER, JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, 0, .Script -FisherJustinScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x190b4e + writetext FisherJustinAfterText waitbutton closetext end TrainerFisherRalph1: - trainer EVENT_BEAT_FISHER_RALPH, FISHER, RALPH1, FisherRalph1SeenText, FisherRalph1BeatenText, 0, FisherRalph1Script + trainer EVENT_BEAT_FISHER_RALPH, FISHER, RALPH1, FisherRalph1SeenText, FisherRalph1BeatenText, 0, .Script -FisherRalph1Script: +.Script: writecode VAR_CALLERID, PHONE_FISHER_RALPH end_if_just_battled opentext checkflag ENGINE_RALPH - iftrue UnknownScript_0x19057d + iftrue .Rematch checkflag ENGINE_SPECIAL_WILDDATA - iftrue UnknownScript_0x1905f1 + iftrue .Swarm checkcellnum PHONE_FISHER_RALPH - iftrue UnknownScript_0x190603 + iftrue .NumberAccepted checkevent EVENT_RALPH_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x190566 - writetext UnknownText_0x190bf8 + iftrue .AskAgain + writetext FisherRalphAfterText buttonsound setevent EVENT_RALPH_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x1905f7 - jump UnknownScript_0x190569 + scall .AskNumber1 + jump .AskForNumber -UnknownScript_0x190566: - scall UnknownScript_0x1905fb -UnknownScript_0x190569: +.AskAgain: + scall .AskNumber2 +.AskForNumber: askforphonenumber PHONE_FISHER_RALPH - if_equal $1, UnknownScript_0x19060b - if_equal $2, UnknownScript_0x190607 + if_equal $1, .PhoneFull + if_equal $2, .NumberDeclined trainertotext FISHER, RALPH1, $0 - scall UnknownScript_0x1905ff - jump UnknownScript_0x190603 + scall .RegisteredNumber + jump .NumberAccepted -UnknownScript_0x19057d: - scall UnknownScript_0x19060f +.Rematch: + scall .RematchStd winlosstext FisherRalph1BeatenText, 0 copybytetovar wRalphFightCount if_equal 4, .Fight4 @@ -261,82 +261,82 @@ UnknownScript_0x19057d: clearflag ENGINE_RALPH end -UnknownScript_0x1905f1: - writetext UnknownText_0x190c37 +.Swarm: + writetext FisherRalphSwarmText waitbutton closetext end -UnknownScript_0x1905f7: +.AskNumber1: jumpstd asknumber1m end -UnknownScript_0x1905fb: +.AskNumber2: jumpstd asknumber2m end -UnknownScript_0x1905ff: +.RegisteredNumber: jumpstd registerednumberm end -UnknownScript_0x190603: +.NumberAccepted: jumpstd numberacceptedm end -UnknownScript_0x190607: +.NumberDeclined: jumpstd numberdeclinedm end -UnknownScript_0x19060b: +.PhoneFull: jumpstd phonefullm end -UnknownScript_0x19060f: +.RematchStd: jumpstd rematchm end TrainerFisherHenry: - trainer EVENT_BEAT_FISHER_HENRY, FISHER, HENRY, FisherHenrySeenText, FisherHenryBeatenText, 0, FisherHenryScript + trainer EVENT_BEAT_FISHER_HENRY, FISHER, HENRY, FisherHenrySeenText, FisherHenryBeatenText, 0, .Script -FisherHenryScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x190df2 + writetext FisherHenryAfterText waitbutton closetext end TrainerPicnickerLiz1: - trainer EVENT_BEAT_PICNICKER_LIZ, PICNICKER, LIZ1, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, 0, PicnickerLiz1Script + trainer EVENT_BEAT_PICNICKER_LIZ, PICNICKER, LIZ1, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, 0, .Script -PicnickerLiz1Script: +.Script: writecode VAR_CALLERID, PHONE_PICNICKER_LIZ end_if_just_battled opentext checkflag ENGINE_LIZ - iftrue UnknownScript_0x19066d + iftrue .Rematch checkcellnum PHONE_PICNICKER_LIZ - iftrue UnknownScript_0x1906ed + iftrue .NumberAccepted checkevent EVENT_LIZ_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x190656 - writetext UnknownText_0x191060 + iftrue .AskAgain + writetext PicnickerLiz1AfterText buttonsound setevent EVENT_LIZ_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x1906e1 - jump UnknownScript_0x190659 + scall .AskNumber1 + jump .AskForNumber -UnknownScript_0x190656: - scall UnknownScript_0x1906e5 -UnknownScript_0x190659: +.AskAgain: + scall .AskNumber2 +.AskForNumber: askforphonenumber PHONE_PICNICKER_LIZ - if_equal $1, UnknownScript_0x1906f5 - if_equal $2, UnknownScript_0x1906f1 + if_equal $1, .PhoneFull + if_equal $2, .NumberDeclined trainertotext PICNICKER, LIZ1, $0 - scall UnknownScript_0x1906e9 - jump UnknownScript_0x1906ed + scall .RegisteredNumber + jump .NumberAccepted -UnknownScript_0x19066d: - scall UnknownScript_0x1906f9 +.Rematch: + scall .RematchStd winlosstext PicnickerLiz1BeatenText, 0 copybytetovar wLizFightCount if_equal 4, .Fight4 @@ -395,63 +395,63 @@ UnknownScript_0x19066d: clearflag ENGINE_LIZ end -UnknownScript_0x1906e1: +.AskNumber1: jumpstd asknumber1f end -UnknownScript_0x1906e5: +.AskNumber2: jumpstd asknumber2f end -UnknownScript_0x1906e9: +.RegisteredNumber: jumpstd registerednumberf end -UnknownScript_0x1906ed: +.NumberAccepted: jumpstd numberacceptedf end -UnknownScript_0x1906f1: +.NumberDeclined: jumpstd numberdeclinedf end -UnknownScript_0x1906f5: +.PhoneFull: jumpstd phonefullf end -UnknownScript_0x1906f9: +.RematchStd: jumpstd rematchf end TrainerYoungsterAlbert: - trainer EVENT_BEAT_YOUNGSTER_ALBERT, YOUNGSTER, ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, 0, YoungsterAlbertScript + trainer EVENT_BEAT_YOUNGSTER_ALBERT, YOUNGSTER, ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, 0, .Script -YoungsterAlbertScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x190e82 + writetext YoungsterAlbertAfterText waitbutton closetext end TrainerYoungsterGordon: - trainer EVENT_BEAT_YOUNGSTER_GORDON, YOUNGSTER, GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, 0, YoungsterGordonScript + trainer EVENT_BEAT_YOUNGSTER_GORDON, YOUNGSTER, GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, 0, .Script -YoungsterGordonScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x190f49 + writetext YoungsterGordonAfterText waitbutton closetext end TrainerBird_keeperPeter: - trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, Bird_keeperPeterSeenText, Bird_keeperPeterBeatenText, 0, Bird_keeperPeterScript + trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, Bird_keeperPeterSeenText, Bird_keeperPeterBeatenText, 0, .Script -Bird_keeperPeterScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1910d4 + writetext Bird_keeperPeterAfterText waitbutton closetext end @@ -460,9 +460,9 @@ FriedaScript: faceplayer opentext checkevent EVENT_GOT_POISON_BARB_FROM_FRIEDA - iftrue FriedaFridayScript + iftrue .Friday checkcode VAR_WEEKDAY - if_not_equal FRIDAY, FriedaNotFridayScript + if_not_equal FRIDAY, .NotFriday checkevent EVENT_MET_FRIEDA_OF_FRIDAY iftrue .MetFrieda writetext MeetFriedaText @@ -472,21 +472,21 @@ FriedaScript: writetext FriedaGivesGiftText buttonsound verbosegiveitem POISON_BARB - iffalse FriedaDoneScript + iffalse .Done setevent EVENT_GOT_POISON_BARB_FROM_FRIEDA writetext FriedaGaveGiftText waitbutton closetext end -FriedaFridayScript: +.Friday: writetext FriedaFridayText waitbutton -FriedaDoneScript: +.Done: closetext end -FriedaNotFridayScript: +.NotFriday: writetext FriedaNotFridayText waitbutton closetext @@ -518,25 +518,25 @@ Route32HiddenSuperPotion: dwb EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION -MovementData_0x190789: +Movement_Route32CooltrainerMPushesYouBackToViolet: step_up step_up step_end -MovementData_0x19078c: +Movement_Route32CooltrainerMReset1: step_down step_end -MovementData_0x19078e: +Movement_Route32CooltrainerMReset2: step_right step_end -UnknownText_0x190790: +Route32CooltrainerMText_WhatsTheHurry: text "Wait up!" line "What's the hurry?" done -UnknownText_0x1907ab: +Route32CooltrainerMText_AideIsWaiting: text "<PLAYER>, right?" line "Some guy wearing" @@ -551,7 +551,7 @@ UnknownText_0x1907ab: done ; might not be referenced anywhere -UnknownText_0x190820: +Route32CooltrainerMText_UnusedSproutTower: text "Have you gone to" line "SPROUT TOWER?" @@ -566,7 +566,7 @@ UnknownText_0x190820: cont "SPROUT TOWER!" done -UnknownText_0x1908b0: +Route32CooltrainerMText_VioletGym: text "Have you gone to" line "the #MON GYM?" @@ -579,7 +579,7 @@ UnknownText_0x1908b0: cont "trainers!" done -UnknownText_0x190925: +Route32CooltrainerMText_HaveThisSeed: text "You have some good" line "#MON there." @@ -604,7 +604,7 @@ UnknownText_0x190925: cont "type moves." done -UnknownText_0x190a15: +Route32CooltrainerMText_ExperiencesShouldBeUseful: text "Your experiences" line "in VIOLET CITY" @@ -612,7 +612,7 @@ UnknownText_0x190a15: line "for your journey." done -UnknownText_0x190a59: +Text_MillionDollarSlowpokeTail: text "How would you like" line "to have this" @@ -625,13 +625,13 @@ UnknownText_0x190a59: para "You'll want this!" done -UnknownText_0x190acf: +Text_ThoughtKidsWereLoaded: text "Tch! I thought" line "kids these days" cont "were loaded…" done -UnknownText_0x190afc: +Text_RefusedToBuySlowpokeTail: text "You don't want it?" line "Then scram. Shoo!" done @@ -647,7 +647,7 @@ FisherJustinBeatenText: text "Sploosh!" done -UnknownText_0x190b4e: +FisherJustinAfterText: text "Calm, collected…" line "The essence of" @@ -669,7 +669,7 @@ FisherRalph1BeatenText: line "rush things…" done -UnknownText_0x190bf8: +FisherRalphAfterText: text "Fishing is a life-" line "long passion." @@ -677,7 +677,7 @@ UnknownText_0x190bf8: line "long friends!" done -UnknownText_0x190c37: +FisherRalphSwarmText: text "One, two, three…" line "Muahahaha, what a" @@ -690,7 +690,7 @@ UnknownText_0x190c37: ; --- start a segment of possibly unused texts -UnknownText_0x190c9c: +Route32UnusedFisher1SeenText: text "I keep catching" line "the same #MON…" @@ -699,29 +699,29 @@ UnknownText_0x190c9c: cont "around for me." done -UnknownText_0x190ceb: +Route32UnusedFisher1BeatenText: text "Nothing ever goes" line "right for me now…" done -UnknownText_0x190d10: +Route32UnusedFisher1AfterText: text "How come the guy" line "next to me catches" cont "good #MON?" done -UnknownText_0x190d40: +Route32UnusedFisher2SeenText: text "Heh, I'm on a roll" line "today. How about a" cont "battle, kid?" done -UnknownText_0x190d73: +Route32UnusedFisher2BeatenText: text "Oof. I wasn't" line "lucky that time." done -UnknownText_0x190d92: +Route32UnusedFisher2AfterText: text "You have to have a" line "good ROD if you" @@ -740,7 +740,7 @@ FisherHenryBeatenText: text "SPLASH?" done -UnknownText_0x190df2: +FisherHenryAfterText: text "Freshly caught" line "#MON are no" @@ -760,7 +760,7 @@ YoungsterAlbertBeatenText: text "You're strong!" done -UnknownText_0x190e82: +YoungsterAlbertAfterText: text "I'm going to try" line "to be the best" cont "with my favorites." @@ -784,7 +784,7 @@ YoungsterGordonBeatenText: line "could win." done -UnknownText_0x190f49: +YoungsterGordonAfterText: text "The grass is full" line "of clingy things." done @@ -799,7 +799,7 @@ CamperRolandBeatenText: line "disappointing." done -UnknownText_0x190faa: +CamperRolandAfterText: text "If you don't want" line "to battle, just" cont "avoid eye contact." @@ -821,7 +821,7 @@ PicnickerLiz1BeatenText: line "relieve my anger!" done -UnknownText_0x191060: +PicnickerLiz1AfterText: text "I was having a" line "nice chat too." done @@ -838,20 +838,20 @@ Bird_keeperPeterBeatenText: line "weaknesses are." done -UnknownText_0x1910d4: +Bird_keeperPeterAfterText: text "I should train" line "again at the GYM" cont "in VIOLET CITY." done ; possibly unused -UnknownText_0x191105: +Route32UnusedText: text "The fishermen" line "yelled at me for" cont "bugging them…" done -UnknownText_0x191133: +Text_RoarIntro: text "WROOOOAR!" line "PEOPLE RUN WHEN I" @@ -862,7 +862,7 @@ UnknownText_0x191133: line "NOW TAKE THIS!" done -UnknownText_0x19118c: +Text_RoarOutro: text "WROOOAR!" line "IT'S ROAR!" @@ -948,13 +948,13 @@ Route32_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $8, $12, $0, UnknownScript_0x1904ab, $0, $0 - xy_trigger 1, $47, $7, $0, UnknownScript_0x1904e9, $0, $0 + xy_trigger 0, $8, $12, $0, Route32CooltrainerMStopsYou, $0, $0 + xy_trigger 1, $47, $7, $0, Route32WannaBuyASlowpokeTailScript, $0, $0 .Signposts: db 6 - signpost 5, 13, SIGNPOST_READ, Route32Sign - signpost 1, 9, SIGNPOST_READ, Route32RuinsSign + signpost 5, 13, SIGNPOST_READ, Route32Sign + signpost 1, 9, SIGNPOST_READ, Route32RuinsSign signpost 84, 10, SIGNPOST_READ, Route32UnionCaveSign signpost 73, 12, SIGNPOST_READ, Route32PokeCenterSign signpost 67, 12, SIGNPOST_ITEM, Route32HiddenGreatBall @@ -969,10 +969,10 @@ Route32_MapEventHeader: person_event SPRITE_YOUNGSTER, 63, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterGordon, -1 person_event SPRITE_YOUNGSTER, 45, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperRoland, -1 person_event SPRITE_LASS, 30, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1 - person_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19046f, -1 + person_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1 person_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperPeter, -1 - person_event SPRITE_FISHER, 70, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x1904f2, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_FISHER, 70, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS person_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL - person_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x1904ce, -1 + person_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1 person_event SPRITE_LASS, 67, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY person_event SPRITE_POKE_BALL, 30, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL diff --git a/maps/Route33.asm b/maps/Route33.asm index 1a263b6b9..ad9d7d7d2 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -10,42 +10,42 @@ Route33_MapScriptHeader: .MapCallbacks: db 0 -LassScript_0x1ac002: - jumptextfaceplayer UnknownText_0x1ac1e7 +Route33LassScript: + jumptextfaceplayer Route33LassText TrainerHikerAnthony: - trainer EVENT_BEAT_HIKER_ANTHONY, HIKER, ANTHONY2, HikerAnthony2SeenText, HikerAnthony2BeatenText, 0, HikerAnthony2Script + trainer EVENT_BEAT_HIKER_ANTHONY, HIKER, ANTHONY2, HikerAnthony2SeenText, HikerAnthony2BeatenText, 0, .Script -HikerAnthony2Script: +.Script: writecode VAR_CALLERID, PHONE_HIKER_ANTHONY end_if_just_battled opentext checkflag ENGINE_ANTHONY - iftrue UnknownScript_0x1ac051 + iftrue .Rematch checkflag ENGINE_DUNSPARCE_SWARM - iftrue UnknownScript_0x1ac0c5 + iftrue .Swarm checkcellnum PHONE_HIKER_ANTHONY - iftrue UnknownScript_0x1ac0d7 + iftrue .NumberAccepted checkevent EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x1ac03a - writetext UnknownText_0x1ac153 + iftrue .AskAgain + writetext HikerAnthony2AfterText buttonsound setevent EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x1ac0cb - jump UnknownScript_0x1ac03d + scall .AskNumber1 + jump .AskForPhoneNumber -UnknownScript_0x1ac03a: - scall UnknownScript_0x1ac0cf -UnknownScript_0x1ac03d: +.AskAgain: + scall .AskNumber2 +.AskForPhoneNumber: askforphonenumber PHONE_HIKER_ANTHONY - if_equal $1, UnknownScript_0x1ac0df - if_equal $2, UnknownScript_0x1ac0db + if_equal $1, .PhoneFull + if_equal $2, .NumberDeclined trainertotext HIKER, ANTHONY2, $0 - scall UnknownScript_0x1ac0d3 - jump UnknownScript_0x1ac0d7 + scall .RegisteredNumber + jump .NumberAccepted -UnknownScript_0x1ac051: - scall UnknownScript_0x1ac0e3 +.Rematch: + scall .RematchStd winlosstext HikerAnthony2BeatenText, 0 copybytetovar wAnthonyFightCount if_equal 4, .Fight4 @@ -104,44 +104,44 @@ UnknownScript_0x1ac051: clearflag ENGINE_ANTHONY end -UnknownScript_0x1ac0c5: - writetext UnknownText_0x1ac180 +.Swarm: + writetext HikerAnthonyDunsparceText waitbutton closetext end -UnknownScript_0x1ac0cb: +.AskNumber1: jumpstd asknumber1m end -UnknownScript_0x1ac0cf: +.AskNumber2: jumpstd asknumber2m end -UnknownScript_0x1ac0d3: +.RegisteredNumber: jumpstd registerednumberm end -UnknownScript_0x1ac0d7: +.NumberAccepted: jumpstd numberacceptedm end -UnknownScript_0x1ac0db: +.NumberDeclined: jumpstd numberdeclinedm end -UnknownScript_0x1ac0df: +.PhoneFull: jumpstd phonefullm end -UnknownScript_0x1ac0e3: +.RematchStd: jumpstd rematchm end MapRoute33Signpost0Script: - jumptext UnknownText_0x1ac279 + jumptext Route33RouteSignText -FruitTreeScript_0x1ac0ea: +Route33FruitTreeScript: fruittree FRUITTREE_ROUTE_33 HikerAnthony2SeenText: @@ -157,13 +157,13 @@ HikerAnthony2BeatenText: line "more zip than me!" done -UnknownText_0x1ac153: +HikerAnthony2AfterText: text "We HIKERS are at" line "our best in the" cont "mountains." done -UnknownText_0x1ac180: +HikerAnthonyDunsparceText: text "Hey, did you get a" line "DUNSPARCE?" @@ -174,7 +174,7 @@ UnknownText_0x1ac180: cont "got a funny face!" done -UnknownText_0x1ac1e7: +Route33LassText: text "Pant, pant…" para "I finally got" @@ -190,7 +190,7 @@ UnknownText_0x1ac1e7: line "outside." done -UnknownText_0x1ac279: +Route33RouteSignText: text "ROUTE 33" done @@ -212,5 +212,5 @@ Route33_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_POKEFAN_M, 13, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerAnthony, -1 - person_event SPRITE_LASS, 16, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x1ac002, -1 - person_event SPRITE_FRUIT_TREE, 16, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1ac0ea, -1 + person_event SPRITE_LASS, 16, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Route33LassScript, -1 + person_event SPRITE_FRUIT_TREE, 16, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route33FruitTreeScript, -1 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index c15a4a7eb..c142602ba 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -22,55 +22,55 @@ VioletCity_MapScriptHeader: setflag ENGINE_FLYPOINT_VIOLET return -FisherScript_0x1a83bb: - applymovement VIOLETCITY_FISHER, MovementData_0x1a8465 +VioletCityEarlScript: + applymovement VIOLETCITY_FISHER, VioletCitySpinningEarl_MovementData faceplayer opentext - writetext UnknownText_0x1a8473 + writetext Text_EarlAsksIfYouBeatFalkner yesorno - iffalse UnknownScript_0x1a83d1 - jump UnknownScript_0x1a83cb + iffalse .FollowEarl + jump .PointlessJump -UnknownScript_0x1a83cb: - writetext UnknownText_0x1a84ac +.PointlessJump: + writetext Text_VeryNiceIndeed waitbutton closetext end -UnknownScript_0x1a83d1: - writetext UnknownText_0x1a84cb +.FollowEarl: + writetext Text_FollowEarl waitbutton closetext playmusic MUSIC_SHOW_ME_AROUND follow VIOLETCITY_FISHER, PLAYER - applymovement VIOLETCITY_FISHER, MovementData_0x1a842a + applymovement VIOLETCITY_FISHER, VioletCityFollowEarl_MovementData spriteface PLAYER, UP - applymovement VIOLETCITY_FISHER, MovementData_0x1a8465 + applymovement VIOLETCITY_FISHER, VioletCitySpinningEarl_MovementData stopfollow special RestartMapMusic opentext - writetext UnknownText_0x1a84f9 + writetext Text_HereTeacherIAm waitbutton closetext - applymovement VIOLETCITY_FISHER, MovementData_0x1a8465 - applymovement VIOLETCITY_FISHER, MovementData_0x1a8463 + applymovement VIOLETCITY_FISHER, VioletCitySpinningEarl_MovementData + applymovement VIOLETCITY_FISHER, VioletCityFinishFollowEarl_MovementData playsound SFX_ENTER_DOOR disappear VIOLETCITY_FISHER clearevent EVENT_EARLS_ACADEMY_EARL waitsfx end -LassScript_0x1a8403: - jumptextfaceplayer UnknownText_0x1a8529 +VioletCityLassScript: + jumptextfaceplayer VioletCityLassText -SuperNerdScript_0x1a8406: - jumptextfaceplayer UnknownText_0x1a8593 +VioletCitySuperNerdScript: + jumptextfaceplayer VioletCitySuperNerdText -GrampsScript_0x1a8409: - jumptextfaceplayer UnknownText_0x1a85ef +VioletCityGrampsScript: + jumptextfaceplayer VioletCityGrampsText -YoungsterScript_0x1a840c: - jumptextfaceplayer UnknownText_0x1a8665 +VioletCityYoungsterScript: + jumptextfaceplayer VioletCityYoungsterText VioletCitySign: jumptext VioletCitySignText @@ -96,13 +96,13 @@ VioletCityPPUp: VioletCityRareCandy: itemball RARE_CANDY -FruitTreeScript_0x1a8425: +VioletCityFruitTreeScript: fruittree FRUITTREE_VIOLET_CITY VioletCityHiddenHyperPotion: dwb EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION -MovementData_0x1a842a: +VioletCityFollowEarl_MovementData: big_step_down big_step_down turn_head_down @@ -161,11 +161,11 @@ MovementData_0x1a842a: turn_head_down step_end -MovementData_0x1a8463: +VioletCityFinishFollowEarl_MovementData: step_up step_end -MovementData_0x1a8465: +VioletCitySpinningEarl_MovementData: turn_head_down turn_head_left turn_head_up @@ -181,7 +181,7 @@ MovementData_0x1a8465: turn_head_down step_end -UnknownText_0x1a8473: +Text_EarlAsksIfYouBeatFalkner: text "Hello!" line "You are trainer?" @@ -189,24 +189,24 @@ UnknownText_0x1a8473: line "win you did?" done -UnknownText_0x1a84ac: +Text_VeryNiceIndeed: text "Ooh, la la!" line "Very indeed nice!" done -UnknownText_0x1a84cb: +Text_FollowEarl: text "Is that so? Then" line "study shall you!" cont "Follow me!" done -UnknownText_0x1a84f9: +Text_HereTeacherIAm: text "Here, teacher I" line "am. Good it is" cont "you study here!" done -UnknownText_0x1a8529: +VioletCityLassText: text "Ghosts are rumored" line "to appear in" cont "SPROUT TOWER." @@ -218,7 +218,7 @@ UnknownText_0x1a8529: line "ghosts." done -UnknownText_0x1a8593: +VioletCitySuperNerdText: text "Hey, you're a" line "#MON trainer?" @@ -229,7 +229,7 @@ UnknownText_0x1a8593: line "for prime time!" done -UnknownText_0x1a85ef: +VioletCityGrampsText: text "FALKNER, from the" line "VIOLET #MON" @@ -243,7 +243,7 @@ UnknownText_0x1a85ef: line "job with it." done -UnknownText_0x1a8665: +VioletCityYoungsterText: text "I saw a wiggly" line "tree up ahead!" @@ -303,7 +303,7 @@ VioletCity_MapEventHeader: db 7 signpost 20, 24, SIGNPOST_READ, VioletCitySign signpost 17, 15, SIGNPOST_READ, VioletGymSign - signpost 8, 24, SIGNPOST_READ, SproutTowerSign + signpost 8, 24, SIGNPOST_READ, SproutTowerSign signpost 17, 27, SIGNPOST_READ, EarlsPokemonAcademySign signpost 25, 32, SIGNPOST_READ, VioletCityPokeCenterSign signpost 17, 10, SIGNPOST_READ, VioletCityMartSign @@ -311,11 +311,11 @@ VioletCity_MapEventHeader: .PersonEvents: db 8 - person_event SPRITE_FISHER, 16, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a83bb, EVENT_VIOLET_CITY_EARL - person_event SPRITE_LASS, 28, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x1a8403, -1 - person_event SPRITE_SUPER_NERD, 14, 24, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a8406, -1 - person_event SPRITE_GRAMPS, 20, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a8409, -1 - person_event SPRITE_YOUNGSTER, 18, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a840c, -1 - person_event SPRITE_FRUIT_TREE, 29, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a8425, -1 + person_event SPRITE_FISHER, 16, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL + person_event SPRITE_LASS, 28, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityLassScript, -1 + person_event SPRITE_SUPER_NERD, 14, 24, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1 + person_event SPRITE_GRAMPS, 20, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletCityGrampsScript, -1 + person_event SPRITE_YOUNGSTER, 18, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1 + person_event SPRITE_FRUIT_TREE, 29, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1 person_event SPRITE_POKE_BALL, 1, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP person_event SPRITE_POKE_BALL, 5, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY |