diff options
Diffstat (limited to 'maps')
388 files changed, 10132 insertions, 7908 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 82b3d9fe6..7714c0e02 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -1,3 +1,12 @@ +const_value set 2 + const AZALEAGYM_BUGSY + const AZALEAGYM_BUG_CATCHER1 + const AZALEAGYM_BUG_CATCHER2 + const AZALEAGYM_BUG_CATCHER3 + const AZALEAGYM_TWIN1 + const AZALEAGYM_TWIN2 + const AZALEAGYM_GYM_GUY + AzaleaGym_MapScriptHeader: .MapTriggers: db 0 @@ -7,21 +16,21 @@ AzaleaGym_MapScriptHeader: BugsyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_BUGSY iftrue .FightDone writetext BugsyText_INeverLose + waitbutton closetext - loadmovesprites winlosstext BugsyText_ResearchIncomplete, 0 loadtrainer BUGSY, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_BUGSY - loadfont + opentext writetext Text_ReceivedHiveBadge playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_HIVEBADGE checkcode VAR_BADGES scall AzaleaGymTriggerRockets @@ -33,20 +42,20 @@ BugsyScript: setevent EVENT_BEAT_BUG_CATCHER_AL setevent EVENT_BEAT_BUG_CATCHER_JOSH writetext BugsyText_HiveBadgeSpeech - keeptextopen + buttonsound verbosegiveitem TM_FURY_CUTTER iffalse .NoRoomForFuryCutter setevent EVENT_GOT_TM49_FURY_CUTTER writetext BugsyText_FuryCutterSpeech + waitbutton closetext - loadmovesprites end .GotFuryCutter: writetext BugsyText_BugMonsAreDeep - closetext + waitbutton .NoRoomForFuryCutter: - loadmovesprites + closetext end AzaleaGymTriggerRockets: @@ -64,72 +73,72 @@ TrainerTwinsAmyandmay1: trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript .AfterScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext TwinsAmyandmay1AfterBattleText + waitbutton closetext - loadmovesprites end TrainerTwinsAmyandmay2: trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript .AfterScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext TwinsAmyandmay2AfterBattleText + waitbutton closetext - loadmovesprites end TrainerBug_catcherbenny: trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherbennySeenText, Bug_catcherbennyBeatenText, 0, .AfterScript .AfterScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext Bug_catcherbennyAfterBattleText + waitbutton closetext - loadmovesprites end TrainerBug_catcherAl: trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, 0, .AfterScript .AfterScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext Bug_catcherAlAfterBattleText + waitbutton closetext - loadmovesprites end TrainerBug_catcherJosh: trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, 0, .AfterScript .AfterScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext Bug_catcherJoshAfterBattleText + waitbutton closetext - loadmovesprites end AzaleaGymGuyScript: faceplayer checkevent EVENT_BEAT_BUGSY iftrue .AzaleaGymGuyWinScript - loadfont + opentext writetext AzaleaGymGuyText + waitbutton closetext - loadmovesprites end .AzaleaGymGuyWinScript - loadfont + opentext writetext AzaleaGymGuyWinText + waitbutton closetext - loadmovesprites end AzaleaGymStatue: diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index ab7242564..ed88a0fd1 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const AZALEAMART_CLERK + const AZALEAMART_COOLTRAINER_M + const AZALEAMART_BUG_CATCHER + AzaleaMart_MapScriptHeader: .MapTriggers: db 0 @@ -6,9 +11,9 @@ AzaleaMart_MapScriptHeader: db 0 ClerkScript_0x18e040: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_AZALEA - loadmovesprites + closetext end CooltrainerMScript_0x18e047: diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index 77555270c..617db23a4 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const AZALEAPOKECENTER1F_NURSE + const AZALEAPOKECENTER1F_GENTLEMAN + const AZALEAPOKECENTER1F_FISHING_GURU + const AZALEAPOKECENTER1F_POKEFAN_F + AzaleaPokeCenter1F_MapScriptHeader: .MapTriggers: db 1 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index ea2168e2a..5921b1f0e 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -1,11 +1,25 @@ +const_value set 2 + const AZALEATOWN_AZALEA_ROCKET1 + const AZALEATOWN_GRAMPS + const AZALEATOWN_TEACHER + const AZALEATOWN_YOUNGSTER + const AZALEATOWN_SLOWPOKE1 + const AZALEATOWN_SLOWPOKE2 + const AZALEATOWN_SLOWPOKE3 + const AZALEATOWN_SLOWPOKE4 + const AZALEATOWN_FRUIT_TREE + const AZALEATOWN_SILVER + const AZALEATOWN_AZALEA_ROCKET3 + const AZALEATOWN_KURT_OUTSIDE + AzaleaTown_MapScriptHeader: .MapTriggers: db 3 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 dw .Trigger2, 0 - dw .Trigger3, 0 .MapCallbacks: db 1 @@ -13,164 +27,164 @@ AzaleaTown_MapScriptHeader: ; callbacks dbw 5, .Flypoint -.Trigger1 +.Trigger0 end -.Trigger2 +.Trigger1 end -.Trigger3 +.Trigger2 end .Flypoint setflag ENGINE_FLYPOINT_AZALEA return -UnknownScript_0x198018: - moveperson $b, $b, $b +AzaleaTownRivalBattleTrigger1: + moveperson AZALEATOWN_SILVER, $b, $b spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic pause 15 - appear $b - applymovement $b, MovementData_0x198134 + appear AZALEATOWN_SILVER + 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_RotatePalettesRightMusic + special Special_FadeOutMusic pause 15 - appear $b - applymovement $b, MovementData_0x19813c + appear AZALEATOWN_SILVER + applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement2 spriteface PLAYER, UP -UnknownScript_0x198049: +AzaleaTownRivalBattleScript: playmusic MUSIC_RIVAL_ENCOUNTER - loadfont - writetext UnknownText_0x19814d + opentext + writetext AzaleaTownRivalBeforeText + waitbutton closetext - loadmovesprites 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 - setlasttalked $b + iftrue .Chikorita + winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText + setlasttalked AZALEATOWN_SILVER loadtrainer RIVAL1, RIVAL1_6 startbattle - reloadmapmusic - returnafterbattle - jump UnknownScript_0x198091 + dontrestartmapmusic + reloadmapafterbattle + jump .AfterBattle -UnknownScript_0x198071: - winlosstext UnknownText_0x1981e6, UnknownText_0x19835b - setlasttalked $b +.Totodile: + winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText + setlasttalked AZALEATOWN_SILVER loadtrainer RIVAL1, RIVAL1_4 startbattle - reloadmapmusic - returnafterbattle - jump UnknownScript_0x198091 + dontrestartmapmusic + reloadmapafterbattle + jump .AfterBattle -UnknownScript_0x198081: - winlosstext UnknownText_0x1981e6, UnknownText_0x19835b - setlasttalked $b +.Chikorita: + winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText + setlasttalked AZALEATOWN_SILVER loadtrainer RIVAL1, RIVAL1_5 startbattle - reloadmapmusic - returnafterbattle - jump UnknownScript_0x198091 + dontrestartmapmusic + reloadmapafterbattle + jump .AfterBattle -UnknownScript_0x198091: +.AfterBattle: playmusic MUSIC_RIVAL_AFTER - loadfont - writetext UnknownText_0x198233 + opentext + writetext AzaleaTownRivalAfterText + waitbutton closetext - loadmovesprites spriteface PLAYER, LEFT - applymovement $b, MovementData_0x198144 + applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement playsound SFX_EXIT_BUILDING - disappear $b + disappear AZALEATOWN_SILVER dotrigger $0 - waitbutton + waitsfx playmapmusic end -AzaleaRocketScript_0x1980ab: - jumptextfaceplayer UnknownText_0x19837b +AzaleaTownRocket1Script: + jumptextfaceplayer GoodSamaritanRocketText -AzaleaRocketScript_0x1980ae: - jumptextfaceplayer UnknownText_0x1983c7 +AzaleaTownRocket2Script: + jumptextfaceplayer TastySlowpokeTailRocketText -GrampsScript_0x1980b1: +AzaleaTownGrampsScript: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_SLOWPOKE_WELL - iftrue UnknownScript_0x1980bf - writetext UnknownText_0x19841b + iftrue .ClearedWell + writetext AzaleaTownGrampsTextBefore + waitbutton closetext - loadmovesprites end -UnknownScript_0x1980bf: - writetext UnknownText_0x198473 +.ClearedWell: + writetext AzaleaTownGrampsTextAfter + waitbutton closetext - loadmovesprites end -TeacherScript_0x1980c5: - jumptextfaceplayer UnknownText_0x1984ce +AzaleaTownTeacherScript: + jumptextfaceplayer AzaleaTownTeacherText -YoungsterScript_0x1980c8: - jumptextfaceplayer UnknownText_0x19851a +AzaleaTownYoungsterScript: + jumptextfaceplayer AzaleaTownYoungsterText -SlowpokeScript_0x1980cb: - loadfont - writetext UnknownText_0x1985b0 +AzaleaTownSlowpokeScript: + opentext + writetext AzaleaTownSlowpokeText1 pause 60 - writetext UnknownText_0x1985c3 + writetext AzaleaTownSlowpokeText2 cry SLOWPOKE + waitbutton closetext - loadmovesprites end WoosterScript: ; unused faceplayer - loadfont + opentext writetext WoosterText cry QUAGSIRE + waitbutton closetext - loadmovesprites end -UnknownScript_0x1980e5: - applymovement PLAYER, MovementData_0x198148 - loadfont - writetext UnknownText_0x1985df - keeptextopen - spriteface $d, RIGHT - writetext UnknownText_0x19860b - keeptextopen - writetext UnknownText_0x198628 - closetext +AzaleaTown_CelebiEventScript: + applymovement PLAYER, Movement_PlayerWalksOutOfKurtsHouse + opentext + writetext IlexForestIsRestlessText + buttonsound + spriteface AZALEATOWN_KURT_OUTSIDE, RIGHT + writetext HeresTheGSBallBackText + buttonsound + writetext PleaseInvestigateIlexForestText + waitbutton verbosegiveitem GS_BALL - spriteface $d, LEFT + spriteface AZALEATOWN_KURT_OUTSIDE, LEFT setflag ENGINE_HAVE_EXAMINED_GS_BALL clearevent EVENT_ILEX_FOREST_LASS setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS dotrigger $0 - loadmovesprites + closetext end -KurtOutsideScript_0x19810c: +AzaleaTownKurtScript: faceplayer - loadfont - writetext UnknownText_0x198628 + opentext + writetext PleaseInvestigateIlexForestText + waitbutton + spriteface AZALEATOWN_KURT_OUTSIDE, LEFT closetext - spriteface $d, LEFT - loadmovesprites end AzaleaTownSign: @@ -200,11 +214,11 @@ AzaleaTownMartSign: WhiteApricornTree: fruittree FRUITTREE_AZALEA_TOWN -MapAzaleaTownSignpostItem8: +AzaleaTownHiddenFullHeal: dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL -MovementData_0x198134: +AzaleaTownRivalBattleApproachMovement1: step_left step_left step_left @@ -214,7 +228,7 @@ MovementData_0x198134: turn_head_up step_end -MovementData_0x19813c: +AzaleaTownRivalBattleApproachMovement2: step_left step_left step_left @@ -224,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." @@ -254,7 +268,7 @@ UnknownText_0x19814d: cont "good you are." done -UnknownText_0x1981e6: +AzaleaTownRivalWinText: text "… Humph! Useless" line "#MON!" @@ -265,7 +279,7 @@ UnknownText_0x1981e6: line "weak." done -UnknownText_0x198233: +AzaleaTownRivalAfterText: text "I hate the weak." para "#MON, trainers." @@ -295,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." @@ -309,7 +323,7 @@ UnknownText_0x19837b: line "Samaritan?" done -UnknownText_0x1983c7: +TastySlowpokeTailRocketText: text "Do you know about" line "SLOWPOKETAIL? I" cont "heard it's tasty!" @@ -318,7 +332,7 @@ UnknownText_0x1983c7: line "told you that?" done -UnknownText_0x19841b: +AzaleaTownGrampsTextBefore: text "The SLOWPOKE have" line "disappeared from" cont "town…" @@ -328,7 +342,7 @@ UnknownText_0x19841b: cont "sold somewhere." done -UnknownText_0x198473: +AzaleaTownGrampsTextAfter: text "The SLOWPOKE have" line "returned." @@ -339,7 +353,7 @@ UnknownText_0x198473: line "where." done -UnknownText_0x1984ce: +AzaleaTownTeacherText: text "Did you come to" line "get KURT to make" cont "some BALLS?" @@ -348,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." @@ -364,13 +378,13 @@ UnknownText_0x19851a: cont "down trees." done -UnknownText_0x1985b0: +AzaleaTownSlowpokeText1: text "SLOWPOKE: …" para "<......> <......> <......>" done -UnknownText_0x1985c3: +AzaleaTownSlowpokeText2: text "<......> <......>Yawn?" done @@ -378,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?" @@ -463,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 @@ -477,19 +491,19 @@ AzaleaTown_MapEventHeader: signpost 9, 16, SIGNPOST_READ, AzaleaTownPokeCenterSign signpost 5, 22, SIGNPOST_READ, AzaleaTownMartSign signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign - signpost 6, 31, SIGNPOST_ITEM, MapAzaleaTownSignpostItem8 + signpost 6, 31, SIGNPOST_ITEM, AzaleaTownHiddenFullHeal .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/BattleTower1F.asm b/maps/BattleTower1F.asm index 41f44dd7a..ba0bd1c33 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const BATTLETOWER1F_RECEPTIONIST + const BATTLETOWER1F_YOUNGSTER + const BATTLETOWER1F_COOLTRAINER_F + const BATTLETOWER1F_BUG_CATCHER + const BATTLETOWER1F_GRANNY + BattleTower1F_MapScriptHeader: .MapTriggers: db 2 @@ -10,27 +17,27 @@ BattleTower1F_MapScriptHeader: db 0 .Trigger0: - writebyte BATTLE_TOWER_ACTION_09 + writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS special BattleTowerAction iffalse .SkipEverything - writebyte BATTLE_TOWER_ACTION_02 + writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState special BattleTowerAction if_equal $0, .SkipEverything if_equal $2, .priorityjump1 if_equal $3, .SkipEverything if_equal $4, .SkipEverything - loadfont - writetext UnknownText_0x9f037 + opentext + writetext Text_WeveBeenWaitingForYou + waitbutton closetext - loadmovesprites - priorityjump UnknownScript_0x9e44e + priorityjump Script_ResumeBattleTowerChallenge end .priorityjump1: priorityjump BattleTower_LeftWithoutSaving - writebyte BATTLE_TOWER_ACTION_04 + writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_06 + writebyte BATTLETOWERACTION_06 special BattleTowerAction .SkipEverything: dotrigger $1 @@ -38,24 +45,24 @@ BattleTower1F_MapScriptHeader: end MapBattleTower1FSignpost0Script: - loadfont + opentext writetext Text_ReadBattleTowerRules yesorno iffalse UnknownScript_0x9e3e0 writetext Text_BattleTowerRules - closetext + waitbutton UnknownScript_0x9e3e0: - loadmovesprites + closetext end ReceptionistScript_0x9e3e2: - writebyte BATTLE_TOWER_ACTION_02 + writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState special BattleTowerAction - if_equal $3, BattleTowerBattleRoomScript_0x9f4e4 ; maps/BattleTowerBattleRoom.asm - loadfont + if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm + opentext writetext Text_BattleTowerWelcomesYou - keeptextopen - writebyte BATTLE_TOWER_ACTION_00 + buttonsound + writebyte BATTLETOWERACTION_00 ; if new save file: bit 1, [sbe4f] special BattleTowerAction if_not_equal $0, Script_Menu_ChallengeExplanationCancel jump Script_BattleTowerIntroductionYesNo @@ -66,13 +73,13 @@ Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc special Special_Menu_ChallengeExplanationCancel if_equal $1, Script_ChoseChallenge if_equal $2, Script_BattleTowerExplanation - jump UnknownScript_0x9e4b0 + jump Script_BattleTowerHopeToServeYouAgain Script_ChoseChallenge: ; 0x9e40f - writebyte BATTLE_TOWER_ACTION_1A ; ResetBattleTowerTrainerSRAM + writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM special BattleTowerAction special SpecialCheckForBattleTowerRules - if_not_equal $0, Script_CloseText + if_not_equal $0, Script_WaitButton writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel @@ -80,175 +87,175 @@ Script_ChoseChallenge: ; 0x9e40f special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel dotrigger $1 - writebyte BATTLE_TOWER_ACTION_01 + writebyte BATTLETOWERACTION_01 ; set 1, [sbe4f] special BattleTowerAction special Function1700b0 if_equal $a, Script_Menu_ChallengeExplanationCancel if_not_equal $0, UnknownScript_0x9e550 - writebyte BATTLE_TOWER_ACTION_11 + writebyte BATTLETOWERACTION_11 special BattleTowerAction writetext Text_RightThisWayToYourBattleRoom + waitbutton closetext - loadmovesprites - writebyte BATTLE_TOWER_ACTION_1E + writebyte BATTLETOWERACTION_CHOOSEREWARD special BattleTowerAction - jump UnknownScript_0x9e454 + jump Script_WalkToBattleTowerElevator -UnknownScript_0x9e44e: - loadmovesprites - writebyte BATTLE_TOWER_ACTION_08 +Script_ResumeBattleTowerChallenge: + closetext + writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group special BattleTowerAction -UnknownScript_0x9e454: - musicfadeout MUSIC_NONE, $8 +Script_WalkToBattleTowerElevator: + musicfadeout MUSIC_NONE, 8 domaptrigger BATTLE_TOWER_BATTLE_ROOM, $0 domaptrigger BATTLE_TOWER_ELEVATOR, $0 domaptrigger BATTLE_TOWER_HALLWAY, $0 - follow $2, PLAYER - applymovement $2, MovementData_0x9e571 - writebyte BATTLE_TOWER_ACTION_0A + follow BATTLETOWER1F_RECEPTIONIST, PLAYER + applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator + writebyte BATTLETOWERACTION_0A special BattleTowerAction warpsound - disappear $2 + disappear BATTLETOWER1F_RECEPTIONIST stopfollow - applymovement PLAYER, MovementData_0x9e576 + applymovement PLAYER, MovementData_BattleTowerHallwayPlayerEntersBattleRoom warpcheck end Script_GivePlayerHisPrize: ; 0x9e47a - writebyte BATTLE_TOWER_ACTION_1C + writebyte BATTLETOWERACTION_1C special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_1B + writebyte BATTLETOWERACTION_GIVEREWARD special BattleTowerAction if_equal POTION, Script_YourPackIsStuffedFull itemtotext $0, $1 giveitem ITEM_FROM_MEM, 5 writetext Text_PlayerGotFive - writebyte BATTLE_TOWER_ACTION_1D + writebyte BATTLETOWERACTION_1D special BattleTowerAction - loadmovesprites + closetext end Script_YourPackIsStuffedFull: ; 0x9e498 writetext Text_YourPackIsStuffedFull + waitbutton closetext - loadmovesprites end Script_BattleTowerIntroductionYesNo: ; 0x9e49e writetext Text_WouldYouLikeToHearAboutTheBattleTower yesorno - iffalse UnknownScript_0x9e4a8 + iffalse Script_BattleTowerSkipExplanation Script_BattleTowerExplanation: ; 0x9e4a5 writetext Text_BattleTowerIntroduction_2 -UnknownScript_0x9e4a8: - writebyte BATTLE_TOWER_ACTION_01 +Script_BattleTowerSkipExplanation: + writebyte BATTLETOWERACTION_01 special BattleTowerAction jump Script_Menu_ChallengeExplanationCancel -UnknownScript_0x9e4b0: +Script_BattleTowerHopeToServeYouAgain: writetext Text_WeHopeToServeYouAgain + waitbutton closetext - loadmovesprites end -UnknownScript_0x9e4b6: +UnreferencedScript_0x9e4b6: special Function17f53d - loadmovesprites + closetext end -Script_CloseText: ; 0x9e4bb +Script_WaitButton: ; 0x9e4bb + waitbutton closetext - loadmovesprites end -UnknownScript_0x9e4be: +UnreferencedScript_0x9e4be: writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - writebyte BATTLE_TOWER_ACTION_01 + writebyte BATTLETOWERACTION_01 special BattleTowerAction special Function1700ba if_equal $a, Script_Menu_ChallengeExplanationCancel if_not_equal $0, UnknownScript_0x9e550 writetext Text_ReceivedAListOfLeadersOnTheHonorRoll - spriteface $2, LEFT + spriteface BATTLETOWER1F_RECEPTIONIST, LEFT writetext Text_PleaseConfirmOnThisMonitor + waitbutton + spriteface BATTLETOWER1F_RECEPTIONIST, DOWN closetext - spriteface $2, DOWN - loadmovesprites end -UnknownScript_0x9e4ea: - writebyte BATTLE_TOWER_ACTION_18 +UnreferencedScript_0x9e4ea: + writebyte BATTLETOWERACTION_18 special BattleTowerAction if_not_equal $0, Script_APkmnLevelExceeds - writebyte BATTLE_TOWER_ACTION_19 + writebyte BATTLETOWERACTION_19 special BattleTowerAction if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70 special SpecialCheckForBattleTowerRules - if_not_equal $0, Script_CloseText - writebyte BATTLE_TOWER_ACTION_05 + if_not_equal $0, Script_WaitButton + writebyte BATTLETOWERACTION_05 special BattleTowerAction - if_equal $0, UnknownScript_0x9e512 - writetext UnknownText_0x9ecb0 - jump UnknownScript_0x9e515 + if_equal $0, .zero + writetext Text_CantBeRegistered_PreviousRecordDeleted + jump continue -UnknownScript_0x9e512: - writetext UnknownText_0x9ec6d -UnknownScript_0x9e515: +.zero: + writetext Text_CantBeRegistered +continue: yesorno iffalse Script_Menu_ChallengeExplanationCancel - writetext UnknownText_0x9ef79 + writetext Text_SaveBeforeReentry yesorno iffalse Script_Menu_ChallengeExplanationCancel dotrigger $0 special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel dotrigger $1 - writebyte BATTLE_TOWER_ACTION_06 + writebyte BATTLETOWERACTION_06 special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_12 + writebyte BATTLETOWERACTION_12 special BattleTowerAction writetext Text_RightThisWayToYourBattleRoom - closetext - jump UnknownScript_0x9e44e + waitbutton + jump Script_ResumeBattleTowerChallenge -UnknownScript_0x9e53b: - writetext UnknownText_0x9f076 - closetext - jump UnknownScript_0x9e4b0 +UnreferencedScript_0x9e53b: + writetext Text_FiveDayBattleLimit_Mobile + waitbutton + jump Script_BattleTowerHopeToServeYouAgain Script_APkmnLevelExceeds: ; 0x9e542 writetext Text_APkmnLevelExceeds - closetext + waitbutton jump Script_Menu_ChallengeExplanationCancel Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549 writetext Text_MayNotEnterABattleRoomUnderL70 - closetext + waitbutton jump Script_Menu_ChallengeExplanationCancel UnknownScript_0x9e550: special Function17f53d - loadmovesprites + closetext end BattleTower_LeftWithoutSaving: - loadfont + opentext writetext Text_BattleTower_LeftWithoutSaving - closetext - jump UnknownScript_0x9e4b0 + waitbutton + jump Script_BattleTowerHopeToServeYouAgain YoungsterScript_0x9e55d: faceplayer - loadfont + opentext writetext Text_BattleTowerYoungster + waitbutton closetext - loadmovesprites - spriteface $3, RIGHT + spriteface BATTLETOWER1F_YOUNGSTER, RIGHT end CooltrainerFScript_0x9e568: @@ -260,24 +267,24 @@ BugCatcherScript_0x9e56b: GrannyScript_0x9e56e: jumptextfaceplayer Text_BattleTowerGranny -MovementData_0x9e571: +MovementData_BattleTower1FWalkToElevator: step_up step_up step_up step_up step_up -MovementData_0x9e576: +MovementData_BattleTowerHallwayPlayerEntersBattleRoom: step_up step_end -MovementData_0x9e578: +MovementData_BattleTowerElevatorExitElevator: step_down step_end -MovementData_0x9e57a: +MovementData_BattleTowerHallwayWalkTo1020Room: step_right step_right -MovementData_0x9e57c: +MovementData_BattleTowerHallwayWalkTo3040Room: step_right step_right step_up @@ -285,13 +292,13 @@ MovementData_0x9e57c: turn_head_left step_end -MovementData_0x9e582: +MovementData_BattleTowerHallwayWalkTo90100Room: step_left step_left -MovementData_0x9e584: +MovementData_BattleTowerHallwayWalkTo7080Room: step_left step_left -MovementData_0x9e586: +MovementData_BattleTowerHallwayWalkTo5060Room: step_left step_left step_up @@ -299,7 +306,7 @@ MovementData_0x9e586: turn_head_right step_end -MovementData_0x9e58c: +MovementData_BattleTowerBattleRoomPlayerWalksIn: step_up step_up step_up @@ -307,28 +314,28 @@ MovementData_0x9e58c: turn_head_right step_end -MovementData_0x9e592: +MovementData_BattleTowerBattleRoomOpponentWalksIn: slow_step_down slow_step_down slow_step_down turn_head_left step_end -MovementData_0x9e597: +MovementData_BattleTowerBattleRoomOpponentWalksOut: turn_head_up slow_step_up slow_step_up slow_step_up step_end -MovementData_0x9e59c: +MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer: slow_step_right slow_step_right slow_step_up slow_step_up step_end -MovementData_0x9e5a1: +MovementData_BattleTowerBattleRoomReceptionistWalksAway: slow_step_down slow_step_down slow_step_left @@ -336,11 +343,11 @@ MovementData_0x9e5a1: turn_head_right step_end -MovementData_0x9e5a7: +MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist: turn_head_down step_end -MovementData_0x9e5a9: +MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent: turn_head_right step_end @@ -482,7 +489,7 @@ Text_ThanksForVisiting: ; 0x9ea49 line "visiting!" done -UnknownText_0x9ea5f: +Text_BeatenAllTheTrainers_Mobile: text "Congratulations!" para "You've beaten all" @@ -512,7 +519,7 @@ Text_CongratulationsYouveBeatenAllTheTrainers: ; 0x9eaef para "" done -UnknownText_0x9eb45: +Text_AskRegisterRecord_Mobile: text "Would you like to" line "register your" @@ -560,7 +567,7 @@ Text_WouldYouLikeToHearAboutTheBattleTower: ; 0x9ec3d cont "BATTLE TOWER?" done -UnknownText_0x9ec6d: +Text_CantBeRegistered: text "Your record from" line "the previous" @@ -568,7 +575,7 @@ UnknownText_0x9ec6d: line "be registered. OK?" done -UnknownText_0x9ecb0: +Text_CantBeRegistered_PreviousRecordDeleted: text "Your record from" line "the previous" @@ -637,7 +644,7 @@ Text_NextUpOpponentNo: ; 0x9eebc text ". Ready?" done -UnknownText_0x9eee0: +Text_SaveBeforeConnecting_Mobile: text "Your session will" line "be SAVED before" @@ -658,7 +665,7 @@ Text_SaveAndEndTheSession: ; 0x9ef5e line "session?" done -UnknownText_0x9ef79: +Text_SaveBeforeReentry: text "Your record will" line "be SAVED before" @@ -671,7 +678,7 @@ Text_CancelYourBattleRoomChallenge: ; 0x9efbf line "ROOM challenge?" done -UnknownText_0x9efe3: +Text_RegisterRecordOnFile_Mobile: text "We have your" line "previous record on" @@ -680,7 +687,7 @@ UnknownText_0x9efe3: cont "it at the CENTER?" done -UnknownText_0x9f037: +Text_WeveBeenWaitingForYou: text "We've been waiting" line "for you. This way" @@ -688,7 +695,7 @@ UnknownText_0x9f037: line "please." done -UnknownText_0x9f076: +Text_FiveDayBattleLimit_Mobile: text "You may enter only" line "five BATTLE ROOMS" cont "each day." @@ -713,7 +720,7 @@ Text_TooMuchTimeElapsedNoRegister: ; 0x9f0c1 done ; a dupe? -UnknownText_0x9f151: +Text_RegisterRecordTimedOut_Mobile: text "Sorry, but it's" line "not possible to" diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 858b51fb0..8626a0021 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -1,138 +1,142 @@ +const_value set 2 + const BATTLETOWERBATTLEROOM_YOUNGSTER + const BATTLETOWERBATTLEROOM_RECEPTIONIST + BattleTowerBattleRoom_MapScriptHeader: .MapTriggers: db 2 ; triggers - dw Script_EnterBattleRoom, 0 - dw UnknownScript_0x9f420, 0 + dw .EnterBattleRoom, 0 + dw .DummyTrigger, 0 .MapCallbacks: db 0 -Script_EnterBattleRoom: ; 0x9f419 - disappear $2 +.EnterBattleRoom: ; 0x9f419 + disappear BATTLETOWERBATTLEROOM_YOUNGSTER priorityjump Script_BattleRoom dotrigger $1 -UnknownScript_0x9f420: +.DummyTrigger: end Script_BattleRoom: ; 0x9f421 - applymovement PLAYER, MovementData_0x9e58c + applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerWalksIn ; beat all 7 opponents in a row Script_BattleRoomLoop: ; 0x9f425 - writebyte $2 + writebyte BATTLETOWERBATTLEROOM_YOUNGSTER special Function_LoadOpponentTrainerAndPokemonsWithOTSprite - appear $2 + appear BATTLETOWERBATTLEROOM_YOUNGSTER warpsound - waitbutton - applymovement $2, MovementData_0x9e592 - loadfont + waitsfx + applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksIn + opentext battletowertext 1 - keeptextopen - loadmovesprites + buttonsound + closetext special BattleTowerBattle ; calls predef startbattle special FadeOutPalettes reloadmap if_not_equal $0, Script_FailedBattleTowerChallenge copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64 if_equal BATTLETOWER_NROFTRAINERS, Script_BeatenAllTrainers - applymovement $2, MovementData_0x9e597 + applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksOut warpsound - disappear $2 - applymovement $3, MovementData_0x9e59c - applymovement PLAYER, MovementData_0x9e5a7 - loadfont + disappear BATTLETOWERBATTLEROOM_YOUNGSTER + applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer + applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist + opentext writetext Text_YourPkmnWillBeHealedToFullHealth + waitbutton closetext - loadmovesprites playmusic MUSIC_HEAL special FadeOutPalettes special LoadMapPalettes pause 60 special FadeInPalettes special RestartMapMusic - loadfont + opentext writetext Text_NextUpOpponentNo yesorno iffalse Script_DontBattleNextOpponent Script_ContinueAndBattleNextOpponent: ; 0x9f477 - loadmovesprites - applymovement PLAYER, MovementData_0x9e5a9 - applymovement $3, MovementData_0x9e5a1 + closetext + applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent + applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksAway jump Script_BattleRoomLoop Script_DontBattleNextOpponent: ; 0x9f483 writetext Text_SaveAndEndTheSession yesorno iffalse Script_DontSaveAndEndTheSession - writebyte BATTLE_TOWER_ACTION_07 + writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_1F + writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_03 + writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave special BattleTowerAction playsound SFX_SAVE - waitbutton + waitsfx special FadeOutPalettes special Reset Script_DontSaveAndEndTheSession: ; 0x9f4a3 writetext Text_CancelYourBattleRoomChallenge yesorno iffalse Script_ContinueAndBattleNextOpponent - writebyte BATTLE_TOWER_ACTION_04 + writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_06 + writebyte BATTLETOWERACTION_06 special BattleTowerAction - loadmovesprites + closetext special FadeOutPalettes warpfacing UP, BATTLE_TOWER_1F, $7, $7 - loadfont - jump UnknownScript_0x9e4b0 + opentext + jump Script_BattleTowerHopeToServeYouAgain Script_FailedBattleTowerChallenge: pause 60 special Special_BattleTowerFade warpfacing UP, BATTLE_TOWER_1F, $7, $7 - writebyte BATTLE_TOWER_ACTION_04 + writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction - loadfont + opentext writetext Text_ThanksForVisiting + waitbutton closetext - loadmovesprites end Script_BeatenAllTrainers: ; 0x9f4d9 pause 60 special Special_BattleTowerFade warpfacing UP, BATTLE_TOWER_1F, $7, $7 -BattleTowerBattleRoomScript_0x9f4e4: - loadfont +Script_BeatenAllTrainers2: + opentext writetext Text_CongratulationsYouveBeatenAllTheTrainers jump Script_GivePlayerHisPrize -UnknownScript_0x9f4eb: - writebyte BATTLE_TOWER_ACTION_04 +UnreferencedScript_0x9f4eb: + writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction - loadfont + opentext writetext Text_TooMuchTimeElapsedNoRegister + waitbutton closetext - loadmovesprites end -UnknownScript_0x9f4f7: - writebyte BATTLE_TOWER_ACTION_04 +UnreferencedScript_0x9f4f7: + writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_06 + writebyte BATTLETOWERACTION_06 special BattleTowerAction - loadfont + opentext writetext Text_ThanksForVisiting writetext Text_WeHopeToServeYouAgain + waitbutton closetext - loadmovesprites end -UnknownText_0x9f50b: +Text_ReturnedAfterSave_Mobile: text "You'll be returned" line "after you SAVE." done diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 20ae591bb..9a25e55a4 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -1,45 +1,48 @@ +const_value set 2 + const BATTLETOWERELEVATOR_RECEPTIONIST + BattleTowerElevator_MapScriptHeader: .MapTriggers: db 2 ; triggers - dw UnknownScript_0x9f562, 0 - dw UnknownScript_0x9f567, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 .MapCallbacks: db 0 -UnknownScript_0x9f562: - priorityjump UnknownScript_0x9f568 +.Trigger0: + priorityjump .RideElevator dotrigger $1 -UnknownScript_0x9f567: +.Trigger1: end -UnknownScript_0x9f568: - follow $2, PLAYER - applymovement $2, MovementData_0x9f58f - applymovement PLAYER, MovementData_0x9f592 - writebyte BATTLE_TOWER_ACTION_0A +.RideElevator: + follow BATTLETOWERELEVATOR_RECEPTIONIST, PLAYER + applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn + applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn + writebyte BATTLETOWERACTION_0A special BattleTowerAction playsound SFX_ELEVATOR earthquake 60 - waitbutton - follow $2, PLAYER - applymovement $2, MovementData_0x9e578 + waitsfx + follow BATTLETOWERELEVATOR_RECEPTIONIST, PLAYER + applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorExitElevator stopfollow warpsound - disappear $2 - applymovement PLAYER, MovementData_0x9e578 + disappear BATTLETOWERELEVATOR_RECEPTIONIST + applymovement PLAYER, MovementData_BattleTowerElevatorExitElevator warpcheck end -MovementData_0x9f58f: +MovementData_BattleTowerElevatorReceptionistWalksIn: step_right turn_head_down step_end -MovementData_0x9f592: +MovementData_BattleTowerElevatorPlayerWalksIn: turn_head_down step_end @@ -60,4 +63,4 @@ BattleTowerElevator_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MovementData_0x9f58f, -1 + person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 52ef201fd..f541da05d 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -1,3 +1,6 @@ +const_value set 2 + const BATTLETOWERHALLWAY_RECEPTIONIST + BattleTowerHallway_MapScriptHeader: .MapTriggers: db 2 @@ -16,7 +19,7 @@ BattleTowerHallway_MapScriptHeader: end .ChooseBattleRoom: - follow $2, PLAYER + follow BATTLETOWERHALLWAY_RECEPTIONIST, PLAYER callasm .asm_load_battle_room jump .WalkToChosenBattleRoom @@ -47,33 +50,33 @@ BattleTowerHallway_MapScriptHeader: if_equal 8, .L70L80 if_equal 9, .L90L100 if_equal 10, .L90L100 - applymovement $2, MovementData_0x9e57a + applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo1020Room jump .EnterBattleRoom .L30L40: ; 0x9f603 - applymovement $2, MovementData_0x9e57c + applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo3040Room jump .EnterBattleRoom .L50L60: ; 0x9f60a - applymovement $2, MovementData_0x9e586 + applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo5060Room jump .EnterBattleRoom .L70L80: ; 0x9f611 - applymovement $2, MovementData_0x9e584 + applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo7080Room jump .EnterBattleRoom .L90L100: ; 0x9f618 - applymovement $2, MovementData_0x9e582 + applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo90100Room jump .EnterBattleRoom .EnterBattleRoom: ; 0x9f61f - faceperson PLAYER, $2 - loadfont + faceperson PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST + opentext writetext Text_PleaseStepThisWay + waitbutton closetext - loadmovesprites stopfollow - applymovement PLAYER, MovementData_0x9e576 + applymovement PLAYER, MovementData_BattleTowerHallwayPlayerEntersBattleRoom warpcheck end diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index a5a198d7d..eab3a5bba 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -1,3 +1,9 @@ +const_value set 2 + const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER + const BATTLETOWEROUTSIDE_BUENA + const BATTLETOWEROUTSIDE_SAILOR + const BATTLETOWEROUTSIDE_LASS + BattleTowerOutside_MapScriptHeader: .MapTriggers: db 0 @@ -16,19 +22,19 @@ BattleTowerOutside_MapScriptHeader: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR return -StandingYoungsterScript_0x9f85f: - jumptextfaceplayer UnknownText_0x9f930 +BattleTowerOutsideYoungsterScript: + jumptextfaceplayer BattleTowerOutsideYoungsterText -BuenaScript_0x9f862: - jumptextfaceplayer UnknownText_0x9f9db +BattleTowerOutsideBuenaScript: + jumptextfaceplayer BattleTowerOutsideBuenaText -SailorScript_0x9f865: - jumptextfaceplayer UnknownText_0x9fa8c +BattleTowerOutsideSailorScript: + jumptextfaceplayer BattleTowerOutsideSailorText MapBattleTowerOutsideSignpost0Script: - jumptext UnknownText_0x9fafc + jumptext BattleTowerOutsideText_UltimateChallenge -UnknownText_0x9f86b: +BattleTowerOutsideUnusedText1: text "Wow, the BATTLE" line "TOWER is huge! My" @@ -36,7 +42,7 @@ UnknownText_0x9f86b: line "looking up at it." done -UnknownText_0x9f8b3: +BattleTowerOutsideUnusedText2: text "Wow, the BATTLE" line "TOWER is huge!" @@ -50,7 +56,7 @@ UnknownText_0x9f8b3: line "#MON." done -UnknownText_0x9f930: +BattleTowerOutsideYoungsterText: text "Wow, the BATTLE" line "TOWER is huge!" @@ -59,7 +65,7 @@ UnknownText_0x9f930: cont "in there!" done -UnknownText_0x9f97b: +BattleTowerOutsideUnusedText3: text "What on earth do" line "they do here?" @@ -70,7 +76,7 @@ UnknownText_0x9f97b: line "#MON battles." done -UnknownText_0x9f9db: +BattleTowerOutsideBuenaText: text "You can use only" line "three #MON." @@ -81,7 +87,7 @@ UnknownText_0x9f9db: line "battle…" done -UnknownText_0x9fa32: +BattleTowerOutsideUnusedText4: text "Ehehehe…" line "I sneaked out of" cont "work to come here." @@ -91,7 +97,7 @@ UnknownText_0x9fa32: cont "a LEADER!" done -UnknownText_0x9fa8c: +BattleTowerOutsideSailorText: text "Hehehe, I snuck" line "out from work." @@ -102,23 +108,23 @@ UnknownText_0x9fa8c: line "all. That I must!" done -UnknownText_0x9faee: +BattleTowerOutsideText_BattleTower: text "BATTLE TOWER" done -UnknownText_0x9fafc: +BattleTowerOutsideText_UltimateChallenge: text "BATTLE TOWER" para "Take the Ultimate" line "Trainer Challenge!" done -UnknownText_0x9fb2f: +BattleTowerOutsideText_DoorsClosed: text "The BATTLE TOWER's" line "doors are closed…" done -UnknownText_0x9fb54: +BattleTowerOutsideText_DoorsOpen: text "It's open!" done @@ -142,7 +148,7 @@ BattleTowerOutside_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, StandingYoungsterScript_0x9f85f, -1 - person_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BuenaScript_0x9f862, -1 - person_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + person_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 + person_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1 + person_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR person_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index b2151f512..0eefa4fdd 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const BILLSHOUSE_GRAMPS + BillsHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,208 +10,208 @@ BillsHouse_MapScriptHeader: GrampsScript_0x189538: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS - iftrue UnknownScript_0x1896ba + iftrue .JustShowedSomething checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA - iftrue UnknownScript_0x1896c0 + iftrue .GotThunderstone checkevent EVENT_MET_BILLS_GRANDPA - iftrue UnknownScript_0x189553 - writetext UnknownText_0x1896ce - keeptextopen + iftrue .MetGrandpa + writetext BillsGrandpaIntroText + buttonsound setevent EVENT_MET_BILLS_GRANDPA -UnknownScript_0x189553: +.MetGrandpa: checkevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA - iftrue UnknownScript_0x189697 + iftrue .ShowedPichu checkevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA - iftrue UnknownScript_0x189680 + iftrue .ShowedGrowlitheVulpix checkevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA - iftrue UnknownScript_0x189669 + iftrue .ShowedStaryu checkevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA - iftrue UnknownScript_0x189652 + iftrue .ShowedOddish checkevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA - iftrue UnknownScript_0x18963b - writetext UnknownText_0x1898c0 - keeptextopen - writetext UnknownText_0x189732 + iftrue .ShowedLickitung + writetext BillsGrandpaLickitungText + buttonsound + writetext BillsGrandpaAskToSeeMonText yesorno - iffalse UnknownScript_0x1896aa - scall UnknownScript_0x1896a5 + iffalse .SaidNo + scall .ExcitedToSee special Special_BillsGrandfather - iffalse UnknownScript_0x1896aa - if_not_equal LICKITUNG, UnknownScript_0x1896c6 - scall UnknownScript_0x1896b0 + iffalse .SaidNo + if_not_equal LICKITUNG, .WrongPokemon + scall .CorrectPokemon setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA - jump UnknownScript_0x18963b + jump .ShowedLickitung -UnknownScript_0x189592: - writetext UnknownText_0x1898ff - keeptextopen - writetext UnknownText_0x189732 +.GotEverstone: + writetext BillsGrandpaOddishText + buttonsound + writetext BillsGrandpaAskToSeeMonText yesorno - iffalse UnknownScript_0x1896aa - scall UnknownScript_0x1896a5 + iffalse .SaidNo + scall .ExcitedToSee special Special_BillsGrandfather - iffalse UnknownScript_0x1896aa - if_not_equal ODDISH, UnknownScript_0x1896c6 - scall UnknownScript_0x1896b0 + iffalse .SaidNo + if_not_equal ODDISH, .WrongPokemon + scall .CorrectPokemon setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA - jump UnknownScript_0x189652 + jump .ShowedOddish -UnknownScript_0x1895b3: - writetext UnknownText_0x189953 - keeptextopen - writetext UnknownText_0x189732 +.GotLeafStone: + writetext BillsGrandpaStaryuText + buttonsound + writetext BillsGrandpaAskToSeeMonText yesorno - iffalse UnknownScript_0x1896aa - scall UnknownScript_0x1896a5 + iffalse .SaidNo + scall .ExcitedToSee special Special_BillsGrandfather - iffalse UnknownScript_0x1896aa - if_not_equal STARYU, UnknownScript_0x1896c6 - scall UnknownScript_0x1896b0 + iffalse .SaidNo + if_not_equal STARYU, .WrongPokemon + scall .CorrectPokemon setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA - jump UnknownScript_0x189669 + jump .ShowedStaryu -UnknownScript_0x1895d4: +.GotWaterStone: checkver - iftrue UnknownScript_0x1895f9 - writetext UnknownText_0x1899fe - keeptextopen - writetext UnknownText_0x189732 + iftrue .Crystal11 + writetext BillsGrandpaGrowlitheText + buttonsound + writetext BillsGrandpaAskToSeeMonText yesorno - iffalse UnknownScript_0x1896aa - scall UnknownScript_0x1896a5 + iffalse .SaidNo + scall .ExcitedToSee special Special_BillsGrandfather - iffalse UnknownScript_0x1896aa - if_not_equal GROWLITHE, UnknownScript_0x1896c6 - scall UnknownScript_0x1896b0 + iffalse .SaidNo + if_not_equal GROWLITHE, .WrongPokemon + scall .CorrectPokemon setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA - jump UnknownScript_0x189680 + jump .ShowedGrowlitheVulpix -UnknownScript_0x1895f9: - writetext UnknownText_0x189a57 - keeptextopen - writetext UnknownText_0x189732 +.Crystal11: + writetext BillsGrandpaVulpixText + buttonsound + writetext BillsGrandpaAskToSeeMonText yesorno - iffalse UnknownScript_0x1896aa - scall UnknownScript_0x1896a5 + iffalse .SaidNo + scall .ExcitedToSee special Special_BillsGrandfather - iffalse UnknownScript_0x1896aa - if_not_equal VULPIX, UnknownScript_0x1896c6 - scall UnknownScript_0x1896b0 + iffalse .SaidNo + if_not_equal VULPIX, .WrongPokemon + scall .CorrectPokemon setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA - jump UnknownScript_0x189680 + jump .ShowedGrowlitheVulpix -UnknownScript_0x18961a: - writetext UnknownText_0x189ab1 - keeptextopen - writetext UnknownText_0x189732 +.GotFireStone: + writetext BillsGrandpaPichuText + buttonsound + writetext BillsGrandpaAskToSeeMonText yesorno - iffalse UnknownScript_0x1896aa - scall UnknownScript_0x1896a5 + iffalse .SaidNo + scall .ExcitedToSee special Special_BillsGrandfather - iffalse UnknownScript_0x1896aa - if_not_equal PICHU, UnknownScript_0x1896c6 - scall UnknownScript_0x1896b0 + iffalse .SaidNo + if_not_equal PICHU, .WrongPokemon + scall .CorrectPokemon setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA - jump UnknownScript_0x189697 + jump .ShowedPichu -UnknownScript_0x18963b: +.ShowedLickitung: checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA - iftrue UnknownScript_0x189592 - scall UnknownScript_0x1896b5 + iftrue .GotEverstone + scall .ReceiveItem verbosegiveitem EVERSTONE - iffalse UnknownScript_0x1896cc + iffalse .BagFull setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA setevent EVENT_GAVE_KURT_APRICORNS - loadmovesprites + closetext end -UnknownScript_0x189652: +.ShowedOddish: checkevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA - iftrue UnknownScript_0x1895b3 - scall UnknownScript_0x1896b5 + iftrue .GotLeafStone + scall .ReceiveItem verbosegiveitem LEAF_STONE - iffalse UnknownScript_0x1896cc + iffalse .BagFull setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA setevent EVENT_GAVE_KURT_APRICORNS - loadmovesprites + closetext end -UnknownScript_0x189669: +.ShowedStaryu: checkevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA - iftrue UnknownScript_0x1895d4 - scall UnknownScript_0x1896b5 + iftrue .GotWaterStone + scall .ReceiveItem verbosegiveitem WATER_STONE - iffalse UnknownScript_0x1896cc + iffalse .BagFull setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA setevent EVENT_GAVE_KURT_APRICORNS - loadmovesprites + closetext end -UnknownScript_0x189680: +.ShowedGrowlitheVulpix: checkevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA - iftrue UnknownScript_0x18961a - scall UnknownScript_0x1896b5 + iftrue .GotFireStone + scall .ReceiveItem verbosegiveitem FIRE_STONE - iffalse UnknownScript_0x1896cc + iffalse .BagFull setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA setevent EVENT_GAVE_KURT_APRICORNS - loadmovesprites + closetext end -UnknownScript_0x189697: - scall UnknownScript_0x1896b5 +.ShowedPichu: + scall .ReceiveItem verbosegiveitem THUNDERSTONE - iffalse UnknownScript_0x1896cc + iffalse .BagFull setevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA - loadmovesprites + closetext end -UnknownScript_0x1896a5: - writetext UnknownText_0x189760 - keeptextopen +.ExcitedToSee: + writetext BillsGrandpaExcitedToSeeText + buttonsound end -UnknownScript_0x1896aa: - writetext UnknownText_0x189784 +.SaidNo: + writetext BillsGrandpaYouDontHaveItTextText + waitbutton closetext - loadmovesprites end -UnknownScript_0x1896b0: - writetext UnknownText_0x1897a6 - keeptextopen +.CorrectPokemon: + writetext BillsGrandpaShownPokemonText + buttonsound end -UnknownScript_0x1896b5: - writetext UnknownText_0x1897e1 - keeptextopen +.ReceiveItem: + writetext BillsGrandpaTokenOfAppreciationText + buttonsound end -UnknownScript_0x1896ba: - writetext UnknownText_0x18980e +.JustShowedSomething: + writetext BillsGrandpaComeAgainText + waitbutton closetext - loadmovesprites end -UnknownScript_0x1896c0: - writetext UnknownText_0x18982a +.GotThunderstone: + writetext BillsGrandpaShownAllThePokemonText + waitbutton closetext - loadmovesprites end -UnknownScript_0x1896c6: - writetext UnknownText_0x189891 +.WrongPokemon: + writetext BillsGrandpaWrongPokemonText + waitbutton closetext - loadmovesprites end -UnknownScript_0x1896cc: - loadmovesprites +.BagFull: + closetext end -UnknownText_0x1896ce: +BillsGrandpaIntroText: text "Hm? You know BILL?" line "He's my grandson." @@ -219,23 +222,23 @@ UnknownText_0x1896ce: line "house-sitting." done -UnknownText_0x189732: +BillsGrandpaAskToSeeMonText: text "If you have that" line "#MON, may I see" cont "it, please?" done -UnknownText_0x189760: +BillsGrandpaExcitedToSeeText: text "You will show me?" line "How good of you!" done -UnknownText_0x189784: +BillsGrandpaYouDontHaveItTextText: text "You don't have it?" line "That's too bad…" done -UnknownText_0x1897a6: +BillsGrandpaShownPokemonText: text "Ah, so that is" line "@" text_from_ram StringBuffer3 @@ -246,19 +249,19 @@ UnknownText_0x1897a6: cont "you." done -UnknownText_0x1897e1: +BillsGrandpaTokenOfAppreciationText: text "Thanks!" para "This is a token of" line "my appreciation." done -UnknownText_0x18980e: +BillsGrandpaComeAgainText: text "Come visit again" line "sometime." done -UnknownText_0x18982a: +BillsGrandpaShownAllThePokemonText: text "Thanks for showing" line "me so many cute" cont "#MON." @@ -270,7 +273,7 @@ UnknownText_0x18982a: line "long life." done -UnknownText_0x189891: +BillsGrandpaWrongPokemonText: text "Hm?" para "That's not the" @@ -278,7 +281,7 @@ UnknownText_0x189891: cont "told about." done -UnknownText_0x1898c0: +BillsGrandpaLickitungText: text "My grandson BILL" line "told me about a" @@ -286,7 +289,7 @@ UnknownText_0x1898c0: line "long tongue." done -UnknownText_0x1898ff: +BillsGrandpaOddishText: text "Ah, my grandson" line "mentioned a round," @@ -295,7 +298,7 @@ UnknownText_0x1898ff: cont "on its head." done -UnknownText_0x189953: +BillsGrandpaStaryuText: text "Do you know of a" line "sea #MON that" @@ -313,7 +316,7 @@ UnknownText_0x189953: line "like to see it." done -UnknownText_0x1899fe: +BillsGrandpaGrowlitheText: text "BILL told me about" line "a #MON that is" @@ -324,7 +327,7 @@ UnknownText_0x1899fe: line "ROAR well." done -UnknownText_0x189a57: +BillsGrandpaVulpixText: text "I heard about a" line "cute #MON that" cont "has six tails." @@ -334,7 +337,7 @@ UnknownText_0x189a57: cont "like that." done -UnknownText_0x189ab1: +BillsGrandpaPichuText: text "Do you know that" line "hugely popular" cont "#MON?" diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index b970499f8..e4595c181 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -1,3 +1,14 @@ +const_value set 2 + const BLACKTHORNCITY_SUPER_NERD1 + const BLACKTHORNCITY_SUPER_NERD2 + const BLACKTHORNCITY_GRAMPS1 + const BLACKTHORNCITY_GRAMPS2 + const BLACKTHORNCITY_BLACK_BELT + const BLACKTHORNCITY_COOLTRAINER_F1 + const BLACKTHORNCITY_YOUNGSTER1 + const BLACKTHORNCITY_YOUNGSTER2 + const BLACKTHORNCITY_COOLTRAINER_F2 + BlackthornCity_MapScriptHeader: .MapTriggers: db 0 @@ -16,102 +27,102 @@ BlackthornCity_MapScriptHeader: .Santos checkcode VAR_WEEKDAY if_equal SATURDAY, .SantosAppears - disappear $9 + disappear BLACKTHORNCITY_YOUNGSTER2 return .SantosAppears - appear $9 + appear BLACKTHORNCITY_YOUNGSTER2 return -SuperNerdScript_0x1a46e8: +BlackthornSuperNerdScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_CLAIR - iftrue UnknownScript_0x1a4702 + iftrue .BeatClair checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x1a46fc - writetext UnknownText_0x1a477a + iftrue .ClearedRadioTower + writetext Text_ClairIsOut + waitbutton closetext - loadmovesprites end -UnknownScript_0x1a46fc: - writetext UnknownText_0x1a47f3 +.ClearedRadioTower: + writetext Text_ClairIsIn + waitbutton closetext - loadmovesprites end -UnknownScript_0x1a4702: - writetext UnknownText_0x1a4865 +.BeatClair: + writetext Text_ClairIsBeaten + waitbutton closetext - loadmovesprites end -GrampsScript_0x1a4708: - jumptextfaceplayer UnknownText_0x1a48c3 +BlackthornGramps1Script: + jumptextfaceplayer BlackthornGrampsRefusesEntryText -GrampsScript_0x1a470b: - jumptextfaceplayer UnknownText_0x1a48fb +BlackthornGramps2Script: + jumptextfaceplayer BlackthornGrampsGrantsEntryText -BlackBeltScript_0x1a470e: +BlackthornBlackBeltScript: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x1a471c - writetext UnknownText_0x1a494a + iftrue .ClearedRadioTower + writetext BlackBeltText_WeirdRadio + waitbutton closetext - loadmovesprites end -UnknownScript_0x1a471c: - writetext UnknownText_0x1a4983 +.ClearedRadioTower: + writetext BlackBeltText_VoicesInMyHead + waitbutton closetext - loadmovesprites end -CooltrainerFScript_0x1a4722: - jumptextfaceplayer UnknownText_0x1a49bd +BlackthornCooltrainerF1Script: + jumptextfaceplayer BlackthornCooltrainerF1Text -YoungsterScript_0x1a4725: - jumptextfaceplayer UnknownText_0x1a49f1 +BlackthornYoungsterScript: + jumptextfaceplayer BlackthornYoungsterText -CooltrainerFScript_0x1a4728: - jumptextfaceplayer UnknownText_0x1a4b1e +BlackthornCooltrainerF2Script: + jumptextfaceplayer BlackthornCooltrainerF2Text SantosScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS - iftrue SantosSaturdayScript + iftrue .Saturday checkcode VAR_WEEKDAY - if_not_equal SATURDAY, SantosNotSaturdayScript + if_not_equal SATURDAY, .NotSaturday checkevent EVENT_MET_SANTOS_OF_SATURDAY iftrue .MetSantos writetext MeetSantosText - keeptextopen + buttonsound setevent EVENT_MET_SANTOS_OF_SATURDAY .MetSantos writetext SantosGivesGiftText - keeptextopen + buttonsound verbosegiveitem SPELL_TAG - iffalse SantosDoneScript + iffalse .Done setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS writetext SantosGaveGiftText + waitbutton closetext - loadmovesprites end -SantosSaturdayScript: +.Saturday writetext SantosSaturdayText + waitbutton +.Done closetext -SantosDoneScript: - loadmovesprites end -SantosNotSaturdayScript: +.NotSaturday writetext SantosNotSaturdayText + waitbutton closetext - loadmovesprites end BlackthornCitySign: @@ -135,7 +146,7 @@ BlackthornCityPokeCenterSign: BlackthornCityMartSign: jumpstd martsign -UnknownText_0x1a477a: +Text_ClairIsOut: text "I am sorry." para "CLAIR, our GYM" @@ -149,7 +160,7 @@ UnknownText_0x1a477a: cont "will return." done -UnknownText_0x1a47f3: +Text_ClairIsIn: text "CLAIR, our GYM" line "LEADER, is waiting" cont "for you." @@ -161,7 +172,7 @@ UnknownText_0x1a47f3: line "trainer to win." done -UnknownText_0x1a4865: +Text_ClairIsBeaten: text "You defeated" line "CLAIR?" @@ -174,7 +185,7 @@ UnknownText_0x1a4865: line "LANCE." done -UnknownText_0x1a48c3: +BlackthornGrampsRefusesEntryText: text "No. Only chosen" line "trainers may train" @@ -182,7 +193,7 @@ UnknownText_0x1a48c3: line "Please leave." done -UnknownText_0x1a48fb: +BlackthornGrampsGrantsEntryText: text "If CLAIR allows" line "it, her grand-" cont "father--our MASTER" @@ -191,13 +202,13 @@ UnknownText_0x1a48fb: para "You may enter." done -UnknownText_0x1a494a: +BlackBeltText_WeirdRadio: text "My radio's busted?" line "Lately, I only get" cont "this weird signal." done -UnknownText_0x1a4983: +BlackBeltText_VoicesInMyHead: text "Arooo! Voices in" line "my head!" @@ -205,13 +216,13 @@ UnknownText_0x1a4983: line "to my radio!" done -UnknownText_0x1a49bd: +BlackthornCooltrainerF1Text: text "Are you going to" line "make your #MON" cont "forget some moves?" done -UnknownText_0x1a49f1: +BlackthornYoungsterText: text "Dragon masters all" line "come from the city" cont "of BLACKTHORN." @@ -257,7 +268,7 @@ SantosNotSaturdayText: line "not Saturday…" done -UnknownText_0x1a4b1e: +BlackthornCooltrainerF2Text: text "Wow, you came" line "through the ICE" cont "PATH?" @@ -333,12 +344,12 @@ BlackthornCity_MapEventHeader: .PersonEvents: db 9 - person_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM - person_event SPRITE_SUPER_NERD, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM - person_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN - person_event SPRITE_GRAMPS, 2, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN - person_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x1a470e, -1 - person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1a4722, -1 - person_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a4725, -1 + person_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM + person_event SPRITE_SUPER_NERD, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM + person_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN + person_event SPRITE_GRAMPS, 2, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN + person_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1 + person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1 + person_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1 person_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY - person_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1a4728, -1 + person_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1 diff --git a/maps/BlackthornDodrioTradeHouse.asm b/maps/BlackthornDodrioTradeHouse.asm index 7f84fe8dc..c70fcde2a 100644 --- a/maps/BlackthornDodrioTradeHouse.asm +++ b/maps/BlackthornDodrioTradeHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const BLACKTHORNDODRIOTRADEHOUSE_LASS + BlackthornDodrioTradeHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,10 +10,10 @@ BlackthornDodrioTradeHouse_MapScriptHeader: Emy: faceplayer - loadfont + opentext trade $3 + waitbutton closetext - loadmovesprites end EmysHouseBookshelf: diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 04e6554c4..1cd07b3cc 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY + const BLACKTHORNDRAGONSPEECHHOUSE_EKANS + BlackthornDragonSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -9,11 +13,11 @@ GrannyScript_0x195949: jumptextfaceplayer UnknownText_0x19595c EkansScript_0x19594c: - loadfont + opentext writetext UnknownText_0x1959ee cry DRATINI + waitbutton closetext - loadmovesprites end UnknownScript_0x195956: diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 5fa27432c..f51805859 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const BLACKTHORNGYM1F_CLAIR + const BLACKTHORNGYM1F_COOLTRAINER_M1 + const BLACKTHORNGYM1F_COOLTRAINER_M2 + const BLACKTHORNGYM1F_COOLTRAINER_F + const BLACKTHORNGYM1F_GYM_GUY + BlackthornGym1F_MapScriptHeader: .MapTriggers: db 0 @@ -23,25 +30,25 @@ BlackthornGym1F_MapScriptHeader: .skip3 return -ClairScript_0x194e24: +BlackthornGymClairScript: faceplayer - loadfont + opentext checkflag ENGINE_RISINGBADGE - iftrue UnknownScript_0x194e69 + iftrue .AlreadyGotBadge checkevent EVENT_BEAT_CLAIR iftrue .FightDone - writetext UnknownText_0x194efa + writetext ClairIntroText + waitbutton closetext - loadmovesprites - winlosstext UnknownText_0x194fd6, 0 + winlosstext ClairWinText, 0 loadtrainer CLAIR, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_CLAIR - loadfont - writetext UnknownText_0x19500e + opentext + writetext ClairText_GoToDragonsDen + waitbutton closetext - loadmovesprites setevent EVENT_BEAT_COOLTRAINERM_PAUL setevent EVENT_BEAT_COOLTRAINERM_CODY setevent EVENT_BEAT_COOLTRAINERM_MIKE @@ -51,88 +58,89 @@ ClairScript_0x194e24: setevent EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN clearevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN end + .FightDone - writetext UnknownText_0x195162 + writetext ClairText_TooMuchToExpect + waitbutton closetext - loadmovesprites end -UnknownScript_0x194e69: +.AlreadyGotBadge checkevent EVENT_GOT_TM24_DRAGONBREATH - iftrue UnknownScript_0x194e94 - writetext UnknownText_0x195196 - keeptextopen + iftrue .GotTM24 + writetext BlackthornGymClairText_YouKeptMeWaiting + buttonsound giveitem TM_DRAGONBREATH - iffalse UnknownScript_0x194e8e + iffalse .BagFull itemtotext TM_DRAGONBREATH, $0 - writetext UnknownText_0x1951bf + writetext BlackthornGymText_ReceivedTM24 playsound SFX_ITEM - waitbutton + waitsfx itemnotify setevent EVENT_GOT_TM24_DRAGONBREATH - writetext UnknownText_0x1951d1 - keeptextopen - jump UnknownScript_0x194e94 + writetext BlackthornGymClairText_DescribeTM24 + buttonsound + jump .GotTM24 -UnknownScript_0x194e8e: - writetext UnknownText_0x19524f +.BagFull: + writetext BlackthornGymClairText_BagFull + waitbutton closetext - loadmovesprites end -UnknownScript_0x194e94: - writetext UnknownText_0x195272 +.GotTM24: + writetext BlackthornGymClairText_League + waitbutton closetext - loadmovesprites end TrainerCooltrainermPaul: trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, CooltrainermPaulScript CooltrainermPaulScript: - talkaftercancel - loadfont - writetext UnknownText_0x1953f1 + end_if_just_battled + opentext + writetext CooltrainermPaulAfterText + waitbutton closetext - loadmovesprites end TrainerCooltrainermMike: trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, CooltrainermMikeScript CooltrainermMikeScript: - talkaftercancel - loadfont - writetext UnknownText_0x195467 + end_if_just_battled + opentext + writetext CooltrainermMikeAfterText + waitbutton closetext - loadmovesprites end TrainerCooltrainerfLola: trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, CooltrainerfLolaScript CooltrainerfLolaScript: - talkaftercancel - loadfont - writetext UnknownText_0x195516 + end_if_just_battled + opentext + writetext CooltrainerfLolaAfterText + waitbutton closetext - loadmovesprites end BlackthornGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_CLAIR iftrue .BlackthornGymGuyWinScript writetext BlackthornGymGuyText + waitbutton closetext - loadmovesprites end .BlackthornGymGuyWinScript writetext BlackthornGymGuyWinText + waitbutton closetext - loadmovesprites end BlackthornGymStatue: @@ -143,7 +151,7 @@ BlackthornGymStatue: trainertotext CLAIR, 1, $1 jumpstd gymstatue2 -UnknownText_0x194efa: +ClairIntroText: text "I am CLAIR." para "The world's best" @@ -168,7 +176,7 @@ UnknownText_0x194efa: line "opponent!" done -UnknownText_0x194fd6: +ClairWinText: text "I lost?" para "I don't believe" @@ -176,7 +184,7 @@ UnknownText_0x194fd6: cont "some mistake…" done -UnknownText_0x19500e: +ClairText_GoToDragonsDen: text "I won't admit" line "this." @@ -211,26 +219,26 @@ UnknownText_0x19500e: cont "BADGE!" done -UnknownText_0x195162: +ClairText_TooMuchToExpect: text "What's the matter?" para "Is it too much to" line "expect of you?" done -UnknownText_0x195196: +BlackthornGymClairText_YouKeptMeWaiting: text "You've kept me" line "waiting!" para "Here! Take this!" done -UnknownText_0x1951bf: +BlackthornGymText_ReceivedTM24: text "<PLAYER> received" line "TM24." done -UnknownText_0x1951d1: +BlackthornGymClairText_DescribeTM24: text "That contains" line "DRAGONBREATH." @@ -243,12 +251,12 @@ UnknownText_0x1951d1: cont "to take it." done -UnknownText_0x19524f: +BlackthornGymClairText_BagFull: text "What is this? You" line "don't have room?" done -UnknownText_0x195272: +BlackthornGymClairText_League: text "What's the matter?" para "Aren't you headed" @@ -292,7 +300,7 @@ CooltrainermPaulBeatenText: line "lost?" done -UnknownText_0x1953f1: +CooltrainermPaulAfterText: text "LANCE told you" line "that he'd like to" @@ -310,7 +318,7 @@ CooltrainermMikeBeatenText: text "That's odd." done -UnknownText_0x195467: +CooltrainermMikeAfterText: text "I know my short-" line "comings now." @@ -336,7 +344,7 @@ CooltrainerfLolaBeatenText: text "Way to go!" done -UnknownText_0x195516: +CooltrainerfLolaAfterText: text "Dragons are weak" line "against dragon-" cont "type moves." @@ -404,7 +412,7 @@ BlackthornGym1F_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_CLAIR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ClairScript_0x194e24, -1 + person_event SPRITE_CLAIR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornGymClairScript, -1 person_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermMike, -1 person_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1 person_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 48ea2db38..7d3176c31 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -1,3 +1,13 @@ +const_value set 2 + const BLACKTHORNGYM2F_COOLTRAINER_M + const BLACKTHORNGYM2F_COOLTRAINER_F + const BLACKTHORNGYM2F_BOULDER1 + const BLACKTHORNGYM2F_BOULDER2 + const BLACKTHORNGYM2F_BOULDER3 + const BLACKTHORNGYM2F_BOULDER4 + const BLACKTHORNGYM2F_BOULDER5 + const BLACKTHORNGYM2F_BOULDER6 + BlackthornGym2F_MapScriptHeader: .MapTriggers: db 0 @@ -17,36 +27,30 @@ BlackthornGym2F_MapScriptHeader: db 0, 0 ; filler .BoulderTable - db 5, 4 ; warp, person - dw .Disappear4 - - db 3, 5 ; warp, person - dw .Disappear5 - - db 4, 6 ; warp, person - dw .Disappear6 - - db $ff ; end + stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Disappear4 + stonetable 3, BLACKTHORNGYM2F_BOULDER2, .Disappear5 + stonetable 4, BLACKTHORNGYM2F_BOULDER3, .Disappear6 + db -1 ; end .Disappear4 - disappear 4 + disappear BLACKTHORNGYM2F_BOULDER1 jump .Fall .Disappear5 - disappear 5 + disappear BLACKTHORNGYM2F_BOULDER2 jump .Fall .Disappear6 - disappear 6 + disappear BLACKTHORNGYM2F_BOULDER3 jump .Fall .Fall pause 30 scall .FX - loadfont + opentext writetext BlackthornGym2FBoulderFellText + waitbutton closetext - loadmovesprites end .FX @@ -62,22 +66,22 @@ TrainerCooltrainermCody: trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, CooltrainermCodyScript CooltrainermCodyScript: - talkaftercancel - loadfont - writetext UnknownText_0x1957d5 + end_if_just_battled + opentext + writetext CooltrainermCodyAfterText + waitbutton closetext - loadmovesprites end TrainerCooltrainerfFran: trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, CooltrainerfFranScript CooltrainerfFranScript: - talkaftercancel - loadfont - writetext UnknownText_0x195883 + end_if_just_battled + opentext + writetext CooltrainerfFranAfterText + waitbutton closetext - loadmovesprites end CooltrainermCodySeenText: @@ -91,7 +95,7 @@ CooltrainermCodyBeatenText: line "had a dragon!" done -UnknownText_0x1957d5: +CooltrainermCodyAfterText: text "Members of our" line "dragon-user clan" @@ -115,7 +119,7 @@ CooltrainerfFranBeatenText: text "Awww… I lost…" done -UnknownText_0x195883: +CooltrainerfFranAfterText: text "Uh-oh… CLAIR is" line "going to be mad…" done diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 317c0a84c..e78bd8a74 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const BLACKTHORNMART_CLERK + const BLACKTHORNMART_COOLTRAINER_M + const BLACKTHORNMART_BLACK_BELT + BlackthornMart_MapScriptHeader: .MapTriggers: db 0 @@ -6,9 +11,9 @@ BlackthornMart_MapScriptHeader: db 0 ClerkScript_0x195a5d: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_BLACKTHORN - loadmovesprites + closetext end CooltrainerMScript_0x195a64: diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokeCenter1F.asm index 5cd378eff..32085c67f 100644 --- a/maps/BlackthornPokeCenter1F.asm +++ b/maps/BlackthornPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const BLACKTHORNPOKECENTER1F_NURSE + const BLACKTHORNPOKECENTER1F_GENTLEMAN + const BLACKTHORNPOKECENTER1F_TWIN + const BLACKTHORNPOKECENTER1F_COOLTRAINER_M + BlackthornPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 36d06b943..72cd935fc 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const BLUESHOUSE_DAISY + BluesHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,12 +10,12 @@ BluesHouse_MapScriptHeader: DaisyScript_0x19b0d0: faceplayer - loadfont + opentext checkcode VAR_HOUR if_equal $f, UnknownScript_0x19b0de writetext UnknownText_0x19b130 + waitbutton closetext - loadmovesprites end UnknownScript_0x19b0de: @@ -22,44 +25,44 @@ UnknownScript_0x19b0de: yesorno iffalse UnknownScript_0x19b124 writetext UnknownText_0x19b244 - closetext + waitbutton special Special_DaisyMassage if_equal 0, UnknownScript_0x19b124 if_equal 1, UnknownScript_0x19b12a setflag ENGINE_TEA_IN_BLUES_HOUSE writetext UnknownText_0x19b266 + waitbutton closetext - loadmovesprites special FadeOutPalettes playmusic MUSIC_HEAL pause 60 special FadeInPalettes special RestartMapMusic - loadfont + opentext writetext UnknownText_0x19b296 special PlayCurMonCry - keeptextopen + buttonsound writetext UnknownText_0x19b2aa + waitbutton closetext - loadmovesprites end UnknownScript_0x19b11e: writetext UnknownText_0x19b2fa + waitbutton closetext - loadmovesprites end UnknownScript_0x19b124: writetext UnknownText_0x19b334 + waitbutton closetext - loadmovesprites end UnknownScript_0x19b12a: writetext UnknownText_0x19b377 + waitbutton closetext - loadmovesprites end UnknownText_0x19b130: diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index a862137de..6fe8772ff 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -1,3 +1,6 @@ +const_value set 2 + const BRUNOSROOM_BRUNO + BrunosRoom_MapScriptHeader: .MapTriggers: db 2 @@ -38,41 +41,41 @@ UnknownScript_0x1809ad: earthquake 80 changeblock $4, $e, $2a reloadmappart - loadmovesprites + closetext dotrigger $1 setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED - waitbutton + waitsfx end BrunoScript_0x1809c5: faceplayer - loadfont + opentext checkevent EVENT_BEAT_ELITE_4_BRUNO iftrue UnknownScript_0x1809f3 writetext UnknownText_0x1809fe + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x180b23, 0 loadtrainer BRUNO, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_BRUNO - loadfont + opentext writetext UnknownText_0x180b3c + waitbutton closetext - loadmovesprites playsound SFX_ENTER_DOOR changeblock $4, $2, $16 reloadmappart - loadmovesprites + closetext setevent EVENT_BRUNOS_ROOM_EXIT_OPEN - waitbutton + waitsfx end UnknownScript_0x1809f3: writetext UnknownText_0x180b3c + waitbutton closetext - loadmovesprites end MovementData_0x1809f9: diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 449a730a8..3adb8f2de 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -1,30 +1,37 @@ +const_value set 2 + const BURNEDTOWER1F_ROCK + const BURNEDTOWER1F_SUPER_NERD + const BURNEDTOWER1F_SILVER + const BURNEDTOWER1F_MORTY + const BURNEDTOWER1F_POKE_BALL + BurnedTower1F_MapScriptHeader: .MapTriggers: db 3 ; triggers - dw UnknownScript_0x185bf2, 0 - dw UnknownScript_0x185bf6, 0 - dw UnknownScript_0x185bf7, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 1 ; callbacks - dbw 1, UnknownScript_0x185bf8 + dbw 1, .HoleAndLadder -UnknownScript_0x185bf2: - priorityjump UnknownScript_0x185c0d +.Trigger0: + priorityjump .EusineTrigger end -UnknownScript_0x185bf6: +.Trigger1: end -UnknownScript_0x185bf7: +.Trigger2: end -UnknownScript_0x185bf8: +.HoleAndLadder: checkevent EVENT_HOLE_IN_BURNED_TOWER iftrue .Next changeblock $a, $8, $32 ; hole @@ -35,123 +42,123 @@ UnknownScript_0x185bf8: .Done return -UnknownScript_0x185c0d: - spriteface $3, DOWN - showemote EMOTE_SHOCK, $3, 15 - applymovement $3, MovementData_0x185cd3 - loadfont - writetext UnknownText_0x185ecc +.EusineTrigger: + spriteface BURNEDTOWER1F_SUPER_NERD, DOWN + showemote EMOTE_SHOCK, BURNEDTOWER1F_SUPER_NERD, 15 + applymovement BURNEDTOWER1F_SUPER_NERD, BurnedTower1FEusineMovement + opentext + writetext BurnedTower1FEusineIntroText + waitbutton closetext - loadmovesprites - moveperson $3, $9, $e + moveperson BURNEDTOWER1F_SUPER_NERD, $9, $e dotrigger $1 end -UnknownScript_0x185c25: - showemote EMOTE_SHOCK, $4, 15 - special Special_RotatePalettesRightMusic +BurnedTowerRivalBattleScript: + showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15 + special Special_FadeOutMusic pause 15 - spriteface $4, RIGHT + spriteface BURNEDTOWER1F_SILVER, RIGHT pause 15 - applymovement PLAYER, MovementData_0x185ccd - applymovement $4, MovementData_0x185ccf + applymovement PLAYER, BurnedTowerMovement_PlayerWalksToSilver + applymovement BURNEDTOWER1F_SILVER, BurnedTowerMovement_SilverWalksToPlayer playmusic MUSIC_RIVAL_ENCOUNTER - loadfont - writetext UnknownText_0x185cd9 + opentext + writetext BurnedTowerSilver_BeforeText + waitbutton closetext - loadmovesprites checkevent EVENT_GOT_TOTODILE_FROM_ELM - iftrue UnknownScript_0x185c60 + iftrue .totodile checkevent EVENT_GOT_CHIKORITA_FROM_ELM - iftrue UnknownScript_0x185c70 - winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c - setlasttalked $4 + iftrue .chikorita + winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText + setlasttalked BURNEDTOWER1F_SILVER loadtrainer RIVAL1, RIVAL1_9 startbattle - reloadmapmusic - returnafterbattle - jump UnknownScript_0x185c80 + dontrestartmapmusic + reloadmapafterbattle + jump .returnfrombattle -UnknownScript_0x185c60: - winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c - setlasttalked $4 +.totodile: + winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText + setlasttalked BURNEDTOWER1F_SILVER loadtrainer RIVAL1, RIVAL1_7 startbattle - reloadmapmusic - returnafterbattle - jump UnknownScript_0x185c80 + dontrestartmapmusic + reloadmapafterbattle + jump .returnfrombattle -UnknownScript_0x185c70: - winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c - setlasttalked $4 +.chikorita: + winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText + setlasttalked BURNEDTOWER1F_SILVER loadtrainer RIVAL1, RIVAL1_8 startbattle - reloadmapmusic - returnafterbattle - jump UnknownScript_0x185c80 + dontrestartmapmusic + reloadmapafterbattle + jump .returnfrombattle -UnknownScript_0x185c80: +.returnfrombattle: playmusic MUSIC_RIVAL_AFTER - loadfont - writetext UnknownText_0x185de2 + opentext + writetext BurnedTowerSilver_AfterText1 + waitbutton closetext - loadmovesprites dotrigger $2 setevent EVENT_RIVAL_BURNED_TOWER - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic pause 15 earthquake 50 showemote EMOTE_SHOCK, PLAYER, 15 playsound SFX_ENTER_DOOR - waitbutton + waitsfx changeblock $a, $8, $25 reloadmappart pause 15 - applymovement PLAYER, MovementData_0x185cd1 + applymovement PLAYER, BurnedTower1FMovement_PlayerStartsToFall playsound SFX_KINESIS - showemote EMOTE_SHOCK, $4, 20 - loadfont - writetext UnknownText_0x185e75 + showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 20 + opentext + writetext BurnedTowerSilver_AfterText2 + waitbutton closetext - loadmovesprites setevent EVENT_HOLE_IN_BURNED_TOWER pause 15 warpcheck end -SuperNerdScript_0x185cbc: - jumptextfaceplayer UnknownText_0x185f99 +BurnedTower1FEusineScript: + jumptextfaceplayer BurnedTower1FEusineText -MortyScript_0x185cbf: - jumptextfaceplayer UnknownText_0x186002 +BurnedTower1FMortyScript: + jumptextfaceplayer BurnedTower1FMortyText BurnedTower1FRock: jumpstd smashrock -MapBurnedTower1FSignpostItem0: +BurnedTower1FHiddenEther: dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER -MapBurnedTower1FSignpostItem1: +BurnedTower1FHiddenUltraBall: dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL -ItemFragment_0x185ccb: - db HP_UP, 1 +BurnedTower1FHPUp: + itemball HP_UP -MovementData_0x185ccd: +BurnedTowerMovement_PlayerWalksToSilver: step_left step_end -MovementData_0x185ccf: +BurnedTowerMovement_SilverWalksToPlayer: step_right step_end -MovementData_0x185cd1: - db $59 ; movement +BurnedTower1FMovement_PlayerStartsToFall: + skyfall_top step_end -MovementData_0x185cd3: +BurnedTower1FEusineMovement: step_down step_left step_left @@ -159,7 +166,7 @@ MovementData_0x185cd3: step_down step_end -UnknownText_0x185cd9: +BurnedTowerSilver_BeforeText: text "<......> <......> <......>" para "…Oh, it's you." @@ -183,7 +190,7 @@ UnknownText_0x185cd9: line "fault!" done -UnknownText_0x185d9b: +BurnedTowerSilver_WinText: text "…Humph!" para "This is why I hate" @@ -193,7 +200,7 @@ UnknownText_0x185d9b: line "challenge in it." done -UnknownText_0x185de2: +BurnedTowerSilver_AfterText1: text "…Aw, whatever." para "You would never be" @@ -203,7 +210,7 @@ UnknownText_0x185de2: line "anyway." done -UnknownText_0x185e2c: +BurnedTowerSilver_LossText: text "…Humph!" para "This is why I hate" @@ -213,7 +220,7 @@ UnknownText_0x185e2c: line "of my time." done -UnknownText_0x185e75: +BurnedTowerSilver_AfterText2: text "Humph!" para "What are you doing" @@ -225,7 +232,7 @@ UnknownText_0x185e75: para "Serves you right!" done -UnknownText_0x185ecc: +BurnedTower1FEusineIntroText: text "EUSINE: My name's" line "EUSINE." @@ -248,7 +255,7 @@ UnknownText_0x185ecc: line "could it be?" done -UnknownText_0x185f99: +BurnedTower1FEusineText: text "EUSINE: I heard" line "that SUICUNE is in" @@ -259,7 +266,7 @@ UnknownText_0x185f99: line "could it be?" done -UnknownText_0x186002: +BurnedTower1FMortyText: text "MORTY: ECRUTEAK's" line "GYM LEADER has to" @@ -285,32 +292,32 @@ BurnedTower1F_MapEventHeader: db 14 warp_def $f, $9, 13, ECRUTEAK_CITY warp_def $f, $a, 13, ECRUTEAK_CITY - warp_def $9, $a, 1, BURNED_TOWER_B1F - warp_def $5, $5, 1, BURNED_TOWER_B1F - warp_def $6, $5, 1, BURNED_TOWER_B1F - warp_def $6, $4, 1, BURNED_TOWER_B1F - warp_def $4, $f, 2, BURNED_TOWER_B1F - warp_def $5, $f, 2, BURNED_TOWER_B1F - warp_def $7, $a, 3, BURNED_TOWER_B1F - warp_def $e, $5, 4, BURNED_TOWER_B1F - warp_def $e, $4, 4, BURNED_TOWER_B1F - warp_def $e, $e, 5, BURNED_TOWER_B1F - warp_def $e, $f, 5, BURNED_TOWER_B1F - warp_def $f, $7, 6, BURNED_TOWER_B1F + warp_def $9, $a, 1, BURNED_TOWER_B1F + warp_def $5, $5, 1, BURNED_TOWER_B1F + warp_def $6, $5, 1, BURNED_TOWER_B1F + warp_def $6, $4, 1, BURNED_TOWER_B1F + warp_def $4, $f, 2, BURNED_TOWER_B1F + warp_def $5, $f, 2, BURNED_TOWER_B1F + warp_def $7, $a, 3, BURNED_TOWER_B1F + warp_def $e, $5, 4, BURNED_TOWER_B1F + warp_def $e, $4, 4, BURNED_TOWER_B1F + warp_def $e, $e, 5, BURNED_TOWER_B1F + warp_def $e, $f, 5, BURNED_TOWER_B1F + warp_def $f, $7, 6, BURNED_TOWER_B1F .XYTriggers: db 1 - xy_trigger 1, $9, $b, $0, UnknownScript_0x185c25, $0, $0 + xy_trigger 1, $9, $b, $0, BurnedTowerRivalBattleScript, $0, $0 .Signposts: db 2 - signpost 7, 8, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem0 - signpost 11, 13, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem1 + signpost 7, 8, SIGNPOST_ITEM, BurnedTower1FHiddenEther + signpost 11, 13, SIGNPOST_ITEM, BurnedTower1FHiddenUltraBall .PersonEvents: db 5 person_event SPRITE_ROCK, 4, 15, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BurnedTower1FRock, -1 - person_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE + person_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE person_event SPRITE_SILVER, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER - person_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY - person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP + person_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY + person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 935b94f4f..623f38dcb 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -1,3 +1,14 @@ +const_value set 2 + const BURNEDTOWERB1F_BOULDER + const BURNEDTOWERB1F_RAIKOU1 + const BURNEDTOWERB1F_ENTEI1 + const BURNEDTOWERB1F_SUICUNE1 + const BURNEDTOWERB1F_RAIKOU2 + const BURNEDTOWERB1F_ENTEI2 + const BURNEDTOWERB1F_SUICUNE2 + const BURNEDTOWERB1F_POKE_BALL + const BURNEDTOWERB1F_SUPER_NERD + BurnedTowerB1F_MapScriptHeader: .MapTriggers: db 2 @@ -29,51 +40,51 @@ UnknownScript_0x18616a: UnknownScript_0x18616b: playmusic MUSIC_NONE pause 30 - appear $3 + appear BURNEDTOWERB1F_RAIKOU1 spriteface PLAYER, UP pause 5 - disappear $6 + disappear BURNEDTOWERB1F_RAIKOU2 pause 15 cry RAIKOU - appear $4 + appear BURNEDTOWERB1F_ENTEI1 spriteface PLAYER, UP pause 5 - disappear $7 + disappear BURNEDTOWERB1F_ENTEI2 pause 15 cry ENTEI - appear $5 + appear BURNEDTOWERB1F_SUICUNE1 spriteface PLAYER, UP pause 5 - disappear $8 + disappear BURNEDTOWERB1F_SUICUNE2 pause 15 cry SUICUNE pause 15 playsound SFX_WARP_FROM spriteface PLAYER, LEFT - applymovement $3, MovementData_0x186236 - disappear $3 - waitbutton + applymovement BURNEDTOWERB1F_RAIKOU1, MovementData_0x186236 + disappear BURNEDTOWERB1F_RAIKOU1 + waitsfx playsound SFX_WARP_FROM spriteface PLAYER, RIGHT - applymovement $4, MovementData_0x18623b - disappear $4 - waitbutton + applymovement BURNEDTOWERB1F_ENTEI1, MovementData_0x18623b + disappear BURNEDTOWERB1F_ENTEI1 + waitsfx pause 15 playsound SFX_WARP_FROM spriteface PLAYER, UP - applymovement $5, MovementData_0x186241 + applymovement BURNEDTOWERB1F_SUICUNE1, MovementData_0x186241 playsound SFX_WARP_FROM spriteface PLAYER, DOWN - applymovement $5, MovementData_0x186248 + applymovement BURNEDTOWERB1F_SUICUNE1, MovementData_0x186248 spriteface PLAYER, UP pause 20 cry SUICUNE pause 30 playsound SFX_WARP_FROM - applymovement $5, MovementData_0x186253 + applymovement BURNEDTOWERB1F_SUICUNE1, MovementData_0x186253 spriteface PLAYER, DOWN - disappear $5 - waitbutton + disappear BURNEDTOWERB1F_SUICUNE1 + waitsfx special RestartMapMusic dotrigger $1 setevent EVENT_RELEASED_THE_BEASTS @@ -85,35 +96,35 @@ UnknownScript_0x18616b: clearevent EVENT_ECRUTEAK_CITY_GRAMPS setevent EVENT_BURNED_TOWER_MORTY setevent EVENT_BURNED_TOWER_1F_EUSINE - appear $a + appear BURNEDTOWERB1F_SUPER_NERD refreshscreen $0 changeblock $6, $e, $1b reloadmappart - loadmovesprites + closetext dotrigger $1 end SuperNerdScript_0x186212: faceplayer - loadfont + opentext writetext UnknownText_0x18626a + waitbutton closetext - loadmovesprites checkcode VAR_FACING if_equal $1, UnknownScript_0x186226 - applymovement $a, MovementData_0x186263 + applymovement BURNEDTOWERB1F_SUPER_NERD, MovementData_0x186263 jump UnknownScript_0x18622a UnknownScript_0x186226: - applymovement $a, MovementData_0x18625c + applymovement BURNEDTOWERB1F_SUPER_NERD, MovementData_0x18625c UnknownScript_0x18622a: - disappear $a + disappear BURNEDTOWERB1F_SUPER_NERD playsound SFX_EXIT_BUILDING - waitbutton + waitsfx end -ItemFragment_0x186231: - db TM_ENDURE, 1 +BurnedTowerB1FTMEndure: + itemball TM_ENDURE BurnedTowerB1FBoulder: jumpstd strengthboulder @@ -258,5 +269,5 @@ BurnedTowerB1F_MapEventHeader: person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - person_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE + person_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE person_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 35ca2971f..26e20308a 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -1,3 +1,10 @@ +const_value set 2 + const CELADONCAFE_SUPER_NERD + const CELADONCAFE_FISHER1 + const CELADONCAFE_FISHER2 + const CELADONCAFE_FISHER3 + const CELADONCAFE_TEACHER + CeladonCafe_MapScriptHeader: .MapTriggers: db 0 @@ -7,77 +14,77 @@ CeladonCafe_MapScriptHeader: SuperNerdScript_0x73049: faceplayer - loadfont + opentext writetext UnknownText_0x730de + waitbutton closetext - loadmovesprites end FisherScript_0x73051: - loadfont + opentext writetext UnknownText_0x73129 + waitbutton closetext - loadmovesprites faceplayer - loadfont + opentext writetext UnknownText_0x7313a + waitbutton closetext - loadmovesprites - spriteface $3, LEFT + spriteface CELADONCAFE_FISHER1, LEFT end FisherScript_0x73062: - loadfont + opentext writetext UnknownText_0x7316a + waitbutton closetext - loadmovesprites faceplayer - loadfont + opentext writetext UnknownText_0x73178 + waitbutton closetext - loadmovesprites - spriteface $4, RIGHT + spriteface CELADONCAFE_FISHER2, RIGHT end FisherScript_0x73073: - loadfont + opentext writetext UnknownText_0x731ae + waitbutton closetext - loadmovesprites faceplayer - loadfont + opentext writetext UnknownText_0x731bd + waitbutton closetext - loadmovesprites - spriteface $5, RIGHT + spriteface CELADONCAFE_FISHER3, RIGHT end TeacherScript_0x73084: checkitem COIN_CASE iftrue UnknownScript_0x7309a - loadfont + opentext writetext UnknownText_0x73201 + waitbutton closetext - loadmovesprites faceplayer - loadfont + opentext writetext UnknownText_0x73212 + waitbutton closetext - loadmovesprites - spriteface $6, LEFT + spriteface CELADONCAFE_TEACHER, LEFT end UnknownScript_0x7309a: - loadfont + opentext writetext UnknownText_0x73254 + waitbutton closetext - loadmovesprites - spriteface $6, RIGHT - loadfont + spriteface CELADONCAFE_TEACHER, RIGHT + opentext writetext UnknownText_0x73278 + waitbutton closetext - loadmovesprites - spriteface $6, LEFT + spriteface CELADONCAFE_TEACHER, LEFT end EatathonContestPoster: @@ -88,24 +95,24 @@ CeladonCafeTrashcan: iftrue .TrashEmpty giveitem LEFTOVERS iffalse .PackFull - loadfont + opentext itemtotext LEFTOVERS, $0 writetext FoundLeftoversText playsound SFX_ITEM - waitbutton + waitsfx itemnotify - loadmovesprites + closetext setevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE end .PackFull - loadfont + opentext itemtotext LEFTOVERS, $0 writetext FoundLeftoversText - keeptextopen + buttonsound writetext NoRoomForLeftoversText + waitbutton closetext - loadmovesprites end .TrashEmpty diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index d2c29fe1c..0dde68efd 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -1,3 +1,14 @@ +const_value set 2 + const CELADONCITY_FISHER + const CELADONCITY_POLIWAG + const CELADONCITY_TEACHER1 + const CELADONCITY_GRAMPS1 + const CELADONCITY_GRAMPS2 + const CELADONCITY_YOUNGSTER1 + const CELADONCITY_YOUNGSTER2 + const CELADONCITY_TEACHER2 + const CELADONCITY_LASS + CeladonCity_MapScriptHeader: .MapTriggers: db 0 @@ -16,11 +27,11 @@ FisherScript_0x1a9f43: jumptextfaceplayer UnknownText_0x1a9f7d CeladonCityPoliwrath: - loadfont + opentext writetext CeladonCityPoliwrathText cry POLIWRATH + waitbutton closetext - loadmovesprites end TeacherScript_0x1a9f50: @@ -65,7 +76,7 @@ CeladonCityTrainerTips: CeladonCityPokeCenterSign: jumpstd pokecentersign -MapCeladonCitySignpostItem7: +CeladonCityHiddenPpUp: dwb EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP UnknownText_0x1a9f7d: @@ -253,7 +264,7 @@ CeladonCity_MapEventHeader: signpost 21, 19, SIGNPOST_READ, CeladonCityGameCornerSign signpost 21, 29, SIGNPOST_READ, CeladonCityTrainerTips signpost 9, 30, SIGNPOST_READ, CeladonCityPokeCenterSign - signpost 21, 37, SIGNPOST_ITEM, MapCeladonCitySignpostItem7 + signpost 21, 37, SIGNPOST_ITEM, CeladonCityHiddenPpUp .PersonEvents: db 9 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 6b307b91c..0abf50524 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CELADONDEPTSTORE1F_RECEPTIONIST + const CELADONDEPTSTORE1F_GENTLEMAN + const CELADONDEPTSTORE1F_TEACHER + CeladonDeptStore1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index 6ce11883f..cd93776ab 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const CELADONDEPTSTORE2F_CLERK1 + const CELADONDEPTSTORE2F_CLERK2 + const CELADONDEPTSTORE2F_POKEFAN_M + const CELADONDEPTSTORE2F_YOUNGSTER + CeladonDeptStore2F_MapScriptHeader: .MapTriggers: db 0 @@ -7,16 +13,16 @@ CeladonDeptStore2F_MapScriptHeader: ClerkScript_0x70bad: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_CELADON_2F_1 - loadmovesprites + closetext end ClerkScript_0x70bb5: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_CELADON_2F_2 - loadmovesprites + closetext end PokefanMScript_0x70bbd: diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 4d0d4dfe0..b40fddf50 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const CELADONDEPTSTORE3F_CLERK + const CELADONDEPTSTORE3F_YOUNGSTER + const CELADONDEPTSTORE3F_GAMEBOY_KID1 + const CELADONDEPTSTORE3F_GAMEBOY_KID2 + const CELADONDEPTSTORE3F_SUPER_NERD + CeladonDeptStore3F_MapScriptHeader: .MapTriggers: db 0 @@ -7,9 +14,9 @@ CeladonDeptStore3F_MapScriptHeader: ClerkScript_0x70d29: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_CELADON_3F - loadmovesprites + closetext end YoungsterScript_0x70d31: @@ -17,20 +24,20 @@ YoungsterScript_0x70d31: GameboyKidScript_0x70d34: faceplayer - loadfont + opentext writetext UnknownText_0x70d86 + waitbutton closetext - loadmovesprites - spriteface $4, DOWN + spriteface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN end GameboyKidScript_0x70d3f: faceplayer - loadfont + opentext writetext UnknownText_0x70dc7 + waitbutton closetext - loadmovesprites - spriteface $5, DOWN + spriteface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN end SuperNerdScript_0x70d4a: diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 27eaa7352..b3cb00655 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CELADONDEPTSTORE4F_CLERK + const CELADONDEPTSTORE4F_SUPER_NERD + const CELADONDEPTSTORE4F_YOUNGSTER + CeladonDeptStore4F_MapScriptHeader: .MapTriggers: db 0 @@ -7,9 +12,9 @@ CeladonDeptStore4F_MapScriptHeader: ClerkScript_0x70f0d: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_CELADON_4F - loadmovesprites + closetext end SuperNerdScript_0x70f15: diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index fcd7ff7ff..a49c573d1 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const CELADONDEPTSTORE5F_CLERK1 + const CELADONDEPTSTORE5F_CLERK2 + const CELADONDEPTSTORE5F_GENTLEMAN + const CELADONDEPTSTORE5F_SAILOR + const CELADONDEPTSTORE5F_TEACHER + CeladonDeptStore5F_MapScriptHeader: .MapTriggers: db 0 @@ -7,16 +14,16 @@ CeladonDeptStore5F_MapScriptHeader: ClerkScript_0x71004: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_CELADON_5F_1 - loadmovesprites + closetext end ClerkScript_0x7100c: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_CELADON_5F_2 - loadmovesprites + closetext end GentlemanScript_0x71014: diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 25f92be00..3abeda346 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const CELADONDEPTSTORE6F_SUPER_NERD + const CELADONDEPTSTORE6F_YOUNGSTER + CeladonDeptStore6F_MapScriptHeader: .MapTriggers: db 0 @@ -20,17 +24,17 @@ YoungsterScript_0x7117d: jumptextfaceplayer UnknownText_0x71310 CeladonVendingMachine: - loadfont + opentext writetext CeladonVendingText .Start - special PlaceMoneyTopRightOW + special PlaceMoneyTopRight loadmenudata .MenuData - interpretmenu2 - writebackup + verticalmenu + closewindow if_equal $1, .FreshWater if_equal $2, .SodaPop if_equal $3, .Lemonade - loadmovesprites + closetext end .FreshWater @@ -64,18 +68,18 @@ CeladonVendingMachine: pause 10 playsound SFX_ENTER_DOOR writetext CeladonClangText - keeptextopen + buttonsound itemnotify jump .Start .NotEnoughMoney writetext CeladonVendingNoMoneyText - closetext + waitbutton jump .Start .NotEnoughSpace writetext CeladonVendingNoSpaceText - closetext + waitbutton jump .Start .MenuData diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index dd620a13d..77133b30f 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -1,3 +1,4 @@ + CeladonDeptStoreElevator_MapScriptHeader: .MapTriggers: db 0 @@ -6,14 +7,14 @@ CeladonDeptStoreElevator_MapScriptHeader: db 0 MapCeladonDeptStoreElevatorSignpost0Script: - loadfont + opentext elevator Elevator_0x713be - loadmovesprites + closetext iffalse UnknownScript_0x713bd pause 5 playsound SFX_ELEVATOR earthquake 60 - waitbutton + waitsfx UnknownScript_0x713bd: end diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index ef644dcd4..fd29c3b02 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -1,3 +1,14 @@ +const_value set 2 + const CELADONGAMECORNER_CLERK + const CELADONGAMECORNER_RECEPTIONIST + const CELADONGAMECORNER_POKEFAN_M + const CELADONGAMECORNER_TEACHER + const CELADONGAMECORNER_FISHING_GURU + const CELADONGAMECORNER_FISHER1 + const CELADONGAMECORNER_FISHER2 + const CELADONGAMECORNER_GYM_GUY + const CELADONGAMECORNER_GRAMPS + CeladonGameCorner_MapScriptHeader: .MapTriggers: db 0 @@ -13,38 +24,38 @@ ReceptionistScript_0x72120: PokefanMScript_0x72123: faceplayer - loadfont + opentext writetext UnknownText_0x72215 + waitbutton closetext - loadmovesprites - spriteface $4, LEFT + spriteface CELADONGAMECORNER_POKEFAN_M, LEFT end TeacherScript_0x7212e: faceplayer - loadfont + opentext writetext UnknownText_0x72242 + waitbutton closetext - loadmovesprites - spriteface $5, RIGHT + spriteface CELADONGAMECORNER_TEACHER, RIGHT end FishingGuruScript_0x72139: faceplayer - loadfont + opentext writetext UnknownText_0x72295 + waitbutton closetext - loadmovesprites - spriteface $6, RIGHT + spriteface CELADONGAMECORNER_FISHING_GURU, RIGHT end FisherScript_0x72144: faceplayer - loadfont + opentext checkevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON iftrue .UnknownScript_0x72169 writetext UnknownText_0x722dc - keeptextopen + buttonsound checkitem COIN_CASE iffalse UnknownScript_0x7217b checkcoins 9998 @@ -55,8 +66,8 @@ FisherScript_0x72144: setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON .UnknownScript_0x72169 writetext UnknownText_0x72345 + waitbutton closetext - loadmovesprites spriteface LAST_TALKED, LEFT end @@ -69,15 +80,15 @@ FisherScript_0x72144: UnknownScript_0x7217b: writetext UnknownText_0x7238a + waitbutton closetext - loadmovesprites spriteface LAST_TALKED, LEFT end UnknownScript_0x72184: writetext UnknownText_0x723d9 + waitbutton closetext - loadmovesprites spriteface LAST_TALKED, LEFT end @@ -86,11 +97,11 @@ CeladonGymGuyScript: GrampsScript_0x72190: faceplayer - loadfont + opentext writetext UnknownText_0x724ad + waitbutton closetext - loadmovesprites - spriteface $a, LEFT + spriteface CELADONGAMECORNER_GRAMPS, LEFT end MapCeladonGameCornerSignpost36Script: @@ -105,31 +116,31 @@ MapCeladonGameCornerSignpost35Script: refreshscreen $0 writebyte $0 special Special_SlotMachine - loadmovesprites + closetext end MapCeladonGameCornerSignpost16Script: refreshscreen $0 writebyte $1 special Special_SlotMachine - loadmovesprites + closetext end MapCeladonGameCornerSignpost11Script: refreshscreen $0 special Special_CardFlip - loadmovesprites + closetext end MapCeladonGameCornerSignpost32Script: jumptext UnknownText_0x7254f MapCeladonGameCornerSignpost9Script: - loadfont + opentext writetext UnknownText_0x72567 - closetext + waitbutton special Special_CardFlip - loadmovesprites + closetext end MovementData_0x721cd: diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 004b60810..1f2ca6ea3 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -1,3 +1,7 @@ +const_value set 2 + const CELADONGAMECORNERPRIZEROOM_GENTLEMAN + const CELADONGAMECORNERPRIZEROOM_PHARMACIST + CeladonGameCornerPrizeRoom_MapScriptHeader: .MapTriggers: db 0 @@ -5,25 +9,25 @@ CeladonGameCornerPrizeRoom_MapScriptHeader: .MapCallbacks: db 0 -GentlemanScript_0x726e9: - jumptextfaceplayer UnknownText_0x728b8 +CeladonGameCornerPrizeRoomGentlemanScript: + jumptextfaceplayer CeladonGameCornerPrizeRoomGentlemanText -PharmacistScript_0x726ec: - jumptextfaceplayer UnknownText_0x728e9 +CeladonGameCornerPrizeRoomPharmacistScript: + jumptextfaceplayer CeladonGameCornerPrizeRoomPharmacistText -MapCeladonGameCornerPrizeRoomSignpost0Script: +GoldenrodGameCornerTMVendor: faceplayer - loadfont - writetext UnknownText_0x7293e - closetext + opentext + writetext CeladonPrizeRoom_PrizeVendorIntroText + waitbutton checkitem COIN_CASE iffalse CeladonPrizeRoom_NoCoinCase - writetext UnknownText_0x72974 + writetext CeladonPrizeRoom_AskWhichPrizeText CeladonPrizeRoom_tmcounterloop: special Special_DisplayCoinCaseBalance - loadmenudata MenuDataHeader_0x72790 - interpretmenu2 - writebackup + loadmenudata CeladonPrizeRoom_TMMenuDataHeader + verticalmenu + closewindow if_equal $1, .doubleteam if_equal $2, .psychic if_equal $3, .hyperbeam @@ -63,50 +67,50 @@ CeladonPrizeRoom_tmcounterloop: jump CeladonPrizeRoom_purchased CeladonPrizeRoom_askbuy: - writetext UnknownText_0x72991 + writetext CeladonPrizeRoom_ConfirmPurchaseText yesorno end CeladonPrizeRoom_purchased: - waitbutton + waitsfx playsound SFX_TRANSACTION - writetext UnknownText_0x729ad - closetext + writetext CeladonPrizeRoom_HereYouGoText + waitbutton jump CeladonPrizeRoom_tmcounterloop CeladonPrizeRoom_notenoughcoins: - writetext UnknownText_0x729bb + writetext CeladonPrizeRoom_NotEnoughCoinsText + waitbutton closetext - loadmovesprites end CeladonPrizeRoom_notenoughroom: - writetext UnknownText_0x729d8 + writetext CeladonPrizeRoom_NotEnoughRoomText + waitbutton closetext - loadmovesprites end CeladonPrizeRoom_cancel: - writetext UnknownText_0x729f2 + writetext CeladonPrizeRoom_ComeAgainText + waitbutton closetext - loadmovesprites end CeladonPrizeRoom_NoCoinCase: - writetext UnknownText_0x72a14 + writetext CeladonPrizeRoom_NoCoinCaseText + waitbutton closetext - loadmovesprites end -MenuDataHeader_0x72790: +CeladonPrizeRoom_TMMenuDataHeader: db $40 ; flags db 02, 00 ; start coords db 11, 15 ; end coords - dw MenuData2_0x72798 + dw .MenuData2 db 1 ; default option -MenuData2_0x72798: +.MenuData2: db $80 ; flags db 4 ; items db "TM32 1500@" @@ -115,19 +119,19 @@ MenuData2_0x72798: db "CANCEL@" -MapCeladonGameCornerPrizeRoomSignpost1Script: +GoldenrodGameCornerPokemonVendor: faceplayer - loadfont - writetext UnknownText_0x7293e - closetext + opentext + writetext CeladonPrizeRoom_PrizeVendorIntroText + waitbutton checkitem COIN_CASE iffalse CeladonPrizeRoom_NoCoinCase .loop: - writetext UnknownText_0x72974 + writetext CeladonPrizeRoom_AskWhichPrizeText special Special_DisplayCoinCaseBalance - loadmenudata MenuDataHeader_0x72877 - interpretmenu2 - writebackup + loadmenudata .MenuDataHeader + verticalmenu + closewindow if_equal $1, .pikachu if_equal $2, .porygon if_equal $3, .larvitar @@ -141,10 +145,10 @@ MapCeladonGameCornerPrizeRoomSignpost1Script: pokenamemem PIKACHU, $0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel - waitbutton + waitsfx playsound SFX_TRANSACTION - writetext UnknownText_0x729ad - closetext + writetext CeladonPrizeRoom_HereYouGoText + waitbutton writebyte PIKACHU special Special_GameCornerPrizeMonCheckDex givepoke PIKACHU, 25 @@ -159,10 +163,10 @@ MapCeladonGameCornerPrizeRoomSignpost1Script: pokenamemem PORYGON, $0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel - waitbutton + waitsfx playsound SFX_TRANSACTION - writetext UnknownText_0x729ad - closetext + writetext CeladonPrizeRoom_HereYouGoText + waitbutton writebyte PORYGON special Special_GameCornerPrizeMonCheckDex givepoke PORYGON, 15 @@ -177,10 +181,10 @@ MapCeladonGameCornerPrizeRoomSignpost1Script: pokenamemem LARVITAR, $0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel - waitbutton + waitsfx playsound SFX_TRANSACTION - writetext UnknownText_0x729ad - closetext + writetext CeladonPrizeRoom_HereYouGoText + waitbutton writebyte LARVITAR special Special_GameCornerPrizeMonCheckDex givepoke LARVITAR, 40 @@ -188,14 +192,14 @@ MapCeladonGameCornerPrizeRoomSignpost1Script: jump .loop -MenuDataHeader_0x72877: +.MenuDataHeader: db $40 ; flags db 02, 00 ; start coords db 11, 17 ; end coords - dw MenuData2_0x7287f + dw .MenuData2 db 1 ; default option -MenuData2_0x7287f: +.MenuData2: db $80 ; flags db 4 ; items db "PIKACHU 2222@" @@ -204,13 +208,13 @@ MenuData2_0x7287f: db "CANCEL@" -UnknownText_0x728b8: +CeladonGameCornerPrizeRoomGentlemanText: text "I wanted PORYGON," line "but I was short by" cont "100 coins…" done -UnknownText_0x728e9: +CeladonGameCornerPrizeRoomPharmacistText: text "Whew…" para "I've got to stay" @@ -221,7 +225,7 @@ UnknownText_0x728e9: cont "all my money…" done -UnknownText_0x7293e: +CeladonPrizeRoom_PrizeVendorIntroText: text "Welcome!" para "We exchange your" @@ -229,38 +233,38 @@ UnknownText_0x7293e: cont "prizes!" done -UnknownText_0x72974: +CeladonPrizeRoom_AskWhichPrizeText: text "Which prize would" line "you like?" done -UnknownText_0x72991: +CeladonPrizeRoom_ConfirmPurchaseText: text "OK, so you wanted" line "a @" text_from_ram StringBuffer3 text "?" done -UnknownText_0x729ad: +CeladonPrizeRoom_HereYouGoText: text "Here you go!" done -UnknownText_0x729bb: +CeladonPrizeRoom_NotEnoughCoinsText: text "You don't have" line "enough coins." done -UnknownText_0x729d8: +CeladonPrizeRoom_NotEnoughRoomText: text "You have no room" line "for it." done -UnknownText_0x729f2: +CeladonPrizeRoom_ComeAgainText: text "Oh. Please come" line "back with coins!" done -UnknownText_0x72a14: +CeladonPrizeRoom_NoCoinCaseText: text "Oh? You don't have" line "a COIN CASE." done @@ -279,10 +283,10 @@ CeladonGameCornerPrizeRoom_MapEventHeader: .Signposts: db 2 - signpost 1, 2, SIGNPOST_READ, MapCeladonGameCornerPrizeRoomSignpost0Script - signpost 1, 4, SIGNPOST_READ, MapCeladonGameCornerPrizeRoomSignpost1Script + signpost 1, 2, SIGNPOST_READ, GoldenrodGameCornerTMVendor + signpost 1, 4, SIGNPOST_READ, GoldenrodGameCornerPokemonVendor .PersonEvents: db 2 - person_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x726e9, -1 - person_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x726ec, -1 + person_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1 + person_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 5e17aed09..8bedbffc4 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -1,3 +1,11 @@ +const_value set 2 + const CELADONGYM_ERIKA + const CELADONGYM_LASS1 + const CELADONGYM_LASS2 + const CELADONGYM_BUENA + const CELADONGYM_TWIN1 + const CELADONGYM_TWIN2 + CeladonGym_MapScriptHeader: .MapTriggers: db 0 @@ -7,93 +15,93 @@ CeladonGym_MapScriptHeader: ErikaScript_0x72a6a: faceplayer - loadfont + opentext checkflag ENGINE_RAINBOWBADGE iftrue .FightDone writetext UnknownText_0x72b28 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x72c3e, 0 loadtrainer ERIKA, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_ERIKA setevent EVENT_BEAT_LASS_MICHELLE setevent EVENT_BEAT_PICNICKER_TANYA setevent EVENT_BEAT_BEAUTY_JULIA setevent EVENT_BEAT_TWINS_JO_AND_ZOE - loadfont + opentext writetext UnknownText_0x72c96 playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_RAINBOWBADGE .FightDone checkevent EVENT_GOT_TM19_GIGA_DRAIN iftrue UnknownScript_0x72aae writetext UnknownText_0x72cb0 - keeptextopen + buttonsound verbosegiveitem TM_GIGA_DRAIN iffalse UnknownScript_0x72aae setevent EVENT_GOT_TM19_GIGA_DRAIN UnknownScript_0x72aae: writetext UnknownText_0x72d8f + waitbutton closetext - loadmovesprites end TrainerLassMichelle: trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, LassMichelleScript LassMichelleScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x72e30 + waitbutton closetext - loadmovesprites end TrainerPicnickerTanya: trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, PicnickerTanyaScript PicnickerTanyaScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x72e8e + waitbutton closetext - loadmovesprites end TrainerBeautyJulia: trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, BeautyJuliaScript BeautyJuliaScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x72f01 + waitbutton closetext - loadmovesprites end TrainerTwinsJoandzoe1: trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, TwinsJoandzoe1Script TwinsJoandzoe1Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x72f70 + waitbutton closetext - loadmovesprites end TrainerTwinsJoandzoe2: trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, TwinsJoandzoe2Script TwinsJoandzoe2Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x72fc0 + waitbutton closetext - loadmovesprites end CeladonGymStatue: diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index e90f167bd..e06fe71cc 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const CELADONMANSION1F_GRANNY + const CELADONMANSION1F_GROWLITHE1 + const CELADONMANSION1F_CLEFAIRY + const CELADONMANSION1F_GROWLITHE2 + CeladonMansion1F_MapScriptHeader: .MapTriggers: db 0 @@ -9,27 +15,27 @@ CeladonMansionManager: jumptextfaceplayer CeladonMansionManagerText CeladonMansion1FMeowth: - loadfont + opentext writetext CeladonMansion1FMeowthText cry MEOWTH + waitbutton closetext - loadmovesprites end CeladonMansion1FClefairy: - loadfont + opentext writetext CeladonMansion1FClefairyText cry CLEFAIRY + waitbutton closetext - loadmovesprites end CeladonMansion1FNidoranF: - loadfont + opentext writetext CeladonMansion1FNidoranFText cry NIDORAN_F + waitbutton closetext - loadmovesprites end CeladonMansionManagersSuiteSign: diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index fbe54d617..1b9528b5f 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -1,3 +1,4 @@ + CeladonMansion2F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 575137bc6..10ba88dfe 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const CELADONMANSION3F_COOLTRAINER_M + const CELADONMANSION3F_GYM_GUY + const CELADONMANSION3F_SUPER_NERD + const CELADONMANSION3F_FISHER + CeladonMansion3F_MapScriptHeader: .MapTriggers: db 0 @@ -7,36 +13,36 @@ CeladonMansion3F_MapScriptHeader: CooltrainerMScript_0x71670: faceplayer - loadfont + opentext writetext UnknownText_0x716ce checkcode VAR_DEXCAUGHT if_greater_than 248, UnknownScript_0x7167e + waitbutton closetext - loadmovesprites end UnknownScript_0x7167e: - keeptextopen + buttonsound writetext UnknownText_0x71725 playsound SFX_DEX_FANFARE_230_PLUS - waitbutton + waitsfx writetext UnknownText_0x71760 - keeptextopen + buttonsound special Diploma writetext UnknownText_0x71763 + waitbutton closetext - loadmovesprites setevent EVENT_ENABLE_DIPLOMA_PRINTING end GymGuyScript_0x71696: faceplayer - loadfont + opentext checkevent EVENT_ENABLE_DIPLOMA_PRINTING iftrue UnknownScript_0x716a4 writetext UnknownText_0x717b4 + waitbutton closetext - loadmovesprites end UnknownScript_0x716a4: @@ -44,19 +50,19 @@ UnknownScript_0x716a4: yesorno iffalse UnknownScript_0x716b0 special PrintDiploma - loadmovesprites + closetext end UnknownScript_0x716b0: writetext UnknownText_0x71830 + waitbutton closetext - loadmovesprites end UnknownScript_0x716b6: writetext UnknownText_0x71863 + waitbutton closetext - loadmovesprites end SuperNerdScript_0x716bc: diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 748f6012e..3ea8d275b 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -1,3 +1,6 @@ +const_value set 2 + const CELADONMANSIONROOF_FISHER + CeladonMansionRoof_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index c7d453fbb..84a0cb069 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const CELADONMANSIONROOFHOUSE_PHARMACIST + CeladonMansionRoofHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,29 +10,29 @@ CeladonMansionRoofHouse_MapScriptHeader: PharmacistScript_0x71afd: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM03_CURSE iftrue UnknownScript_0x71b21 writetext UnknownText_0x71b27 - keeptextopen + buttonsound checknite iftrue UnknownScript_0x71b14 writetext UnknownText_0x71b4a + waitbutton closetext - loadmovesprites end UnknownScript_0x71b14: writetext UnknownText_0x71ba3 - keeptextopen + buttonsound verbosegiveitem TM_CURSE iffalse UnknownScript_0x71b25 setevent EVENT_GOT_TM03_CURSE UnknownScript_0x71b21: writetext UnknownText_0x71db3 - closetext + waitbutton UnknownScript_0x71b25: - loadmovesprites + closetext end UnknownText_0x71b27: diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index baf108b09..cb9b99c46 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const CELADONPOKECENTER1F_NURSE + const CELADONPOKECENTER1F_GENTLEMAN + const CELADONPOKECENTER1F_PHARMACIST + const CELADONPOKECENTER1F_COOLTRAINER_F + const CELADONPOKECENTER1F_SUPER_NERD + CeladonPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -19,35 +26,35 @@ PharmacistScript_0x71e2b: SuperNerdScript_0x71e2e: faceplayer - loadfont + opentext writetext UnknownText_0x71f22 - keeptextopen + buttonsound writebyte SUICUNE special SpecialMonCheck iffalse UnknownScript_0x71e46 special SpecialBeastsCheck iftrue UnknownScript_0x71e48 writetext UnknownText_0x7201a - closetext + waitbutton UnknownScript_0x71e46: - loadmovesprites + closetext end UnknownScript_0x71e48: writetext UnknownText_0x71f65 + waitbutton closetext - loadmovesprites checkcode VAR_FACING if_equal $1, UnknownScript_0x71e5a - applymovement $6, MovementData_0x71e6b + applymovement CELADONPOKECENTER1F_SUPER_NERD, MovementData_0x71e6b jump UnknownScript_0x71e5e UnknownScript_0x71e5a: - applymovement $6, MovementData_0x71e65 + applymovement CELADONPOKECENTER1F_SUPER_NERD, MovementData_0x71e65 UnknownScript_0x71e5e: - disappear $6 + disappear CELADONPOKECENTER1F_SUPER_NERD playsound SFX_EXIT_BUILDING - waitbutton + waitsfx end MovementData_0x71e65: diff --git a/maps/CeladonPokeCenter2FBeta.asm b/maps/CeladonPokeCenter2FBeta.asm index 9c8d25332..2f211dc8d 100644 --- a/maps/CeladonPokeCenter2FBeta.asm +++ b/maps/CeladonPokeCenter2FBeta.asm @@ -1,3 +1,4 @@ + CeladonPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 969f2ca34..b841f3f78 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -1,3 +1,11 @@ +const_value set 2 + const CERULEANCITY_COOLTRAINER_M + const CERULEANCITY_SUPER_NERD + const CERULEANCITY_SLOWPOKE + const CERULEANCITY_COOLTRAINER_F + const CERULEANCITY_FISHER + const CERULEANCITY_YOUNGSTER + CeruleanCity_MapScriptHeader: .MapTriggers: db 0 @@ -14,106 +22,106 @@ CeruleanCity_MapScriptHeader: CooltrainerMScript_0x184009: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x184017 writetext UnknownText_0x1840bc + waitbutton closetext - loadmovesprites end UnknownScript_0x184017: writetext UnknownText_0x184144 + waitbutton closetext - loadmovesprites end SuperNerdScript_0x18401d: jumptextfaceplayer UnknownText_0x1841a8 CeruleanCitySlowbro: - loadfont + opentext writetext CeruleanCitySlowbroText cry SLOWBRO + waitbutton closetext - loadmovesprites end CooltrainerFScript_0x18402a: faceplayer - loadfont + opentext writetext UnknownText_0x1841fa + waitbutton closetext - loadmovesprites - spriteface $5, LEFT - loadfont + spriteface CERULEANCITY_COOLTRAINER_F, LEFT + opentext writetext UnknownText_0x184229 + waitbutton closetext - loadmovesprites - loadfont + opentext writetext CeruleanCitySlowbroText cry SLOWBRO + waitbutton closetext - loadmovesprites - loadfont + opentext writetext UnknownText_0x18424b + waitbutton closetext - loadmovesprites end FisherScript_0x18404a: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x184058 checkevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM iftrue UnknownScript_0x18405e UnknownScript_0x184058: writetext UnknownText_0x18424e + waitbutton closetext - loadmovesprites end UnknownScript_0x18405e: writetext UnknownText_0x184275 + waitbutton closetext - loadmovesprites end YoungsterScript_0x184064: faceplayer - loadfont + opentext writetext UnknownText_0x1842a9 + waitbutton closetext - loadmovesprites checkevent EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY iffalse UnknownScript_0x184072 end UnknownScript_0x184072: - waitbutton + waitsfx playsound SFX_SECOND_PART_OF_ITEMFINDER - waitbutton + waitsfx playsound SFX_TRANSACTION - waitbutton + waitsfx playsound SFX_SECOND_PART_OF_ITEMFINDER - waitbutton + waitsfx playsound SFX_TRANSACTION - waitbutton + waitsfx playsound SFX_SECOND_PART_OF_ITEMFINDER - waitbutton + waitsfx playsound SFX_TRANSACTION - waitbutton + waitsfx playsound SFX_SECOND_PART_OF_ITEMFINDER - waitbutton + waitsfx playsound SFX_TRANSACTION - waitbutton - showemote EMOTE_SHOCK, $7, 15 - spriteface $7, LEFT - loadfont + waitsfx + showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15 + spriteface CERULEANCITY_YOUNGSTER, LEFT + opentext writetext UnknownText_0x1842ee + waitbutton closetext - loadmovesprites end CeruleanCitySign: @@ -140,7 +148,7 @@ CeruleanCityPokeCenterSign: CeruleanCityMartSign: jumpstd martsign -MapCeruleanCitySignpostItem8: +CeruleanCityHiddenBerserkGene: dwb EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE UnknownText_0x1840bc: @@ -295,7 +303,7 @@ CeruleanCity_MapEventHeader: signpost 29, 14, SIGNPOST_READ, CeruleanLockedDoor signpost 21, 20, SIGNPOST_READ, CeruleanCityPokeCenterSign signpost 29, 26, SIGNPOST_READ, CeruleanCityMartSign - signpost 12, 2, SIGNPOST_ITEM, MapCeruleanCitySignpostItem8 + signpost 12, 2, SIGNPOST_ITEM, CeruleanCityHiddenBerserkGene .PersonEvents: db 6 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index a15eeb496..a5d826eba 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -1,3 +1,11 @@ +const_value set 2 + const CERULEANGYM_ROCKET + const CERULEANGYM_MISTY + const CERULEANGYM_SWIMMER_GIRL1 + const CERULEANGYM_SWIMMER_GIRL2 + const CERULEANGYM_SWIMMER_GUY + const CERULEANGYM_GYM_GUY + CeruleanGym_MapScriptHeader: .MapTriggers: db 2 @@ -17,35 +25,35 @@ UnknownScript_0x1883da: end UnknownScript_0x1883de: - applymovement $2, MovementData_0x1884e3 + applymovement CERULEANGYM_ROCKET, MovementData_0x1884e3 playsound SFX_TACKLE - applymovement $2, MovementData_0x1884eb + applymovement CERULEANGYM_ROCKET, MovementData_0x1884eb playmusic MUSIC_ROCKET_ENCOUNTER - loadfont + opentext writetext UnknownText_0x1884fb + waitbutton closetext - loadmovesprites - showemote EMOTE_SHOCK, $2, 15 - applymovement $2, MovementData_0x1884f7 - loadfont + showemote EMOTE_SHOCK, CERULEANGYM_ROCKET, 15 + applymovement CERULEANGYM_ROCKET, MovementData_0x1884f7 + opentext writetext UnknownText_0x188574 + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x1884f5 - loadfont + applymovement CERULEANGYM_ROCKET, MovementData_0x1884f5 + opentext writetext UnknownText_0x1885a5 + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x1884e8 + applymovement CERULEANGYM_ROCKET, MovementData_0x1884e8 playsound SFX_EXIT_BUILDING - disappear $2 + disappear CERULEANGYM_ROCKET setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM clearevent EVENT_ROUTE_24_ROCKET clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND dotrigger $0 domaptrigger ROUTE_25, $1 domaptrigger POWER_PLANT, $0 - waitbutton + waitsfx special RestartMapMusic pause 15 spriteface PLAYER, DOWN @@ -54,100 +62,100 @@ UnknownScript_0x1883de: MistyScript_0x188432: faceplayer - loadfont + opentext checkflag ENGINE_CASCADEBADGE iftrue .FightDone writetext UnknownText_0x188674 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x18870c, 0 loadtrainer MISTY, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_MISTY setevent EVENT_BEAT_SWIMMERF_DIANA setevent EVENT_BEAT_SWIMMERF_BRIANA setevent EVENT_BEAT_SWIMMERM_PARKER - loadfont + opentext writetext UnknownText_0x188768 playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_CASCADEBADGE .FightDone writetext UnknownText_0x188782 + waitbutton closetext - loadmovesprites end TrainerSwimmerfDiana: trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, SwimmerfDianaScript SwimmerfDianaScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x188856 + waitbutton closetext - loadmovesprites end TrainerSwimmerfBriana: trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, SwimmerfBrianaScript SwimmerfBrianaScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1888c0 + waitbutton closetext - loadmovesprites end TrainerSwimmermParker: trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, SwimmermParkerScript SwimmermParkerScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x188943 + waitbutton closetext - loadmovesprites end CeruleanGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_MISTY iftrue .CeruleanGymGuyWinScript writetext CeruleanGymGuyText + waitbutton closetext - loadmovesprites end .CeruleanGymGuyWinScript writetext CeruleanGymGuyWinText + waitbutton closetext - loadmovesprites end -MapCeruleanGymSignpostItem0: +CeruleanGymHiddenMachinePart: dwb EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART CeruleanGymStatue1: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM iffalse CeruleanGymStatue - loadfont + opentext writetext CeruleanGymNote1 + waitbutton closetext - loadmovesprites end CeruleanGymStatue2: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM iffalse CeruleanGymStatue - loadfont + opentext writetext CeruleanGymNote2 + waitbutton closetext - loadmovesprites end CeruleanGymStatue: @@ -371,7 +379,7 @@ CeruleanGym_MapEventHeader: .Signposts: db 3 - signpost 8, 3, SIGNPOST_ITEM, MapCeruleanGymSignpostItem0 + signpost 8, 3, SIGNPOST_ITEM, CeruleanGymHiddenMachinePart signpost 13, 2, SIGNPOST_READ, CeruleanGymStatue1 signpost 13, 6, SIGNPOST_READ, CeruleanGymStatue2 diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index ef5ceb76b..c6cdd60ac 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M + CeruleanGymBadgeSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index b2ec0ad79..993b6b1af 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CERULEANMART_CLERK + const CERULEANMART_COOLTRAINER_M + const CERULEANMART_COOLTRAINER_F + CeruleanMart_MapScriptHeader: .MapTriggers: db 0 @@ -6,9 +11,9 @@ CeruleanMart_MapScriptHeader: db 0 ClerkScript_0x188ac0: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_CERULEAN - loadmovesprites + closetext end CooltrainerMScript_0x188ac7: diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm index 8a04b43cb..0e3aac84a 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokeCenter1F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CERULEANPOKECENTER1F_NURSE + const CERULEANPOKECENTER1F_SUPER_NERD + const CERULEANPOKECENTER1F_GYM_GUY + CeruleanPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CeruleanPokeCenter2FBeta.asm b/maps/CeruleanPokeCenter2FBeta.asm index 4479a484f..20c577fb7 100644 --- a/maps/CeruleanPokeCenter2FBeta.asm +++ b/maps/CeruleanPokeCenter2FBeta.asm @@ -1,3 +1,4 @@ + CeruleanPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 4440aa322..3f4c9d8f7 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CERULEANPOLICESTATION_FISHING_GURU + const CERULEANPOLICESTATION_POKEFAN_F + const CERULEANPOLICESTATION_DIGLETT + CeruleanPoliceStation_MapScriptHeader: .MapTriggers: db 0 @@ -12,11 +17,11 @@ PokefanFScript_0x18804d: jumptextfaceplayer UnknownText_0x1880c3 DiglettScript_0x188050: - loadfont + opentext writetext UnknownText_0x1880e7 cry DIGLETT + waitbutton closetext - loadmovesprites end UnknownText_0x18805a: diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 15fdd9320..f499d8c1f 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -1,3 +1,9 @@ +const_value set 2 + const CERULEANTRADESPEECHHOUSE_GRANNY + const CERULEANTRADESPEECHHOUSE_GRAMPS + const CERULEANTRADESPEECHHOUSE_RHYDON + const CERULEANTRADESPEECHHOUSE_ZUBAT + CeruleanTradeSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -12,19 +18,19 @@ GrampsScript_0x188136: jumptextfaceplayer UnknownText_0x18818a RhydonScript_0x188139: - loadfont + opentext writetext UnknownText_0x18819c cry KANGASKHAN + waitbutton closetext - loadmovesprites end ZubatScript_0x188143: - loadfont + opentext writetext UnknownText_0x1881b5 cry ZUBAT + waitbutton closetext - loadmovesprites end UnknownText_0x18814d: diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 3c4ee42cf..bdf79238b 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CHARCOALKILN_BLACK_BELT + const CHARCOALKILN_YOUNGSTER + const CHARCOALKILN_MOLTRES + CharcoalKiln_MapScriptHeader: .MapTriggers: db 0 @@ -7,63 +12,63 @@ CharcoalKiln_MapScriptHeader: CharcoalKilnBoss: faceplayer - loadfont + opentext checkevent EVENT_GOT_HM01_CUT iftrue .GotCut checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue .SavedSlowpoke writetext CharcoalKilnBossText1 + waitbutton closetext - loadmovesprites end .SavedSlowpoke writetext CharcoalKilnBossText2 + waitbutton closetext - loadmovesprites end .GotCut writetext CharcoalKilnBossText3 + waitbutton closetext - loadmovesprites end CharcoalKilnApprentice: faceplayer - loadfont + opentext checkevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN iftrue .YoureTheCoolest checkevent EVENT_GOT_HM01_CUT iftrue .Thanks writetext CharcoalKilnApprenticeText1 + waitbutton closetext - loadmovesprites end .Thanks writetext CharcoalKilnApprenticeText2 - keeptextopen + buttonsound verbosegiveitem CHARCOAL iffalse .Done setevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN - loadmovesprites + closetext end .YoureTheCoolest writetext CharcoalKilnApprenticeText3 - closetext + waitbutton .Done - loadmovesprites + closetext end CharcoalKilnFarfetchd: faceplayer - loadfont + opentext writetext FarfetchdText cry FARFETCH_D + waitbutton closetext - loadmovesprites end CharcoalKilnBookshelf: diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 8ae9a329c..e3dc14c0a 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -1,10 +1,17 @@ +const_value set 2 + const CHERRYGROVECITY_GRAMPS + const CHERRYGROVECITY_SILVER + const CHERRYGROVECITY_TEACHER + const CHERRYGROVECITY_YOUNGSTER + const CHERRYGROVECITY_FISHER + CherrygroveCity_MapScriptHeader: .MapTriggers: db 2 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 - dw .Trigger2, 0 .MapCallbacks: db 1 @@ -12,10 +19,10 @@ CherrygroveCity_MapScriptHeader: ; callbacks dbw 5, .FlyPoint -.Trigger1 +.Trigger0 end -.Trigger2 +.Trigger1 end .FlyPoint @@ -24,67 +31,67 @@ CherrygroveCity_MapScriptHeader: CherrygroveCityGuideGent: faceplayer - loadfont + opentext writetext GuideGentIntroText yesorno iffalse .No jump .Yes .Yes writetext GuideGentTourText1 + waitbutton closetext - loadmovesprites playmusic MUSIC_SHOW_ME_AROUND - follow $2, PLAYER - applymovement $2, MovementData_0x19c195 - loadfont + follow CHERRYGROVECITY_GRAMPS, PLAYER + applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement1 + opentext writetext GuideGentPokeCenterText + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x19c19b + applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement2 spriteface PLAYER, UP - loadfont + opentext writetext GuideGentMartText + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x19c1a3 + applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement3 spriteface PLAYER, UP - loadfont + opentext writetext GuideGentRoute30Text + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x19c1ac + applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement4 spriteface PLAYER, LEFT - loadfont + opentext writetext GuideGentSeaText + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x19c1b6 + applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement5 spriteface PLAYER, UP pause 60 - spriteface $2, LEFT + spriteface CHERRYGROVECITY_GRAMPS, LEFT spriteface PLAYER, RIGHT - loadfont + opentext writetext GuideGentGiftText - keeptextopen + buttonsound stringtotext .mapcardname, $1 - scall .UnknownScript_0x19c097 + scall .JumpstdReceiveItem setflag ENGINE_MAP_CARD writetext GotMapCardText - keeptextopen + buttonsound writetext GuideGentPokegearText + waitbutton closetext - loadmovesprites stopfollow special RestartMapMusic spriteface PLAYER, UP - applymovement $2, MovementData_0x19c1cb + applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement6 playsound SFX_ENTER_DOOR - disappear $2 + disappear CHERRYGROVECITY_GRAMPS clearevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE - waitbutton + waitsfx end -.UnknownScript_0x19c097 +.JumpstdReceiveItem jumpstd receiveitem end @@ -93,134 +100,133 @@ CherrygroveCityGuideGent: .No writetext GuideGentNoText + waitbutton closetext - loadmovesprites end -UnknownScript_0x19c0aa: - moveperson $3, $27, $7 - -UnknownScript_0x19c0ae: +CherrygroveSilverTriggerSouth: + moveperson CHERRYGROVECITY_SILVER, $27, $7 +CherrygroveSilverTriggerNorth: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic pause 15 - appear $3 - applymovement $3, MovementData_0x19c1ce + appear CHERRYGROVECITY_SILVER + applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalWalksToYou spriteface PLAYER, RIGHT playmusic MUSIC_RIVAL_ENCOUNTER - loadfont + opentext writetext UnknownText_0x19c4e2 + waitbutton closetext - loadmovesprites checkevent EVENT_GOT_TOTODILE_FROM_ELM - iftrue UnknownScript_0x19c0ee + iftrue .Totodile checkevent EVENT_GOT_CHIKORITA_FROM_ELM - iftrue UnknownScript_0x19c104 - winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 - setlasttalked $3 + iftrue .Chikorita + winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText + setlasttalked CHERRYGROVECITY_SILVER loadtrainer RIVAL1, RIVAL1_3 writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle - reloadmapmusic + dontrestartmapmusic reloadmap - iftrue UnknownScript_0x19c11a - jump UnknownScript_0x19c126 + iftrue .AfterVictorious + jump .AfterYourDefeat -UnknownScript_0x19c0ee: - winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 - setlasttalked $3 +.Totodile: + winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText + setlasttalked CHERRYGROVECITY_SILVER loadtrainer RIVAL1, RIVAL1_1 writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle - reloadmapmusic + dontrestartmapmusic reloadmap - iftrue UnknownScript_0x19c11a - jump UnknownScript_0x19c126 + iftrue .AfterVictorious + jump .AfterYourDefeat -UnknownScript_0x19c104: - winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 - setlasttalked $3 +.Chikorita: + winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText + setlasttalked CHERRYGROVECITY_SILVER loadtrainer RIVAL1, RIVAL1_2 writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle - reloadmapmusic + dontrestartmapmusic reloadmap - iftrue UnknownScript_0x19c11a - jump UnknownScript_0x19c126 + iftrue .AfterVictorious + jump .AfterYourDefeat -UnknownScript_0x19c11a: +.AfterVictorious: playmusic MUSIC_RIVAL_AFTER - loadfont - writetext UnknownText_0x19c608 + opentext + writetext CherrygroveRivalText_YouWon + waitbutton closetext - loadmovesprites - jump UnknownScript_0x19c12f + jump .FinishRival -UnknownScript_0x19c126: +.AfterYourDefeat: playmusic MUSIC_RIVAL_AFTER - loadfont - writetext UnknownText_0x19c59e + opentext + writetext CherrygroveRivalText_YouLost + waitbutton closetext - loadmovesprites -UnknownScript_0x19c12f: +.FinishRival: playsound SFX_TACKLE - applymovement PLAYER, MovementData_0x19c1d4 + applymovement PLAYER, CherrygroveCity_RivalPushesYouOutOfTheWay spriteface PLAYER, LEFT - applymovement $3, MovementData_0x19c1da - disappear $3 + applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft + disappear CHERRYGROVECITY_SILVER dotrigger $0 special HealParty playmapmusic end -TeacherScript_0x19c146: +CherrygroveTeacherScript: faceplayer - loadfont + opentext checkflag ENGINE_MAP_CARD - iftrue UnknownScript_0x19c154 - writetext UnknownText_0x19c650 + iftrue .HaveMapCard + writetext CherrygroveTeacherText_NoMapCard + waitbutton closetext - loadmovesprites end -UnknownScript_0x19c154: - writetext UnknownText_0x19c6a8 +.HaveMapCard: + writetext CherrygroveTeacherText_HaveMapCard + waitbutton closetext - loadmovesprites end -YoungsterScript_0x19c15a: +CherrygroveYoungsterScript: faceplayer - loadfont + opentext checkflag ENGINE_POKEDEX - iftrue UnknownScript_0x19c168 - writetext UnknownText_0x19c6d6 + iftrue .HavePokedex + writetext CherrygroveYoungsterText_NoPokedex + waitbutton closetext - loadmovesprites end -UnknownScript_0x19c168: - writetext UnknownText_0x19c701 +.HavePokedex: + writetext CherrygroveYoungsterText_HavePokedex + waitbutton closetext - loadmovesprites end MysticWaterGuy: faceplayer - loadfont + opentext checkevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE - iftrue UnknownScript_0x19c183 - writetext UnknownText_0x19c766 - keeptextopen + iftrue .After + writetext MysticWaterGuyTextBefore + buttonsound verbosegiveitem MYSTIC_WATER - iffalse UnknownScript_0x19c187 + iffalse .Exit setevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE -UnknownScript_0x19c183: - writetext UnknownText_0x19c7c1 +.After: + writetext MysticWaterGuyTextAfter + waitbutton +.Exit: closetext -UnknownScript_0x19c187: - loadmovesprites end CherrygroveCitySign: @@ -235,7 +241,7 @@ CherrygroveCityPokeCenterSign: CherrygroveCityMartSign: jumpstd martsign -MovementData_0x19c195: +GuideGentMovement1: step_left step_left step_up @@ -243,7 +249,7 @@ MovementData_0x19c195: turn_head_up step_end -MovementData_0x19c19b: +GuideGentMovement2: step_left step_left step_left @@ -253,7 +259,7 @@ MovementData_0x19c19b: turn_head_up step_end -MovementData_0x19c1a3: +GuideGentMovement3: step_left step_left step_left @@ -264,7 +270,7 @@ MovementData_0x19c1a3: turn_head_up step_end -MovementData_0x19c1ac: +GuideGentMovement4: step_left step_left step_left @@ -276,7 +282,7 @@ MovementData_0x19c1ac: turn_head_left step_end -MovementData_0x19c1b6: +GuideGentMovement5: step_down step_down step_right @@ -299,12 +305,12 @@ MovementData_0x19c1b6: turn_head_up step_end -MovementData_0x19c1cb: +GuideGentMovement6: step_up step_up step_end -MovementData_0x19c1ce: +CherrygroveCity_RivalWalksToYou: step_left step_left step_left @@ -312,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 @@ -451,12 +457,12 @@ UnknownText_0x19c4e2: line "what I mean!" done -UnknownText_0x19c57f: +SilverCherrygroveWinText: text "Humph. Are you" line "happy you won?" done -UnknownText_0x19c59e: +CherrygroveRivalText_YouLost: text "<......> <......> <......>" para "My name's ???." @@ -467,12 +473,12 @@ UnknownText_0x19c59e: cont "trainer." done -UnknownText_0x19c5e6: +SilverCherrygroveLossText: text "Humph. That was a" line "waste of time." done -UnknownText_0x19c608: +CherrygroveRivalText_YouWon: text "<......> <......> <......>" para "My name's ???." @@ -483,7 +489,7 @@ UnknownText_0x19c608: cont "trainer." done -UnknownText_0x19c650: +CherrygroveTeacherText_NoMapCard: text "Did you talk to" line "the old man by the" cont "#MON CENTER?" @@ -493,19 +499,19 @@ UnknownText_0x19c650: cont "#GEAR." done -UnknownText_0x19c6a8: +CherrygroveTeacherText_HaveMapCard: text "When you're with" line "#MON, going" cont "anywhere is fun." done -UnknownText_0x19c6d6: +CherrygroveYoungsterText_NoPokedex: text "MR.#MON's house" line "is still farther" cont "up ahead." done -UnknownText_0x19c701: +CherrygroveYoungsterText_HavePokedex: text "I battled the" line "trainers on the" cont "road." @@ -517,7 +523,7 @@ UnknownText_0x19c701: line "a #MON CENTER." done -UnknownText_0x19c766: +MysticWaterGuyTextBefore: text "A #MON I caught" line "had an item." @@ -528,7 +534,7 @@ UnknownText_0x19c766: line "so do you want it?" done -UnknownText_0x19c7c1: +MysticWaterGuyTextAfter: text "Back to fishing" line "for me, then." done @@ -558,8 +564,8 @@ CherrygroveCity_MapEventHeader: .XYTriggers: db 2 - xy_trigger 1, $6, $21, $0, UnknownScript_0x19c0ae, $0, $0 - xy_trigger 1, $7, $21, $0, UnknownScript_0x19c0aa, $0, $0 + xy_trigger 1, $6, $21, $0, CherrygroveSilverTriggerNorth, $0, $0 + xy_trigger 1, $7, $21, $0, CherrygroveSilverTriggerSouth, $0, $0 .Signposts: db 4 @@ -572,6 +578,6 @@ CherrygroveCity_MapEventHeader: db 5 person_event SPRITE_GRAMPS, 6, 32, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE person_event SPRITE_SILVER, 6, 39, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY - person_event SPRITE_TEACHER, 12, 27, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x19c146, -1 - person_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19c15a, -1 + person_event SPRITE_TEACHER, 12, 27, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1 + person_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1 person_event SPRITE_FISHER, 12, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, MysticWaterGuy, -1 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index e2a294d06..b737313f9 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS + const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER + CherrygroveEvolutionSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -6,17 +10,17 @@ CherrygroveEvolutionSpeechHouse_MapScriptHeader: db 0 YoungsterScript_0x196cb2: - loadfont + opentext writetext UnknownText_0x196cc3 + waitbutton closetext - loadmovesprites end LassScript_0x196cb9: - loadfont + opentext writetext UnknownText_0x196cfc + waitbutton closetext - loadmovesprites end CherrygroveEvolutionSpeechHouseBookshelf: diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 64c841b7e..c556d8cb7 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M + const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER + CherrygroveGymSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 02ccb1007..fe8a733eb 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CHERRYGROVEMART_CLERK + const CHERRYGROVEMART_COOLTRAINER_M + const CHERRYGROVEMART_YOUNGSTER + CherrygroveMart_MapScriptHeader: .MapTriggers: db 0 @@ -6,32 +11,32 @@ CherrygroveMart_MapScriptHeader: db 0 ClerkScript_0x19680a: - loadfont + opentext checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196817 pokemart MARTTYPE_STANDARD, MART_CHERRYGROVE - loadmovesprites + closetext end UnknownScript_0x196817: pokemart MARTTYPE_STANDARD, MART_CHERRYGROVE_DEX - loadmovesprites + closetext end CooltrainerMScript_0x19681d: faceplayer - loadfont + opentext checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x19682b writetext UnknownText_0x196834 + waitbutton closetext - loadmovesprites end UnknownScript_0x19682b: writetext UnknownText_0x196873 + waitbutton closetext - loadmovesprites end YoungsterScript_0x196831: diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index 51b5c74af..d3056b177 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const CHERRYGROVEPOKECENTER1F_NURSE + const CHERRYGROVEPOKECENTER1F_FISHER + const CHERRYGROVEPOKECENTER1F_GENTLEMAN + const CHERRYGROVEPOKECENTER1F_TEACHER + CherrygrovePokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -16,18 +22,18 @@ GentlemanScript_0x196973: TeacherScript_0x196976: faceplayer - loadfont + opentext checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196984 writetext UnknownText_0x1969f1 + waitbutton closetext - loadmovesprites end UnknownScript_0x196984: writetext UnknownText_0x196a46 + waitbutton closetext - loadmovesprites end UnknownText_0x19698a: diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 6bb1daada..c05109db4 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -1,10 +1,24 @@ +const_value set 2 + const CIANWOODCITY_STANDING_YOUNGSTER + const CIANWOODCITY_POKEFAN_M + const CIANWOODCITY_LASS + const CIANWOODCITY_ROCK1 + const CIANWOODCITY_ROCK2 + const CIANWOODCITY_ROCK3 + const CIANWOODCITY_ROCK4 + const CIANWOODCITY_ROCK5 + const CIANWOODCITY_ROCK6 + const CIANWOODCITY_POKEFAN_F + const CIANWOODCITY_EUSINE + const CIANWOODCITY_SUICUNE + CianwoodCity_MapScriptHeader: .MapTriggers: db 2 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 - dw .Trigger2, 0 .MapCallbacks: db 1 @@ -12,10 +26,10 @@ CianwoodCity_MapScriptHeader: ; callbacks dbw 5, .FlyPointAndSuicune -.Trigger1 +.Trigger0 end -.Trigger2 +.Trigger1 end .FlyPointAndSuicune @@ -23,7 +37,7 @@ CianwoodCity_MapScriptHeader: setevent EVENT_EUSINE_IN_BURNED_TOWER checkevent EVENT_FOUGHT_EUSINE iffalse UnknownScript_0x1a001d - disappear $c + disappear CIANWOODCITY_EUSINE UnknownScript_0x1a001d: return @@ -32,12 +46,12 @@ UnknownScript_0x1a001e: showemote EMOTE_SHOCK, PLAYER, 15 pause 15 playsound SFX_WARP_FROM - applymovement $d, MovementData_0x1a00da + applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00da spriteface PLAYER, DOWN pause 15 playsound SFX_WARP_FROM - applymovement $d, MovementData_0x1a00e0 - disappear $d + applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0 + disappear CIANWOODCITY_SUICUNE pause 10 dotrigger $0 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42 @@ -46,27 +60,27 @@ UnknownScript_0x1a001e: iftrue .Done setevent EVENT_FOUGHT_EUSINE playmusic MUSIC_MYSTICALMAN_ENCOUNTER - appear $c - applymovement $c, MovementData_0x1a00e7 - loadfont + appear CIANWOODCITY_EUSINE + applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00e7 + opentext writetext UnknownText_0x1a0433 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x1a05a1, 0 - setlasttalked $c + setlasttalked CIANWOODCITY_EUSINE loadtrainer MYSTICALMAN, EUSINE startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle playmusic MUSIC_MYSTICALMAN_ENCOUNTER - loadfont + opentext writetext UnknownText_0x1a05c3 + waitbutton closetext - loadmovesprites - applymovement $c, MovementData_0x1a00ec - disappear $c + applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00ec + disappear CIANWOODCITY_EUSINE pause 20 - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic playmapmusic pause 10 .Done @@ -74,31 +88,31 @@ UnknownScript_0x1a001e: PokefanFScript_0x1a0084: faceplayer - loadfont + opentext checkevent EVENT_GOT_HM02_FLY iftrue UnknownScript_0x1a00ad writetext UnknownText_0x1a00f1 - keeptextopen + buttonsound checkevent EVENT_BEAT_CHUCK iftrue UnknownScript_0x1a009c writetext UnknownText_0x1a0163 + waitbutton closetext - loadmovesprites end UnknownScript_0x1a009c: writetext UnknownText_0x1a01e3 - keeptextopen + buttonsound verbosegiveitem HM_FLY iffalse UnknownScript_0x1a00b1 setevent EVENT_GOT_HM02_FLY writetext UnknownText_0x1a021d - keeptextopen + buttonsound UnknownScript_0x1a00ad: writetext UnknownText_0x1a0277 - closetext + waitbutton UnknownScript_0x1a00b1: - loadmovesprites + closetext end StandingYoungsterScript_0x1a00b3: @@ -134,10 +148,10 @@ CianwoodPokeCenterSign: CianwoodCityRock: jumpstd smashrock -MapCianwoodCitySignpostItem6: +CianwoodCityHiddenRevive: dwb EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE -MapCianwoodCitySignpostItem7: +CianwoodCityHiddenMaxEther: dwb EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER MovementData_0x1a00da: @@ -396,8 +410,8 @@ CianwoodCity_MapEventHeader: signpost 47, 19, SIGNPOST_READ, CianwoodPharmacySign signpost 32, 8, SIGNPOST_READ, CianwoodPhotoStudioSign signpost 24, 8, SIGNPOST_READ, CianwoodPokeSeerSign - signpost 19, 4, SIGNPOST_ITEM, MapCianwoodCitySignpostItem6 - signpost 29, 5, SIGNPOST_ITEM, MapCianwoodCitySignpostItem7 + signpost 19, 4, SIGNPOST_ITEM, CianwoodCityHiddenRevive + signpost 29, 5, SIGNPOST_ITEM, CianwoodCityHiddenMaxEther .PersonEvents: db 12 diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index 95cba4982..026050f6a 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -1,3 +1,6 @@ +const_value set 2 + const CIANWOODCITYPHOTOSTUDIO_FISHING_GURU + CianwoodCityPhotoStudio_MapScriptHeader: .MapTriggers: db 0 @@ -7,21 +10,21 @@ CianwoodCityPhotoStudio_MapScriptHeader: FishingGuruScript_0x9e0e0: faceplayer - loadfont + opentext writetext UnknownText_0x9e0f9 yesorno iffalse UnknownScript_0x9e0f3 writetext UnknownText_0x9e142 - closetext + waitbutton special PhotoStudio + waitbutton closetext - loadmovesprites end UnknownScript_0x9e0f3: writetext UnknownText_0x9e156 + waitbutton closetext - loadmovesprites end UnknownText_0x9e0f9: diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index a081cdcd8..3d0a87751 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -1,3 +1,14 @@ +const_value set 2 + const CIANWOODGYM_CHUCK + const CIANWOODGYM_BLACK_BELT1 + const CIANWOODGYM_BLACK_BELT2 + const CIANWOODGYM_BLACK_BELT3 + const CIANWOODGYM_BLACK_BELT4 + const CIANWOODGYM_BOULDER1 + const CIANWOODGYM_BOULDER2 + const CIANWOODGYM_BOULDER3 + const CIANWOODGYM_BOULDER4 + CianwoodGym_MapScriptHeader: .MapTriggers: db 0 @@ -7,36 +18,36 @@ CianwoodGym_MapScriptHeader: ChuckScript_0x9d60f: faceplayer - loadfont + opentext checkevent EVENT_BEAT_CHUCK iftrue .FightDone writetext UnknownText_0x9d6f9 + waitbutton closetext - loadmovesprites - spriteface $2, RIGHT - loadfont + spriteface CIANWOODGYM_CHUCK, RIGHT + opentext writetext UnknownText_0x9d76f + waitbutton closetext - loadmovesprites - applymovement $7, MovementData_0x9d6f3 + applymovement CIANWOODGYM_BOULDER1, MovementData_0x9d6f3 playsound SFX_STRENGTH earthquake 80 - disappear $7 + disappear CIANWOODGYM_BOULDER1 pause 30 faceplayer - loadfont + opentext writetext UnknownText_0x9d78a + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x9d7f6, 0 loadtrainer CHUCK, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_CHUCK - loadfont + opentext writetext UnknownText_0x9d835 playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_STORMBADGE checkcode VAR_BADGES scall CianwoodGymTriggerRockets @@ -48,20 +59,20 @@ ChuckScript_0x9d60f: setevent EVENT_BEAT_BLACKBELT_NOB setevent EVENT_BEAT_BLACKBELT_LUNG writetext UnknownText_0x9d84d - keeptextopen + buttonsound verbosegiveitem TM_DYNAMICPUNCH iffalse UnknownScript_0x9d67f setevent EVENT_GOT_TM01_DYNAMICPUNCH writetext UnknownText_0x9d8da + waitbutton closetext - loadmovesprites end UnknownScript_0x9d67b: writetext UnknownText_0x9d930 - closetext + waitbutton UnknownScript_0x9d67f: - loadmovesprites + closetext end CianwoodGymTriggerRockets: @@ -79,44 +90,44 @@ TrainerBlackbeltYoshi: trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, BlackbeltYoshiScript BlackbeltYoshiScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x9d9fa + waitbutton closetext - loadmovesprites end TrainerBlackbeltLao: trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, BlackbeltLaoScript BlackbeltLaoScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x9da61 + waitbutton closetext - loadmovesprites end TrainerBlackbeltNob: trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, BlackbeltNobScript BlackbeltNobScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x9dac0 + waitbutton closetext - loadmovesprites end TrainerBlackbeltLung: trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, BlackbeltLungScript BlackbeltLungScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x9db14 + waitbutton closetext - loadmovesprites end CianwoodGymBoulder: diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index ac19a402e..0ab10dd82 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CIANWOODLUGIASPEECHHOUSE_TEACHER + const CIANWOODLUGIASPEECHHOUSE_LASS + const CIANWOODLUGIASPEECHHOUSE_TWIN + CianwoodLugiaSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 528789583..f488e8993 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -1,3 +1,6 @@ +const_value set 2 + const CIANWOODPHARMACY_PHARMACIST + CianwoodPharmacy_MapScriptHeader: .MapTriggers: db 1 @@ -13,27 +16,27 @@ CianwoodPharmacyTrigger: CianwoodPharmacist: faceplayer - loadfont + opentext checkevent EVENT_GOT_SECRETPOTION_FROM_PHARMACY iftrue .Mart checkevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS iffalse .Mart writetext PharmacistGiveSecretpotionText - keeptextopen + buttonsound giveitem SECRETPOTION writetext ReceivedSecretpotionText playsound SFX_KEY_ITEM - waitbutton + waitsfx itemnotify setevent EVENT_GOT_SECRETPOTION_FROM_PHARMACY writetext PharmacistDescribeSecretpotionText + waitbutton closetext - loadmovesprites end .Mart pokemart MARTTYPE_PHARMACY, MART_CIANWOOD - loadmovesprites + closetext end CianwoodPharmacyBookshelf: diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index 4969a507a..3fe7c1ef8 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const CIANWOODPOKECENTER1F_NURSE + const CIANWOODPOKECENTER1F_LASS + const CIANWOODPOKECENTER1F_GYM_GUY + const CIANWOODPOKECENTER1F_SUPER_NERD + CianwoodPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -15,17 +21,17 @@ CianwoodGymGuyScript: faceplayer checkevent EVENT_BEAT_CHUCK iftrue .CianwoodGymGuyWinScript - loadfont + opentext writetext CianwoodGymGuyText + waitbutton closetext - loadmovesprites end .CianwoodGymGuyWinScript - loadfont + opentext writetext CianwoodGymGuyWinText + waitbutton closetext - loadmovesprites end SuperNerdScript_0x9dbea: diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 77c1ae2f2..6823bc8a7 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -1,3 +1,6 @@ +const_value set 2 + const CINNABARISLAND_BLUE + CinnabarIsland_MapScriptHeader: .MapTriggers: db 0 @@ -14,13 +17,13 @@ CinnabarIsland_MapScriptHeader: CinnabarIslandBlue: faceplayer - loadfont + opentext writetext CinnabarIslandBlueText + waitbutton closetext - loadmovesprites playsound SFX_WARP_TO - applymovement $2, CinnabarIslandBlueTeleport - disappear $2 + applymovement CINNABARISLAND_BLUE, CinnabarIslandBlueTeleport + disappear CINNABARISLAND_BLUE clearevent EVENT_VIRIDIAN_GYM_BLUE end @@ -33,7 +36,7 @@ CinnabarIslandSign: CinnabarIslandPokeCenterSign: jumpstd pokecentersign -MapCinnabarIslandSignpostItem3: +CinnabarIslandHiddenRareCandy: dwb EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY CinnabarIslandBlueTeleport: @@ -142,7 +145,7 @@ CinnabarIsland_MapEventHeader: signpost 11, 12, SIGNPOST_READ, CinnabarIslandPokeCenterSign signpost 11, 9, SIGNPOST_READ, CinnabarIslandGymSign signpost 7, 7, SIGNPOST_READ, CinnabarIslandSign - signpost 1, 9, SIGNPOST_ITEM, MapCinnabarIslandSignpostItem3 + signpost 1, 9, SIGNPOST_ITEM, CinnabarIslandHiddenRareCandy .PersonEvents: db 1 diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm index d42451dc1..a97aae5c6 100644 --- a/maps/CinnabarPokeCenter1F.asm +++ b/maps/CinnabarPokeCenter1F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CINNABARPOKECENTER1F_NURSE + const CINNABARPOKECENTER1F_COOLTRAINER_F + const CINNABARPOKECENTER1F_FISHER + CinnabarPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CinnabarPokeCenter2FBeta.asm b/maps/CinnabarPokeCenter2FBeta.asm index fb9d96b7a..b73f9c43d 100644 --- a/maps/CinnabarPokeCenter2FBeta.asm +++ b/maps/CinnabarPokeCenter2FBeta.asm @@ -1,3 +1,4 @@ + CinnabarPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 3c1e597b2..b4383ac75 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -1,11 +1,15 @@ +const_value set 2 + const COLOSSEUM_CHRIS1 + const COLOSSEUM_CHRIS2 + Colosseum_MapScriptHeader: .MapTriggers: db 3 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 dw .Trigger2, 0 - dw .Trigger3, 0 .MapCallbacks: db 2 @@ -16,26 +20,26 @@ Colosseum_MapScriptHeader: dbw 5, ColosseumScript_InitializeCB -.Trigger1: +.Trigger0: priorityjump ColosseumScript_Initialize end -.Trigger2: +.Trigger1: end -.Trigger3: +.Trigger2: end ColosseumScript_SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 - disappear $3 - appear $2 + disappear COLOSSEUM_CHRIS2 + appear COLOSSEUM_CHRIS1 return .Chris2: - disappear $2 - appear $3 + disappear COLOSSEUM_CHRIS1 + appear COLOSSEUM_CHRIS2 return ColosseumScript_InitializeCB: @@ -53,10 +57,10 @@ MapColosseumSignpost1Script: end ChrisScript_0x193499: - loadfont + opentext writetext .FriendReadyText + waitbutton closetext - loadmovesprites end .FriendReadyText: diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 34a8dea5b..cf8bd771c 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const COPYCATSHOUSE1F_POKEFAN_M + const COPYCATSHOUSE1F_POKEFAN_F + const COPYCATSHOUSE1F_CLEFAIRY + CopycatsHouse1F_MapScriptHeader: .MapTriggers: db 0 @@ -10,26 +15,26 @@ PokefanMScript_0x18ad13: PokefanFScript_0x18ad16: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18ad24 writetext UnknownText_0x18ad95 + waitbutton closetext - loadmovesprites end UnknownScript_0x18ad24: writetext UnknownText_0x18add3 + waitbutton closetext - loadmovesprites end ClefairyScript_0x18ad2a: - loadfont + opentext writetext UnknownText_0x18ae4b cry BLISSEY + waitbutton closetext - loadmovesprites end UnknownText_0x18ad34: diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index fe41d7a3d..b25ba93be 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const COPYCATSHOUSE2F_COPYCAT1 + const COPYCATSHOUSE2F_MOLTRES + const COPYCATSHOUSE2F_FAIRY + const COPYCATSHOUSE2F_MONSTER + const COPYCATSHOUSE2F_BIRD + const COPYCATSHOUSE2F_COPYCAT2 + CopycatsHouse2F_MapScriptHeader: .MapTriggers: db 0 @@ -12,12 +20,12 @@ CopycatsHouse2F_MapScriptHeader: CopycatsHouse2FCallback: checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part1 - disappear $7 - appear $2 + disappear COPYCATSHOUSE2F_COPYCAT2 + appear COPYCATSHOUSE2F_COPYCAT1 jump .Done .Part1 - disappear $2 - appear $7 + disappear COPYCATSHOUSE2F_COPYCAT1 + appear COPYCATSHOUSE2F_COPYCAT2 .Done return @@ -31,20 +39,20 @@ Copycat: iftrue .Part12 checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part1 - applymovement $2, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_CHRIS jump .Part2 .Part1 - applymovement $7, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Part2 special RunCallback_04 checkevent EVENT_RETURNED_MACHINE_PART iftrue .Part7 - loadfont + opentext checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part3 writetext UnknownText_0x18afda @@ -53,27 +61,27 @@ Copycat: .Part3 writetext UnknownText_0x18b316 .Part4 + waitbutton closetext - loadmovesprites checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part5 - applymovement $2, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0 jump .Part6 .Part5 - applymovement $7, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0 .Part6 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS special RunCallback_04 - loadfont + opentext writetext UnknownText_0x18b028 + waitbutton closetext - loadmovesprites end .Part7 - loadfont + opentext checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part8 writetext UnknownText_0x18b064 @@ -82,63 +90,63 @@ Copycat: .Part8 writetext UnknownText_0x18b366 .Part9 + waitbutton closetext - loadmovesprites checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part10 - applymovement $2, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0 jump .Part11 .Part10 - applymovement $7, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0 .Part11 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS special RunCallback_04 - loadfont + opentext writetext UnknownText_0x18b116 + waitbutton closetext - loadmovesprites setevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM end .Part12 - loadfont + opentext writetext UnknownText_0x18b17f - keeptextopen + buttonsound takeitem LOST_ITEM setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT clearevent EVENT_COPYCATS_HOUSE_2F_DOLL jump .Part14 .Part13 - loadfont + opentext .Part14 writetext UnknownText_0x18b1e2 - keeptextopen + buttonsound verbosegiveitem PASS iffalse .Part22 setevent EVENT_GOT_PASS_FROM_COPYCAT writetext UnknownText_0x18b214 + waitbutton closetext - loadmovesprites end .Part15 checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part16 - applymovement $2, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_CHRIS jump .Part17 .Part16 - applymovement $7, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Part17 special RunCallback_04 - loadfont + opentext checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part18 writetext UnknownText_0x18b298 @@ -147,34 +155,34 @@ Copycat: .Part18 writetext UnknownText_0x18b415 .Part19 + waitbutton closetext - loadmovesprites checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part20 - applymovement $2, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0 jump .Part21 .Part20 - applymovement $7, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0 .Part21 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS special RunCallback_04 - loadfont + opentext writetext UnknownText_0x18b2f5 - closetext + waitbutton .Part22 - loadmovesprites + closetext end CopycatsDodrio: - loadfont + opentext writetext CopycatsDodrioText1 cry DODRIO - keeptextopen + buttonsound writetext CopycatsDodrioText2 + waitbutton closetext - loadmovesprites end CopycatsHouse2FDoll: diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 40b48da85..d4a647207 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -1,3 +1,14 @@ +const_value set 2 + const DANCETHEATRE_KIMONO_GIRL1 + const DANCETHEATRE_KIMONO_GIRL2 + const DANCETHEATRE_KIMONO_GIRL3 + const DANCETHEATRE_KIMONO_GIRL4 + const DANCETHEATRE_KIMONO_GIRL5 + const DANCETHEATRE_GENTLEMAN + const DANCETHEATRE_RHYDON + const DANCETHEATRE_COOLTRAINER_M + const DANCETHEATRE_GRANNY + DanceTheatre_MapScriptHeader: .MapTriggers: db 0 @@ -9,62 +20,62 @@ TrainerKimono_girlNaoko2: trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, 0, Kimono_girlNaoko2Script Kimono_girlNaoko2Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x99579 + waitbutton closetext - loadmovesprites end TrainerKimono_girlSayo: trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, 0, Kimono_girlSayoScript Kimono_girlSayoScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x9960b + waitbutton closetext - loadmovesprites end TrainerKimono_girlZuki: trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, 0, Kimono_girlZukiScript Kimono_girlZukiScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x99688 + waitbutton closetext - loadmovesprites end TrainerKimono_girlKuni: trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, 0, Kimono_girlKuniScript Kimono_girlKuniScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x99714 + waitbutton closetext - loadmovesprites end TrainerKimono_girlMiki: trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, 0, Kimono_girlMikiScript Kimono_girlMikiScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x997a8 + waitbutton closetext - loadmovesprites end GentlemanScript_0x994c6: faceplayer - loadfont + opentext writetext UnknownText_0x9980a - keeptextopen + buttonsound checkevent EVENT_GOT_HM03_SURF iftrue UnknownScript_0x99515 checkevent EVENT_BEAT_KIMONO_GIRL_NAOKO @@ -83,38 +94,38 @@ UnknownScript_0x994f3: checkflag ENGINE_PLAYER_IS_FEMALE iftrue UnknownScript_0x994ff writetext UnknownText_0x99891 + waitbutton closetext - loadmovesprites end UnknownScript_0x994ff: writetext UnknownText_0x998d4 + waitbutton closetext - loadmovesprites end UnknownScript_0x99505: writetext UnknownText_0x9991a - keeptextopen + buttonsound verbosegiveitem HM_SURF setevent EVENT_GOT_HM03_SURF writetext UnknownText_0x9999b + waitbutton closetext - loadmovesprites end UnknownScript_0x99515: writetext UnknownText_0x999d5 + waitbutton closetext - loadmovesprites end RhydonScript_0x9951b: - loadfont + opentext writetext UnknownText_0x99a0a cry RHYDON + waitbutton closetext - loadmovesprites end CooltrainerMScript_0x99525: diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 88fa67028..ead75b1d8 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -1,3 +1,8 @@ +const_value set 2 + const DARKCAVEBLACKTHORNENTRANCE_PHARMACIST + const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1 + const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2 + DarkCaveBlackthornEntrance_MapScriptHeader: .MapTriggers: db 0 @@ -7,26 +12,26 @@ DarkCaveBlackthornEntrance_MapScriptHeader: PharmacistScript_0x18c720: faceplayer - loadfont + opentext checkevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE iftrue UnknownScript_0x18c735 writetext UnknownText_0x18c73f - keeptextopen + buttonsound verbosegiveitem BLACKGLASSES iffalse UnknownScript_0x18c739 setevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE UnknownScript_0x18c735: writetext UnknownText_0x18c80c - closetext + waitbutton UnknownScript_0x18c739: - loadmovesprites + closetext end -ItemFragment_0x18c73b: - db REVIVE, 1 +DarkCaveBlackthornEntranceRevive: + itemball REVIVE -ItemFragment_0x18c73d: - db TM_SNORE, 1 +DarkCaveBlackthornEntranceTMSnore: + itemball TM_SNORE UnknownText_0x18c73f: text "Whoa! You startled" @@ -74,5 +79,5 @@ DarkCaveBlackthornEntrance_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x18c720, -1 - person_event SPRITE_POKE_BALL, 24, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c73b, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE - person_event SPRITE_POKE_BALL, 22, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c73d, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE + person_event SPRITE_POKE_BALL, 24, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE + person_event SPRITE_POKE_BALL, 22, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index c8629f558..615a98c94 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -1,3 +1,13 @@ +const_value set 2 + const DARKCAVEVIOLETENTRANCE_POKE_BALL1 + const DARKCAVEVIOLETENTRANCE_ROCK1 + const DARKCAVEVIOLETENTRANCE_ROCK2 + const DARKCAVEVIOLETENTRANCE_ROCK3 + const DARKCAVEVIOLETENTRANCE_ROCK4 + const DARKCAVEVIOLETENTRANCE_POKE_BALL2 + const DARKCAVEVIOLETENTRANCE_POKE_BALL3 + const DARKCAVEVIOLETENTRANCE_POKE_BALL4 + DarkCaveVioletEntrance_MapScriptHeader: .MapTriggers: db 0 @@ -5,22 +15,22 @@ DarkCaveVioletEntrance_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x18c68e: - db POTION, 1 +DarkCaveVioletEntrancePotion: + itemball POTION -ItemFragment_0x18c690: - db FULL_HEAL, 1 +DarkCaveVioletEntranceFullHeal: + itemball FULL_HEAL -ItemFragment_0x18c692: - db HYPER_POTION, 1 +DarkCaveVioletEntranceHyperPotion: + itemball HYPER_POTION -ItemFragment_0x18c694: - db DIRE_HIT, 1 +DarkCaveVioletEntranceDireHit: + itemball DIRE_HIT DarkCaveVioletEntranceRock: jumpstd smashrock -MapDarkCaveVioletEntranceSignpostItem0: +DarkCaveVioletEntranceHiddenElixer: dwb EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER @@ -39,15 +49,15 @@ DarkCaveVioletEntrance_MapEventHeader: .Signposts: db 1 - signpost 3, 26, SIGNPOST_ITEM, MapDarkCaveVioletEntranceSignpostItem0 + signpost 3, 26, SIGNPOST_ITEM, DarkCaveVioletEntranceHiddenElixer .PersonEvents: db 8 - person_event SPRITE_POKE_BALL, 8, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c68e, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION + person_event SPRITE_POKE_BALL, 8, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION person_event SPRITE_ROCK, 14, 16, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 6, 27, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 14, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 31, 36, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_POKE_BALL, 22, 36, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c690, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL - person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c692, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION - person_event SPRITE_POKE_BALL, 28, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c694, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT + person_event SPRITE_POKE_BALL, 22, 36, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL + person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION + person_event SPRITE_POKE_BALL, 28, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 5c2ec8c56..d6fbd8853 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -1,3 +1,7 @@ +const_value set 2 + const DAYCARE_GRAMPS + const DAYCARE_GRANNY + DayCare_MapScriptHeader: .MapTriggers: db 0 @@ -7,79 +11,79 @@ DayCare_MapScriptHeader: ; callbacks - dbw 2, UnknownScript_0x62f7b + dbw 2, .EggCheckCallback -UnknownScript_0x62f7b: - checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE - iftrue UnknownScript_0x62f88 +.EggCheckCallback: + checkflag ENGINE_DAYCARE_MAN_HAS_EGG + iftrue .PutDaycareManOutside clearevent EVENT_DAYCARE_MAN_IN_DAYCARE setevent EVENT_DAYCARE_MAN_ON_ROUTE_34 return -UnknownScript_0x62f88: +.PutDaycareManOutside: setevent EVENT_DAYCARE_MAN_IN_DAYCARE clearevent EVENT_DAYCARE_MAN_ON_ROUTE_34 return -GrampsScript_0x62f8f: +DayCareManScript_Inside: faceplayer - loadfont + opentext checkevent EVENT_GOT_ODD_EGG - iftrue UnknownScript_0x62fbd - writetext UnknownText_0x630ce - keeptextopen - loadmovesprites + iftrue .AlreadyHaveOddEgg + writetext DayCareManText_GiveOddEgg + buttonsound + closetext checkcode VAR_PARTYCOUNT - if_equal $6, UnknownScript_0x62fb6 - special Function117656 - loadfont - writetext UnknownText_0x631ae + if_equal PARTY_LENGTH, .PartyFull + special Special_GiveOddEgg + opentext + writetext DayCareText_GotOddEgg playsound SFX_KEY_ITEM + waitsfx + writetext DayCareText_DescribeOddEgg waitbutton - writetext UnknownText_0x631c3 closetext - loadmovesprites setevent EVENT_GOT_ODD_EGG end -UnknownScript_0x62fb6: - loadfont - writetext UnknownText_0x63237 +.PartyFull: + opentext + writetext DayCareText_PartyFull + waitbutton closetext - loadmovesprites end -UnknownScript_0x62fbd: +.AlreadyHaveOddEgg: special Special_DayCareMan + waitbutton closetext - loadmovesprites end -GrannyScript_0x62fc3: +DayCareLadyScript: faceplayer - loadfont - checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE - iftrue UnknownScript_0x62fd1 + opentext + checkflag ENGINE_DAYCARE_MAN_HAS_EGG + iftrue .HusbandWasLookingForYou special Special_DayCareLady + waitbutton closetext - loadmovesprites end -UnknownScript_0x62fd1: - writetext UnknownText_0x62fda +.HusbandWasLookingForYou: + writetext Text_GrampsLookingForYou + waitbutton closetext - loadmovesprites end DayCareBookshelf: jumpstd difficultbookshelf -UnknownText_0x62fda: +Text_GrampsLookingForYou: text "Gramps was looking" line "for you." done -UnknownText_0x62ff7: +Text_DayCareManTalksAboutEggTicket: text "I'm the DAY-CARE" line "MAN." @@ -102,7 +106,7 @@ UnknownText_0x62ff7: line "as well have it." done -UnknownText_0x630ce: +DayCareManText_GiveOddEgg: text "I'm the DAY-CARE" line "MAN." @@ -126,16 +130,16 @@ UnknownText_0x630ce: line "yours to keep!" done -UnknownText_0x631a1: +DayCareText_ComeAgain: text "Come again." done -UnknownText_0x631ae: +DayCareText_GotOddEgg: text "<PLAYER> received" line "ODD EGG!" done -UnknownText_0x631c3: +DayCareText_DescribeOddEgg: text "I found that when" line "I was caring for" @@ -149,7 +153,7 @@ UnknownText_0x631c3: line "it around." done -UnknownText_0x63237: +DayCareText_PartyFull: text "You've no room for" line "this." done @@ -175,5 +179,5 @@ DayCare_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x62f8f, EVENT_DAYCARE_MAN_IN_DAYCARE - person_event SPRITE_GRANNY, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GrannyScript_0x62fc3, -1 + person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAYCARE_MAN_IN_DAYCARE + person_event SPRITE_GRANNY, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, DayCareLadyScript, -1 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 222330d3c..2f85c057d 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -1,3 +1,6 @@ +const_value set 2 + const DIGLETTSCAVE_POKEFAN_M + DiglettsCave_MapScriptHeader: .MapTriggers: db 0 @@ -8,7 +11,7 @@ DiglettsCave_MapScriptHeader: PokefanMScript_0x74002: jumptextfaceplayer UnknownText_0x74008 -MapDiglettsCaveSignpostItem0: +DiglettsCaveHiddenMaxRevive: dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE @@ -38,7 +41,7 @@ DiglettsCave_MapEventHeader: .Signposts: db 1 - signpost 11, 6, SIGNPOST_ITEM, MapDiglettsCaveSignpostItem0 + signpost 11, 6, SIGNPOST_ITEM, DiglettsCaveHiddenMaxRevive .PersonEvents: db 1 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 62fcf4acb..942920874 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -1,34 +1,40 @@ +const_value set 2 + const DRAGONSHRINE_ELDER1 + const DRAGONSHRINE_ELDER2 + const DRAGONSHRINE_ELDER3 + const DRAGONSHRINE_CLAIR + DragonShrine_MapScriptHeader: .MapTriggers: db 2 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 - dw .Trigger2, 0 .MapCallbacks: db 0 -.Trigger1: +.Trigger0: priorityjump DragonShrineTestScript end -.Trigger2: +.Trigger1: end DragonShrineTestScript: applymovement PLAYER, MovementData_0x18d2bf - applymovement $2, MovementData_0x18d2c7 - loadfont + applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c7 + opentext writetext UnknownText_0x18d2ea - keeptextopen + buttonsound .Question1: setevent EVENT_RECEIVED_BALLS_FROM_KURT writetext UnknownText_0x18d3bc - keeptextopen + buttonsound loadmenudata MenuDataHeader_0x18d215 - interpretmenu2 - writebackup + verticalmenu + closewindow if_equal $1, .RightAnswer if_equal $2, .WrongAnswer if_equal $3, .RightAnswer @@ -37,40 +43,40 @@ DragonShrineTestScript: .Question2: setevent EVENT_DRAGON_SHRINE_QUESTION_2 writetext UnknownText_0x18d3d3 - keeptextopen + buttonsound loadmenudata MenuDataHeader_0x18d234 - interpretmenu2 - writebackup + verticalmenu + closewindow if_equal $1, .RightAnswer if_equal $2, .RightAnswer if_equal $3, .WrongAnswer .Question3: setevent EVENT_DRAGON_SHRINE_QUESTION_3 writetext UnknownText_0x18d3f3 - keeptextopen + buttonsound loadmenudata MenuDataHeader_0x18d258 - interpretmenu2 - writebackup + verticalmenu + closewindow if_equal $1, .WrongAnswer if_equal $2, .RightAnswer if_equal $3, .RightAnswer .Question4: setevent EVENT_DRAGON_SHRINE_QUESTION_4 writetext UnknownText_0x18d420 - keeptextopen + buttonsound loadmenudata MenuDataHeader_0x18d283 - interpretmenu2 - writebackup + verticalmenu + closewindow if_equal $1, .RightAnswer if_equal $2, .WrongAnswer if_equal $3, .RightAnswer .Question5: setevent EVENT_DRAGON_SHRINE_QUESTION_5 writetext UnknownText_0x18d44a - keeptextopen + buttonsound loadmenudata MenuDataHeader_0x18d2a5 - interpretmenu2 - writebackup + verticalmenu + closewindow if_equal $1, .WrongAnswer if_equal $2, .RightAnswer if_equal $3, .WrongAnswer @@ -78,7 +84,7 @@ DragonShrineTestScript: checkevent EVENT_DRAGON_SHRINE_QUESTION_5 iftrue .PassedTheTest writetext UnknownText_0x18d82d - keeptextopen + buttonsound checkevent EVENT_DRAGON_SHRINE_QUESTION_4 iftrue .Question5 checkevent EVENT_DRAGON_SHRINE_QUESTION_3 @@ -88,19 +94,19 @@ DragonShrineTestScript: checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue .Question2 .WrongAnswer: - loadmovesprites - spriteface $2, LEFT - loadfont + closetext + spriteface DRAGONSHRINE_ELDER1, LEFT + opentext writetext UnknownText_0x18d7f6 + waitbutton closetext - loadmovesprites - spriteface $2, DOWN - loadfont + spriteface DRAGONSHRINE_ELDER1, DOWN + opentext writetext UnknownText_0x18d816 + waitbutton closetext - loadmovesprites setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG - loadfont + opentext checkevent EVENT_DRAGON_SHRINE_QUESTION_5 iftrue .Question5 checkevent EVENT_DRAGON_SHRINE_QUESTION_4 @@ -113,83 +119,83 @@ DragonShrineTestScript: iftrue .Question1 .PassedTheTest: writetext UnknownText_0x18d47c + waitbutton closetext - loadmovesprites playsound SFX_ENTER_DOOR showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_CLAIR - appear $5 - waitbutton + appear DRAGONSHRINE_CLAIR + waitsfx spriteface PLAYER, DOWN pause 30 - applymovement $5, MovementData_0x18d2d4 - spriteface $5, RIGHT + applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2d4 + spriteface DRAGONSHRINE_CLAIR, RIGHT spriteface PLAYER, LEFT - spriteface $2, LEFT - loadfont + spriteface DRAGONSHRINE_ELDER1, LEFT + opentext writetext UnknownText_0x18d916 + waitbutton closetext - loadmovesprites - special Special_RotatePalettesRightMusic - applymovement $5, MovementData_0x18d2da - loadfont + special Special_FadeOutMusic + applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2da + opentext writetext UnknownText_0x18d974 + waitbutton closetext - loadmovesprites - applymovement $5, MovementData_0x18d2dd - loadfont + applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2dd + opentext writetext UnknownText_0x18d983 + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x18d2c9 - spriteface $5, UP - loadfont + applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c9 + spriteface DRAGONSHRINE_CLAIR, UP + opentext writetext UnknownText_0x18d520 + waitbutton closetext - loadmovesprites - showemote EMOTE_SHOCK, $5, 15 - loadfont + showemote EMOTE_SHOCK, DRAGONSHRINE_CLAIR, 15 + opentext writetext UnknownText_0x18d9ae + waitbutton closetext - loadmovesprites - applymovement $5, MovementData_0x18d2e0 - loadfont + applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e0 + opentext writetext UnknownText_0x18d9bf - closetext + waitbutton setflag ENGINE_RISINGBADGE playsound SFX_GET_BADGE - waitbutton + waitsfx special RestartMapMusic specialphonecall SPECIALCALL_MASTERBALL dotrigger $1 domaptrigger DRAGONS_DEN_B1F, $1 writetext UnknownText_0x18d9f2 - keeptextopen + buttonsound writetext UnknownText_0x18da0b + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x18d2ce - spriteface $5, UP - applymovement $2, MovementData_0x18d2d1 + applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2ce + spriteface DRAGONSHRINE_CLAIR, UP + applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1 spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x18d5a3 + waitbutton closetext - loadmovesprites - loadfont + opentext writetext UnknownText_0x18dab4 + waitbutton closetext - loadmovesprites - applymovement $5, MovementData_0x18d2e3 + applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e3 playsound SFX_ENTER_DOOR - disappear $5 - waitbutton + disappear DRAGONSHRINE_CLAIR + waitsfx setevent EVENT_GAVE_KURT_APRICORNS end ElderScript_0x18d1a5: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iftrue .DontGiveDratiniYet checkevent EVENT_JUST_RECEIVED_DRATINI @@ -199,66 +205,66 @@ ElderScript_0x18d1a5: checkevent EVENT_BEAT_RIVAL_IN_MT_MOON iftrue .BeatRivalInMtMoon writetext UnknownText_0x18d724 + waitbutton closetext - loadmovesprites end .GiveDratini: writetext UnknownText_0x18d604 - closetext + waitbutton checkcode VAR_PARTYCOUNT if_equal 6, .PartyFull writetext UnknownText_0x18d697 playsound SFX_CAUGHT_MON - waitbutton + waitsfx givepoke DRATINI, 15 checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG special SpecialDratini setevent EVENT_GOT_DRATINI setevent EVENT_JUST_RECEIVED_DRATINI writetext UnknownText_0x18d6ca + waitbutton closetext - loadmovesprites end .PartyFull: writetext UnknownText_0x18d6ac + waitbutton closetext - loadmovesprites end .BeatRivalInMtMoon: writetext UnknownText_0x18d782 + waitbutton closetext - loadmovesprites end .DontGiveDratiniYet: writetext UnknownText_0x18d5e5 + waitbutton closetext - loadmovesprites end .ReceivedDratini: writetext UnknownText_0x18d6ca + waitbutton closetext - loadmovesprites end ElderScript_0x18d205: faceplayer - loadfont + opentext writetext UnknownText_0x18d840 + waitbutton closetext - loadmovesprites end ElderScript_0x18d20d: faceplayer - loadfont + opentext writetext UnknownText_0x18d8b1 + waitbutton closetext - loadmovesprites end diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index aaadae4d4..dd68d73f2 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -1,3 +1,4 @@ + DragonsDen1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index afeb0769a..5497bc90c 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -1,79 +1,90 @@ +const_value set 2 + const DRAGONSDENB1F_POKE_BALL1 + const DRAGONSDENB1F_CLAIR + const DRAGONSDENB1F_SILVER + const DRAGONSDENB1F_COOLTRAINER_M + const DRAGONSDENB1F_COOLTRAINER_F + const DRAGONSDENB1F_TWIN1 + const DRAGONSDENB1F_TWIN2 + const DRAGONSDENB1F_POKE_BALL2 + const DRAGONSDENB1F_POKE_BALL3 + DragonsDenB1F_MapScriptHeader: .MapTriggers: db 2 ; triggers - dw UnknownScript_0x18c89d, 0 - dw UnknownScript_0x18c89e, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 .MapCallbacks: db 1 ; callbacks - dbw 5, UnknownScript_0x18c89f + dbw 5, .CheckSilver -UnknownScript_0x18c89d: +.Trigger0: end -UnknownScript_0x18c89e: +.Trigger1: end -UnknownScript_0x18c89f: +.CheckSilver: checkevent EVENT_BEAT_RIVAL_IN_MT_MOON - iftrue UnknownScript_0x18c8a8 - disappear $4 + iftrue .CheckDay + disappear DRAGONSDENB1F_SILVER return -UnknownScript_0x18c8a8: +.CheckDay: checkcode VAR_WEEKDAY - if_equal TUESDAY, UnknownScript_0x18c8b5 - if_equal THURSDAY, UnknownScript_0x18c8b5 - disappear $4 + if_equal TUESDAY, .AppearSilver + if_equal THURSDAY, .AppearSilver + disappear DRAGONSDENB1F_SILVER return -UnknownScript_0x18c8b5: - appear $4 +.AppearSilver: + appear DRAGONSDENB1F_SILVER return -UnknownScript_0x18c8b8: - appear $3 - loadfont - writetext UnknownText_0x18c9b8 +DragonsDenB1F_ClairTrigger: + appear DRAGONSDENB1F_CLAIR + opentext + writetext ClairText_Wait pause 30 - loadmovesprites + closetext showemote EMOTE_SHOCK, PLAYER, 15 spriteface PLAYER, LEFT playmusic MUSIC_CLAIR - applymovement $3, MovementData_0x18c9ae - loadfont - writetext UnknownText_0x18c9bf - keeptextopen + applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksToYou + opentext + writetext ClairText_GiveDragonbreathDragonDen + buttonsound giveitem TM_DRAGONBREATH - iffalse UnknownScript_0x18c8f4 + iffalse .BagFull itemtotext TM_DRAGONBREATH, $0 - writetext UnknownText_0x18c9fb + writetext NotifyReceiveDragonbreath playsound SFX_ITEM - waitbutton + waitsfx itemnotify setevent EVENT_GOT_TM24_DRAGONBREATH - writetext UnknownText_0x18ca0d - keeptextopen - writetext UnknownText_0x18caf1 + writetext ClairText_DescribeDragonbreathDragonDen + buttonsound + writetext ClairText_WhatsTheMatterDragonDen + waitbutton closetext - loadmovesprites - jump UnknownScript_0x18c8f9 + jump .FinishClair -UnknownScript_0x18c8f4: - writetext UnknownText_0x18ca8b +.BagFull: + writetext ClairText_NoRoom + waitbutton closetext - loadmovesprites -UnknownScript_0x18c8f9: - applymovement $3, MovementData_0x18c9b3 - special Special_RotatePalettesRightMusic +.FinishClair: + applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksAway + special Special_FadeOutMusic pause 30 special RestartMapMusic - disappear $3 + disappear DRAGONSDENB1F_CLAIR dotrigger $0 end @@ -81,126 +92,129 @@ TrainerCooltrainermDarin: trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, CooltrainermDarinScript CooltrainermDarinScript: - talkaftercancel - loadfont - writetext UnknownText_0x18cd82 + end_if_just_battled + opentext + writetext CooltrainermDarinAfterText + waitbutton closetext - loadmovesprites end TrainerCooltrainerfCara: trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, CooltrainerfCaraScript CooltrainerfCaraScript: - talkaftercancel - loadfont - writetext UnknownText_0x18ce11 + end_if_just_battled + opentext + writetext CooltrainerfCaraAfterText + waitbutton closetext - loadmovesprites end TrainerTwinsLeaandpia1: trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, TwinsLeaandpia1Script TwinsLeaandpia1Script: - talkaftercancel - loadfont - writetext UnknownText_0x18ced3 + end_if_just_battled + opentext + writetext TrinsLeaandpia1AfterText + waitbutton closetext - loadmovesprites end TrainerTwinsLeaandpia2: trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, TwinsLeaandpia2Script TwinsLeaandpia2Script: - talkaftercancel - loadfont - writetext UnknownText_0x18cf0f + end_if_just_battled + opentext + writetext TrinsLeaandpia2AfterText + waitbutton closetext - loadmovesprites end PokeBallScript_0x18c95a: +; This whole script is written out rather than as an +; item fragment because it's left over from the GS +; event. giveitem DRAGON_FANG - iffalse UnknownScript_0x18c970 - disappear $2 - loadfont + iffalse .BagFull + disappear DRAGONSDENB1F_POKE_BALL1 + opentext itemtotext DRAGON_FANG, $0 - writetext UnknownText_0x18cf41 + writetext Text_FoundDragonFang playsound SFX_ITEM - waitbutton + waitsfx itemnotify - loadmovesprites + closetext end -UnknownScript_0x18c970: - loadfont +.BagFull: + opentext itemtotext DRAGON_FANG, $0 - writetext UnknownText_0x18cf41 - keeptextopen - writetext UnknownText_0x18cf51 + writetext Text_FoundDragonFang + buttonsound + writetext Text_NoRoomForDragonFang + waitbutton closetext - loadmovesprites end SilverScript_0x18c97e: playmusic MUSIC_RIVAL_ENCOUNTER faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS - iftrue UnknownScript_0x18c995 - writetext UnknownText_0x18cc83 + iftrue .SilverTalkAgain + writetext SilverText_Training1 + waitbutton closetext - loadmovesprites setevent EVENT_GAVE_KURT_APRICORNS special RestartMapMusic end -UnknownScript_0x18c995: - writetext UnknownText_0x18cd2d +.SilverTalkAgain: + writetext SilverText_Training2 + waitbutton closetext - loadmovesprites special RestartMapMusic end MapDragonsDenB1FSignpost0Script: - jumptext UnknownText_0x18cc2e + jumptext DragonShrineSignpostText -ItemFragment_0x18c9a1: - db CALCIUM, 1 +DragonsDenB1FCalcium: + itemball CALCIUM -ItemFragment_0x18c9a3: - db MAX_ELIXER, 1 +DragonsDenB1FMaxElixer: + itemball MAX_ELIXER -MapDragonsDenB1FSignpostItem1: +DragonsDenB1FHiddenRevive: dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE -MapDragonsDenB1FSignpostItem2: +DragonsDenB1FHiddenMaxPotion: dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION -MapDragonsDenB1FSignpostItem3: +DragonsDenB1FHiddenMaxElixer: dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER -MovementData_0x18c9ae: +MovementDragonsDen_ClairWalksToYou: slow_step_right slow_step_right slow_step_right slow_step_right step_end -MovementData_0x18c9b3: +MovementDragonsDen_ClairWalksAway: slow_step_left slow_step_left slow_step_left slow_step_left step_end -UnknownText_0x18c9b8: +ClairText_Wait: text "Wait!" done -UnknownText_0x18c9bf: +ClairText_GiveDragonbreathDragonDen: text "CLAIR: I'm sorry" line "about this." @@ -208,12 +222,12 @@ UnknownText_0x18c9bf: line "my apology." done -UnknownText_0x18c9fb: +NotifyReceiveDragonbreath: text "<PLAYER> received" line "TM24." done -UnknownText_0x18ca0d: +ClairText_DescribeDragonbreathDragonDen: text "That contains" line "DRAGONBREATH." @@ -226,7 +240,7 @@ UnknownText_0x18ca0d: cont "to take it." done -UnknownText_0x18ca8b: +ClairText_NoRoom: text "Oh? You don't have" line "any room for this." @@ -237,7 +251,7 @@ UnknownText_0x18ca8b: line "see me there." done -UnknownText_0x18caf1: +ClairText_WhatsTheMatterDragonDen: text "CLAIR: What's the" line "matter? Aren't you" @@ -270,7 +284,7 @@ UnknownText_0x18caf1: line "you've got." done -UnknownText_0x18cc2e: +DragonShrineSignpostText: text "DRAGON SHRINE" para "A shrine honoring" @@ -280,7 +294,7 @@ UnknownText_0x18cc2e: line "in DRAGON'S DEN." done -UnknownText_0x18cc83: +SilverText_Training1: text "…" line "What? <PLAYER>?" @@ -300,7 +314,7 @@ UnknownText_0x18cc83: line "MON trainer…" done -UnknownText_0x18cd2d: +SilverText_Training2: text "…" para "Whew…" @@ -318,7 +332,7 @@ CooltrainermDarinBeatenText: text "S-strong!" done -UnknownText_0x18cd82: +CooltrainermDarinAfterText: text "The SHRINE ahead" line "is home to the" @@ -338,7 +352,7 @@ CooltrainerfCaraBeatenText: text "Oh yikes, I lost!" done -UnknownText_0x18ce11: +CooltrainerfCaraAfterText: text "Soon I'm going to" line "get permission" @@ -364,7 +378,7 @@ TwinsLeaandpia1BeatenText: text "Ouchies." done -UnknownText_0x18ced3: +TrinsLeaandpia1AfterText: text "It was like having" line "to battle LANCE." done @@ -377,21 +391,21 @@ TwinsLeaandpia2BeatenText: text "Meanie." done -UnknownText_0x18cf0f: +TrinsLeaandpia2AfterText: text "We'll tell on you." para "MASTER will be" line "angry with you." done -UnknownText_0x18cf41: +Text_FoundDragonFang: text "<PLAYER> found" line "@" text_from_ram StringBuffer3 text "!" done -UnknownText_0x18cf51: +Text_NoRoomForDragonFang: text "But <PLAYER> can't" line "carry any more" cont "items." @@ -408,14 +422,14 @@ DragonsDenB1F_MapEventHeader: .XYTriggers: db 1 - xy_trigger 1, $1e, $13, $0, UnknownScript_0x18c8b8, $0, $0 + xy_trigger 1, $1e, $13, $0, DragonsDenB1F_ClairTrigger, $0, $0 .Signposts: db 4 signpost 24, 18, SIGNPOST_READ, MapDragonsDenB1FSignpost0Script - signpost 29, 33, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem1 - signpost 17, 21, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem2 - signpost 15, 31, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem3 + signpost 29, 33, SIGNPOST_ITEM, DragonsDenB1FHiddenRevive + signpost 17, 21, SIGNPOST_ITEM, DragonsDenB1FHiddenMaxPotion + signpost 15, 31, SIGNPOST_ITEM, DragonsDenB1FHiddenMaxElixer .PersonEvents: db 9 @@ -426,5 +440,5 @@ DragonsDenB1F_MapEventHeader: person_event SPRITE_COOLTRAINER_F, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1 person_event SPRITE_TWIN, 17, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1 person_event SPRITE_TWIN, 18, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1 - person_event SPRITE_POKE_BALL, 4, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c9a1, EVENT_DRAGONS_DEN_B1F_CALCIUM - person_event SPRITE_POKE_BALL, 20, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c9a3, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER + person_event SPRITE_POKE_BALL, 4, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM + person_event SPRITE_POKE_BALL, 20, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 64b541994..865e34c1c 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -1,3 +1,11 @@ +const_value set 2 + const EARLSPOKEMONACADEMY_FISHER + const EARLSPOKEMONACADEMY_YOUNGSTER1 + const EARLSPOKEMONACADEMY_GAMEBOY_KID1 + const EARLSPOKEMONACADEMY_GAMEBOY_KID2 + const EARLSPOKEMONACADEMY_YOUNGSTER2 + const EARLSPOKEMONACADEMY_POKEDEX + EarlsPokemonAcademy_MapScriptHeader: .MapTriggers: db 0 @@ -6,9 +14,9 @@ EarlsPokemonAcademy_MapScriptHeader: db 0 AcademyEarl: - applymovement $2, MovementData_0x68b2d + applymovement EARLSPOKEMONACADEMY_FISHER, MovementData_0x68b2d faceplayer - loadfont + opentext writetext UnknownText_0x68b3b yesorno iffalse .Part1 @@ -20,14 +28,14 @@ AcademyEarl: yesorno iffalse .Done writetext UnknownText_0x68c7b + waitbutton closetext - loadmovesprites end .Done writetext UnknownText_0x68d31 + waitbutton closetext - loadmovesprites end YoungsterScript_0x68a83: @@ -35,63 +43,63 @@ YoungsterScript_0x68a83: GameboyKidScript_0x68a86: faceplayer - loadfont + opentext writetext UnknownText_0x68dda + waitbutton closetext - loadmovesprites - spriteface $4, DOWN + spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN end GameboyKidScript_0x68a91: faceplayer - loadfont + opentext writetext UnknownText_0x68e07 + waitbutton closetext - loadmovesprites - spriteface $5, DOWN + spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN end YoungsterScript_0x68a9c: jumptextfaceplayer UnknownText_0x68e39 AcademyBlackboard: - loadfont + opentext writetext AcademyBlackboardText .Loop loadmenudata .MenuHeader - interpretmenu - writebackup + _2dmenu + closewindow if_equal $1, .Poison if_equal $2, .Paralysis if_equal $3, .Sleep if_equal $4, .Burn if_equal $5, .Freeze - loadmovesprites + closetext end .Poison writetext AcademyPoisonText - closetext + waitbutton jump .Loop .Paralysis writetext AcademyParalysisText - closetext + waitbutton jump .Loop .Sleep writetext AcademySleepText - closetext + waitbutton jump .Loop .Burn writetext AcademyBurnText - closetext + waitbutton jump .Loop .Freeze: writetext AcademyFreezeText - closetext + waitbutton jump .Loop .MenuHeader @@ -106,7 +114,7 @@ AcademyBlackboard: dn 3, 2 ; rows, columns db 5 ; spacing dba .Text - dbw $1a, 0 + dbw BANK(AcademyBlackboard), 0 .Text db "PSN@" @@ -117,7 +125,7 @@ AcademyBlackboard: db "QUIT@" AcademyNotebook: - loadfont + opentext writetext AcademyNotebookText yesorno iffalse .Done @@ -128,9 +136,9 @@ AcademyNotebook: yesorno iffalse .Done writetext AcademyNotebookText3 - closetext + waitbutton .Done - loadmovesprites + closetext end AcademyStickerMachine: diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index fc2d407a7..0b5fd1192 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -1,3 +1,12 @@ +const_value set 2 + const ECRUTEAKCITY_GRAMPS1 + const ECRUTEAKCITY_GRAMPS2 + const ECRUTEAKCITY_LASS1 + const ECRUTEAKCITY_LASS2 + const ECRUTEAKCITY_FISHER + const ECRUTEAKCITY_YOUNGSTER + const ECRUTEAKCITY_GRAMPS3 + EcruteakCity_MapScriptHeader: .MapTriggers: db 0 @@ -26,34 +35,34 @@ LassScript_0x1a4012: LassScript_0x1a4015: faceplayer - loadfont + opentext checkevent EVENT_RELEASED_THE_BEASTS iftrue UnknownScript_0x1a4023 writetext UnknownText_0x1a421a + waitbutton closetext - loadmovesprites end UnknownScript_0x1a4023: writetext UnknownText_0x1a4269 + waitbutton closetext - loadmovesprites end FisherScript_0x1a4029: faceplayer - loadfont + opentext checkevent EVENT_JASMINE_RETURNED_TO_GYM iftrue UnknownScript_0x1a4037 writetext UnknownText_0x1a42ac + waitbutton closetext - loadmovesprites end UnknownScript_0x1a4037: writetext UnknownText_0x1a4325 + waitbutton closetext - loadmovesprites end YoungsterScript_0x1a403d: @@ -80,7 +89,7 @@ EcruteakCityPokeCenterSign: EcruteakCityMartSign: jumpstd martsign -MapEcruteakCitySignpostItem7: +EcruteakCityHiddenHyperPotion: dwb EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION UnusedMissingDaughterText: @@ -286,7 +295,7 @@ EcruteakCity_MapEventHeader: signpost 10, 2, SIGNPOST_READ, BurnedTowerSign signpost 27, 24, SIGNPOST_READ, EcruteakCityPokeCenterSign signpost 21, 30, SIGNPOST_READ, EcruteakCityMartSign - signpost 14, 23, SIGNPOST_ITEM, MapEcruteakCitySignpostItem7 + signpost 14, 23, SIGNPOST_ITEM, EcruteakCityHiddenHyperPotion .PersonEvents: db 7 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index f3e136c9d..43193217c 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -1,3 +1,12 @@ +const_value set 2 + const ECRUTEAKGYM_MORTY + const ECRUTEAKGYM_SAGE1 + const ECRUTEAKGYM_SAGE2 + const ECRUTEAKGYM_GRANNY1 + const ECRUTEAKGYM_GRANNY2 + const ECRUTEAKGYM_GYM_GUY + const ECRUTEAKGYM_GRAMPS + EcruteakGym_MapScriptHeader: .MapTriggers: db 2 @@ -18,21 +27,21 @@ UnknownScript_0x99d57: MortyScript_0x99d58: faceplayer - loadfont + opentext checkevent EVENT_BEAT_MORTY iftrue .FightDone writetext UnknownText_0x99e65 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x9a00a, 0 loadtrainer MORTY, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_MORTY - loadfont + opentext writetext UnknownText_0x9a043 playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_FOGBADGE checkcode VAR_BADGES scall EcruteakGymTriggerRockets @@ -47,20 +56,20 @@ MortyScript_0x99d58: setevent EVENT_BEAT_MEDIUM_MARTHA setevent EVENT_BEAT_MEDIUM_GRACE writetext UnknownText_0x9a059 - keeptextopen + buttonsound verbosegiveitem TM_SHADOW_BALL iffalse UnknownScript_0x99db5 setevent EVENT_GOT_TM30_SHADOW_BALL writetext UnknownText_0x9a0ec + waitbutton closetext - loadmovesprites end UnknownScript_0x99db1: writetext UnknownText_0x9a145 - closetext + waitbutton UnknownScript_0x99db5: - loadmovesprites + closetext end EcruteakGymTriggerRockets: @@ -76,17 +85,17 @@ EcruteakGymTriggerRockets: UnknownScript_0x99dc6: applymovement PLAYER, MovementData_0x99e5d - applymovement $8, MovementData_0x99e63 - loadfont + applymovement ECRUTEAKGYM_GRAMPS, MovementData_0x99e63 + opentext writetext UnknownText_0x9a49c + waitbutton closetext - loadmovesprites - follow PLAYER, $8 + follow PLAYER, ECRUTEAKGYM_GRAMPS applymovement PLAYER, MovementData_0x99e5f stopfollow special FadeOutPalettes playsound SFX_ENTER_DOOR - waitbutton + waitsfx warp ECRUTEAK_CITY, $6, $1b end @@ -94,60 +103,60 @@ TrainerSageJeffrey: trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, SageJeffreyScript SageJeffreyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x9a263 + waitbutton closetext - loadmovesprites end TrainerSagePing: trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, 0, SagePingScript SagePingScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x9a2b7 + waitbutton closetext - loadmovesprites end TrainerMediumMartha: trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, MediumMarthaScript MediumMarthaScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x9a318 + waitbutton closetext - loadmovesprites end TrainerMediumGrace: trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, MediumGraceScript MediumGraceScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x9a38a + waitbutton closetext - loadmovesprites end EcruteakGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_MORTY iftrue .EcruteakGymGuyWinScript writetext EcruteakGymGuyText + waitbutton closetext - loadmovesprites end .EcruteakGymGuyWinScript writetext EcruteakGymGuyWinText + waitbutton closetext - loadmovesprites end EcruteakGymStatue: diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 5719e14bc..e8de95bc7 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -1,10 +1,16 @@ +const_value set 2 + const ECRUTEAKHOUSE_SAGE1 + const ECRUTEAKHOUSE_SAGE2 + const ECRUTEAKHOUSE_SAGE3 + const ECRUTEAKHOUSE_GRAMPS + EcruteakHouse_MapScriptHeader: .MapTriggers: db 2 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 - dw .Trigger2, 0 .MapCallbacks: db 1 @@ -13,10 +19,10 @@ EcruteakHouse_MapScriptHeader: dbw 2, .InitializeSages -.Trigger1: +.Trigger0: end -.Trigger2: +.Trigger1: end .InitializeSages: @@ -45,21 +51,21 @@ EcruteakHouse_MapScriptHeader: EcruteakHouse_XYTrigger1: checkevent EVENT_RANG_CLEAR_BELL_2 iftrue EcruteakHouse_XYTrigger_DontMove - applymovement $3, MovementData_0x980c7 - moveperson $2, $4, $6 - appear $2 + applymovement ECRUTEAKHOUSE_SAGE2, MovementData_0x980c7 + moveperson ECRUTEAKHOUSE_SAGE1, $4, $6 + appear ECRUTEAKHOUSE_SAGE1 pause 5 - disappear $3 + disappear ECRUTEAKHOUSE_SAGE2 end EcruteakHouse_XYTrigger2: checkevent EVENT_RANG_CLEAR_BELL_1 iftrue EcruteakHouse_XYTrigger_DontMove - applymovement $2, MovementData_0x980cc - moveperson $3, $5, $6 - appear $3 + applymovement ECRUTEAKHOUSE_SAGE1, MovementData_0x980cc + moveperson ECRUTEAKHOUSE_SAGE2, $5, $6 + appear ECRUTEAKHOUSE_SAGE2 pause 5 - disappear $2 + disappear ECRUTEAKHOUSE_SAGE1 end EcruteakHouse_XYTrigger_DontMove: @@ -67,20 +73,20 @@ EcruteakHouse_XYTrigger_DontMove: SageScript_0x98062: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_RADIO_TOWER iftrue .CheckForClearBell checkflag ENGINE_FOGBADGE iftrue .BlockPassage_GotFogBadge writetext UnknownText_0x980d1 + waitbutton closetext - loadmovesprites end .BlockPassage_GotFogBadge: writetext UnknownText_0x98131 + waitbutton closetext - loadmovesprites end .CheckForClearBell: @@ -91,14 +97,14 @@ SageScript_0x98062: checkitem CLEAR_BELL iftrue .RingClearBell writetext UnknownText_0x981a4 + waitbutton closetext - loadmovesprites end .RingClearBell: writetext UnknownText_0x98250 + waitbutton closetext - loadmovesprites dotrigger $1 setevent EVENT_RANG_CLEAR_BELL_2 clearevent EVENT_RANG_CLEAR_BELL_1 @@ -107,30 +113,30 @@ SageScript_0x98062: .AllowedThrough: writetext UnknownText_0x9837e + waitbutton closetext - loadmovesprites end .Event000: writetext UnknownText_0x98391 + waitbutton closetext - loadmovesprites end SageScript_0x980b0: faceplayer - loadfont + opentext checkevent EVENT_GOT_CLEAR_BELL iftrue .GotClearBell writetext UnknownText_0x9840b + waitbutton closetext - loadmovesprites end .GotClearBell: writetext UnknownText_0x9846f + waitbutton closetext - loadmovesprites end GrampsScript_0x980c4: diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index a6e2c872f..f053c9442 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ECRUTEAKITEMFINDERHOUSE_COOLTRAINER_M + const ECRUTEAKITEMFINDERHOUSE_POKEDEX + EcruteakItemfinderHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,47 +11,47 @@ EcruteakItemfinderHouse_MapScriptHeader: CooltrainerMScript_0x9a5fb: faceplayer - loadfont + opentext checkevent EVENT_GOT_ITEMFINDER iftrue UnknownScript_0x9a614 writetext UnknownText_0x9a63c yesorno iffalse UnknownScript_0x9a61a writetext UnknownText_0x9a6b5 - keeptextopen + buttonsound verbosegiveitem ITEMFINDER setevent EVENT_GOT_ITEMFINDER UnknownScript_0x9a614: writetext UnknownText_0x9a70e + waitbutton closetext - loadmovesprites end UnknownScript_0x9a61a: writetext UnknownText_0x9a805 + waitbutton closetext - loadmovesprites end PokedexScript_0x9a620: - loadfont + opentext writetext UnknownText_0x9a826 yesorno iftrue UnknownScript_0x9a62a - loadmovesprites + closetext end UnknownScript_0x9a62a: writetext UnknownText_0x9a84c yesorno iftrue UnknownScript_0x9a633 - loadmovesprites + closetext end UnknownScript_0x9a633: writetext UnknownText_0x9a902 + waitbutton closetext - loadmovesprites end ItemFinderHouseRadio: diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index f200a2ed4..4307a19c9 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ECRUTEAKLUGIASPEECHHOUSE_GRAMPS + const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER + EcruteakLugiaSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index d10ee827a..052b4c40d 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ECRUTEAKMART_CLERK + const ECRUTEAKMART_SUPER_NERD + const ECRUTEAKMART_GRANNY + EcruteakMart_MapScriptHeader: .MapTriggers: db 0 @@ -6,9 +11,9 @@ EcruteakMart_MapScriptHeader: db 0 ClerkScript_0x99c3b: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_ECRUTEAK - loadmovesprites + closetext end SuperNerdScript_0x99c42: diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index be51b7764..cc116f862 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const ECRUTEAKPOKECENTER1F_NURSE + const ECRUTEAKPOKECENTER1F_POKEFAN_M + const ECRUTEAKPOKECENTER1F_COOLTRAINER_F + const ECRUTEAKPOKECENTER1F_GYM_GUY + const ECRUTEAKPOKECENTER1F_BILL + EcruteakPokeCenter1F_MapScriptHeader: .MapTriggers: db 2 @@ -19,37 +26,37 @@ UnknownScript_0x98e63: UnknownScript_0x98e64: pause 30 playsound SFX_EXIT_BUILDING - appear $6 - waitbutton - applymovement $6, MovementData_0x98ec5 + appear ECRUTEAKPOKECENTER1F_BILL + waitsfx + applymovement ECRUTEAKPOKECENTER1F_BILL, MovementData_0x98ec5 applymovement PLAYER, MovementData_0x98ed4 - spriteface $2, UP + spriteface ECRUTEAKPOKECENTER1F_NURSE, UP pause 10 - spriteface $2, DOWN + spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN pause 30 - spriteface $2, UP + spriteface ECRUTEAKPOKECENTER1F_NURSE, UP pause 10 - spriteface $2, DOWN + spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN pause 20 - spriteface $6, DOWN + spriteface ECRUTEAKPOKECENTER1F_BILL, DOWN pause 10 - loadfont + opentext writetext UnknownText_0x98ed8 - keeptextopen + buttonsound jump UnknownScript_0x98e95 UnknownScript_0x98e95: writetext UnknownText_0x98f22 + waitbutton closetext - loadmovesprites spriteface PLAYER, DOWN - applymovement $6, MovementData_0x98ece + applymovement ECRUTEAKPOKECENTER1F_BILL, MovementData_0x98ece playsound SFX_EXIT_BUILDING - disappear $6 + disappear ECRUTEAKPOKECENTER1F_BILL clearevent EVENT_MET_BILL setflag ENGINE_TIME_CAPSULE dotrigger $1 - waitbutton + waitsfx end NurseScript_0x98eb0: diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 9672611e8..950d7a6f3 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ELMSHOUSE_TEACHER + const ELMSHOUSE_BUG_CATCHER + ElmsHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index af3545944..f24586f31 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1,53 +1,61 @@ +const_value set 2 + const ELMSLAB_ELM + const ELMSLAB_SCIENTIST + const ELMSLAB_POKE_BALL1 + const ELMSLAB_POKE_BALL2 + const ELMSLAB_POKE_BALL3 + const ELMSLAB_OFFICER + ElmsLab_MapScriptHeader: .MapTriggers: db 6 ; triggers - dw UnknownScript_0x78b7a, 0 - dw UnknownScript_0x78b7e, 0 - dw UnknownScript_0x78b7f, 0 - dw UnknownScript_0x78b80, 0 - dw UnknownScript_0x78b81, 0 - dw UnknownScript_0x78b82, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 + dw .Trigger2, 0 + dw .Trigger3, 0 + dw .Trigger4, 0 + dw .Trigger5, 0 .MapCallbacks: db 1 ; callbacks - dbw 2, ElmsLab_PutElmAtLaptop + dbw 2, .Callback_MoveElm -UnknownScript_0x78b7a: +.Trigger0: priorityjump ElmsLab_AutowalkUpToElm end -UnknownScript_0x78b7e: +.Trigger1: end -UnknownScript_0x78b7f: +.Trigger2: end -UnknownScript_0x78b80: +.Trigger3: end -UnknownScript_0x78b81: +.Trigger4: end -UnknownScript_0x78b82: +.Trigger5: end -ElmsLab_PutElmAtLaptop: +.Callback_MoveElm: checktriggers iftrue .Skip - moveperson $2, $3, $4 + moveperson ELMSLAB_ELM, $3, $4 .Skip: return ElmsLab_AutowalkUpToElm: applymovement PLAYER, ElmsLab_WalkUpToElmMovement - showemote EMOTE_SHOCK, $2, 15 - spriteface $2, RIGHT - loadfont + showemote EMOTE_SHOCK, ELMSLAB_ELM, 15 + spriteface ELMSLAB_ELM, RIGHT + opentext writetext ElmText_Intro ElmsLab_RefuseLoop: yesorno @@ -57,37 +65,37 @@ ElmsLab_RefuseLoop: ElmsLab_ElmGetsEmail: writetext ElmText_Accepted - keeptextopen + buttonsound writetext ElmText_ResearchAmbitions + waitbutton closetext - loadmovesprites playsound SFX_GLASS_TING pause 30 - showemote EMOTE_SHOCK, $2, 10 - spriteface $2, DOWN - loadfont + showemote EMOTE_SHOCK, ELMSLAB_ELM, 10 + spriteface ELMSLAB_ELM, DOWN + opentext writetext ElmText_GotAnEmail + waitbutton closetext - loadmovesprites - loadfont - spriteface $2, RIGHT + opentext + spriteface ELMSLAB_ELM, RIGHT writetext ElmText_MissionFromMrPokemon + waitbutton closetext - loadmovesprites - applymovement $2, ElmsLab_ElmToDefaultPositionMovement1 + applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement1 spriteface PLAYER, UP - applymovement $2, ElmsLab_ElmToDefaultPositionMovement2 + applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement2 spriteface PLAYER, RIGHT - loadfont + opentext writetext ElmText_ChooseAPokemon - closetext + waitbutton dotrigger $1 - loadmovesprites + closetext end ProfElmScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_SS_TICKET_FROM_ELM iftrue ElmCheckMasterBall checkevent EVENT_BEAT_ELITE_FOUR @@ -111,8 +119,8 @@ ElmCheckEverstone: special Special_FindThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writetext UnknownText_0x79a40 + waitbutton closetext - loadmovesprites end ElmEggHatchedScript: @@ -141,134 +149,134 @@ ElmCheckGotEggAgain: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue ElmDescribesMrPokemonScript writetext ElmText_LetYourMonBattleIt + waitbutton closetext - loadmovesprites end LabTryToLeaveScript: - spriteface $2, DOWN - loadfont + spriteface ELMSLAB_ELM, DOWN + opentext writetext LabWhereGoingText + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x78f70 end CyndaquilPokeBallScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript - spriteface $2, DOWN + spriteface ELMSLAB_ELM, DOWN refreshscreen $0 pokepic CYNDAQUIL cry CYNDAQUIL - closetext - pokepicyesorno - loadfont + waitbutton + closepokepic + opentext writetext TakeCyndaquilText yesorno iffalse DidntChooseStarterScript - disappear $4 + disappear ELMSLAB_POKE_BALL1 setevent EVENT_GOT_CYNDAQUIL_FROM_ELM writetext ChoseStarterText - keeptextopen - waitbutton + buttonsound + waitsfx pokenamemem CYNDAQUIL, $0 writetext ReceivedStarterText playsound SFX_CAUGHT_MON - waitbutton - keeptextopen + waitsfx + buttonsound givepoke CYNDAQUIL, 5, BERRY - loadmovesprites + closetext checkcode VAR_FACING - if_equal $3, ElmDirectionsScript + if_equal RIGHT, ElmDirectionsScript applymovement PLAYER, AfterCyndaquilMovement jump ElmDirectionsScript TotodilePokeBallScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript - spriteface $2, DOWN + spriteface ELMSLAB_ELM, DOWN refreshscreen $0 pokepic TOTODILE cry TOTODILE - closetext - pokepicyesorno - loadfont + waitbutton + closepokepic + opentext writetext TakeTotodileText yesorno iffalse DidntChooseStarterScript - disappear $5 + disappear ELMSLAB_POKE_BALL2 setevent EVENT_GOT_TOTODILE_FROM_ELM writetext ChoseStarterText - keeptextopen - waitbutton + buttonsound + waitsfx pokenamemem TOTODILE, $0 writetext ReceivedStarterText playsound SFX_CAUGHT_MON - waitbutton - keeptextopen + waitsfx + buttonsound givepoke TOTODILE, 5, BERRY - loadmovesprites + closetext applymovement PLAYER, AfterTotodileMovement jump ElmDirectionsScript ChikoritaPokeBallScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript - spriteface $2, DOWN + spriteface ELMSLAB_ELM, DOWN refreshscreen $0 pokepic CHIKORITA cry CHIKORITA - closetext - pokepicyesorno - loadfont + waitbutton + closepokepic + opentext writetext TakeChikoritaText yesorno iffalse DidntChooseStarterScript - disappear $6 + disappear ELMSLAB_POKE_BALL3 setevent EVENT_GOT_CHIKORITA_FROM_ELM writetext ChoseStarterText - keeptextopen - waitbutton + buttonsound + waitsfx pokenamemem CHIKORITA, $0 writetext ReceivedStarterText playsound SFX_CAUGHT_MON - waitbutton - keeptextopen + waitsfx + buttonsound givepoke CHIKORITA, 5, BERRY - loadmovesprites + closetext applymovement PLAYER, AfterChikoritaMovement jump ElmDirectionsScript DidntChooseStarterScript: writetext DidntChooseStarterText + waitbutton closetext - loadmovesprites end ElmDirectionsScript: spriteface PLAYER, UP - loadfont + opentext writetext ElmDirectionsText1 + waitbutton closetext - loadmovesprites addcellnum PHONE_ELM - loadfont + opentext writetext GotElmsNumberText playsound SFX_REGISTER_PHONE_NUMBER + waitsfx waitbutton closetext - loadmovesprites - spriteface $2, LEFT - loadfont + spriteface ELMSLAB_ELM, LEFT + opentext writetext ElmDirectionsText2 + waitbutton closetext - loadmovesprites - spriteface $2, DOWN - loadfont + spriteface ELMSLAB_ELM, DOWN + opentext writetext ElmDirectionsText3 + waitbutton closetext - loadmovesprites setevent EVENT_GOT_A_POKEMON_FROM_ELM setevent EVENT_RIVAL_CHERRYGROVE_CITY dotrigger $5 @@ -277,31 +285,31 @@ ElmDirectionsScript: ElmDescribesMrPokemonScript: writetext ElmDescribesMrPokemonText + waitbutton closetext - loadmovesprites end LookAtElmPokeBallScript: - loadfont + opentext writetext ElmPokeBallText + waitbutton closetext - loadmovesprites end ElmsLabHealingMachine: - loadfont + opentext checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue .CanHeal writetext ElmsLabHealingMachineText1 + waitbutton closetext - loadmovesprites end .CanHeal writetext ElmsLabHealingMachineText2 yesorno iftrue ElmsLabHealingMachine_HealParty - loadmovesprites + closetext end ElmsLabHealingMachine_HealParty: @@ -312,112 +320,112 @@ ElmsLabHealingMachine_HealParty: special HealMachineAnim pause 30 special RestartMapMusic - loadmovesprites + closetext end ElmAfterTheftDoneScript: + waitbutton closetext - loadmovesprites end ElmAfterTheftScript: writetext ElmAfterTheftText1 checkitem MYSTERY_EGG iffalse ElmAfterTheftDoneScript - keeptextopen + buttonsound writetext ElmAfterTheftText2 - closetext + waitbutton takeitem MYSTERY_EGG scall ElmJumpBackScript1 writetext ElmAfterTheftText3 - closetext + waitbutton scall ElmJumpBackScript2 writetext ElmAfterTheftText4 - keeptextopen + buttonsound writetext ElmAfterTheftText5 - keeptextopen + buttonsound setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM setflag ENGINE_BUG_CONTEST_ON domaptrigger ROUTE_29, $1 clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY setevent EVENT_ROUTE_30_BATTLE writetext ElmAfterTheftText6 + waitbutton closetext - loadmovesprites dotrigger $6 end ElmStudyingEggScript: writetext ElmStudyingEggText + waitbutton closetext - loadmovesprites end ElmAideHasEggScript: writetext ElmAideHasEggText + waitbutton closetext - loadmovesprites end ElmWaitingEggHatchScript: writetext ElmWaitingEggHatchText + waitbutton closetext - loadmovesprites end ShowElmTogepiScript: writetext ShowElmTogepiText1 + waitbutton closetext - loadmovesprites - showemote EMOTE_SHOCK, $2, 15 + showemote EMOTE_SHOCK, ELMSLAB_ELM, 15 setevent EVENT_SHOWED_TOGEPI_TO_ELM - loadfont + opentext writetext ShowElmTogepiText2 - keeptextopen + buttonsound writetext ShowElmTogepiText3 - keeptextopen + buttonsound ElmGiveEverstoneScript: writetext ElmGiveEverstoneText1 - keeptextopen + buttonsound verbosegiveitem EVERSTONE iffalse ElmScript_NoRoomForEverstone writetext ElmGiveEverstoneText2 + waitbutton closetext - loadmovesprites setevent EVENT_GOT_EVERSTONE_FROM_ELM end ElmScript_CallYou: writetext ElmText_CallYou - closetext + waitbutton ElmScript_NoRoomForEverstone: - loadmovesprites + closetext end ElmGiveMasterBallScript: writetext ElmGiveMasterBallText1 - keeptextopen + buttonsound verbosegiveitem MASTER_BALL iffalse .notdone setevent EVENT_GOT_MASTER_BALL_FROM_ELM writetext ElmGiveMasterBallText2 - closetext + waitbutton .notdone - loadmovesprites + closetext end ElmGiveTicketScript: writetext ElmGiveTicketText1 - keeptextopen + buttonsound verbosegiveitem S_S_TICKET setevent EVENT_GOT_SS_TICKET_FROM_ELM writetext ElmGiveTicketText2 + waitbutton closetext - loadmovesprites end ElmJumpBackScript1: - loadmovesprites + closetext checkcode VAR_FACING if_equal DOWN, ElmJumpDownScript if_equal UP, ElmJumpUpScript @@ -426,7 +434,7 @@ ElmJumpBackScript1: end ElmJumpBackScript2: - loadmovesprites + closetext checkcode VAR_FACING if_equal DOWN, ElmJumpUpScript if_equal UP, ElmJumpDownScript @@ -435,75 +443,75 @@ ElmJumpBackScript2: end ElmJumpUpScript: - applymovement $2, ElmJumpUpMovement - loadfont + applymovement ELMSLAB_ELM, ElmJumpUpMovement + opentext end ElmJumpDownScript: - applymovement $2, ElmJumpDownMovement - loadfont + applymovement ELMSLAB_ELM, ElmJumpDownMovement + opentext end ElmJumpLeftScript: - applymovement $2, ElmJumpLeftMovement - loadfont + applymovement ELMSLAB_ELM, ElmJumpLeftMovement + opentext end ElmJumpRightScript: - applymovement $2, ElmJumpRightMovement - loadfont + applymovement ELMSLAB_ELM, ElmJumpRightMovement + opentext end AideScript_WalkPotions1: - applymovement $3, AideWalksRight1 + applymovement ELMSLAB_SCIENTIST, AideWalksRight1 spriteface PLAYER, DOWN scall AideScript_GivePotions - applymovement $3, AideWalksLeft1 + applymovement ELMSLAB_SCIENTIST, AideWalksLeft1 end AideScript_WalkPotions2: - applymovement $3, AideWalksRight2 + applymovement ELMSLAB_SCIENTIST, AideWalksRight2 spriteface PLAYER, DOWN scall AideScript_GivePotions - applymovement $3, AideWalksLeft2 + applymovement ELMSLAB_SCIENTIST, AideWalksLeft2 end AideScript_GivePotions: - loadfont + opentext writetext AideText_GiveYouPotions - keeptextopen + buttonsound verbosegiveitem POTION writetext AideText_AlwaysBusy + waitbutton closetext - loadmovesprites dotrigger $2 end AideScript_WalkBalls1: - applymovement $3, AideWalksRight1 + applymovement ELMSLAB_SCIENTIST, AideWalksRight1 spriteface PLAYER, DOWN scall AideScript_GiveYouBalls - applymovement $3, AideWalksLeft1 + applymovement ELMSLAB_SCIENTIST, AideWalksLeft1 end AideScript_WalkBalls2: - applymovement $3, AideWalksRight2 + applymovement ELMSLAB_SCIENTIST, AideWalksRight2 spriteface PLAYER, DOWN scall AideScript_GiveYouBalls - applymovement $3, AideWalksLeft2 + applymovement ELMSLAB_SCIENTIST, AideWalksLeft2 end AideScript_GiveYouBalls: - loadfont + opentext writetext AideText_GiveYouBalls - keeptextopen + buttonsound itemtotext POKE_BALL, $1 scall AideScript_ReceiveTheBalls giveitem POKE_BALL, 5 writetext AideText_ExplainBalls - keeptextopen + buttonsound itemnotify - loadmovesprites + closetext dotrigger $2 end @@ -513,7 +521,7 @@ AideScript_ReceiveTheBalls: ElmsAideScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE iftrue AideScript_AfterTheft checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM @@ -521,26 +529,26 @@ ElmsAideScript: checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON iftrue AideScript_TheftTestimony writetext AideText_AlwaysBusy + waitbutton closetext - loadmovesprites end AideScript_TheftTestimony: writetext AideText_TheftTestimony + waitbutton closetext - loadmovesprites end AideScript_ExplainBalls: writetext AideText_ExplainBalls + waitbutton closetext - loadmovesprites end AideScript_AfterTheft: writetext AideText_AfterTheft + waitbutton closetext - loadmovesprites end MeetCopScript2: @@ -549,21 +557,21 @@ MeetCopScript2: MeetCopScript: applymovement PLAYER, MeetCopScript_WalkUp CopScript: - spriteface $7, LEFT - loadfont + spriteface ELMSLAB_OFFICER, LEFT + opentext writetext ElmsLabOfficerText1 - keeptextopen + buttonsound special SpecialNameRival writetext ElmsLabOfficerText2 + waitbutton closetext - loadmovesprites - applymovement $7, OfficerLeavesMovement - disappear $7 + applymovement ELMSLAB_OFFICER, OfficerLeavesMovement + disappear ELMSLAB_OFFICER dotrigger $2 end ElmsLabWindow: - loadfont + opentext checkflag ENGINE_FLYPOINT_VIOLET iftrue .Normal checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON @@ -572,14 +580,14 @@ ElmsLabWindow: .BreakIn writetext ElmsLabWindowText2 + waitbutton closetext - loadmovesprites end .Normal writetext ElmsLabWindowText1 + waitbutton closetext - loadmovesprites end ElmsLabTravelTip1: diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index be1675a1b..40335d6df 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -1,29 +1,35 @@ +const_value set 2 + const FASTSHIP1F_SAILOR1 + const FASTSHIP1F_SAILOR2 + const FASTSHIP1F_SAILOR3 + const FASTSHIP1F_GENTLEMAN + FastShip1F_MapScriptHeader: .MapTriggers: db 3 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 dw .Trigger2, 0 - dw .Trigger3, 0 .MapCallbacks: db 0 -.Trigger1: +.Trigger0: end -.Trigger2: +.Trigger1: priorityjump .PriorityJump2 end -.Trigger3: +.Trigger2: end .PriorityJump2: - applymovement $2, MovementData_0x7520e + applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e applymovement PLAYER, MovementData_0x75217 - applymovement $2, MovementData_0x75211 + applymovement FASTSHIP1F_SAILOR1, MovementData_0x75211 pause 30 playsound SFX_BOAT earthquake 30 @@ -40,32 +46,32 @@ FastShip1F_MapScriptHeader: SailorScript_0x75160: faceplayer - loadfont + opentext checkevent EVENT_FAST_SHIP_HAS_ARRIVED iftrue .Arrived checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE iftrue .Olivine writetext UnknownText_0x7523b + waitbutton closetext - loadmovesprites end .Olivine writetext UnknownText_0x7529b + waitbutton closetext - loadmovesprites end .Arrived: checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE iftrue ._Olivine writetext UnknownText_0x754be + waitbutton closetext - loadmovesprites scall .LetThePlayerOut playsound SFX_EXIT_BUILDING special FadeOutPalettes - waitbutton + waitsfx setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY domaptrigger VERMILION_PORT, $1 warp VERMILION_PORT, $7, $11 @@ -73,12 +79,12 @@ SailorScript_0x75160: ._Olivine writetext UnknownText_0x7548d + waitbutton closetext - loadmovesprites scall .LetThePlayerOut playsound SFX_EXIT_BUILDING special FadeOutPalettes - waitbutton + waitsfx setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY domaptrigger OLIVINE_PORT, $1 warp OLIVINE_PORT, $7, $17 @@ -87,50 +93,50 @@ SailorScript_0x75160: .LetThePlayerOut: checkcode VAR_FACING if_equal RIGHT, .YouAreFacingRight - applymovement $2, MovementData_0x7520e + applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e applymovement PLAYER, MovementData_0x75235 end .YouAreFacingRight: - applymovement $2, MovementData_0x75214 + applymovement FASTSHIP1F_SAILOR1, MovementData_0x75214 applymovement PLAYER, MovementData_0x75238 end SailorScript_0x751d0: faceplayer - loadfont + opentext checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue .Vermilion writetext UnknownText_0x752f9 + waitbutton closetext - loadmovesprites end .Vermilion: writetext UnknownText_0x7534f + waitbutton closetext - loadmovesprites end SailorScript_0x751e4: jumptextfaceplayer UnknownText_0x753c0 WorriedGrandpaTriggerRight: - moveperson $5, $14, $6 + moveperson FASTSHIP1F_GENTLEMAN, $14, $6 WorriedGrandpaTriggerLeft: - appear $5 - applymovement $5, MovementData_0x7521b + appear FASTSHIP1F_GENTLEMAN + applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x7521b playsound SFX_TACKLE applymovement PLAYER, MovementData_0x7522e - applymovement $5, MovementData_0x75220 - loadfont + applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75220 + opentext writetext UnknownText_0x75412 + waitbutton closetext - loadmovesprites spriteface PLAYER, RIGHT - applymovement $5, MovementData_0x75222 - disappear $5 + applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222 + disappear FASTSHIP1F_GENTLEMAN dotrigger $0 end diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 7634bd7f2..b5167bfdc 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -1,3 +1,17 @@ +const_value set 2 + const FASTSHIPB1F_SAILOR1 + const FASTSHIPB1F_SAILOR2 + const FASTSHIPB1F_SAILOR3 + const FASTSHIPB1F_LASS + const FASTSHIPB1F_SUPER_NERD + const FASTSHIPB1F_SAILOR4 + const FASTSHIPB1F_FISHER + const FASTSHIPB1F_BLACK_BELT + const FASTSHIPB1F_SAILOR5 + const FASTSHIPB1F_TEACHER + const FASTSHIPB1F_YOUNGSTER1 + const FASTSHIPB1F_YOUNGSTER2 + FastShipB1F_MapScriptHeader: .MapTriggers: db 2 @@ -18,21 +32,21 @@ UnknownScript_0x7673b: UnknownScript_0x7673c: checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT iftrue UnknownScript_0x76766 - applymovement $3, MovementData_0x76876 - moveperson $2, $1e, $6 - appear $2 + applymovement FASTSHIPB1F_SAILOR2, MovementData_0x76876 + moveperson FASTSHIPB1F_SAILOR1, $1e, $6 + appear FASTSHIPB1F_SAILOR1 pause 5 - disappear $3 + disappear FASTSHIPB1F_SAILOR2 end UnknownScript_0x76751: checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT iftrue UnknownScript_0x76766 - applymovement $2, MovementData_0x76871 - moveperson $3, $1f, $6 - appear $3 + applymovement FASTSHIPB1F_SAILOR1, MovementData_0x76871 + moveperson FASTSHIPB1F_SAILOR2, $1f, $6 + appear FASTSHIPB1F_SAILOR2 pause 5 - disappear $2 + disappear FASTSHIPB1F_SAILOR1 end UnknownScript_0x76766: @@ -40,7 +54,7 @@ UnknownScript_0x76766: SailorScript_0x76767: faceplayer - loadfont + opentext checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue UnknownScript_0x767a0 checkevent EVENT_FAST_SHIP_LAZY_SAILOR @@ -48,147 +62,147 @@ SailorScript_0x76767: checkevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR iftrue UnknownScript_0x76787 writetext UnknownText_0x7687b + waitbutton closetext - loadmovesprites setevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR clearevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR end UnknownScript_0x76787: writetext UnknownText_0x76907 + waitbutton closetext - loadmovesprites end UnknownScript_0x7678d: writetext UnknownText_0x7692e checkevent EVENT_FAST_SHIP_FOUND_GIRL iffalse UnknownScript_0x76799 + waitbutton closetext - loadmovesprites end UnknownScript_0x76799: - keeptextopen + buttonsound writetext UnknownText_0x7696d + waitbutton closetext - loadmovesprites end UnknownScript_0x767a0: writetext UnknownText_0x7699d + waitbutton closetext - loadmovesprites end TrainerSailorJeff: trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, SailorJeffScript SailorJeffScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x76a38 + waitbutton closetext - loadmovesprites end TrainerPicnickerDebra: trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, PicnickerDebraScript PicnickerDebraScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x76a99 + waitbutton closetext - loadmovesprites end TrainerJugglerFritz: trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, JugglerFritzScript JugglerFritzScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x76b02 + waitbutton closetext - loadmovesprites end TrainerSailorGarrett: trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, SailorGarrettScript SailorGarrettScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x76b7a + waitbutton closetext - loadmovesprites end TrainerFisherJonah: trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, FisherJonahScript FisherJonahScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x76c22 + waitbutton closetext - loadmovesprites end TrainerBlackbeltWai: trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, BlackbeltWaiScript BlackbeltWaiScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x76c9e + waitbutton closetext - loadmovesprites end TrainerSailorKenneth: trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, SailorKennethScript SailorKennethScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x76d5f + waitbutton closetext - loadmovesprites end TrainerTeacherShirley: trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, TeacherShirleyScript TeacherShirleyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x76de1 + waitbutton closetext - loadmovesprites end TrainerSchoolboyNate: trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, SchoolboyNateScript SchoolboyNateScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x76e3d + waitbutton closetext - loadmovesprites end TrainerSchoolboyRicky: trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, SchoolboyRickyScript SchoolboyRickyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x76eb6 + waitbutton closetext - loadmovesprites end FashShipB1FTrashcan: diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index d7f50a3b1..b19fa8773 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -1,3 +1,12 @@ +const_value set 2 + const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_M + const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_F + const FASTSHIPCABINS_NNW_NNE_NE_SUPER_NERD + const FASTSHIPCABINS_NNW_NNE_NE_POKEFAN_M + const FASTSHIPCABINS_NNW_NNE_NE_SAILOR + const FASTSHIPCABINS_NNW_NNE_NE_GENTLEMAN + const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST + FastShipCabins_NNW_NNE_NE_MapScriptHeader: .MapTriggers: db 0 @@ -9,100 +18,100 @@ TrainerCooltrainermSean: trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, CooltrainermSeanScript CooltrainermSeanScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7567b + waitbutton closetext - loadmovesprites end TrainerCooltrainerfCarol: trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, CooltrainerfCarolScript CooltrainerfCarolScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x756f7 + waitbutton closetext - loadmovesprites end TrainerPokemaniacEthan: trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, PokemaniacEthanScript PokemaniacEthanScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7574b + waitbutton closetext - loadmovesprites end TrainerHikerNoland: trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, HikerNolandScript HikerNolandScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x757d4 + waitbutton closetext - loadmovesprites end TrainerGentlemanEdward: trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, GentlemanEdwardScript GentlemanEdwardScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x75937 + waitbutton closetext - loadmovesprites end TrainerBurglarCorey: trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, BurglarCoreyScript BurglarCoreyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x75996 + waitbutton closetext - loadmovesprites end SailorScript_0x755f1: playmusic MUSIC_HIKER_ENCOUNTER faceplayer - loadfont + opentext writetext UnknownText_0x75812 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x75897, 0 loadtrainer SAILOR, STANLY startbattle reloadmap special HealParty setevent EVENT_BEAT_SAILOR_STANLY - loadfont + opentext writetext UnknownText_0x758b1 + waitbutton closetext - loadmovesprites setevent EVENT_FAST_SHIP_LAZY_SAILOR domaptrigger FAST_SHIP_B1F, $1 checkcode VAR_FACING if_equal $3, UnknownScript_0x75629 - applymovement $6, MovementData_0x75637 + applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637 playsound SFX_EXIT_BUILDING - disappear $6 - waitbutton + disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR + waitsfx end UnknownScript_0x75629: - applymovement $6, MovementData_0x7563c + applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x7563c playsound SFX_EXIT_BUILDING - disappear $6 - waitbutton + disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR + waitsfx end FastShipCabins_NNW_NNE_NETrashcan: diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 70759c740..eea6bbc36 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -1,3 +1,16 @@ +const_value set 2 + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_CAPTAIN + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2 + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_POKEFAN_M1 + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN3 + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN4 + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD1 + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_POKEFAN_M2 + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_POKEFAN_F + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2 + FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader: .MapTriggers: db 0 @@ -10,198 +23,198 @@ UnknownScript_0x75ea6: CaptainScript_0x75ea7: faceplayer - loadfont + opentext checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue UnknownScript_0x75eb5 writetext UnknownText_0x76012 + waitbutton closetext - loadmovesprites end UnknownScript_0x75eb5: writetext UnknownText_0x76064 + waitbutton closetext - loadmovesprites end TwinScript_0x75ebb: - spriteface $5, RIGHT - loadfont + spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT + opentext writetext UnknownText_0x761e0 + waitbutton closetext - loadmovesprites faceplayer - loadfont + opentext writetext UnknownText_0x7621f + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes - disappear $5 + disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2 applymovement PLAYER, MovementData_0x76004 - moveperson $4, $3, $13 - appear $4 + moveperson FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, $3, $13 + appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 spriteface PLAYER, UP - spriteface $4, UP + spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP special Special_FadeInQuickly - spriteface $3, DOWN - showemote EMOTE_SHOCK, $3, 15 - applymovement $4, MovementData_0x7600c - spriteface $3, RIGHT + spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN + showemote EMOTE_SHOCK, FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, 15 + applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, MovementData_0x7600c + spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT checkflag ENGINE_PLAYER_IS_FEMALE iftrue UnknownScript_0x75f03 - loadfont + opentext writetext UnknownText_0x76284 + waitbutton closetext - loadmovesprites jump UnknownScript_0x75f09 UnknownScript_0x75f03: - loadfont + opentext writetext UnknownText_0x762c6 + waitbutton closetext - loadmovesprites UnknownScript_0x75f09: - spriteface $5, DOWN - applymovement $3, MovementData_0x76010 - loadfont + spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN + applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x76010 + opentext writetext UnknownText_0x76143 - keeptextopen + buttonsound setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY domaptrigger FAST_SHIP_1F, $0 jump UnknownScript_0x75f37 GentlemanScript_0x75f1f: faceplayer - loadfont + opentext checkevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA iftrue UnknownScript_0x75f67 checkevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 iftrue UnknownScript_0x75f58 writetext UnknownText_0x760ae + waitbutton closetext - loadmovesprites domaptrigger FAST_SHIP_1F, $0 end UnknownScript_0x75f37: writetext UnknownText_0x7619b - keeptextopen + buttonsound verbosegiveitem METAL_COAT iffalse UnknownScript_0x75f44 setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA UnknownScript_0x75f44: - loadmovesprites - waitbutton + closetext + waitsfx playsound SFX_ELEVATOR_END pause 30 - loadfont + opentext writetext UnknownText_0x76645 - closetext + waitbutton setevent EVENT_FAST_SHIP_HAS_ARRIVED setevent EVENT_FAST_SHIP_FOUND_GIRL - loadmovesprites + closetext end UnknownScript_0x75f58: writetext UnknownText_0x7619b - keeptextopen + buttonsound verbosegiveitem METAL_COAT iffalse UnknownScript_0x75f65 setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA UnknownScript_0x75f65: - loadmovesprites + closetext end UnknownScript_0x75f67: writetext UnknownText_0x761be + waitbutton closetext - loadmovesprites end TwinScript_0x75f6d: faceplayer - loadfont + opentext writetext UnknownText_0x7630d + waitbutton closetext - loadmovesprites end TrainerPokefanmColin: trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, PokefanmColinScript PokefanmColinScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7635b + waitbutton closetext - loadmovesprites end TrainerTwinsMegandpeg1: trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, TwinsMegandpeg1Script TwinsMegandpeg1Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x763c2 + waitbutton closetext - loadmovesprites end TrainerTwinsMegandpeg2: trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, TwinsMegandpeg2Script TwinsMegandpeg2Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x76428 + waitbutton closetext - loadmovesprites end TrainerPsychicRodney: trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, PsychicRodneyScript PsychicRodneyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x76497 + waitbutton closetext - loadmovesprites end TrainerPokefanmJeremy: trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, PokefanmJeremyScript PokefanmJeremyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7651c + waitbutton closetext - loadmovesprites end TrainerPokefanfGeorgia: trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, PokefanfGeorgiaScript PokefanfGeorgiaScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x76596 + waitbutton closetext - loadmovesprites end TrainerSupernerdShawn: trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, SupernerdShawnScript SupernerdShawnScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7660f + waitbutton closetext - loadmovesprites end FastShipCaptainsCabinTrashcan: diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 493ee070e..13f0399c3 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -1,3 +1,9 @@ +const_value set 2 + const FASTSHIPCABINS_SW_SSW_NW_FISHER + const FASTSHIPCABINS_SW_SSW_NW_BUG_CATCHER + const FASTSHIPCABINS_SW_SSW_NW_BUENA + const FASTSHIPCABINS_SW_SSW_NW_ROCKER + FastShipCabins_SW_SSW_NW_MapScriptHeader: .MapTriggers: db 0 @@ -9,60 +15,60 @@ TrainerFirebreatherLyle: trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, FirebreatherLyleScript FirebreatherLyleScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x75b52 + waitbutton closetext - loadmovesprites end TrainerBug_catcherKen: trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, 0, Bug_catcherKenScript Bug_catcherKenScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x75bd5 + waitbutton closetext - loadmovesprites end TrainerBeautyCassie: trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, BeautyCassieScript BeautyCassieScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x75c43 + waitbutton closetext - loadmovesprites end TrainerGuitaristClyde: trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, GuitaristClydeScript GuitaristClydeScript: - talkaftercancel + end_if_just_battled special Mobile_DummyReturnFalse iftrue .mobile - loadfont + opentext writetext UnknownText_0x75d65 + waitbutton closetext - loadmovesprites end .mobile: - loadfont + opentext writetext UnknownText_0x75cfe + waitbutton closetext - loadmovesprites end FastShipBed: - loadfont + opentext writetext FastShipBedText1 + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes special Mobile_HealParty @@ -71,10 +77,10 @@ FastShipBed: pause 60 special RestartMapMusic special Special_FadeInQuickly - loadfont + opentext writetext FastShipBedText2 + waitbutton closetext - loadmovesprites checkevent EVENT_FAST_SHIP_HAS_ARRIVED iftrue UnknownScript_0x75ae1 checkevent EVENT_FAST_SHIP_FOUND_GIRL @@ -89,18 +95,18 @@ UnknownScript_0x75ae2: pause 30 checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE iftrue UnknownScript_0x75af7 - loadfont + opentext writetext FastShipArrivedVermilionText + waitbutton closetext - loadmovesprites setevent EVENT_FAST_SHIP_HAS_ARRIVED end UnknownScript_0x75af7: - loadfont + opentext writetext FastShipArrivedOlivineText + waitbutton closetext - loadmovesprites setevent EVENT_FAST_SHIP_HAS_ARRIVED end diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index cc7f38889..3032519aa 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -1,3 +1,7 @@ +const_value set 2 + const FIGHTINGDOJO_BLACK_BELT + const FIGHTINGDOJO_POKE_BALL + FightingDojo_MapScriptHeader: .MapTriggers: db 0 @@ -14,8 +18,8 @@ MapFightingDojoSignpost0Script: MapFightingDojoSignpost1Script: jumptext UnknownText_0x189be0 -ItemFragment_0x189b6a: - db FOCUS_BAND, 1 +FightingDojoFocusBand: + itemball FOCUS_BAND UnknownText_0x189b6c: text "Hello!" @@ -58,4 +62,4 @@ FightingDojo_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x189b61, -1 - person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND + person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index b95469107..7abec5a1e 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const FUCHSIABILLSPEECHHOUSE_POKEFAN_F + const FUCHSIABILLSPEECHHOUSE_YOUNGSTER + FuchsiaBillSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 1d60f9f6f..50f7664fd 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -1,3 +1,9 @@ +const_value set 2 + const FUCHSIACITY_YOUNGSTER + const FUCHSIACITY_POKEFAN_M + const FUCHSIACITY_TEACHER + const FUCHSIACITY_FRUIT_TREE + FuchsiaCity_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index d5a739898..48a5d2684 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -1,3 +1,11 @@ +const_value set 2 + const FUCHSIAGYM_JANINE + const FUCHSIAGYM_FUCHSIA_GYM_1 + const FUCHSIAGYM_FUCHSIA_GYM_2 + const FUCHSIAGYM_FUCHSIA_GYM_3 + const FUCHSIAGYM_FUCHSIA_GYM_4 + const FUCHSIAGYM_GYM_GUY + FuchsiaGym_MapScriptHeader: .MapTriggers: db 0 @@ -8,16 +16,16 @@ FuchsiaGym_MapScriptHeader: JanineScript_0x195db9: checkflag ENGINE_SOULBADGE iftrue .FightDone - applymovement $2, MovementData_0x195f27 + applymovement FUCHSIAGYM_JANINE, MovementData_0x195f27 faceplayer - loadfont + opentext writetext UnknownText_0x195f35 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x195fa1, 0 loadtrainer JANINE, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_JANINE setevent EVENT_BEAT_LASS_ALICE setevent EVENT_BEAT_LASS_LINDA @@ -28,179 +36,179 @@ JanineScript_0x195db9: variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER special RunCallback_04 - loadfont + opentext writetext UnknownText_0x195feb playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_SOULBADGE jump UnknownScript_0x195e02 .FightDone faceplayer - loadfont + opentext UnknownScript_0x195e02: checkevent EVENT_GOT_TM06_TOXIC iftrue UnknownScript_0x195e15 writetext UnknownText_0x196002 - keeptextopen + buttonsound verbosegiveitem TM_TOXIC iffalse UnknownScript_0x195e15 setevent EVENT_GOT_TM06_TOXIC UnknownScript_0x195e15: writetext UnknownText_0x196074 + waitbutton closetext - loadmovesprites end FuschiaGym1Script_0x195e1b: checkevent EVENT_BEAT_LASS_ALICE iftrue UnknownScript_0x195e2c - applymovement $3, MovementData_0x195f27 + applymovement FUCHSIAGYM_FUCHSIA_GYM_1, MovementData_0x195f27 faceplayer variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS special RunCallback_04 UnknownScript_0x195e2c: faceplayer - loadfont + opentext checkevent EVENT_BEAT_LASS_ALICE iftrue UnknownScript_0x195e4f writetext UnknownText_0x1960e6 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x196126, 0 loadtrainer LASS, ALICE startbattle iftrue UnknownScript_0x195e4a - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_LASS_ALICE end UnknownScript_0x195e4a: variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_JANINE - returnafterbattle + reloadmapafterbattle end UnknownScript_0x195e4f: writetext UnknownText_0x196139 + waitbutton closetext - loadmovesprites end FuschiaGym2Script_0x195e55: checkevent EVENT_BEAT_LASS_LINDA iftrue UnknownScript_0x195e66 - applymovement $4, MovementData_0x195f27 + applymovement FUCHSIAGYM_FUCHSIA_GYM_2, MovementData_0x195f27 faceplayer variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS special RunCallback_04 UnknownScript_0x195e66: faceplayer - loadfont + opentext checkevent EVENT_BEAT_LASS_LINDA iftrue UnknownScript_0x195e89 writetext UnknownText_0x196166 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x19617b, 0 loadtrainer LASS, LINDA startbattle iftrue UnknownScript_0x195e84 - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_LASS_LINDA end UnknownScript_0x195e84: variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_JANINE - returnafterbattle + reloadmapafterbattle end UnknownScript_0x195e89: writetext UnknownText_0x196199 + waitbutton closetext - loadmovesprites end FuschiaGym3Script_0x195e8f: checkevent EVENT_BEAT_PICNICKER_CINDY iftrue UnknownScript_0x195ea0 - applymovement $5, MovementData_0x195f27 + applymovement FUCHSIAGYM_FUCHSIA_GYM_3, MovementData_0x195f27 faceplayer variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS special RunCallback_04 UnknownScript_0x195ea0: faceplayer - loadfont + opentext checkevent EVENT_BEAT_PICNICKER_CINDY iftrue UnknownScript_0x195ec3 writetext UnknownText_0x1961bb + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x1961f1, 0 loadtrainer PICNICKER, CINDY startbattle iftrue UnknownScript_0x195ebe - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_PICNICKER_CINDY end UnknownScript_0x195ebe: variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_JANINE - returnafterbattle + reloadmapafterbattle end UnknownScript_0x195ec3: writetext UnknownText_0x19620c + waitbutton closetext - loadmovesprites end FuschiaGym4Script_0x195ec9: checkevent EVENT_BEAT_CAMPER_BARRY iftrue UnknownScript_0x195eda - applymovement $6, MovementData_0x195f27 + applymovement FUCHSIAGYM_FUCHSIA_GYM_4, MovementData_0x195f27 faceplayer variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER special RunCallback_04 UnknownScript_0x195eda: faceplayer - loadfont + opentext checkevent EVENT_BEAT_CAMPER_BARRY iftrue UnknownScript_0x195efd writetext UnknownText_0x196228 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x19624a, 0 loadtrainer CAMPER, BARRY startbattle iftrue UnknownScript_0x195ef8 - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_CAMPER_BARRY end UnknownScript_0x195ef8: variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_JANINE - returnafterbattle + reloadmapafterbattle end UnknownScript_0x195efd: writetext UnknownText_0x19626b + waitbutton closetext - loadmovesprites end FuchsiaGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_JANINE iftrue .FuchsiaGymGuyWinScript writetext FuchsiaGymGuyText + waitbutton closetext - loadmovesprites end .FuchsiaGymGuyWinScript writetext FuchsiaGymGuyWinText + waitbutton closetext - loadmovesprites end FuchsiaGymStatue: diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index ee32abccb..fdf0bc045 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const FUCHSIAMART_CLERK + const FUCHSIAMART_FISHER + const FUCHSIAMART_COOLTRAINER_F + FuchsiaMart_MapScriptHeader: .MapTriggers: db 0 @@ -6,9 +11,9 @@ FuchsiaMart_MapScriptHeader: db 0 ClerkScript_0x195ce8: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_FUCHSIA - loadmovesprites + closetext end FisherScript_0x195cef: diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index 8241aefe6..36557c0ae 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const FUCHSIAPOKECENTER1F_NURSE + const FUCHSIAPOKECENTER1F_COOLTRAINER_M + const FUCHSIAPOKECENTER1F_COOLTRAINER_F + const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR + FuchsiaPokeCenter1F_MapScriptHeader: .MapTriggers: db 1 @@ -22,19 +28,19 @@ CooltrainerFScript_0x19645f: JanineImpersonatorScript_0x196462: faceplayer - loadfont + opentext writetext UnknownText_0x19652e + waitbutton closetext - loadmovesprites - applymovement $5, MovementData_0x196486 + applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE special RunCallback_04 - loadfont + opentext writetext UnknownText_0x19654e + waitbutton closetext - loadmovesprites - applymovement $5, MovementData_0x196486 + applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS special RunCallback_04 diff --git a/maps/FuchsiaPokeCenter2FBeta.asm b/maps/FuchsiaPokeCenter2FBeta.asm index 7ba5508a9..496bc7c06 100644 --- a/maps/FuchsiaPokeCenter2FBeta.asm +++ b/maps/FuchsiaPokeCenter2FBeta.asm @@ -1,3 +1,4 @@ + FuchsiaPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 5f11981e0..456f5aaa0 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -1,3 +1,6 @@ +const_value set 2 + const GOLDENRODBIKESHOP_CLERK + GoldenrodBikeShop_MapScriptHeader: .MapTriggers: db 0 @@ -10,32 +13,32 @@ UnknownScript_0x5474f: ClerkScript_0x54750: faceplayer - loadfont + opentext checkevent EVENT_GOT_BICYCLE iftrue UnknownScript_0x54775 writetext UnknownText_0x54787 yesorno iffalse UnknownScript_0x5477b writetext UnknownText_0x547f8 - keeptextopen - waitbutton + buttonsound + waitsfx giveitem BICYCLE writetext UnknownText_0x54848 playsound SFX_KEY_ITEM - waitbutton + waitsfx itemnotify setflag ENGINE_BIKE_SHOP_CALL_ENABLED setevent EVENT_GOT_BICYCLE UnknownScript_0x54775: writetext UnknownText_0x5485f + waitbutton closetext - loadmovesprites end UnknownScript_0x5477b: writetext UnknownText_0x54898 + waitbutton closetext - loadmovesprites end ; possibly unused diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 0cf7952c3..6d33b5ce0 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -1,3 +1,8 @@ +const_value set 2 + const GOLDENRODBILLSHOUSE_BILL + const GOLDENRODBILLSHOUSE_POKEFAN_F + const GOLDENRODBILLSHOUSE_TWIN + GoldenrodBillsHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,91 +12,91 @@ GoldenrodBillsHouse_MapScriptHeader: BillsHouseBill: faceplayer - loadfont + opentext checkevent EVENT_GOT_EEVEE iftrue UnknownScript_0x54c1f writetext UnknownText_0x54c74 yesorno iffalse UnknownScript_0x54c19 writetext UnknownText_0x54d3f - keeptextopen - waitbutton + buttonsound + waitsfx checkcode VAR_PARTYCOUNT if_equal $6, UnknownScript_0x54c13 writetext UnknownText_0x54dae playsound SFX_CAUGHT_MON - waitbutton + waitsfx givepoke EEVEE, 20 setevent EVENT_GOT_EEVEE writetext UnknownText_0x54dc1 + waitbutton closetext - loadmovesprites end UnknownScript_0x54c13: writetext UnknownText_0x54e02 + waitbutton closetext - loadmovesprites end UnknownScript_0x54c19: writetext UnknownText_0x54e2d + waitbutton closetext - loadmovesprites end UnknownScript_0x54c1f: writetext UnknownText_0x54e42 + waitbutton closetext - loadmovesprites end BillsMom: faceplayer - loadfont + opentext checkevent EVENT_MET_BILL iffalse UnknownScript_0x54c33 writetext UnknownText_0x54ea8 + waitbutton closetext - loadmovesprites end UnknownScript_0x54c33: writetext UnknownText_0x54f4e + waitbutton closetext - loadmovesprites end BillsSister: faceplayer - loadfont + opentext checkcellnum PHONE_BILL iftrue UnknownScript_0x54c58 writetext UnknownText_0x54f9e askforphonenumber PHONE_BILL if_equal $1, UnknownScript_0x54c64 if_equal $2, UnknownScript_0x54c5e - waitbutton + waitsfx addcellnum PHONE_BILL writetext UnknownText_0x54fd9 playsound SFX_REGISTER_PHONE_NUMBER - waitbutton - keeptextopen + waitsfx + buttonsound UnknownScript_0x54c58: ;0x54c58 writetext UnknownText_0x55069 + waitbutton closetext - loadmovesprites end UnknownScript_0x54c5e: writetext UnknownText_0x54ff3 + waitbutton closetext - loadmovesprites end UnknownScript_0x54c64: writetext UnknownText_0x55046 - keeptextopen + buttonsound jump UnknownScript_0x54c5e BillsHouseBookshelf1: diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index fc711f366..e50f6e223 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -1,3 +1,20 @@ +const_value set 2 + const GOLDENRODCITY_POKEFAN_M1 + const GOLDENRODCITY_YOUNGSTER1 + const GOLDENRODCITY_COOLTRAINER_F1 + const GOLDENRODCITY_COOLTRAINER_F2 + const GOLDENRODCITY_YOUNGSTER2 + const GOLDENRODCITY_LASS + const GOLDENRODCITY_GRAMPS + const GOLDENRODCITY_ROCKET1 + const GOLDENRODCITY_ROCKET2 + const GOLDENRODCITY_ROCKET3 + const GOLDENRODCITY_ROCKET4 + const GOLDENRODCITY_ROCKET5 + const GOLDENRODCITY_ROCKET6 + const GOLDENRODCITY_ROCKET7 + const GOLDENRODCITY_POKEFAN_M2 + GoldenrodCity_MapScriptHeader: .MapTriggers: db 0 @@ -27,19 +44,19 @@ GoldenrodCity_MapScriptHeader: if_equal WEDNESDAY, .MoveTutorAppear if_equal SATURDAY, .MoveTutorAppear .MoveTutorDisappear - disappear $10 + disappear GOLDENRODCITY_POKEFAN_M2 return .MoveTutorAppear checkflag ENGINE_DAILY_MOVE_TUTOR iftrue .MoveTutorDone - appear $10 + appear GOLDENRODCITY_POKEFAN_M2 .MoveTutorDone return MoveTutor: faceplayer - loadfont + opentext writetext UnknownText_0x199042 yesorno iffalse .Refused @@ -51,8 +68,8 @@ MoveTutor: if_equal $2, .NotEnoughMoney writetext UnknownText_0x1990ce loadmenudata .MoveMenuDataHeader - interpretmenu2 - writebackup + verticalmenu + closewindow if_equal $1, .Flamethrower if_equal $2, .Thunderbolt if_equal $3, .IceBeam @@ -98,51 +115,51 @@ MoveTutor: .Refused: writetext UnknownText_0x1990b4 + waitbutton closetext - loadmovesprites end .Refused2: writetext UnknownText_0x199107 + waitbutton closetext - loadmovesprites end .TeachMove: writetext UnknownText_0x19913a - keeptextopen + buttonsound takecoins 4000 - waitbutton + waitsfx playsound SFX_TRANSACTION special Special_DisplayCoinCaseBalance writetext UnknownText_0x19918b + waitbutton closetext - loadmovesprites checkcode VAR_FACING - if_equal $2, .WalkAroundPlayer - applymovement $10, MovementData_0x198a5f + if_equal LEFT, .WalkAroundPlayer + applymovement GOLDENRODCITY_POKEFAN_M2, MovementData_0x198a5f jump .GoInside .WalkAroundPlayer: - applymovement $10, MovementData_0x198a63 + applymovement GOLDENRODCITY_POKEFAN_M2, MovementData_0x198a63 .GoInside: playsound SFX_ENTER_DOOR - disappear $10 + disappear GOLDENRODCITY_POKEFAN_M2 clearevent EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR setflag ENGINE_DAILY_MOVE_TUTOR - waitbutton + waitsfx end .Incompatible: writetext UnknownText_0x1991a4 + waitbutton closetext - loadmovesprites end .NotEnoughMoney: writetext UnknownText_0x1991ac + waitbutton closetext - loadmovesprites end PokefanMScript_0x1989e3: @@ -153,34 +170,34 @@ YoungsterScript_0x1989e6: CooltrainerFScript_0x1989e9: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_RADIO_TOWER iftrue .ClearedRadioTower writetext UnknownText_0x198ae6 + waitbutton closetext - loadmovesprites end .ClearedRadioTower: writetext UnknownText_0x198b2d + waitbutton closetext - loadmovesprites end CooltrainerFScript_0x1989fd: faceplayer - loadfont + opentext checkflag ENGINE_RADIO_CARD iftrue .GotRadioCard writetext UnknownText_0x198b73 + waitbutton closetext - loadmovesprites end .GotRadioCard: writetext UnknownText_0x198c14 + waitbutton closetext - loadmovesprites end YoungsterScript_0x198a11: @@ -193,14 +210,14 @@ GrampsScript_0x198a17: jumptextfaceplayer UnknownText_0x198ccf RocketScript_0x198a1a: - loadfont + opentext writetext UnknownText_0x198d0d - keeptextopen + buttonsound faceplayer writetext UnknownText_0x198d2a + waitbutton closetext - loadmovesprites - spriteface $9, UP + spriteface GOLDENRODCITY_ROCKET1, UP end RocketScript_0x198a29: diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index ccc74c28e..455d66b79 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const GOLDENRODDEPTSTORE1F_RECEPTIONIST + const GOLDENRODDEPTSTORE1F_POKEFAN_F + const GOLDENRODDEPTSTORE1F_BUG_CATCHER + const GOLDENRODDEPTSTORE1F_GENTLEMAN + GoldenrodDeptStore1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index 2a39b3fa9..ba7c74a18 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const GOLDENRODDEPTSTORE2F_CLERK1 + const GOLDENRODDEPTSTORE2F_CLERK2 + const GOLDENRODDEPTSTORE2F_YOUNGSTER + const GOLDENRODDEPTSTORE2F_COOLTRAINER_F + const GOLDENRODDEPTSTORE2F_GENTLEMAN + GoldenrodDeptStore2F_MapScriptHeader: .MapTriggers: db 0 @@ -7,16 +14,16 @@ GoldenrodDeptStore2F_MapScriptHeader: ClerkScript_0x55b5d: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_GOLDENROD_2F_1 - loadmovesprites + closetext end ClerkScript_0x55b65: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_GOLDENROD_2F_2 - loadmovesprites + closetext end YoungsterScript_0x55b6d: diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 5073b0863..e9db446a0 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const GOLDENRODDEPTSTORE3F_CLERK + const GOLDENRODDEPTSTORE3F_SUPER_NERD + const GOLDENRODDEPTSTORE3F_ROCKER + GoldenrodDeptStore3F_MapScriptHeader: .MapTriggers: db 0 @@ -7,9 +12,9 @@ GoldenrodDeptStore3F_MapScriptHeader: ClerkScript_0x55db8: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_GOLDENROD_3F - loadmovesprites + closetext end SuperNerdScript_0x55dc0: diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 16a5024bb..61c5ff120 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const GOLDENRODDEPTSTORE4F_CLERK + const GOLDENRODDEPTSTORE4F_COOLTRAINER_M + const GOLDENRODDEPTSTORE4F_BUG_CATCHER + const GOLDENRODDEPTSTORE4F_GAMEBOY_KID + GoldenrodDeptStore4F_MapScriptHeader: .MapTriggers: db 0 @@ -7,9 +13,9 @@ GoldenrodDeptStore4F_MapScriptHeader: ClerkScript_0x55ee9: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_GOLDENROD_4F - loadmovesprites + closetext end CooltrainerMScript_0x55ef1: @@ -20,11 +26,11 @@ BugCatcherScript_0x55ef4: GameboyKidScript_0x55ef7: faceplayer - loadfont + opentext writetext UnknownText_0x55f74 + waitbutton closetext - loadmovesprites - spriteface $5, DOWN + spriteface GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN end GoldenrodDeptStore4FDirectory: diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 35f055909..72d299472 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const GOLDENRODDEPTSTORE5F_CLERK + const GOLDENRODDEPTSTORE5F_LASS + const GOLDENRODDEPTSTORE5F_COOLTRAINER_M + const GOLDENRODDEPTSTORE5F_POKEFAN_M + const GOLDENRODDEPTSTORE5F_TWIN + const GOLDENRODDEPTSTORE5F_RECEPTIONIST + GoldenrodDeptStore5F_MapScriptHeader: .MapTriggers: db 0 @@ -12,16 +20,16 @@ GoldenrodDeptStore5F_MapScriptHeader: .CheckIfSunday: checkcode VAR_WEEKDAY if_equal SUNDAY, .yes - disappear $7 + disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST return .yes: - appear $7 + appear GOLDENRODDEPTSTORE5F_RECEPTIONIST return ClerkScript_0x5609c: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM02_HEADBUTT iftrue .headbutt checkevent EVENT_GOT_TM08_ROCK_SMASH @@ -35,84 +43,84 @@ ClerkScript_0x5609c: .neither: pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_1 - loadmovesprites + closetext end .onlyheadbutt: pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_2 - loadmovesprites + closetext end .onlyrocksmash: pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_3 - loadmovesprites + closetext end .both: pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_4 - loadmovesprites + closetext end ReceptionistScript_0x560ce: faceplayer - loadfont + opentext checkcode VAR_WEEKDAY if_not_equal SUNDAY, .EventIsOver checkflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT iftrue .EventIsOver special GetFirstPokemonHappiness writetext UnknownText_0x56143 - keeptextopen + buttonsound if_greater_than $95, .VeryHappy if_greater_than $31, .SomewhatHappy jump .NotVeryHappy .VeryHappy: writetext UnknownText_0x5615a - keeptextopen + buttonsound verbosegiveitem TM_RETURN iffalse .Done setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT - loadmovesprites + closetext end .SomewhatHappy: writetext UnknownText_0x561a6 + waitbutton closetext - loadmovesprites end .NotVeryHappy: writetext UnknownText_0x561d8 - keeptextopen + buttonsound verbosegiveitem TM_FRUSTRATION iffalse .Done setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT - loadmovesprites + closetext end .EventIsOver: writetext UnknownText_0x56202 - closetext + waitbutton .Done: - loadmovesprites + closetext end TwinScript_0x56118: faceplayer - loadfont + opentext special SpecialGameboyCheck if_not_equal $2, .NotGBC ; This is a dummy check from Gold and Silver. In normal gameplay, this would not be checked. writetext UnknownText_0x56241 + waitbutton closetext - loadmovesprites special Special_UnlockMysteryGift end .NotGBC: writetext UnknownText_0x56279 + waitbutton closetext - loadmovesprites end LassScript_0x56130: @@ -120,10 +128,10 @@ LassScript_0x56130: CooltrainerMScript_0x56133: faceplayer - loadfont + opentext trade $0 + waitbutton closetext - loadmovesprites end PokefanMScript_0x5613a: diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index a0853ac17..3d54a45b0 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const GOLDENRODDEPTSTORE6F_LASS + const GOLDENRODDEPTSTORE6F_SUPER_NERD + GoldenrodDeptStore6F_MapScriptHeader: .MapTriggers: db 0 @@ -6,17 +10,17 @@ GoldenrodDeptStore6F_MapScriptHeader: db 0 GoldenrodVendingMachine: - loadfont + opentext writetext GoldenrodVendingText .Start - special PlaceMoneyTopRightOW + special PlaceMoneyTopRight loadmenudata .MenuData - interpretmenu2 - writebackup + verticalmenu + closewindow if_equal $1, .FreshWater if_equal $2, .SodaPop if_equal $3, .Lemonade - loadmovesprites + closetext end .FreshWater @@ -50,18 +54,18 @@ GoldenrodVendingMachine: pause 10 playsound SFX_ENTER_DOOR writetext GoldenrodClangText - keeptextopen + buttonsound itemnotify jump .Start .NotEnoughMoney writetext GoldenrodVendingNoMoneyText - closetext + waitbutton jump .Start .NotEnoughSpace writetext GoldenrodVendingNoSpaceText - closetext + waitbutton jump .Start .MenuData diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index e726755da..3fd4b6e97 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -1,3 +1,13 @@ +const_value set 2 + const GOLDENRODDEPTSTOREB1F_POKE_BALL1 + const GOLDENRODDEPTSTOREB1F_POKE_BALL2 + const GOLDENRODDEPTSTOREB1F_POKE_BALL3 + const GOLDENRODDEPTSTOREB1F_POKE_BALL4 + const GOLDENRODDEPTSTOREB1F_BLACK_BELT1 + const GOLDENRODDEPTSTOREB1F_BLACK_BELT2 + const GOLDENRODDEPTSTOREB1F_BLACK_BELT3 + const GOLDENRODDEPTSTOREB1F_MACHOP + GoldenrodDeptStoreB1F_MapScriptHeader: .MapTriggers: db 0 @@ -50,24 +60,24 @@ BlackBeltScript_0x7d7b6: jumptextfaceplayer UnknownText_0x7d875 MachopScript_0x7d7b9: - loadfont + opentext writetext UnknownText_0x7d8bb cry MACHOKE + waitbutton closetext - loadmovesprites end -ItemFragment_0x7d7c3: - db ETHER, 1 +GoldenrodDeptStoreB1FEther: + itemball ETHER -ItemFragment_0x7d7c5: - db AMULET_COIN, 1 +GoldenrodDeptStoreB1FAmuletCoin: + itemball AMULET_COIN -ItemFragment_0x7d7c7: - db BURN_HEAL, 1 +GoldenrodDeptStoreB1FBurnHeal: + itemball BURN_HEAL -ItemFragment_0x7d7c9: - db ULTRA_BALL, 1 +GoldenrodDeptStoreB1FUltraBall: + itemball ULTRA_BALL UnknownText_0x7d7cb: text "Hey, kid! You're" @@ -121,10 +131,10 @@ GoldenrodDeptStoreB1F_MapEventHeader: .PersonEvents: db 8 - person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d7c3, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER - person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d7c5, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN - person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d7c7, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL - person_event SPRITE_POKE_BALL, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d7c9, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL + person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER + person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN + person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL + person_event SPRITE_POKE_BALL, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL person_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b0, -1 person_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b3, -1 person_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b6, -1 diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index a7ca59c89..c6b99287e 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -1,3 +1,4 @@ + GoldenrodDeptStoreElevator_MapScriptHeader: .MapTriggers: db 0 @@ -6,14 +7,14 @@ GoldenrodDeptStoreElevator_MapScriptHeader: db 0 MapGoldenrodDeptStoreElevatorSignpost0Script: - loadfont + opentext elevator Elevator_0x566e0 - loadmovesprites + closetext iffalse .Done pause 5 playsound SFX_ELEVATOR earthquake 60 - waitbutton + waitsfx checkevent EVENT_WAREHOUSE_BLOCKED_OFF iftrue .Done checkevent EVENT_WAREHOUSE_LAYOUT_1 @@ -53,7 +54,7 @@ Elevator_0x566e0: elevfloor _4F, 3, GOLDENROD_DEPT_STORE_4F elevfloor _5F, 3, GOLDENROD_DEPT_STORE_5F elevfloor _6F, 2, GOLDENROD_DEPT_STORE_6F - db $ff ; end + db -1 ; end GoldenrodDeptStoreElevator_MapEventHeader: diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index f0ed3e21d..6a95af206 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -1,3 +1,13 @@ +const_value set 2 + const GOLDENRODDEPTSTOREROOF_CLERK + const GOLDENRODDEPTSTOREROOF_POKEFAN_F + const GOLDENRODDEPTSTOREROOF_FISHER + const GOLDENRODDEPTSTOREROOF_TWIN + const GOLDENRODDEPTSTOREROOF_SUPER_NERD + const GOLDENRODDEPTSTOREROOF_POKEFAN_M + const GOLDENRODDEPTSTOREROOF_TEACHER + const GOLDENRODDEPTSTOREROOF_BUG_CATCHER + GoldenrodDeptStoreRoof_MapScriptHeader: .MapTriggers: db 0 @@ -34,9 +44,9 @@ GoldenrodDeptStoreRoof_MapScriptHeader: return ClerkScript_0x5673f: - loadfont + opentext pokemart MARTTYPE_ROOFTOP, 0 - loadmovesprites + closetext end PokefanFScript_0x56746: @@ -44,27 +54,27 @@ PokefanFScript_0x56746: FisherScript_0x56749: faceplayer - loadfont + opentext writetext UnknownText_0x567d2 + waitbutton closetext - loadmovesprites - spriteface $4, UP + spriteface GOLDENRODDEPTSTOREROOF_FISHER, UP end TwinScript_0x56754: jumptextfaceplayer UnknownText_0x56839 SuperNerdScript_0x56757: - loadfont + opentext writetext UnknownText_0x56867 + waitbutton closetext - loadmovesprites - spriteface $6, UP - loadfont + spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, UP + opentext writetext UnknownText_0x56871 + waitbutton closetext - loadmovesprites - spriteface $6, RIGHT + spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT end PokefanMScript_0x5676a: diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index d99afb751..4c2dd558e 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -1,3 +1,7 @@ +const_value set 2 + const GOLDENRODFLOWERSHOP_TEACHER + const GOLDENRODFLOWERSHOP_LASS + GoldenrodFlowerShop_MapScriptHeader: .MapTriggers: db 0 @@ -17,22 +21,22 @@ FlowerShopTeacherScript: checkflag ENGINE_PLAINBADGE iffalse .NoPlainBadge faceplayer - loadfont + opentext writetext UnknownText_0x554c2 - keeptextopen + buttonsound verbosegiveitem SQUIRTBOTTLE setevent EVENT_GOT_SQUIRTBOTTLE - loadmovesprites + closetext setevent EVENT_FLORIA_AT_SUDOWOODO clearevent EVENT_FLORIA_AT_FLOWER_SHOP end .Lalala: - spriteface $2, LEFT - loadfont + spriteface GOLDENRODFLOWERSHOP_TEACHER, LEFT + opentext writetext UnknownText_0x5552e + waitbutton closetext - loadmovesprites end .GotSquirtbottle: @@ -46,14 +50,14 @@ FlowerShopTeacherScript: FlowerShopFloriaScript: faceplayer - loadfont + opentext checkevent EVENT_FOUGHT_SUDOWOODO iftrue .FoughtSudowoodo checkevent EVENT_GOT_SQUIRTBOTTLE iftrue .GotSquirtbottle writetext UnknownText_0x55561 + waitbutton closetext - loadmovesprites setevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP setevent EVENT_FLORIA_AT_FLOWER_SHOP clearevent EVENT_FLORIA_AT_SUDOWOODO @@ -61,14 +65,14 @@ FlowerShopFloriaScript: .GotSquirtbottle: writetext UnknownText_0x555e6 + waitbutton closetext - loadmovesprites end .FoughtSudowoodo: writetext UnknownText_0x55604 + waitbutton closetext - loadmovesprites end FlowerShopShelf1: diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 88e99f217..d1fa4bc43 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -1,3 +1,17 @@ +const_value set 2 + const GOLDENRODGAMECORNER_CLERK + const GOLDENRODGAMECORNER_RECEPTIONIST1 + const GOLDENRODGAMECORNER_RECEPTIONIST2 + const GOLDENRODGAMECORNER_PHARMACIST1 + const GOLDENRODGAMECORNER_PHARMACIST2 + const GOLDENRODGAMECORNER_POKEFAN_M1 + const GOLDENRODGAMECORNER_COOLTRAINER_M + const GOLDENRODGAMECORNER_POKEFAN_F + const GOLDENRODGAMECORNER_COOLTRAINER_F + const GOLDENRODGAMECORNER_GENTLEMAN + const GOLDENRODGAMECORNER_POKEFAN_M2 + const GOLDENRODGAMECORNER_POKEFAN_M3 + GoldenrodGameCorner_MapScriptHeader: .MapTriggers: db 0 @@ -7,135 +21,135 @@ GoldenrodGameCorner_MapScriptHeader: ; callbacks - dbw 2, UnknownScript_0x56bf9 + dbw 2, .Callback -UnknownScript_0x56bf9: +.Callback checkevent EVENT_BEAT_ELITE_FOUR - iffalse UnknownScript_0x56c19 + iffalse .finish checkitem COIN_CASE - iffalse UnknownScript_0x56c0e + iffalse .move_tutor_inside checkcode VAR_WEEKDAY - if_equal WEDNESDAY, UnknownScript_0x56c11 - if_equal SATURDAY, UnknownScript_0x56c11 -UnknownScript_0x56c0e: - appear $d + if_equal WEDNESDAY, .move_tutor_outside + if_equal SATURDAY, .move_tutor_outside +.move_tutor_inside + appear GOLDENRODGAMECORNER_POKEFAN_M3 return -UnknownScript_0x56c11: +.move_tutor_outside checkflag ENGINE_DAILY_MOVE_TUTOR - iftrue UnknownScript_0x56c19 - disappear $d -UnknownScript_0x56c19: ;0x56c19 + iftrue .finish + disappear GOLDENRODGAMECORNER_POKEFAN_M3 +.finish return -PokefanMScript_0x56c1a: +GoldenrodGameCornerPokefanM3Script: faceplayer - loadfont - writetext UnknownText_0x5718a + opentext + writetext GoldenrodGameCornerPokefanM3Text + waitbutton closetext - loadmovesprites - spriteface $d, RIGHT + spriteface GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT end -ClerkScript_0x56c25: +GoldenrodGmeCornerCoinVendorScript: jumpstd gamecornercoinvendor -ReceptionistScript_0x56c28: +GoldenrodGmeCornerTMVendorScript: faceplayer - loadfont - writetext UnknownText_0x56e50 - closetext + opentext + writetext GoldenrodGameCornerPrizeVendorIntroText + waitbutton checkitem COIN_CASE - iffalse UnknownScript_0x56cc3 - writetext UnknownText_0x56e8b -UnknownScript_0x56c36: ; 056c36 + iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript + writetext GoldenrodGameCornerPrizeVendorWhichPrizeText +GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 special Special_DisplayCoinCaseBalance - loadmenudata MenuDataHeader_0x56cc9 - interpretmenu2 - writebackup - if_equal $1, UnknownScript_0x56c4d - if_equal $2, UnknownScript_0x56c69 - if_equal $3, UnknownScript_0x56c85 - jump UnknownScript_0x56cbd - -UnknownScript_0x56c4d: + loadmenudata GoldenrodGameCornerTMVendorMenuData + verticalmenu + closewindow + if_equal $1, .Thunder + if_equal $2, .Blizzard + if_equal $3, .FireBlast + jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript + +.Thunder: checkcoins 5500 - if_equal $2, UnknownScript_0x56cb1 + if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript itemtotext TM_THUNDER, $0 - scall UnknownScript_0x56ca1 - iffalse UnknownScript_0x56cbd + scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript + iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_THUNDER - iffalse UnknownScript_0x56cb7 + iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript takecoins 5500 - jump UnknownScript_0x56ca6 + jump GoldenrodGmeCornerTMVendor_FinishScript -UnknownScript_0x56c69: +.Blizzard: checkcoins 5500 - if_equal $2, UnknownScript_0x56cb1 + if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript itemtotext TM_BLIZZARD, $0 - scall UnknownScript_0x56ca1 - iffalse UnknownScript_0x56cbd + scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript + iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_BLIZZARD - iffalse UnknownScript_0x56cb7 + iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript takecoins 5500 - jump UnknownScript_0x56ca6 + jump GoldenrodGmeCornerTMVendor_FinishScript -UnknownScript_0x56c85: +.FireBlast: checkcoins 5500 - if_equal $2, UnknownScript_0x56cb1 + if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript itemtotext TM_FIRE_BLAST, $0 - scall UnknownScript_0x56ca1 - iffalse UnknownScript_0x56cbd + scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript + iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript giveitem TM_FIRE_BLAST - iffalse UnknownScript_0x56cb7 + iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript takecoins 5500 - jump UnknownScript_0x56ca6 + jump GoldenrodGmeCornerTMVendor_FinishScript -UnknownScript_0x56ca1: - writetext UnknownText_0x56ea8 +GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript: + writetext GoldenrodGameCornerPrizeVendorConfirmPrizeText yesorno end -UnknownScript_0x56ca6: - waitbutton +GoldenrodGmeCornerTMVendor_FinishScript: + waitsfx playsound SFX_TRANSACTION - writetext UnknownText_0x56ebd - closetext - jump UnknownScript_0x56c36 + writetext GoldenrodGameCornerPrizeVendorHereYouGoText + waitbutton + jump GoldenrodGmeCornerTMVendor_LoopScript -UnknownScript_0x56cb1: - writetext UnknownText_0x56ecb +GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript: + writetext GoldenrodGameCornerPrizeVendorNeedMoreCoinsText + waitbutton closetext - loadmovesprites end -UnknownScript_0x56cb7: - writetext UnknownText_0x56ee8 +GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript: + writetext GoldenrodGameCornerPrizeVendorNoMoreRoomText + waitbutton closetext - loadmovesprites end -UnknownScript_0x56cbd: - writetext UnknownText_0x56f09 +GoldenrodGameCornerPrizeVendor_CancelPurchaseScript: + writetext GoldenrodGameCornerPrizeVendorQuitText + waitbutton closetext - loadmovesprites end -UnknownScript_0x56cc3: - writetext UnknownText_0x56f35 +GoldenrodGameCornerPrizeVendor_NoCoinCaseScript: + writetext GoldenrodGameCornerPrizeVendorNoCoinCaseText + waitbutton closetext - loadmovesprites end -MenuDataHeader_0x56cc9: +GoldenrodGameCornerTMVendorMenuData: db $40 ; flags db 02, 00 ; start coords db 11, 15 ; end coords - dw MenuData2_0x56cd1 + dw .MenuData2 db 1 ; default option -MenuData2_0x56cd1: +.MenuData2 db $80 ; flags db 4 ; items db "TM25 5500@" @@ -144,87 +158,87 @@ MenuData2_0x56cd1: db "CANCEL@" -ReceptionistScript_0x56d01: +GoldenrodGameCornerPrizeMonVendorScript: faceplayer - loadfont - writetext UnknownText_0x56e50 - closetext + opentext + writetext GoldenrodGameCornerPrizeVendorIntroText + waitbutton checkitem COIN_CASE - iffalse UnknownScript_0x56cc3 -UnknownScript_0x56d0c: - writetext UnknownText_0x56e8b + iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript +.loop + writetext GoldenrodGameCornerPrizeVendorWhichPrizeText special Special_DisplayCoinCaseBalance - loadmenudata MenuDataHeader_0x56db0 - interpretmenu2 - writebackup - if_equal $1, UnknownScript_0x56d26 - if_equal $2, UnknownScript_0x56d54 - if_equal $3, UnknownScript_0x56d82 - jump UnknownScript_0x56cbd - -UnknownScript_0x56d26: + loadmenudata .MenuDataHeader + verticalmenu + closewindow + if_equal $1, .abra + if_equal $2, .cubone + if_equal $3, .wobbuffet + jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript + +.abra: checkcoins 100 - if_equal $2, UnknownScript_0x56cb1 + if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT - if_equal $6, UnknownScript_0x56cb7 + if_equal $6, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript pokenamemem ABRA, $0 - scall UnknownScript_0x56ca1 - iffalse UnknownScript_0x56cbd - waitbutton + scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript + iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript + waitsfx playsound SFX_TRANSACTION - writetext UnknownText_0x56ebd - closetext + writetext GoldenrodGameCornerPrizeVendorHereYouGoText + waitbutton writebyte ABRA special Special_GameCornerPrizeMonCheckDex givepoke ABRA, 5 takecoins 100 - jump UnknownScript_0x56d0c + jump .loop -UnknownScript_0x56d54: +.cubone: checkcoins 800 - if_equal $2, UnknownScript_0x56cb1 + if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT - if_equal $6, UnknownScript_0x56cb7 + if_equal $6, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript pokenamemem CUBONE, $0 - scall UnknownScript_0x56ca1 - iffalse UnknownScript_0x56cbd - waitbutton + scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript + iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript + waitsfx playsound SFX_TRANSACTION - writetext UnknownText_0x56ebd - closetext + writetext GoldenrodGameCornerPrizeVendorHereYouGoText + waitbutton writebyte CUBONE special Special_GameCornerPrizeMonCheckDex givepoke CUBONE, 15 takecoins 800 - jump UnknownScript_0x56d0c + jump .loop -UnknownScript_0x56d82: +.wobbuffet: checkcoins 1500 - if_equal $2, UnknownScript_0x56cb1 + if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT - if_equal $6, UnknownScript_0x56cb7 + if_equal $6, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript pokenamemem WOBBUFFET, $0 - scall UnknownScript_0x56ca1 - iffalse UnknownScript_0x56cbd - waitbutton + scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript + iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript + waitsfx playsound SFX_TRANSACTION - writetext UnknownText_0x56ebd - closetext + writetext GoldenrodGameCornerPrizeVendorHereYouGoText + waitbutton writebyte WOBBUFFET special Special_GameCornerPrizeMonCheckDex givepoke WOBBUFFET, 15 takecoins 1500 - jump UnknownScript_0x56d0c + jump .loop -MenuDataHeader_0x56db0: +.MenuDataHeader: db $40 ; flags db 02, 00 ; start coords db 11, 17 ; end coords - dw MenuData2_0x56db8 + dw .MenuData2 db 1 ; default option -MenuData2_0x56db8: +.MenuData2: db $80 ; flags db 4 ; items db "ABRA 100@" @@ -233,83 +247,83 @@ MenuData2_0x56db8: db "CANCEL@" -PharmacistScript_0x56df1: +GoldenrodGameCornerPharmacistScript: faceplayer - loadfont - writetext UnknownText_0x56f55 + opentext + writetext GoldenrodGameCornerPharmacistText + waitbutton closetext - loadmovesprites spriteface LAST_TALKED, LEFT end -PokefanMScript_0x56dfc: +GoldenrodGameCornerPokefanM1Script: faceplayer - loadfont - writetext UnknownText_0x56f9e + opentext + writetext GoldenrodGameCornerPokefanM1Text + waitbutton closetext - loadmovesprites - spriteface $7, RIGHT + spriteface GOLDENRODGAMECORNER_POKEFAN_M1, RIGHT end -CooltrainerMScript_0x56e07: +GoldenrodGameCornerCooltrainerMScript: faceplayer - loadfont - writetext UnknownText_0x56ff4 + opentext + writetext GoldenrodGameCornerCooltrainerMText + waitbutton closetext - loadmovesprites - spriteface $8, LEFT + spriteface GOLDENRODGAMECORNER_COOLTRAINER_M, LEFT end -PokefanFScript_0x56e12: +GoldenrodGameCornerPokefanFScript: faceplayer - loadfont - writetext UnknownText_0x5702b + opentext + writetext GoldenrodGameCornerPokefanFText + waitbutton closetext - loadmovesprites - spriteface $9, RIGHT + spriteface GOLDENRODGAMECORNER_POKEFAN_F, RIGHT end -CooltrainerFScript_0x56e1d: - jumptextfaceplayer UnknownText_0x57097 +GoldenrodGameCornerCooltrainerFScript: + jumptextfaceplayer GoldenrodGameCornerCooltrainerFText -GentlemanScript_0x56e20: +GoldenrodGameCornerGentlemanScript: faceplayer - loadfont - writetext UnknownText_0x570b1 + opentext + writetext GoldenrodGameCornerGentlemanText + waitbutton closetext - loadmovesprites - spriteface $b, RIGHT + spriteface GOLDENRODGAMECORNER_GENTLEMAN, RIGHT end -PokefanMScript_0x56e2b: - jumptextfaceplayer UnknownText_0x5710d +GoldenrodGameCornerPokefanM2Script: + jumptextfaceplayer GoldenrodGameCornerPokefanM2Text -MapGoldenrodGameCornerSignpost30Script: - jumptext UnknownText_0x571af +GoldenrodGameCornerLeftTheirDrinkScript: + jumptext GoldenrodGameCornerLeftTheirDrinkText -MapGoldenrodGameCornerSignpost17Script: - random $6 - if_equal $0, MapGoldenrodGameCornerSignpost7Script +GoldenrodGameCornerSlotsMachineScript: + random 6 + if_equal 0, GoldenrodGameCornerLuckySlotsMachineScript refreshscreen $0 - writebyte $0 + writebyte FALSE special Special_SlotMachine - loadmovesprites + closetext end -MapGoldenrodGameCornerSignpost7Script: +GoldenrodGameCornerLuckySlotsMachineScript: refreshscreen $0 - writebyte $1 + writebyte TRUE special Special_SlotMachine - loadmovesprites + closetext end -MapGoldenrodGameCornerSignpost29Script: +GoldenrodGameCornerCardFlipMachineScript: refreshscreen $0 special Special_CardFlip - loadmovesprites + closetext end -UnknownText_0x56e50: +GoldenrodGameCornerPrizeVendorIntroText: text "Welcome!" para "We exchange your" @@ -317,43 +331,43 @@ UnknownText_0x56e50: cont "fabulous prizes!" done -UnknownText_0x56e8b: +GoldenrodGameCornerPrizeVendorWhichPrizeText: text "Which prize would" line "you like?" done -UnknownText_0x56ea8: +GoldenrodGameCornerPrizeVendorConfirmPrizeText: text_from_ram StringBuffer3 text "." line "Is that right?" done -UnknownText_0x56ebd: +GoldenrodGameCornerPrizeVendorHereYouGoText: text "Here you go!" done -UnknownText_0x56ecb: +GoldenrodGameCornerPrizeVendorNeedMoreCoinsText: text "Sorry! You need" line "more coins." done -UnknownText_0x56ee8: +GoldenrodGameCornerPrizeVendorNoMoreRoomText: text "Sorry. You can't" line "carry any more." done -UnknownText_0x56f09: +GoldenrodGameCornerPrizeVendorQuitText: text "OK. Please save" line "your coins and" cont "come again!" done -UnknownText_0x56f35: +GoldenrodGameCornerPrizeVendorNoCoinCaseText: text "Oh? You don't have" line "a COIN CASE." done -UnknownText_0x56f55: +GoldenrodGameCornerPharmacistText: text "I always play this" line "slot machine. It" @@ -361,7 +375,7 @@ UnknownText_0x56f55: line "others, I think." done -UnknownText_0x56f9e: +GoldenrodGameCornerPokefanM1Text: text "I just love this" line "new slot machine." @@ -370,13 +384,13 @@ UnknownText_0x56f9e: cont "ones in CELADON." done -UnknownText_0x56ff4: +GoldenrodGameCornerCooltrainerMText: text "Life is a gamble." line "I'm going to flip" cont "cards till I drop!" done -UnknownText_0x5702b: +GoldenrodGameCornerPokefanFText: text "Card flip…" para "I prefer it over" @@ -389,12 +403,12 @@ UnknownText_0x5702b: line "much lower." done -UnknownText_0x57097: +GoldenrodGameCornerCooltrainerFText: text "I won't quit until" line "I win!" done -UnknownText_0x570b1: +GoldenrodGameCornerGentlemanText: text "I taught BLIZZARD" line "to my #MON." @@ -405,7 +419,7 @@ UnknownText_0x570b1: line "worth it." done -UnknownText_0x5710d: +GoldenrodGameCornerPokefanM2Text: text "I couldn't win at" line "the slots, and I" @@ -419,12 +433,12 @@ UnknownText_0x5710d: line "UNDERGROUND." done -UnknownText_0x5718a: +GoldenrodGameCornerPokefanM3Text: text "Wahahah! The coins" line "keep rolling in!" done -UnknownText_0x571af: +GoldenrodGameCornerLeftTheirDrinkText: text "Someone left their" line "drink." @@ -445,49 +459,49 @@ GoldenrodGameCorner_MapEventHeader: .Signposts: db 31 - signpost 6, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script - signpost 7, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script - signpost 8, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script - signpost 9, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script - signpost 10, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script - signpost 11, 6, SIGNPOST_RIGHT, MapGoldenrodGameCornerSignpost17Script - signpost 6, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script - signpost 7, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost7Script - signpost 8, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script - signpost 9, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script - signpost 10, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script - signpost 11, 7, SIGNPOST_LEFT, MapGoldenrodGameCornerSignpost17Script - signpost 6, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script - signpost 7, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script - signpost 8, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script - signpost 9, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script - signpost 10, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script - signpost 11, 12, SIGNPOST_RIGHT, MapGoldenrodGameCornerSignpost17Script - signpost 6, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script - signpost 7, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script - signpost 8, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script - signpost 9, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script - signpost 10, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script - signpost 11, 13, SIGNPOST_LEFT, MapGoldenrodGameCornerSignpost29Script - signpost 6, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script - signpost 7, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script - signpost 8, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script - signpost 9, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script - signpost 10, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script - signpost 11, 18, SIGNPOST_RIGHT, MapGoldenrodGameCornerSignpost29Script - signpost 1, 12, SIGNPOST_LEFT, MapGoldenrodGameCornerSignpost30Script + signpost 6, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript + signpost 7, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript + signpost 8, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript + signpost 9, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript + signpost 10, 6, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript + signpost 11, 6, SIGNPOST_RIGHT, GoldenrodGameCornerSlotsMachineScript + signpost 6, 7, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript + signpost 7, 7, SIGNPOST_READ, GoldenrodGameCornerLuckySlotsMachineScript + signpost 8, 7, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript + signpost 9, 7, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript + signpost 10, 7, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript + signpost 11, 7, SIGNPOST_LEFT, GoldenrodGameCornerSlotsMachineScript + signpost 6, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript + signpost 7, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript + signpost 8, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript + signpost 9, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript + signpost 10, 12, SIGNPOST_READ, GoldenrodGameCornerSlotsMachineScript + signpost 11, 12, SIGNPOST_RIGHT, GoldenrodGameCornerSlotsMachineScript + signpost 6, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript + signpost 7, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript + signpost 8, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript + signpost 9, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript + signpost 10, 13, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript + signpost 11, 13, SIGNPOST_LEFT, GoldenrodGameCornerCardFlipMachineScript + signpost 6, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript + signpost 7, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript + signpost 8, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript + signpost 9, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript + signpost 10, 18, SIGNPOST_READ, GoldenrodGameCornerCardFlipMachineScript + signpost 11, 18, SIGNPOST_RIGHT, GoldenrodGameCornerCardFlipMachineScript + signpost 1, 12, SIGNPOST_LEFT, GoldenrodGameCornerLeftTheirDrinkScript .PersonEvents: db 12 - person_event SPRITE_CLERK, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ClerkScript_0x56c25, -1 - person_event SPRITE_RECEPTIONIST, 2, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x56c28, -1 - person_event SPRITE_RECEPTIONIST, 2, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x56d01, -1 - person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 2, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x56df1, -1 - person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 4, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x56df1, -1 - person_event SPRITE_POKEFAN_M, 10, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x56dfc, -1 - person_event SPRITE_COOLTRAINER_M, 8, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x56e07, -1 - person_event SPRITE_POKEFAN_F, 6, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x56e12, -1 - person_event SPRITE_COOLTRAINER_F, 3, 10, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x56e1d, -1 - person_event SPRITE_GENTLEMAN, 10, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x56e20, -1 - person_event SPRITE_POKEFAN_M, 9, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x56e2b, -1 - person_event SPRITE_POKEFAN_M, 10, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x56c1a, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR + person_event SPRITE_CLERK, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1 + person_event SPRITE_RECEPTIONIST, 2, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1 + person_event SPRITE_RECEPTIONIST, 2, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 + person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << DAY), (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 + person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << NITE), (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 + person_event SPRITE_POKEFAN_M, 10, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1 + person_event SPRITE_COOLTRAINER_M, 8, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1 + person_event SPRITE_POKEFAN_F, 6, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1 + person_event SPRITE_COOLTRAINER_F, 3, 10, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1 + person_event SPRITE_GENTLEMAN, 10, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1 + person_event SPRITE_POKEFAN_M, 9, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1 + person_event SPRITE_POKEFAN_M, 10, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index c2746de68..5704b54a9 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -1,3 +1,11 @@ +const_value set 2 + const GOLDENRODGYM_WHITNEY + const GOLDENRODGYM_LASS1 + const GOLDENRODGYM_LASS2 + const GOLDENRODGYM_BUENA1 + const GOLDENRODGYM_BUENA2 + const GOLDENRODGYM_GYM_GUY + GoldenrodGym_MapScriptHeader: .MapTriggers: db 2 @@ -19,14 +27,14 @@ WhitneyScript_0x5400c: faceplayer checkevent EVENT_BEAT_WHITNEY iftrue .FightDone - loadfont + opentext writetext UnknownText_0x54122 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x541a5, 0 loadtrainer WHITNEY, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_WHITNEY setevent EVENT_MADE_WHITNEY_CRY dotrigger $1 @@ -35,12 +43,12 @@ WhitneyScript_0x5400c: setevent EVENT_BEAT_LASS_CARRIE setevent EVENT_BEAT_LASS_BRIDGET .FightDone - loadfont + opentext checkevent EVENT_MADE_WHITNEY_CRY iffalse .StoppedCrying writetext UnknownText_0x541f4 + waitbutton closetext - loadmovesprites end .StoppedCrying @@ -49,30 +57,30 @@ WhitneyScript_0x5400c: checkflag ENGINE_PLAINBADGE iftrue UnknownScript_0x54064 writetext UnknownText_0x54222 - keeptextopen - waitbutton + buttonsound + waitsfx writetext UnknownText_0x54273 playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_PLAINBADGE checkcode VAR_BADGES scall GoldenrodGymTriggerRockets UnknownScript_0x54064: writetext UnknownText_0x5428b - keeptextopen + buttonsound verbosegiveitem TM_ATTRACT iffalse UnknownScript_0x5407b setevent EVENT_GOT_TM45_ATTRACT writetext UnknownText_0x54302 + waitbutton closetext - loadmovesprites end UnknownScript_0x54077: writetext UnknownText_0x54360 - closetext + waitbutton UnknownScript_0x5407b: - loadmovesprites + closetext end GoldenrodGymTriggerRockets: @@ -90,22 +98,22 @@ TrainerLassCarrie: trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, LassCarrieScript LassCarrieScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext LassCarrieOWText + waitbutton closetext - loadmovesprites end WhitneyCriesScript: - showemote EMOTE_SHOCK, $4, 15 - applymovement $4, BridgetWalksUpMovement + showemote EMOTE_SHOCK, GOLDENRODGYM_LASS2, 15 + applymovement GOLDENRODGYM_LASS2, BridgetWalksUpMovement spriteface PLAYER, DOWN - loadfont + opentext writetext BridgetWhitneyCriesText + waitbutton closetext - loadmovesprites - applymovement $4, BridgetWalksAwayMovement + applymovement GOLDENRODGYM_LASS2, BridgetWalksAwayMovement dotrigger $0 clearevent EVENT_MADE_WHITNEY_CRY end @@ -114,50 +122,50 @@ TrainerLassBridget: trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, LassBridgetScript LassBridgetScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext LassBridgetOWText + waitbutton closetext - loadmovesprites end TrainerBeautyVictoria: trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, BeautyVictoriaScript BeautyVictoriaScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext BeautyVictoriaOWText + waitbutton closetext - loadmovesprites end TrainerBeautySamantha: trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, BeautySamanthaScript BeautySamanthaScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext BeautySamanthaOWText + waitbutton closetext - loadmovesprites end GoldenrodGymGuyScript: faceplayer checkevent EVENT_BEAT_WHITNEY iftrue .GoldenrodGymGuyWinScript - loadfont + opentext writetext GoldenrodGymGuyText + waitbutton closetext - loadmovesprites end .GoldenrodGymGuyWinScript - loadfont + opentext writetext GoldenrodGymGuyWinText + waitbutton closetext - loadmovesprites end GoldenrodGymStatue: diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 3ef382fa5..cebfef9f2 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -1,3 +1,8 @@ +const_value set 2 + const GOLDENRODHAPPINESSRATER_TEACHER + const GOLDENRODHAPPINESSRATER_POKEFAN_M + const GOLDENRODHAPPINESSRATER_TWIN + GoldenrodHappinessRater_MapScriptHeader: .MapTriggers: db 0 @@ -7,10 +12,10 @@ GoldenrodHappinessRater_MapScriptHeader: TeacherScript_0x54953: faceplayer - loadfont + opentext special GetFirstPokemonHappiness writetext UnknownText_0x549a3 - keeptextopen + buttonsound if_greater_than $f9, UnknownScript_0x54973 if_greater_than $c7, UnknownScript_0x54979 if_greater_than $95, UnknownScript_0x5497f @@ -20,38 +25,38 @@ TeacherScript_0x54953: UnknownScript_0x54973: writetext UnknownText_0x549fc + waitbutton closetext - loadmovesprites end UnknownScript_0x54979: writetext UnknownText_0x54a2c + waitbutton closetext - loadmovesprites end UnknownScript_0x5497f: writetext UnknownText_0x54a5a + waitbutton closetext - loadmovesprites end UnknownScript_0x54985: writetext UnknownText_0x54a8e + waitbutton closetext - loadmovesprites end UnknownScript_0x5498b: writetext UnknownText_0x54a9f + waitbutton closetext - loadmovesprites end UnknownScript_0x54991: writetext UnknownText_0x54ad1 + waitbutton closetext - loadmovesprites end PokefanMScript_0x54997: diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 75819cf92..a8276d1cf 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -1,24 +1,28 @@ +const_value set 2 + const GOLDENRODMAGNETTRAINSTATION_OFFICER + const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN + GoldenrodMagnetTrainStation_MapScriptHeader: .MapTriggers: db 1 ; triggers - dw .Trigger1, 0 + dw .Trigger0, 0 .MapCallbacks: db 0 -.Trigger1: +.Trigger0: end OfficerScript_0x550ec: faceplayer - loadfont + opentext checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .MagnetTrainToSaffron writetext UnknownText_0x55160 + waitbutton closetext - loadmovesprites end .MagnetTrainToSaffron: @@ -28,9 +32,9 @@ OfficerScript_0x550ec: checkitem PASS iffalse .PassNotInBag writetext UnknownText_0x551ed + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x55146 + applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 applymovement PLAYER, MovementData_0x5514f writebyte $0 special Special_MagnetTrain @@ -46,24 +50,24 @@ OfficerScript_0x550ec: .PassNotInBag: writetext UnknownText_0x5522c + waitbutton closetext - loadmovesprites end .DecidedNotToRide: writetext UnknownText_0x5524f + waitbutton closetext - loadmovesprites end Script_ArriveFromSaffron: - applymovement $2, MovementData_0x55146 + applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 applymovement PLAYER, MovementData_0x55158 - applymovement $2, MovementData_0x5514b - loadfont + applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x5514b + opentext writetext UnknownText_0x5526a + waitbutton closetext - loadmovesprites end GentlemanScript_0x55143: diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm index 4253fe3ef..3b2c5cc3f 100644 --- a/maps/GoldenrodNameRatersHouse.asm +++ b/maps/GoldenrodNameRatersHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const GOLDENRODNAMERATERSHOUSE_GENTLEMAN + GoldenrodNameRatersHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,10 +10,10 @@ GoldenrodNameRatersHouse_MapScriptHeader: GentlemanScript_0x5577c: faceplayer - loadfont + opentext special SpecialNameRater + waitbutton closetext - loadmovesprites end GoldenrodNameRatersHouseBookshelf: diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 0f373281a..710959645 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const GOLDENRODPPSPEECHHOUSE_FISHER + const GOLDENRODPPSPEECHHOUSE_LASS + GoldenrodPPSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index 83fe5e26a..b8c7b1b76 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const GOLDENRODPOKECENTER1F_NURSE + const GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST + const GOLDENRODPOKECENTER1F_GAMEBOY_KID + const GOLDENRODPOKECENTER1F_LASS + const GOLDENRODPOKECENTER1F_POKEFAN_F + GoldenrodPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -9,7 +16,7 @@ NurseScript_0x60f91: jumpstd pokecenternurse GoldenrodPokeCenter1F_GSBallTriggerLeft: - writebyte BATTLE_TOWER_ACTION_0B + writebyte BATTLETOWERACTION_CHECKMOBILEEVENT special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end @@ -18,30 +25,30 @@ GoldenrodPokeCenter1F_GSBallTriggerLeft: checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue .cancel playsound SFX_EXIT_BUILDING - moveperson $3, $0, $7 - disappear $3 - appear $3 + moveperson GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, $0, $7 + disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST + appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND - applymovement $3, MovementData_0x6105a + applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x6105a spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x622f0 - closetext + waitbutton verbosegiveitem GS_BALL setevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER setevent EVENT_CAN_GIVE_GS_BALL_TO_KURT writetext UnknownText_0x62359 + waitbutton closetext - loadmovesprites - applymovement $3, MovementData_0x61060 + applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x61060 special RestartMapMusic - disappear $3 + disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playsound SFX_EXIT_BUILDING .cancel: end GoldenrodPokeCenter1F_GSBallTriggerRight: - writebyte BATTLE_TOWER_ACTION_0B + writebyte BATTLETOWERACTION_CHECKMOBILEEVENT special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end @@ -50,24 +57,24 @@ GoldenrodPokeCenter1F_GSBallTriggerRight: checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue .cancel playsound SFX_EXIT_BUILDING - moveperson $3, $0, $7 - disappear $3 - appear $3 + moveperson GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, $0, $7 + disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST + appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND - applymovement $3, MovementData_0x61065 + applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x61065 spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x622f0 - closetext + waitbutton verbosegiveitem GS_BALL setevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER setevent EVENT_CAN_GIVE_GS_BALL_TO_KURT writetext UnknownText_0x62359 + waitbutton closetext - loadmovesprites - applymovement $3, MovementData_0x6106c + applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x6106c special RestartMapMusic - disappear $3 + disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playsound SFX_EXIT_BUILDING .cancel: end @@ -80,36 +87,36 @@ LassScript_0x61021: PokefanFScript_0x61024: faceplayer - loadfont + opentext writetext UnknownText_0x623fb - closetext + waitbutton writetext UnknownText_0x6248c yesorno iffalse UnknownScript_0x6104b takeitem EON_MAIL iffalse UnknownScript_0x6104b writetext UnknownText_0x62549 - closetext + waitbutton writetext UnknownText_0x624a4 - closetext + waitbutton verbosegiveitem REVIVE iffalse UnknownScript_0x61051 writetext UnknownText_0x624e9 + waitbutton closetext - loadmovesprites end UnknownScript_0x6104b: writetext UnknownText_0x62509 + waitbutton closetext - loadmovesprites end UnknownScript_0x61051: giveitem EON_MAIL writetext UnknownText_0x6252a + waitbutton closetext - loadmovesprites end MovementData_0x6105a: diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index f43e02ee9..56ae85b30 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -1,3 +1,8 @@ +const_value set 2 + const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST1 + const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST2 + const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST3 + GoldenrodPokeComCenter2FMobile_MapScriptHeader: .MapTriggers: db 0 @@ -15,32 +20,32 @@ ScientistScript_0x625d7: jumptextfaceplayer UnknownText_0x62795 MapGoldenrodPokeComCenter2FMobileSignpost0Script: - loadfont + opentext writetext UnknownText_0x627ee - closetext + waitbutton UnknownScript_0x625df: reloadmappart loadmenudata MenuDataHeader_0x62602 - interpretmenu2 - writebackup + verticalmenu + closewindow if_equal $1, UnknownScript_0x625f0 if_equal $2, UnknownScript_0x625f8 jump UnknownScript_0x62600 UnknownScript_0x625f0: - loadfont + opentext writetext UnknownText_0x62828 - closetext + waitbutton jump UnknownScript_0x625df UnknownScript_0x625f8: - loadfont + opentext writetext UnknownText_0x628f4 - closetext + waitbutton jump UnknownScript_0x625df UnknownScript_0x62600: - loadmovesprites + closetext end @@ -60,32 +65,32 @@ MenuData2_0x6260a: MapGoldenrodPokeComCenter2FMobileSignpost1Script: - loadfont + opentext writetext UnknownText_0x62989 - closetext + waitbutton UnknownScript_0x62629: reloadmappart loadmenudata MenuDataHeader_0x6264c - interpretmenu2 - writebackup + verticalmenu + closewindow if_equal $1, UnknownScript_0x6263a if_equal $2, UnknownScript_0x62642 jump UnknownScript_0x6264a UnknownScript_0x6263a: - loadfont + opentext writetext UnknownText_0x629ae - closetext + waitbutton jump UnknownScript_0x62629 UnknownScript_0x62642: - loadfont + opentext writetext UnknownText_0x62a5a - closetext + waitbutton jump UnknownScript_0x62629 UnknownScript_0x6264a: - loadmovesprites + closetext end diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index ecc481750..1b6befa08 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const GUIDEGENTSHOUSE_GRAMPS + GuideGentsHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 35da37630..c8ee751a1 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -1,31 +1,34 @@ +const_value set 2 + const HALLOFFAME_LANCE + HallOfFame_MapScriptHeader: .MapTriggers: db 2 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 - dw .Trigger2, 0 .MapCallbacks: db 0 -.Trigger1: +.Trigger0: priorityjump HallOfFameScript end -.Trigger2: +.Trigger1: end HallOfFameScript: - follow $2, PLAYER - applymovement $2, HallOfFame_WalkUpWithLance + follow HALLOFFAME_LANCE, PLAYER + applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance stopfollow spriteface PLAYER, RIGHT - loadfont + opentext writetext HallOfFame_LanceText + waitbutton closetext - loadmovesprites - spriteface $2, UP + spriteface HALLOFFAME_LANCE, UP applymovement PLAYER, HallOfFame_SlowlyApproachMachine dotrigger $1 pause 15 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index c39fd9a45..ab2ba2702 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ICEPATH1F_POKE_BALL1 + const ICEPATH1F_POKE_BALL2 + const ICEPATH1F_POKE_BALL3 + IcePath1F_MapScriptHeader: .MapTriggers: db 0 @@ -5,14 +10,14 @@ IcePath1F_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x7e472: - db HM_WATERFALL, 1 +IcePath1FHMWaterfall: + itemball HM_WATERFALL -ItemFragment_0x7e474: - db PP_UP, 1 +IcePath1FPPUp: + itemball PP_UP -ItemFragment_0x7e476: - db PROTEIN, 1 +IcePath1FProtein: + itemball PROTEIN IcePath1F_MapEventHeader: ; filler @@ -33,6 +38,6 @@ IcePath1F_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_POKE_BALL, 7, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e472, EVENT_GOT_HM07_WATERFALL - person_event SPRITE_POKE_BALL, 23, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e474, EVENT_ICE_PATH_1F_PP_UP - person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e476, EVENT_ICE_PATH_1F_PROTEIN + person_event SPRITE_POKE_BALL, 7, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL + person_event SPRITE_POKE_BALL, 23, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP + person_event SPRITE_POKE_BALL, 9, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 80d341b03..510e4e458 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const ICEPATHB1F_BOULDER1 + const ICEPATHB1F_BOULDER2 + const ICEPATHB1F_BOULDER3 + const ICEPATHB1F_BOULDER4 + const ICEPATHB1F_POKE_BALL + IcePathB1F_MapScriptHeader: .MapTriggers: db 0 @@ -18,47 +25,39 @@ IcePathB1F_MapScriptHeader: db 0, 0 ; filler .StoneTable: - db 3, 2 ; warp, person - dw .Boulder1 - - db 4, 3 ; warp, person - dw .Boulder2 - - db 5, 4 ; warp, person - dw .Boulder3 - - db 6, 5 ; warp, person - dw .Boulder4 - - db -1 ; end + stonetable 3, ICEPATHB1F_BOULDER1, .Boulder1 + stonetable 4, ICEPATHB1F_BOULDER2, .Boulder2 + stonetable 5, ICEPATHB1F_BOULDER3, .Boulder3 + stonetable 6, ICEPATHB1F_BOULDER4, .Boulder4 + db -1 .Boulder1: - disappear 2 + disappear ICEPATHB1F_BOULDER1 clearevent EVENT_BOULDER_IN_ICE_PATH_1A jump .FinishBoulder .Boulder2: - disappear 3 + disappear ICEPATHB1F_BOULDER2 clearevent EVENT_BOULDER_IN_ICE_PATH_2A jump .FinishBoulder .Boulder3: - disappear 4 + disappear ICEPATHB1F_BOULDER3 clearevent EVENT_BOULDER_IN_ICE_PATH_3A jump .FinishBoulder .Boulder4: - disappear 5 + disappear ICEPATHB1F_BOULDER4 clearevent EVENT_BOULDER_IN_ICE_PATH_4A jump .FinishBoulder .FinishBoulder: pause 30 scall .BoulderFallsThrough - loadfont - writetext UnknownText_0x7e512 + opentext + writetext IcePathBoulderFellThroughText + waitbutton closetext - loadmovesprites end .BoulderFallsThrough: @@ -70,14 +69,14 @@ IcePathB1F_MapScriptHeader: IcePathB1FBoulder: jumpstd strengthboulder -ItemFragment_0x7e50d: - db IRON, 1 +IcePathB1FIron: + itemball IRON -MapIcePathB1FSignpostItem0: +IcePathB1FHiddenMaxPotion: dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION -UnknownText_0x7e512: +IcePathBoulderFellThroughText: text "The boulder fell" line "through." done @@ -103,7 +102,7 @@ IcePathB1F_MapEventHeader: .Signposts: db 1 - signpost 30, 17, SIGNPOST_ITEM, MapIcePathB1FSignpostItem0 + signpost 30, 17, SIGNPOST_ITEM, IcePathB1FHiddenMaxPotion .PersonEvents: db 5 @@ -111,4 +110,4 @@ IcePathB1F_MapEventHeader: person_event SPRITE_BOULDER, 8, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 person_event SPRITE_BOULDER, 9, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 person_event SPRITE_BOULDER, 7, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4 - person_event SPRITE_POKE_BALL, 35, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e50d, EVENT_ICE_PATH_B1F_IRON + person_event SPRITE_POKE_BALL, 35, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index d229579f8..12d5dbdcb 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL + IcePathB2FBlackthornSide_MapScriptHeader: .MapTriggers: db 0 @@ -5,10 +8,10 @@ IcePathB2FBlackthornSide_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x7e646: - db TM_REST, 1 +IcePathB2FBlackthornSideTMRest: + itemball TM_REST -MapIcePathB2FBlackthornSideSignpostItem0: +IcePathB2FBlackthornSideHiddenIceHeal: dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL @@ -26,8 +29,8 @@ IcePathB2FBlackthornSide_MapEventHeader: .Signposts: db 1 - signpost 10, 2, SIGNPOST_ITEM, MapIcePathB2FBlackthornSideSignpostItem0 + signpost 10, 2, SIGNPOST_ITEM, IcePathB2FBlackthornSideHiddenIceHeal .PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e646, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST + person_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 77a5ff29a..f17f21d12 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -1,3 +1,11 @@ +const_value set 2 + const ICEPATHB2FMAHOGANYSIDE_BOULDER1 + const ICEPATHB2FMAHOGANYSIDE_BOULDER2 + const ICEPATHB2FMAHOGANYSIDE_BOULDER3 + const ICEPATHB2FMAHOGANYSIDE_BOULDER4 + const ICEPATHB2FMAHOGANYSIDE_POKE_BALL1 + const ICEPATHB2FMAHOGANYSIDE_POKE_BALL2 + IcePathB2FMahoganySide_MapScriptHeader: .MapTriggers: db 0 @@ -8,13 +16,13 @@ IcePathB2FMahoganySide_MapScriptHeader: BoulderScript_0x7e5a3: jumptext UnknownText_0x7e5ad -ItemFragment_0x7e5a6: - db FULL_HEAL, 1 +IcePathB2FMahoganySideFullHeal: + itemball FULL_HEAL -ItemFragment_0x7e5a8: - db MAX_POTION, 1 +IcePathB2FMahoganySideMaxPotion: + itemball MAX_POTION -MapIcePathB2FMahoganySideSignpostItem0: +IcePathB2FMahoganySideHiddenCarbos: dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS @@ -41,7 +49,7 @@ IcePathB2FMahoganySide_MapEventHeader: .Signposts: db 1 - signpost 17, 0, SIGNPOST_ITEM, MapIcePathB2FMahoganySideSignpostItem0 + signpost 17, 0, SIGNPOST_ITEM, IcePathB2FMahoganySideHiddenCarbos .PersonEvents: db 6 @@ -49,5 +57,5 @@ IcePathB2FMahoganySide_MapEventHeader: person_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A person_event SPRITE_BOULDER, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A person_event SPRITE_BOULDER, 13, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A - person_event SPRITE_POKE_BALL, 9, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e5a6, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL - person_event SPRITE_POKE_BALL, 2, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e5a8, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION + person_event SPRITE_POKE_BALL, 9, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL + person_event SPRITE_POKE_BALL, 2, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 0fe12cd7d..1eb0c4548 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ICEPATHB3F_POKE_BALL + const ICEPATHB3F_ROCK + IcePathB3F_MapScriptHeader: .MapTriggers: db 0 @@ -5,8 +9,8 @@ IcePathB3F_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x7e66f: - db NEVERMELTICE, 1 +IcePathB3FNevermeltice: + itemball NEVERMELTICE IcePathB3FRock: jumpstd smashrock @@ -28,5 +32,5 @@ IcePathB3F_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_POKE_BALL, 7, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e66f, EVENT_ICE_PATH_B3F_NEVERMELTICE + person_event SPRITE_POKE_BALL, 7, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE person_event SPRITE_ROCK, 6, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IcePathB3FRock, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 851f50399..5e6ad9f2e 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -1,3 +1,16 @@ +const_value set 2 + const ILEXFOREST_BIRD + const ILEXFOREST_YOUNGSTER1 + const ILEXFOREST_BLACK_BELT + const ILEXFOREST_ROCKER + const ILEXFOREST_POKE_BALL1 + const ILEXFOREST_KURT + const ILEXFOREST_LASS + const ILEXFOREST_YOUNGSTER2 + const ILEXFOREST_POKE_BALL2 + const ILEXFOREST_POKE_BALL3 + const ILEXFOREST_POKE_BALL4 + IlexForest_MapScriptHeader: .MapTriggers: db 0 @@ -7,343 +20,345 @@ IlexForest_MapScriptHeader: ; callbacks - dbw 2, UnknownScript_0x6eb03 + dbw 2, .FarfetchdCallback -UnknownScript_0x6eb03: +.FarfetchdCallback: checkevent EVENT_GOT_HM01_CUT - iftrue UnknownScript_0x6eb34 + iftrue .Static copybytetovar FarfetchdPosition - if_equal $1, UnknownScript_0x6eb35 - if_equal $2, UnknownScript_0x6eb3c - if_equal $3, UnknownScript_0x6eb43 - if_equal $4, UnknownScript_0x6eb4a - if_equal $5, UnknownScript_0x6eb51 - if_equal $6, UnknownScript_0x6eb58 - if_equal $7, UnknownScript_0x6eb5f - if_equal $8, UnknownScript_0x6eb66 - if_equal $9, UnknownScript_0x6eb6d - if_equal $a, UnknownScript_0x6eb74 -UnknownScript_0x6eb34: + if_equal 1, .PositionOne + if_equal 2, .PositionTwo + if_equal 3, .PositionThree + if_equal 4, .PositionFour + if_equal 5, .PositionFive + if_equal 6, .PositionSix + if_equal 7, .PositionSeven + if_equal 8, .PositionEight + if_equal 9, .PositionNine + if_equal 10, .PositionTen +.Static: return -UnknownScript_0x6eb35: - moveperson $2, $e, $1f - appear $2 +.PositionOne: + moveperson ILEXFOREST_BIRD, $e, $1f + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb3c: - moveperson $2, $f, $19 - appear $2 +.PositionTwo: + moveperson ILEXFOREST_BIRD, $f, $19 + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb43: - moveperson $2, $14, $18 - appear $2 +.PositionThree: + moveperson ILEXFOREST_BIRD, $14, $18 + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb4a: - moveperson $2, $1d, $16 - appear $2 +.PositionFour: + moveperson ILEXFOREST_BIRD, $1d, $16 + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb51: - moveperson $2, $1c, $1f - appear $2 +.PositionFive: + moveperson ILEXFOREST_BIRD, $1c, $1f + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb58: - moveperson $2, $18, $23 - appear $2 +.PositionSix: + moveperson ILEXFOREST_BIRD, $18, $23 + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb5f: - moveperson $2, $16, $1f - appear $2 +.PositionSeven: + moveperson ILEXFOREST_BIRD, $16, $1f + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb66: - moveperson $2, $f, $1d - appear $2 +.PositionEight: + moveperson ILEXFOREST_BIRD, $f, $1d + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb6d: - moveperson $2, $a, $23 - appear $2 +.PositionNine: + moveperson ILEXFOREST_BIRD, $a, $23 + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb74: - moveperson $2, $6, $1c - appear $2 +.PositionTen: + moveperson ILEXFOREST_BIRD, $6, $1c + appear ILEXFOREST_BIRD return -YoungsterScript_0x6eb7b: +IlexForestCharcoalApprenticeScript: faceplayer - loadfont + opentext checkevent EVENT_HERDED_FARFETCHD - iftrue UnknownScript_0x6eb89 + iftrue .DoneFarfetchd writetext UnknownText_0x6ef5c + waitbutton closetext - loadmovesprites end -UnknownScript_0x6eb89: +.DoneFarfetchd: writetext UnknownText_0x6f019 + waitbutton closetext - loadmovesprites end -BirdScript_0x6eb8f: +IlexForestFarfetchdScript: copybytetovar FarfetchdPosition - if_equal $1, UnknownScript_0x6ebba - if_equal $2, UnknownScript_0x6ebd9 - if_equal $3, UnknownScript_0x6ec02 - if_equal $4, UnknownScript_0x6ec2b - if_equal $5, UnknownScript_0x6ec54 - if_equal $6, UnknownScript_0x6eca7 - if_equal $7, UnknownScript_0x6ecd0 - if_equal $8, UnknownScript_0x6ed0e - if_equal $9, UnknownScript_0x6ed50 - if_equal $a, UnknownScript_0x6ed96 -UnknownScript_0x6ebba: + if_equal 1, .Position1 + if_equal 2, .Position2 + if_equal 3, .Position3 + if_equal 4, .Position4 + if_equal 5, .Position5 + if_equal 6, .Position6 + if_equal 7, .Position7 + if_equal 8, .Position8 + if_equal 9, .Position9 + if_equal 10, .Position10 + +.Position1: faceplayer - loadfont - writetext UnknownText_0x6f06f - keeptextopen - writetext UnknownText_0x6f086 + opentext + writetext Text_ItsTheMissingPokemon + buttonsound + writetext Text_Kwaaaa cry FARFETCH_D + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x6ee8f - moveperson $2, $f, $19 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $2 - end - -UnknownScript_0x6ebd9: - scall UnknownScript_0x6eda1 - if_equal $0, UnknownScript_0x6ebf1 - applymovement $2, MovementData_0x6ee95 - moveperson $2, $14, $18 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $3 - end - -UnknownScript_0x6ebf1: - applymovement $2, MovementData_0x6ee9e - moveperson $2, $f, $1d - disappear $2 - appear $2 - loadvar FarfetchdPosition, $8 - end - -UnknownScript_0x6ec02: - scall UnknownScript_0x6eda1 - if_equal $2, UnknownScript_0x6ec1a - applymovement $2, MovementData_0x6eea4 - moveperson $2, $1d, $16 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $4 - end - -UnknownScript_0x6ec1a: - applymovement $2, MovementData_0x6eeab - moveperson $2, $f, $19 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $2 - end - -UnknownScript_0x6ec2b: - scall UnknownScript_0x6eda1 - if_equal $1, UnknownScript_0x6ec43 - applymovement $2, MovementData_0x6eeb1 - moveperson $2, $1c, $1f - disappear $2 - appear $2 - loadvar FarfetchdPosition, $5 - end - -UnknownScript_0x6ec43: - applymovement $2, MovementData_0x6eeb8 - moveperson $2, $14, $18 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $3 - end - -UnknownScript_0x6ec54: - scall UnknownScript_0x6eda1 - if_equal $1, UnknownScript_0x6ec85 - if_equal $2, UnknownScript_0x6ec74 - if_equal $3, UnknownScript_0x6ec96 - applymovement $2, MovementData_0x6eebd - moveperson $2, $18, $23 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $6 - end - -UnknownScript_0x6ec74: - applymovement $2, MovementData_0x6eec7 - moveperson $2, $16, $1f - disappear $2 - appear $2 - loadvar FarfetchdPosition, $7 - end - -UnknownScript_0x6ec85: - applymovement $2, MovementData_0x6eecc - moveperson $2, $1d, $16 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $4 - end - -UnknownScript_0x6ec96: - applymovement $2, MovementData_0x6eed2 - moveperson $2, $1d, $16 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $4 - end - -UnknownScript_0x6eca7: - scall UnknownScript_0x6eda1 - if_equal $3, UnknownScript_0x6ecbf - applymovement $2, MovementData_0x6eee6 - moveperson $2, $16, $1f - disappear $2 - appear $2 - loadvar FarfetchdPosition, $7 - end - -UnknownScript_0x6ecbf: - applymovement $2, MovementData_0x6eeef - moveperson $2, $1c, $1f - disappear $2 - appear $2 - loadvar FarfetchdPosition, $5 - end - -UnknownScript_0x6ecd0: - scall UnknownScript_0x6eda1 - if_equal $0, UnknownScript_0x6ecfd - if_equal $2, UnknownScript_0x6ecec - applymovement $2, MovementData_0x6eef8 - moveperson $2, $f, $1d - disappear $2 - appear $2 - loadvar FarfetchdPosition, $8 - end - -UnknownScript_0x6ecec: - applymovement $2, MovementData_0x6ef00 - moveperson $2, $18, $23 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $6 - end - -UnknownScript_0x6ecfd: - applymovement $2, MovementData_0x6ef09 - moveperson $2, $1c, $1f - disappear $2 - appear $2 - loadvar FarfetchdPosition, $5 - end - -UnknownScript_0x6ed0e: - scall UnknownScript_0x6eda1 - if_equal $1, UnknownScript_0x6ed3f - if_equal $2, UnknownScript_0x6ed3f - if_equal $3, UnknownScript_0x6ed2e - applymovement $2, MovementData_0x6ef10 - moveperson $2, $a, $23 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $9 - end - -UnknownScript_0x6ed2e: - applymovement $2, MovementData_0x6ef18 - moveperson $2, $16, $1f - disappear $2 - appear $2 - loadvar FarfetchdPosition, $7 - end - -UnknownScript_0x6ed3f: - applymovement $2, MovementData_0x6ef1e - moveperson $2, $f, $19 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $2 - end - -UnknownScript_0x6ed50: - scall UnknownScript_0x6eda1 - if_equal $0, UnknownScript_0x6ed85 - if_equal $3, UnknownScript_0x6ed74 - applymovement $2, MovementData_0x6ef23 - moveperson $2, $6, $1c - disappear $2 - appear $2 - loadvar FarfetchdPosition, $a - appear $4 + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos1_Pos2 + moveperson ILEXFOREST_BIRD, $f, $19 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 2 + end + +.Position2: + scall .CryAndCheckFacing + if_equal DOWN, .Position2_Down + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos2_Pos3 + moveperson ILEXFOREST_BIRD, $14, $18 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 3 + end + +.Position2_Down: + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos2_Pos8 + moveperson ILEXFOREST_BIRD, $f, $1d + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 8 + end + +.Position3: + scall .CryAndCheckFacing + if_equal LEFT, .Position3_Left + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos3_Pos4 + moveperson ILEXFOREST_BIRD, $1d, $16 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 4 + end + +.Position3_Left: + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos3_Pos2 + moveperson ILEXFOREST_BIRD, $f, $19 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 2 + end + +.Position4: + scall .CryAndCheckFacing + if_equal UP, .Position4_Up + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos4_Pos5 + moveperson ILEXFOREST_BIRD, $1c, $1f + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 5 + end + +.Position4_Up: + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos4_Pos3 + moveperson ILEXFOREST_BIRD, $14, $18 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 3 + end + +.Position5: + scall .CryAndCheckFacing + if_equal UP, .Position5_Up + if_equal LEFT, .Position5_Left + if_equal RIGHT, .Position5_Right + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos5_Pos6 + moveperson ILEXFOREST_BIRD, $18, $23 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 6 + end + +.Position5_Left: + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos5_Pos7 + moveperson ILEXFOREST_BIRD, $16, $1f + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 7 + end + +.Position5_Up: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos5_Pos4_Up + moveperson ILEXFOREST_BIRD, $1d, $16 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 4 + end + +.Position5_Right: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos5_Pos4_Right + moveperson ILEXFOREST_BIRD, $1d, $16 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 4 + end + +.Position6: + scall .CryAndCheckFacing + if_equal RIGHT, .Position6_Right + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos6_Pos7 + moveperson ILEXFOREST_BIRD, $16, $1f + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 7 + end + +.Position6_Right: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos6_Pos5 + moveperson ILEXFOREST_BIRD, $1c, $1f + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 5 + end + +.Position7: + scall .CryAndCheckFacing + if_equal DOWN, .Position7_Down + if_equal LEFT, .Position7_Left + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos7_Pos8 + moveperson ILEXFOREST_BIRD, $f, $1d + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 8 + end + +.Position7_Left: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos7_Pos6 + moveperson ILEXFOREST_BIRD, $18, $23 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 6 + end + +.Position7_Down: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos7_Pos5 + moveperson ILEXFOREST_BIRD, $1c, $1f + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 5 + end + +.Position8: + scall .CryAndCheckFacing + if_equal UP, .Position8_Up + if_equal LEFT, .Position8_Left + if_equal RIGHT, .Position8_Right + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos8_Pos9 + moveperson ILEXFOREST_BIRD, $a, $23 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 9 + end + +.Position8_Right: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos8_Pos7 + moveperson ILEXFOREST_BIRD, $16, $1f + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 7 + end + +.Position8_Up: +.Position8_Left: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos8_Pos2 + moveperson ILEXFOREST_BIRD, $f, $19 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 2 + end + +.Position9: + scall .CryAndCheckFacing + if_equal DOWN, .Position9_Down + if_equal RIGHT, .Position9_Right + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos9_Pos10 + moveperson ILEXFOREST_BIRD, $6, $1c + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 10 + appear ILEXFOREST_BLACK_BELT setevent EVENT_CHARCOAL_KILN_BOSS setevent EVENT_HERDED_FARFETCHD end -UnknownScript_0x6ed74: - applymovement $2, MovementData_0x6ef33 - moveperson $2, $f, $1d - disappear $2 - appear $2 - loadvar FarfetchdPosition, $8 +.Position9_Right: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos9_Pos8_Right + moveperson ILEXFOREST_BIRD, $f, $1d + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 8 end -UnknownScript_0x6ed85: - applymovement $2, MovementData_0x6ef3d - moveperson $2, $f, $1d - disappear $2 - appear $2 - loadvar FarfetchdPosition, $8 +.Position9_Down: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos9_Pos8_Down + moveperson ILEXFOREST_BIRD, $f, $1d + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 8 end -UnknownScript_0x6ed96: +.Position10: faceplayer - loadfont - writetext UnknownText_0x6f086 + opentext + writetext Text_Kwaaaa cry FARFETCH_D + waitbutton closetext - loadmovesprites end -UnknownScript_0x6eda1: +.CryAndCheckFacing: faceplayer - loadfont - writetext UnknownText_0x6f086 + opentext + writetext Text_Kwaaaa cry FARFETCH_D + waitbutton closetext - loadmovesprites checkcode VAR_FACING end -BlackBeltScript_0x6edae: +IlexForestCharcoalMasterScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_HM01_CUT - iftrue UnknownScript_0x6edd8 - writetext UnknownText_0x6f099 - keeptextopen + iftrue .AlreadyGotCut + writetext Text_CharcoalMasterIntro + buttonsound verbosegiveitem HM_CUT setevent EVENT_GOT_HM01_CUT - writetext UnknownText_0x6f141 + writetext Text_CharcoalMasterOutro + waitbutton closetext - loadmovesprites setevent EVENT_ILEX_FOREST_FARFETCHD setevent EVENT_ILEX_FOREST_APPRENTICE setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER @@ -352,64 +367,64 @@ BlackBeltScript_0x6edae: clearevent EVENT_CHARCOAL_KILN_BOSS end -UnknownScript_0x6edd8: - writetext UnknownText_0x6f1c0 +.AlreadyGotCut: + writetext Text_CharcoalMasterTalkAfter + waitbutton closetext - loadmovesprites end -RockerScript_0x6edde: +IlexForestHeadbuttGuyScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM02_HEADBUTT - iftrue UnknownScript_0x6edf3 - writetext UnknownText_0x6f21b - keeptextopen + iftrue .AlreadyGotHeadbutt + writetext Text_HeadbuttIntro + buttonsound verbosegiveitem TM_HEADBUTT - iffalse UnknownScript_0x6edf7 + iffalse .BagFull setevent EVENT_GOT_TM02_HEADBUTT -UnknownScript_0x6edf3: - writetext UnknownText_0x6f26d +.AlreadyGotHeadbutt: + writetext Text_HeadbuttOutro + waitbutton +.BagFull: closetext -UnknownScript_0x6edf7: - loadmovesprites end TrainerBug_catcherWayne: trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, 0, Bug_catcherWayneScript Bug_catcherWayneScript: - talkaftercancel - loadfont - writetext UnknownText_0x6f571 + end_if_just_battled + opentext + writetext Bug_catcherWayneAfterText + waitbutton closetext - loadmovesprites end -LassScript_0x6ee0d: - jumptextfaceplayer UnknownText_0x6f2af +IlexForestLassScript: + jumptextfaceplayer Text_IlexForestLass -ItemFragment_0x6ee10: - db REVIVE, 1 +IlexForestRevive: + itemball REVIVE -ItemFragment_0x6ee12: - db X_ATTACK, 1 +IlexForestXAttack: + itemball X_ATTACK -ItemFragment_0x6ee14: - db ANTIDOTE, 1 +IlexForestAntidote: + itemball ANTIDOTE -ItemFragment_0x6ee16: - db ETHER, 1 +IlexForestEther: + itemball ETHER -MapIlexForestSignpostItem1: +IlexForestHiddenEther: dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER -MapIlexForestSignpostItem2: +IlexForestHiddenSuperPotion: dwb EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION -MapIlexForestSignpostItem3: +IlexForestHiddenFullHeal: dwb EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL IlexForestBoulder: @@ -417,63 +432,63 @@ IlexForestBoulder: jumpstd strengthboulder MapIlexForestSignpost0Script: - jumptext UnknownText_0x6f2de + jumptext Text_IlexForestSignpost0 MapIlexForestSignpost4Script: checkevent EVENT_FOREST_IS_RESTLESS - iftrue UnknownScript_0x6ee30 - jump UnknownScript_0x6ee35 + iftrue .ForestIsRestless + jump .DontDoCelebiEvent -UnknownScript_0x6ee30: +.ForestIsRestless: checkitem GS_BALL - iftrue UnknownScript_0x6ee38 -UnknownScript_0x6ee35: - jumptext UnknownText_0x6f358 + iftrue .AskCelebiEvent +.DontDoCelebiEvent: + jumptext Text_IlexForestShrine -UnknownScript_0x6ee38: - loadfont - writetext UnknownText_0x6f394 +.AskCelebiEvent: + opentext + writetext Text_ShrineCelebiEvent yesorno - iftrue UnknownScript_0x6ee42 - loadmovesprites + iftrue .CelebiEvent + closetext end -UnknownScript_0x6ee42: +.CelebiEvent: takeitem GS_BALL clearevent EVENT_FOREST_IS_RESTLESS setevent EVENT_AZALEA_TOWN_KURT - disappear $8 + disappear ILEXFOREST_LASS clearevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS - writetext UnknownText_0x6f43b + writetext Text_InsertGSBall + waitbutton closetext - loadmovesprites pause 20 showemote EMOTE_SHOCK, PLAYER, 20 - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic applymovement PLAYER, MovementData_0x6ef58 pause 30 spriteface PLAYER, DOWN pause 20 clearflag ENGINE_HAVE_EXAMINED_GS_BALL special Special_CelebiShrineEvent - loadpokedata CELEBI, 30 + loadwildmon CELEBI, 30 startbattle - returnafterbattle + reloadmapafterbattle pause 20 special CheckCaughtCelebi - iffalse UnknownScript_0x6ee8e - appear $7 - applymovement $7, MovementData_0x6ef4e - loadfont - writetext UnknownText_0x6f452 + iffalse .DidntCatchCelebi + appear ILEXFOREST_KURT + applymovement ILEXFOREST_KURT, MovementData_0x6ef4e + opentext + writetext Text_KurtCaughtCelebi + waitbutton closetext - loadmovesprites - applymovement $7, MovementData_0x6ef53 - disappear $7 -UnknownScript_0x6ee8e: + applymovement ILEXFOREST_KURT, MovementData_0x6ef53 + disappear ILEXFOREST_KURT +.DidntCatchCelebi: end -MovementData_0x6ee8f: +MovementData_Farfetchd_Pos1_Pos2: big_step_up big_step_up big_step_up @@ -481,7 +496,7 @@ MovementData_0x6ee8f: big_step_up step_end -MovementData_0x6ee95: +MovementData_Farfetchd_Pos2_Pos3: big_step_up big_step_up big_step_right @@ -492,7 +507,7 @@ MovementData_0x6ee95: big_step_down step_end -MovementData_0x6ee9e: +MovementData_Farfetchd_Pos2_Pos8: big_step_down big_step_down big_step_down @@ -500,7 +515,7 @@ MovementData_0x6ee9e: big_step_down step_end -MovementData_0x6eea4: +MovementData_Farfetchd_Pos3_Pos4: big_step_right big_step_right big_step_right @@ -509,7 +524,7 @@ MovementData_0x6eea4: big_step_right step_end -MovementData_0x6eeab: +MovementData_Farfetchd_Pos3_Pos2: big_step_up big_step_left big_step_left @@ -517,7 +532,7 @@ MovementData_0x6eeab: big_step_left step_end -MovementData_0x6eeb1: +MovementData_Farfetchd_Pos4_Pos5: big_step_down big_step_down big_step_down @@ -526,14 +541,14 @@ MovementData_0x6eeb1: big_step_down step_end -MovementData_0x6eeb8: +MovementData_Farfetchd_Pos4_Pos3: big_step_left jump_step_left big_step_left big_step_left step_end -MovementData_0x6eebd: +MovementData_Farfetchd_Pos5_Pos6: big_step_down big_step_down big_step_down @@ -545,14 +560,14 @@ MovementData_0x6eebd: big_step_left step_end -MovementData_0x6eec7: +MovementData_Farfetchd_Pos5_Pos7: big_step_left big_step_left big_step_left big_step_left step_end -MovementData_0x6eecc: +MovementData_Farfetched_Pos5_Pos4_Up: big_step_up big_step_up big_step_up @@ -560,14 +575,14 @@ MovementData_0x6eecc: big_step_up step_end -MovementData_0x6eed2: +MovementData_Farfetched_Pos5_Pos4_Right: big_step_right turn_head_up - db $3e ; movement + step_sleep_1 turn_head_down - db $3e ; movement + step_sleep_1 turn_head_up - db $3e ; movement + step_sleep_1 big_step_down big_step_down fix_facing @@ -582,7 +597,7 @@ MovementData_0x6eed2: big_step_up step_end -MovementData_0x6eee6: +MovementData_Farfetched_Pos6_Pos7: big_step_left big_step_left big_step_left @@ -593,7 +608,7 @@ MovementData_0x6eee6: big_step_up step_end -MovementData_0x6eeef: +MovementData_Farfetched_Pos6_Pos5: big_step_right big_step_right big_step_right @@ -604,7 +619,7 @@ MovementData_0x6eeef: big_step_up step_end -MovementData_0x6eef8: +MovementData_Farfetched_Pos7_Pos8: big_step_up big_step_up big_step_left @@ -614,7 +629,7 @@ MovementData_0x6eef8: big_step_left step_end -MovementData_0x6ef00: +MovementData_Farfetched_Pos7_Pos6: big_step_down big_step_down big_step_left @@ -625,7 +640,7 @@ MovementData_0x6ef00: big_step_right step_end -MovementData_0x6ef09: +MovementData_Farfetched_Pos7_Pos5: big_step_right big_step_right big_step_right @@ -634,7 +649,7 @@ MovementData_0x6ef09: big_step_right step_end -MovementData_0x6ef10: +MovementData_Farfetched_Pos8_Pos9: big_step_down big_step_left big_step_down @@ -644,7 +659,7 @@ MovementData_0x6ef10: big_step_down step_end -MovementData_0x6ef18: +MovementData_Farfetched_Pos8_Pos7: big_step_right big_step_right big_step_right @@ -652,14 +667,14 @@ MovementData_0x6ef18: big_step_right step_end -MovementData_0x6ef1e: +MovementData_Farfetched_Pos8_Pos2: big_step_up big_step_up big_step_up big_step_up step_end -MovementData_0x6ef23: +MovementData_Farfetched_Pos9_Pos10: big_step_left big_step_left fix_facing @@ -677,7 +692,7 @@ MovementData_0x6ef23: big_step_up step_end -MovementData_0x6ef33: +MovementData_Farfetched_Pos9_Pos8_Right: big_step_right big_step_right big_step_right @@ -689,7 +704,7 @@ MovementData_0x6ef33: big_step_up step_end -MovementData_0x6ef3d: +MovementData_Farfetched_Pos9_Pos8_Down: big_step_left big_step_left fix_facing @@ -757,16 +772,16 @@ UnknownText_0x6f019: cont "a BADGE." done -UnknownText_0x6f06f: +Text_ItsTheMissingPokemon: text "It's the missing" line "#MON!" done -UnknownText_0x6f086: +Text_Kwaaaa: text "FARFETCH'D: Kwaa!" done -UnknownText_0x6f099: +Text_CharcoalMasterIntro: text "Ah! My FARFETCH'D!" para "You found it for" @@ -787,7 +802,7 @@ UnknownText_0x6f099: line "this." done -UnknownText_0x6f141: +Text_CharcoalMasterOutro: text "That's the CUT HM." line "Teach that to a" @@ -801,7 +816,7 @@ UnknownText_0x6f141: line "AZALEA to use it." done -UnknownText_0x6f1c0: +Text_CharcoalMasterTalkAfter: text "Do you want to" line "apprentice as a" @@ -812,7 +827,7 @@ UnknownText_0x6f1c0: line "rate in ten years!" done -UnknownText_0x6f21b: +Text_HeadbuttIntro: text "What am I doing?" para "I'm shaking trees" @@ -822,20 +837,20 @@ UnknownText_0x6f21b: line "you try it too!" done -UnknownText_0x6f26d: +Text_HeadbuttOutro: text "Rattle trees with" line "HEADBUTT. Some-" cont "times, sleeping" cont "#MON fall out." done -UnknownText_0x6f2af: +Text_IlexForestLass: text "Did something" line "happen to the" cont "forest's guardian?" done -UnknownText_0x6f2de: +Text_IlexForestSignpost0: text "ILEX FOREST is" line "so overgrown with" @@ -847,7 +862,7 @@ UnknownText_0x6f2de: cont "have been dropped." done -UnknownText_0x6f358: +Text_IlexForestShrine: text "ILEX FOREST" line "SHRINE…" @@ -856,7 +871,7 @@ UnknownText_0x6f358: cont "protector…" done -UnknownText_0x6f394: +Text_ShrineCelebiEvent: text "ILEX FOREST" line "SHRINE…" @@ -876,12 +891,12 @@ UnknownText_0x6f394: line "BALL here?" done -UnknownText_0x6f43b: +Text_InsertGSBall: text "<PLAYER> put in the" line "GS BALL." done -UnknownText_0x6f452: +Text_KurtCaughtCelebi: text "Whew, wasn't that" line "something!" @@ -914,7 +929,7 @@ Bug_catcherWayneBeatenText: line "#MON before…" done -UnknownText_0x6f571: +Bug_catcherWayneAfterText: text "A #MON I've" line "never seen before" @@ -943,21 +958,21 @@ IlexForest_MapEventHeader: .Signposts: db 5 signpost 17, 3, SIGNPOST_READ, MapIlexForestSignpost0Script - signpost 7, 11, SIGNPOST_ITEM, MapIlexForestSignpostItem1 - signpost 14, 22, SIGNPOST_ITEM, MapIlexForestSignpostItem2 - signpost 17, 1, SIGNPOST_ITEM, MapIlexForestSignpostItem3 + signpost 7, 11, SIGNPOST_ITEM, IlexForestHiddenEther + signpost 14, 22, SIGNPOST_ITEM, IlexForestHiddenSuperPotion + signpost 17, 1, SIGNPOST_ITEM, IlexForestHiddenFullHeal signpost 22, 8, SIGNPOST_UP, MapIlexForestSignpost4Script .PersonEvents: db 11 - person_event SPRITE_BIRD, 31, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BirdScript_0x6eb8f, EVENT_ILEX_FOREST_FARFETCHD - person_event SPRITE_YOUNGSTER, 28, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6eb7b, EVENT_ILEX_FOREST_APPRENTICE - person_event SPRITE_BLACK_BELT, 28, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x6edae, EVENT_ILEX_FOREST_CHARCOAL_MASTER - person_event SPRITE_ROCKER, 14, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RockerScript_0x6edde, -1 - person_event SPRITE_POKE_BALL, 32, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6ee10, EVENT_ILEX_FOREST_REVIVE + person_event SPRITE_BIRD, 31, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD + person_event SPRITE_YOUNGSTER, 28, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE + person_event SPRITE_BLACK_BELT, 28, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER + person_event SPRITE_ROCKER, 14, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IlexForestHeadbuttGuyScript, -1 + person_event SPRITE_POKE_BALL, 32, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE person_event SPRITE_KURT, 29, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT - person_event SPRITE_LASS, 24, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x6ee0d, EVENT_ILEX_FOREST_LASS + person_event SPRITE_LASS, 24, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS person_event SPRITE_YOUNGSTER, 1, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 0, TrainerBug_catcherWayne, -1 - person_event SPRITE_POKE_BALL, 17, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6ee12, EVENT_ILEX_FOREST_X_ATTACK - person_event SPRITE_POKE_BALL, 7, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6ee14, EVENT_ILEX_FOREST_ANTIDOTE - person_event SPRITE_POKE_BALL, 1, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6ee16, EVENT_ILEX_FOREST_ETHER + person_event SPRITE_POKE_BALL, 17, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK + person_event SPRITE_POKE_BALL, 7, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE + person_event SPRITE_POKE_BALL, 1, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 39596b0a2..25ffdfcd0 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ILEXFORESTAZALEAGATE_OFFICER + const ILEXFORESTAZALEAGATE_GRANNY + IlexForestAzaleaGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 6595cc0a9..620008472 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const INDIGOPLATEAUPOKECENTER1F_NURSE + const INDIGOPLATEAUPOKECENTER1F_CLERK + const INDIGOPLATEAUPOKECENTER1F_COOLTRAINER_M + const INDIGOPLATEAUPOKECENTER1F_SILVER + const INDIGOPLATEAUPOKECENTER1F_GRAMPS + const INDIGOPLATEAUPOKECENTER1F_JYNX + IndigoPlateauPokeCenter1F_MapScriptHeader: .MapTriggers: db 1 @@ -51,13 +59,13 @@ UnknownScript_0x180053: if_equal THURSDAY, UnknownScript_0x18012b if_equal FRIDAY, UnknownScript_0x18012b if_equal SATURDAY, UnknownScript_0x18012b - moveperson $5, $11, $9 - appear $5 + moveperson INDIGOPLATEAUPOKECENTER1F_SILVER, $11, $9 + appear INDIGOPLATEAUPOKECENTER1F_SILVER spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic pause 15 - applymovement $5, MovementData_0x180164 + applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, MovementData_0x180164 playmusic MUSIC_RIVAL_ENCOUNTER spriteface PLAYER, RIGHT jump UnknownScript_0x1800ce @@ -73,59 +81,59 @@ UnknownScript_0x180094: if_equal THURSDAY, UnknownScript_0x18012b if_equal FRIDAY, UnknownScript_0x18012b if_equal SATURDAY, UnknownScript_0x18012b - appear $5 + appear INDIGOPLATEAUPOKECENTER1F_SILVER spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic pause 15 - applymovement $5, MovementData_0x18016b + applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, MovementData_0x18016b playmusic MUSIC_RIVAL_ENCOUNTER spriteface PLAYER, LEFT UnknownScript_0x1800ce: - loadfont + opentext writetext UnknownText_0x1801f5 + waitbutton closetext - loadmovesprites setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x1800f3 checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x180103 winlosstext UnknownText_0x180295, UnknownText_0x1802fd - setlasttalked $5 + setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER loadtrainer RIVAL2, 6 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump UnknownScript_0x180113 UnknownScript_0x1800f3: winlosstext UnknownText_0x180295, UnknownText_0x1802fd - setlasttalked $5 + setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER loadtrainer RIVAL2, 4 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump UnknownScript_0x180113 UnknownScript_0x180103: winlosstext UnknownText_0x180295, UnknownText_0x1802fd - setlasttalked $5 + setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER loadtrainer RIVAL2, 5 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump UnknownScript_0x180113 UnknownScript_0x180113: playmusic MUSIC_RIVAL_AFTER - loadfont + opentext writetext UnknownText_0x1802a4 + waitbutton closetext - loadmovesprites spriteface PLAYER, DOWN - applymovement $5, MovementData_0x180172 - disappear $5 + applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, MovementData_0x180172 + disappear INDIGOPLATEAUPOKECENTER1F_SILVER dotrigger $0 playmapmusic setflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT @@ -136,9 +144,9 @@ NurseScript_0x18012c: jumpstd pokecenternurse ClerkScript_0x18012f: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_INDIGO_PLATEAU - loadmovesprites + closetext end CooltrainerMScript_0x180136: @@ -146,31 +154,31 @@ CooltrainerMScript_0x180136: TeleportGuyScript: faceplayer - loadfont + opentext writetext TeleportGuyText1 yesorno iffalse .No writetext TeleportGuyYesText + waitbutton closetext - loadmovesprites playsound SFX_WARP_TO special FadeOutPalettes - waitbutton + waitsfx warp NEW_BARK_TOWN, $d, $6 end .No writetext TeleportGuyNoText + waitbutton closetext - loadmovesprites end AbraScript: - loadfont + opentext writetext AbraText cry ABRA + waitbutton closetext - loadmovesprites end MovementData_0x180164: diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 0f32ebebc..035346da9 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -1,3 +1,6 @@ +const_value set 2 + const KARENSROOM_KAREN + KarensRoom_MapScriptHeader: .MapTriggers: db 2 @@ -38,41 +41,41 @@ UnknownScript_0x180bd6: earthquake 80 changeblock $4, $e, $2a reloadmappart - loadmovesprites + closetext dotrigger $1 setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED - waitbutton + waitsfx end KarenScript_0x180bee: faceplayer - loadfont + opentext checkevent EVENT_BEAT_ELITE_4_KAREN iftrue UnknownScript_0x180c1c writetext UnknownText_0x180c27 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x180cf8, 0 loadtrainer KAREN, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_KAREN - loadfont + opentext writetext UnknownText_0x180d29 + waitbutton closetext - loadmovesprites playsound SFX_ENTER_DOOR changeblock $4, $2, $16 reloadmappart - loadmovesprites + closetext setevent EVENT_KARENS_ROOM_EXIT_OPEN - waitbutton + waitsfx end UnknownScript_0x180c1c: writetext UnknownText_0x180d29 + waitbutton closetext - loadmovesprites end MovementData_0x180c22: diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index b822efd9f..47ab0ba7c 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -1,3 +1,6 @@ +const_value set 2 + const KOGASROOM_KOGA + KogasRoom_MapScriptHeader: .MapTriggers: db 2 @@ -38,41 +41,41 @@ UnknownScript_0x180742: earthquake 80 changeblock $4, $e, $2a reloadmappart - loadmovesprites + closetext dotrigger $1 setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED - waitbutton + waitsfx end KogaScript_0x18075a: faceplayer - loadfont + opentext checkevent EVENT_BEAT_ELITE_4_KOGA iftrue UnknownScript_0x180788 writetext UnknownText_0x180793 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x1808a9, 0 loadtrainer KOGA, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_KOGA - loadfont + opentext writetext UnknownText_0x1808ca + waitbutton closetext - loadmovesprites playsound SFX_ENTER_DOOR changeblock $4, $2, $16 reloadmappart - loadmovesprites + closetext setevent EVENT_KOGAS_ROOM_EXIT_OPEN - waitbutton + waitsfx end UnknownScript_0x180788: writetext UnknownText_0x1808ca + waitbutton closetext - loadmovesprites end MovementData_0x18078e: diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index a211456c9..4538bf41b 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const KRISSHOUSE1F_MOM1 + const KRISSHOUSE1F_MOM2 + const KRISSHOUSE1F_MOM3 + const KRISSHOUSE1F_MOM4 + const KRISSHOUSE1F_POKEFAN_F + KrissHouse1F_MapScriptHeader: .MapTriggers: db 2 @@ -20,19 +27,19 @@ UnknownScript_0x7a4d8: UnknownScript_0x7a4db: playmusic MUSIC_MOM - showemote EMOTE_SHOCK, $2, 15 + showemote EMOTE_SHOCK, KRISSHOUSE1F_MOM1, 15 spriteface PLAYER, LEFT checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x7a4f2 - applymovement $2, MovementData_0x7a5fc + applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fc jump UnknownScript_0x7a4f6 UnknownScript_0x7a4f2: - applymovement $2, MovementData_0x7a5fe + applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fe UnknownScript_0x7a4f6: - loadfont + opentext writetext UnknownText_0x7a604 - keeptextopen + buttonsound stringtotext GearName, $1 scall UnknownScript_0x7a57e setflag ENGINE_POKEGEAR @@ -42,7 +49,7 @@ UnknownScript_0x7a4f6: setevent EVENT_KRISS_HOUSE_MOM_1 clearevent EVENT_KRISS_HOUSE_MOM_2 writetext UnknownText_0x7a6bd - keeptextopen + buttonsound special Special_SetDayOfWeek UnknownScript_0x7a519: writetext UnknownText_0x7a742 @@ -65,18 +72,18 @@ UnknownScript_0x7a531: UnknownScript_0x7a53b: writetext UnknownText_0x7a7cb - keeptextopen + buttonsound jump UnknownScript_0x7a549 UnknownScript_0x7a542: writetext UnknownText_0x7a807 - keeptextopen + buttonsound jump UnknownScript_0x7a549 UnknownScript_0x7a549: writetext UnknownText_0x7a850 + waitbutton closetext - loadmovesprites checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x7a55d checkevent EVENT_RECEIVED_BALLS_FROM_KURT @@ -84,16 +91,16 @@ UnknownScript_0x7a549: jump UnknownScript_0x7a56b UnknownScript_0x7a55d: - applymovement $2, MovementData_0x7a600 + applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a600 jump UnknownScript_0x7a56b UnknownScript_0x7a564: - applymovement $2, MovementData_0x7a602 + applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a602 jump UnknownScript_0x7a56b UnknownScript_0x7a56b: special RestartMapMusic - spriteface $2, LEFT + spriteface KRISSHOUSE1F_MOM1, LEFT end UnknownScript_0x7a572: @@ -112,7 +119,7 @@ MomScript_0x7a582: setevent EVENT_RECEIVED_BALLS_FROM_KURT checktriggers iffalse UnknownScript_0x7a572 - loadfont + opentext checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM iftrue UnknownScript_0x7a5af checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST @@ -122,20 +129,20 @@ MomScript_0x7a582: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue UnknownScript_0x7a5a9 writetext UnknownText_0x7a8b5 + waitbutton closetext - loadmovesprites end UnknownScript_0x7a5a9: writetext UnknownText_0x7a8e5 + waitbutton closetext - loadmovesprites end UnknownScript_0x7a5af: writetext UnknownText_0x7a957 + waitbutton closetext - loadmovesprites end UnknownScript_0x7a5b5: @@ -143,13 +150,13 @@ UnknownScript_0x7a5b5: UnknownScript_0x7a5b8: setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST special Special_BankOfMom + waitbutton closetext - loadmovesprites end NeighborScript: faceplayer - loadfont + opentext checkmorn iftrue .MornScript checkday @@ -159,24 +166,24 @@ NeighborScript: .MornScript writetext NeighborMornIntroText - keeptextopen + buttonsound jump .Main .DayScript writetext NeighborDayIntroText - keeptextopen + buttonsound jump .Main .NiteScript writetext NeighborNiteIntroText - keeptextopen + buttonsound jump .Main .Main writetext NeighborText + waitbutton closetext - loadmovesprites - spriteface $6, RIGHT + spriteface KRISSHOUSE1F_POKEFAN_F, RIGHT end TVScript: diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 4275dd8ee..c6dc28738 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const KRISSHOUSE2F_CONSOLE + const KRISSHOUSE2F_DOLL_1 + const KRISSHOUSE2F_DOLL_2 + const KRISSHOUSE2F_BIG_DOLL + KrissHouse2F_MapScriptHeader: .MapTriggers: db 0 @@ -34,22 +40,21 @@ KrissHouse2F_MapScriptHeader: Doll1: - describedecoration $1 + describedecoration 1 Doll2: - describedecoration $2 + describedecoration 2 BigDoll: - describedecoration $3 + describedecoration 3 GameConsole: - describedecoration $4 + describedecoration 4 KrissHousePoster: - dw EVENT_KRISS_ROOM_POSTER ; event - dw .Script + dw EVENT_KRISS_ROOM_POSTER, .Script .Script - describedecoration $0 + describedecoration 0 KrissHouseRadio: checkevent EVENT_GOT_A_POKEMON_FROM_ELM @@ -57,17 +62,17 @@ KrissHouseRadio: checkevent EVENT_LISTENED_TO_INITIAL_RADIO iftrue .AbbreviatedRadio playmusic MUSIC_POKEMON_TALK - loadfont + opentext writetext KrisRadioText1 pause 45 writetext KrisRadioText2 pause 45 writetext KrisRadioText3 pause 45 - musicfadeout MUSIC_NEW_BARK_TOWN, $10 + musicfadeout MUSIC_NEW_BARK_TOWN, 16 writetext KrisRadioText4 pause 45 - loadmovesprites + closetext setevent EVENT_LISTENED_TO_INITIAL_RADIO end @@ -75,20 +80,20 @@ KrissHouseRadio: jumpstd radio1 .AbbreviatedRadio - loadfont + opentext writetext KrisRadioText4 pause 45 - loadmovesprites + closetext end KrissHouseBookshelf: jumpstd picturebookshelf KrissHousePC: - loadfont + opentext special Special_KrissHousePC iftrue .Warp - loadmovesprites + closetext end .Warp warp NONE, $0, $0 diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 07ec09d72..54783779b 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const KRISSNEIGHBORSHOUSE_COOLTRAINER_F + const KRISSNEIGHBORSHOUSE_POKEFAN_F + KrissNeighborsHouse_MapScriptHeader: .MapTriggers: db 0 @@ -20,7 +24,7 @@ KrissNeighborsHouseRadio: checkevent EVENT_LISTENED_TO_INITIAL_RADIO iftrue .AbbreviatedRadio playmusic MUSIC_POKEMON_TALK - loadfont + opentext writetext KrisNeighborRadioText1 pause 45 writetext KrisNeighborRadioText2 @@ -30,16 +34,16 @@ KrissNeighborsHouseRadio: musicfadeout MUSIC_NEW_BARK_TOWN, $10 writetext KrisNeighborRadioText4 pause 45 - loadmovesprites + closetext setevent EVENT_LISTENED_TO_INITIAL_RADIO end .NormalRadio jumpstd radio1 .AbbreviatedRadio - loadfont + opentext writetext KrisNeighborRadioText4 pause 45 - loadmovesprites + closetext end KrissNeighborsDaughterText: diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 4a24daf72..e0f4555c9 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -1,3 +1,10 @@ +const_value set 2 + const KURTSHOUSE_KURT1 + const KURTSHOUSE_TWIN1 + const KURTSHOUSE_SLOWPOKE + const KURTSHOUSE_KURT2 + const KURTSHOUSE_TWIN2 + KurtsHouse_MapScriptHeader: .MapTriggers: db 0 @@ -16,56 +23,56 @@ UnknownScript_0x18e154: iftrue UnknownScript_0x18e177 checkflag ENGINE_KURT_MAKING_BALLS iftrue UnknownScript_0x18e16f - disappear $5 - appear $2 - disappear $6 - appear $3 + disappear KURTSHOUSE_KURT2 + appear KURTSHOUSE_KURT1 + disappear KURTSHOUSE_TWIN2 + appear KURTSHOUSE_TWIN1 return UnknownScript_0x18e16f: - disappear $2 - appear $5 - disappear $3 - appear $6 + disappear KURTSHOUSE_KURT1 + appear KURTSHOUSE_KURT2 + disappear KURTSHOUSE_TWIN1 + appear KURTSHOUSE_TWIN2 UnknownScript_0x18e177: return KurtScript_0x18e178: faceplayer - loadfont + opentext checkevent EVENT_KURT_GAVE_YOU_LURE_BALL iftrue .GotLureBall checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue .ClearedSlowpokeWell writetext UnknownText_0x18e473 + waitbutton closetext - loadmovesprites - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET checkcode VAR_FACING if_equal UP, .RunAround spriteface PLAYER, DOWN playsound SFX_FLY - applymovement $2, MovementData_0x18e466 + applymovement KURTSHOUSE_KURT1, MovementData_0x18e466 playsound SFX_EXIT_BUILDING - disappear $2 - waitbutton + disappear KURTSHOUSE_KURT1 + waitsfx special RestartMapMusic end .RunAround: spriteface PLAYER, DOWN playsound SFX_FLY - applymovement $2, MovementData_0x18e46c + applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c playsound SFX_EXIT_BUILDING - disappear $2 - waitbutton + disappear KURTSHOUSE_KURT1 + waitsfx special RestartMapMusic end .ClearedSlowpokeWell: writetext UnknownText_0x18e615 - keeptextopen + buttonsound verbosegiveitem LURE_BALL iffalse .NoRoomForBall setevent EVENT_KURT_GAVE_YOU_LURE_BALL @@ -94,7 +101,7 @@ KurtScript_0x18e178: checkevent EVENT_DRAGON_SHRINE_QUESTION_2 iftrue .CheckApricorns writetext UnknownText_0x18e6c9 - closetext + waitbutton .CheckApricorns: checkitem RED_APRICORN iftrue .AskApricorn @@ -114,18 +121,18 @@ KurtScript_0x18e178: iftrue .ThatTurnedOutGreat checkevent EVENT_DRAGON_SHRINE_QUESTION_2 iftrue .IMakeBallsFromApricorns - loadmovesprites + closetext end .IMakeBallsFromApricorns: writetext UnknownText_0x18e6c9 + waitbutton closetext - loadmovesprites end .AskApricorn: writetext UnknownText_0x18e736 - keeptextopen + buttonsound setevent EVENT_DRAGON_SHRINE_QUESTION_2 special Special_SelectApricornForKurt if_equal $0, .Cancel @@ -168,30 +175,30 @@ KurtScript_0x18e178: setflag ENGINE_KURT_MAKING_BALLS .WaitForApricorns: writetext UnknownText_0x18e779 + waitbutton closetext - loadmovesprites end .Cancel: writetext UnknownText_0x18e7bc + waitbutton closetext - loadmovesprites end ._ThatTurnedOutGreat: setevent EVENT_RECEIVED_BALLS_FROM_KURT .ThatTurnedOutGreat: writetext UnknownText_0x18e82a - closetext + waitbutton .NoRoomForBall: - loadmovesprites + closetext end .GiveLevelBall: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb - keeptextopen + buttonsound verbosegiveitem2 LEVEL_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_RED_APRICORN @@ -201,7 +208,7 @@ KurtScript_0x18e178: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb - keeptextopen + buttonsound verbosegiveitem2 LURE_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_BLU_APRICORN @@ -211,7 +218,7 @@ KurtScript_0x18e178: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb - keeptextopen + buttonsound verbosegiveitem2 MOON_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_YLW_APRICORN @@ -221,7 +228,7 @@ KurtScript_0x18e178: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb - keeptextopen + buttonsound verbosegiveitem2 FRIEND_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_GRN_APRICORN @@ -231,7 +238,7 @@ KurtScript_0x18e178: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb - keeptextopen + buttonsound verbosegiveitem2 FAST_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_WHT_APRICORN @@ -241,7 +248,7 @@ KurtScript_0x18e178: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb - keeptextopen + buttonsound verbosegiveitem2 HEAVY_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_BLK_APRICORN @@ -251,7 +258,7 @@ KurtScript_0x18e178: checkflag ENGINE_KURT_MAKING_BALLS iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb - keeptextopen + buttonsound verbosegiveitem2 LOVE_BALL, VAR_KURT_APRICORNS iffalse .NoRoomForBall clearevent EVENT_GAVE_KURT_PNK_APRICORN @@ -263,8 +270,8 @@ KurtScript_0x18e178: checkitem GS_BALL iffalse .NoGSBall writetext UnknownText_0x18e8ab + waitbutton closetext - loadmovesprites setevent EVENT_GAVE_GS_BALL_TO_KURT takeitem GS_BALL setflag ENGINE_KURT_MAKING_BALLS @@ -274,71 +281,71 @@ KurtScript_0x18e178: checkflag ENGINE_KURT_MAKING_BALLS iffalse .NotMakingBalls writetext UnknownText_0x18e934 - closetext + waitbutton writetext UnknownText_0x18e949 + waitbutton closetext - loadmovesprites end .NotMakingBalls: writetext UnknownText_0x18e95c + waitbutton closetext - loadmovesprites setevent EVENT_FOREST_IS_RESTLESS clearevent EVENT_CAN_GIVE_GS_BALL_TO_KURT clearevent EVENT_GAVE_GS_BALL_TO_KURT - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic pause 20 - showemote EMOTE_SHOCK, $2, 30 + showemote EMOTE_SHOCK, KURTSHOUSE_KURT1, 30 checkcode VAR_FACING if_equal UP, .GSBallRunAround spriteface PLAYER, DOWN playsound SFX_FLY - applymovement $2, MovementData_0x18e466 + applymovement KURTSHOUSE_KURT1, MovementData_0x18e466 jump .KurtHasLeftTheBuilding .GSBallRunAround: spriteface PLAYER, DOWN playsound SFX_FLY - applymovement $2, MovementData_0x18e46c + applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c .KurtHasLeftTheBuilding: playsound SFX_EXIT_BUILDING - disappear $2 + disappear KURTSHOUSE_KURT1 clearevent EVENT_AZALEA_TOWN_KURT - waitbutton + waitsfx special RestartMapMusic domaptrigger AZALEA_TOWN, $2 end KurtScript_0x18e3bd: faceplayer - loadfont + opentext checkevent EVENT_GAVE_GS_BALL_TO_KURT iftrue KurtScript_ImCheckingItNow KurtMakingBallsScript: checkevent EVENT_BUGGING_KURT_TOO_MUCH iffalse Script_FirstTimeBuggingKurt writetext UnknownText_0x18e7d8 + waitbutton closetext - loadmovesprites - spriteface $5, UP + spriteface KURTSHOUSE_KURT2, UP end Script_FirstTimeBuggingKurt: writetext UnknownText_0x18e863 + waitbutton closetext - loadmovesprites - spriteface $5, UP + spriteface KURTSHOUSE_KURT2, UP setevent EVENT_BUGGING_KURT_TOO_MUCH end KurtScript_ImCheckingItNow: writetext UnknownText_0x18e934 - closetext - spriteface $5, UP + waitbutton + spriteface KURTSHOUSE_KURT2, UP writetext UnknownText_0x18e949 + waitbutton closetext - loadmovesprites end KurtsGranddaughter1: @@ -355,66 +362,66 @@ KurtsGranddaughter1: iftrue .SlowpokeBack checkevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET iftrue .Lonely - loadfont + opentext writetext KurtsGranddaughterSlowpokeGoneText + waitbutton closetext - loadmovesprites end .SlowpokeBack - loadfont + opentext writetext KurtsGranddaughterSlowpokeBackText + waitbutton closetext - loadmovesprites end .Lonely - loadfont + opentext writetext KurtsGranddaughterLonelyText + waitbutton closetext - loadmovesprites end .Dad - loadfont + opentext writetext KurtsGranddaughterDadText + waitbutton closetext - loadmovesprites end KurtsGranddaughter2: faceplayer KurtsGranddaughter2Subscript: - loadfont + opentext checkevent EVENT_GAVE_GS_BALL_TO_KURT iftrue .GSBall writetext KurtsGranddaughterHelpText + waitbutton closetext - loadmovesprites - spriteface $6, RIGHT + spriteface KURTSHOUSE_TWIN2, RIGHT end .GSBall writetext KurtsGranddaughterGSBallText + waitbutton closetext - loadmovesprites - spriteface $6, RIGHT + spriteface KURTSHOUSE_TWIN2, RIGHT end KurtsGranddaughterFunScript: - loadfont + opentext writetext KurtsGranddaughterFunText + waitbutton closetext - loadmovesprites end KurtsHouseSlowpoke: faceplayer - loadfont + opentext writetext KurtsHouseSlowpokeText cry SLOWPOKE + waitbutton closetext - loadmovesprites end KurtsHouseOakPhoto: diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index a31201e5d..20f7c0997 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -1,10 +1,24 @@ +const_value set 2 + const LAKEOFRAGE_LANCE + const LAKEOFRAGE_GRAMPS + const LAKEOFRAGE_SUPER_NERD1 + const LAKEOFRAGE_COOLTRAINER_F1 + const LAKEOFRAGE_FISHER1 + const LAKEOFRAGE_FISHER2 + const LAKEOFRAGE_COOLTRAINER_M + const LAKEOFRAGE_COOLTRAINER_F2 + const LAKEOFRAGE_GYARADOS + const LAKEOFRAGE_SUPER_NERD2 + const LAKEOFRAGE_POKE_BALL1 + const LAKEOFRAGE_POKE_BALL2 + LakeofRage_MapScriptHeader: .MapTriggers: db 2 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 - dw .Trigger2, 0 .MapCallbacks: db 2 @@ -14,10 +28,10 @@ LakeofRage_MapScriptHeader: dbw 5, .FlyPoint dbw 2, .Wesley -.Trigger1 +.Trigger0 end -.Trigger2 +.Trigger1 end .FlyPoint @@ -27,30 +41,30 @@ LakeofRage_MapScriptHeader: .Wesley checkcode VAR_WEEKDAY if_equal WEDNESDAY, .WesleyAppears - disappear $b + disappear LAKEOFRAGE_SUPER_NERD2 return .WesleyAppears - appear $b + appear LAKEOFRAGE_SUPER_NERD2 return LanceScript_0x70022: checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE iftrue UnknownScript_0x70057 - loadfont + opentext writetext UnknownText_0x70157 - keeptextopen + buttonsound faceplayer writetext UnknownText_0x701b4 yesorno iffalse UnknownScript_0x7004e UnknownScript_0x70035: writetext UnknownText_0x702c6 + waitbutton closetext - loadmovesprites playsound SFX_WARP_TO - applymovement $2, MovementData_0x70155 - disappear $2 + applymovement LAKEOFRAGE_LANCE, MovementData_0x70155 + disappear LAKEOFRAGE_LANCE clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_DECIDED_TO_HELP_LANCE domaptrigger MAHOGANY_MART_1F, $1 @@ -58,58 +72,58 @@ UnknownScript_0x70035: UnknownScript_0x7004e: writetext UnknownText_0x70371 + waitbutton closetext - loadmovesprites setevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE end UnknownScript_0x70057: faceplayer - loadfont + opentext writetext UnknownText_0x703a5 yesorno iffalse UnknownScript_0x7004e jump UnknownScript_0x70035 GyaradosScript_0x70063: - loadfont + opentext writetext UnknownText_0x703cb pause 15 cry GYARADOS - loadmovesprites - loadpokedata GYARADOS, 30 + closetext + loadwildmon GYARADOS, 30 writecode VAR_BATTLETYPE, BATTLETYPE_SHINY startbattle if_equal $1, UnknownScript_0x7007a - disappear $a + disappear LAKEOFRAGE_GYARADOS UnknownScript_0x7007a: - returnafterbattle - loadfont + reloadmapafterbattle + opentext giveitem RED_SCALE - waitbutton + waitsfx writetext UnknownText_0x703df playsound SFX_ITEM - waitbutton + waitsfx itemnotify - loadmovesprites + closetext dotrigger $0 - appear $2 + appear LAKEOFRAGE_LANCE end GrampsScript_0x7008e: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x7009c writetext UnknownText_0x703f8 + waitbutton closetext - loadmovesprites end UnknownScript_0x7009c: writetext UnknownText_0x70421 + waitbutton closetext - loadmovesprites end SuperNerdScript_0x700a2: @@ -122,67 +136,67 @@ MapLakeofRageSignpost0Script: jumptext UnknownText_0x708d7 MapLakeofRageSignpost1Script: - loadfont + opentext writetext UnknownText_0x70903 checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x700b8 + waitbutton closetext - loadmovesprites end UnknownScript_0x700b8: - keeptextopen + buttonsound special Special_MagikarpHouseSign - loadmovesprites + closetext end TrainerFisherAndre: trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, FisherAndreScript FisherAndreScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7058f + waitbutton closetext - loadmovesprites end TrainerFisherRaymond: trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, FisherRaymondScript FisherRaymondScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x70611 + waitbutton closetext - loadmovesprites end TrainerCooltrainermAaron: trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, CooltrainermAaronScript CooltrainermAaronScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7069c + waitbutton closetext - loadmovesprites end TrainerCooltrainerfLois: trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, CooltrainerfLoisScript CooltrainerfLoisScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x70752 + waitbutton closetext - loadmovesprites end WesleyScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_BLACKBELT_FROM_WESLEY iftrue WesleyWednesdayScript checkcode VAR_WEEKDAY @@ -190,47 +204,47 @@ WesleyScript: checkevent EVENT_MET_WESLEY_OF_WEDNESDAY iftrue .MetWesley writetext MeetWesleyText - keeptextopen + buttonsound setevent EVENT_MET_WESLEY_OF_WEDNESDAY .MetWesley writetext WesleyGivesGiftText - keeptextopen + buttonsound verbosegiveitem BLACKBELT iffalse WesleyDoneScript setevent EVENT_GOT_BLACKBELT_FROM_WESLEY writetext WesleyGaveGiftText + waitbutton closetext - loadmovesprites end WesleyWednesdayScript: writetext WesleyWednesdayText - closetext + waitbutton WesleyDoneScript: - loadmovesprites + closetext end WesleyNotWednesdayScript: writetext WesleyNotWednesdayText + waitbutton closetext - loadmovesprites end -ItemFragment_0x70148: - db ELIXER, 1 +LakeofRageElixer: + itemball ELIXER -ItemFragment_0x7014a: - db TM_DETECT, 1 +LakeofRageTMDetect: + itemball TM_DETECT -MapLakeofRageSignpostItem2: +LakeofRageHiddenFullRestore: dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE -MapLakeofRageSignpostItem3: +LakeofRageHiddenRareCandy: dwb EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY -MapLakeofRageSignpostItem4: +LakeofRageHiddenMaxPotion: dwb EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION @@ -503,9 +517,9 @@ LakeofRage_MapEventHeader: db 5 signpost 27, 21, SIGNPOST_READ, MapLakeofRageSignpost0Script signpost 31, 25, SIGNPOST_READ, MapLakeofRageSignpost1Script - signpost 28, 11, SIGNPOST_ITEM, MapLakeofRageSignpostItem2 - signpost 4, 4, SIGNPOST_ITEM, MapLakeofRageSignpostItem3 - signpost 5, 35, SIGNPOST_ITEM, MapLakeofRageSignpostItem4 + signpost 28, 11, SIGNPOST_ITEM, LakeofRageHiddenFullRestore + signpost 4, 4, SIGNPOST_ITEM, LakeofRageHiddenRareCandy + signpost 5, 35, SIGNPOST_ITEM, LakeofRageHiddenMaxPotion .PersonEvents: db 12 @@ -519,5 +533,5 @@ LakeofRage_MapEventHeader: person_event SPRITE_COOLTRAINER_F, 7, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS person_event SPRITE_GYARADOS, 22, 18, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS person_event SPRITE_SUPER_NERD, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY - person_event SPRITE_POKE_BALL, 10, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x70148, EVENT_LAKE_OF_RAGE_ELIXER - person_event SPRITE_POKE_BALL, 2, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7014a, EVENT_LAKE_OF_RAGE_TM_DETECT + person_event SPRITE_POKE_BALL, 10, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeofRageElixer, EVENT_LAKE_OF_RAGE_ELIXER + person_event SPRITE_POKE_BALL, 2, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeofRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index 2c616d617..2abb1e1ff 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER + LakeofRageHiddenPowerHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,23 +10,23 @@ LakeofRageHiddenPowerHouse_MapScriptHeader: HiddenPowerGuy: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM10_HIDDEN_POWER iftrue .AlreadyGotItem writetext HiddenPowerGuyText1 - keeptextopen + buttonsound verbosegiveitem TM_HIDDEN_POWER iffalse .Done setevent EVENT_GOT_TM10_HIDDEN_POWER writetext HiddenPowerGuyText2 + waitbutton closetext - loadmovesprites end .AlreadyGotItem writetext HiddenPowerGuyText3 - closetext + waitbutton .Done - loadmovesprites + closetext end HiddenPowerHouseBookshelf: diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index 48b563d46..417af28d4 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU + LakeofRageMagikarpHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,7 +10,7 @@ LakeofRageMagikarpHouse_MapScriptHeader: FishingGuruScript_0x19a6ae: faceplayer - loadfont + opentext checkevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY iftrue UnknownScript_0x19a6fe checkevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP @@ -17,21 +20,21 @@ FishingGuruScript_0x19a6ae: checkevent EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP iftrue UnknownScript_0x19a6d1 writetext UnknownText_0x19a72e + waitbutton closetext - loadmovesprites setevent EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP end UnknownScript_0x19a6d1: writetext UnknownText_0x19a84d + waitbutton closetext - loadmovesprites end UnknownScript_0x19a6d7: writetext UnknownText_0x19a890 + waitbutton closetext - loadmovesprites setevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP end @@ -40,7 +43,7 @@ UnknownScript_0x19a6e0: special Special_FindThatSpecies iffalse UnknownScript_0x19a6d7 writetext UnknownText_0x19a93e - closetext + waitbutton special Special_CheckMagikarpLength if_equal $0, UnknownScript_0x19a71c if_equal $1, UnknownScript_0x19a722 @@ -49,36 +52,36 @@ UnknownScript_0x19a6e0: UnknownScript_0x19a6fe: writetext UnknownText_0x19a977 - keeptextopen + buttonsound verbosegiveitem ELIXER iffalse UnknownScript_0x19a711 writetext UnknownText_0x19a9c3 + waitbutton closetext - loadmovesprites clearevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY end UnknownScript_0x19a711: - loadmovesprites + closetext setevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY end UnknownScript_0x19a716: writetext UnknownText_0x19aa01 + waitbutton closetext - loadmovesprites end UnknownScript_0x19a71c: writetext UnknownText_0x19aa5c + waitbutton closetext - loadmovesprites end UnknownScript_0x19a722: writetext UnknownText_0x19aa79 + waitbutton closetext - loadmovesprites end UnknownScript_0x19a728: diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 0a89ea3a7..db050db6d 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -1,3 +1,8 @@ +const_value set 2 + const LANCESROOM_LANCE + const LANCESROOM_MARY + const LANCESROOM_OAK + LancesRoom_MapScriptHeader: .MapTriggers: db 2 @@ -38,93 +43,93 @@ UnknownScript_0x180e53: earthquake 80 changeblock $4, $16, $34 reloadmappart - loadmovesprites + closetext dotrigger $1 setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED end UnknownScript_0x180e6a: - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic applymovement PLAYER, MovementData_0x180f38 jump LanceScript_0x180e7b UnknownScript_0x180e74: - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic applymovement PLAYER, MovementData_0x180f3c LanceScript_0x180e7b: - spriteface $2, LEFT - loadfont + spriteface LANCESROOM_LANCE, LEFT + opentext writetext UnknownText_0x180f67 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x1810a4, 0 - setlasttalked $2 + setlasttalked LANCESROOM_LANCE loadtrainer CHAMPION, LANCE startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle setevent EVENT_BEAT_CHAMPION_LANCE - loadfont + opentext writetext UnknownText_0x181132 + waitbutton closetext - loadmovesprites playsound SFX_ENTER_DOOR changeblock $4, $0, $b reloadmappart - loadmovesprites + closetext setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED musicfadeout MUSIC_BEAUTY_ENCOUNTER, $10 pause 30 - showemote EMOTE_SHOCK, $2, 15 - spriteface $2, DOWN + showemote EMOTE_SHOCK, LANCESROOM_LANCE, 15 + spriteface LANCESROOM_LANCE, DOWN pause 10 spriteface PLAYER, DOWN - appear $3 - applymovement $3, MovementData_0x180f41 - loadfont + appear LANCESROOM_MARY + applymovement LANCESROOM_MARY, MovementData_0x180f41 + opentext writetext UnknownText_0x1811dd + waitbutton closetext - loadmovesprites - appear $4 - applymovement $4, MovementData_0x180f46 - follow $3, $4 - applymovement $3, MovementData_0x180f49 + appear LANCESROOM_OAK + applymovement LANCESROOM_OAK, MovementData_0x180f46 + follow LANCESROOM_MARY, LANCESROOM_OAK + applymovement LANCESROOM_MARY, MovementData_0x180f49 stopfollow - spriteface $4, UP - spriteface $2, LEFT - loadfont + spriteface LANCESROOM_OAK, UP + spriteface LANCESROOM_LANCE, LEFT + opentext writetext UnknownText_0x18121b + waitbutton closetext - loadmovesprites - applymovement $3, MovementData_0x180f4c + applymovement LANCESROOM_MARY, MovementData_0x180f4c spriteface PLAYER, LEFT - loadfont + opentext writetext UnknownText_0x18134b + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x180f4f + applymovement LANCESROOM_LANCE, MovementData_0x180f4f spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x18137b + waitbutton closetext - loadmovesprites - follow $2, PLAYER - spriteface $3, UP - spriteface $4, UP - applymovement $2, MovementData_0x180f53 + follow LANCESROOM_LANCE, PLAYER + spriteface LANCESROOM_MARY, UP + spriteface LANCESROOM_OAK, UP + applymovement LANCESROOM_LANCE, MovementData_0x180f53 stopfollow playsound SFX_EXIT_BUILDING - disappear $2 + disappear LANCESROOM_LANCE applymovement PLAYER, MovementData_0x180f55 playsound SFX_EXIT_BUILDING disappear PLAYER - applymovement $3, MovementData_0x180f57 - showemote EMOTE_SHOCK, $3, 15 - loadfont + applymovement LANCESROOM_MARY, MovementData_0x180f57 + showemote EMOTE_SHOCK, LANCESROOM_MARY, 15 + opentext writetext UnknownText_0x1813c5 pause 30 - loadmovesprites - applymovement $3, MovementData_0x180f5b + closetext + applymovement LANCESROOM_MARY, MovementData_0x180f5b special FadeOutPalettes pause 15 warpfacing UP, HALL_OF_FAME, $4, $d diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 23bd3c222..e1f967d10 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const LAVRADIOTOWER1F_RECEPTIONIST + const LAVRADIOTOWER1F_OFFICER + const LAVRADIOTOWER1F_SUPER_NERD1 + const LAVRADIOTOWER1F_GENTLEMAN + const LAVRADIOTOWER1F_SUPER_NERD2 + LavRadioTower1F_MapScriptHeader: .MapTriggers: db 0 @@ -16,26 +23,26 @@ SuperNerdScript_0x7ee69: GentlemanScript_0x7ee6c: faceplayer - loadfont + opentext checkflag ENGINE_EXPN_CARD iftrue .UnknownScript_0x7ee8e checkevent EVENT_RETURNED_MACHINE_PART iftrue .UnknownScript_0x7ee80 writetext UnknownText_0x7effb + waitbutton closetext - loadmovesprites end .UnknownScript_0x7ee80: writetext UnknownText_0x7f0a1 - keeptextopen + buttonsound stringtotext .expncardname, $1 scall .UnknownScript_0x7ee94 setflag ENGINE_EXPN_CARD .UnknownScript_0x7ee8e writetext UnknownText_0x7f141 + waitbutton closetext - loadmovesprites end .UnknownScript_0x7ee94 @@ -47,18 +54,18 @@ GentlemanScript_0x7ee6c: SuperNerdScript_0x7eea2: faceplayer - loadfont + opentext checkflag ENGINE_EXPN_CARD iftrue UnknownScript_0x7eeb0 writetext UnknownText_0x7f193 + waitbutton closetext - loadmovesprites end UnknownScript_0x7eeb0: writetext UnknownText_0x7f248 + waitbutton closetext - loadmovesprites end MapLavRadioTower1FSignpost0Script: diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 2b1243fd8..fa753ab1b 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const LAVENDERMART_CLERK + const LAVENDERMART_POKEFAN_M + const LAVENDERMART_ROCKER + LavenderMart_MapScriptHeader: .MapTriggers: db 0 @@ -6,9 +11,9 @@ LavenderMart_MapScriptHeader: db 0 ClerkScript_0x7eb1c: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_LAVENDER - loadmovesprites + closetext end PokefanMScript_0x7eb23: diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 0bb873e3e..3258685b4 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -1,3 +1,6 @@ +const_value set 2 + const LAVENDERNAMERATER_GENTLEMAN + LavenderNameRater_MapScriptHeader: .MapTriggers: db 1 @@ -13,10 +16,10 @@ UnknownScript_0x7eaf1: LavenderNameRater: faceplayer - loadfont + opentext special SpecialNameRater + waitbutton closetext - loadmovesprites end LavenderNameRaterBookshelf: diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index 53cfb6e17..6cf383773 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const LAVENDERPOKECENTER1F_NURSE + const LAVENDERPOKECENTER1F_GENTLEMAN + const LAVENDERPOKECENTER1F_TEACHER + const LAVENDERPOKECENTER1F_YOUNGSTER + LavenderPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -16,18 +22,18 @@ TeacherScript_0x7e6a6: YoungsterScript_0x7e6a9: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x7e6b7 writetext UnknownText_0x7e779 + waitbutton closetext - loadmovesprites end UnknownScript_0x7e6b7: writetext UnknownText_0x7e7ed + waitbutton closetext - loadmovesprites end UnknownText_0x7e6bd: diff --git a/maps/LavenderPokeCenter2FBeta.asm b/maps/LavenderPokeCenter2FBeta.asm index 9d31d8d4e..19a431331 100644 --- a/maps/LavenderPokeCenter2FBeta.asm +++ b/maps/LavenderPokeCenter2FBeta.asm @@ -1,3 +1,4 @@ + LavenderPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index c29ad4182..d10cce8d0 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -1,3 +1,9 @@ +const_value set 2 + const LAVENDERTOWN_POKEFAN_M + const LAVENDERTOWN_TEACHER + const LAVENDERTOWN_GRAMPS + const LAVENDERTOWN_YOUNGSTER + LavenderTown_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index d2f450339..ad4d0e23c 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const LAVENDERTOWNSPEECHHOUSE_POKEFAN_F + LavenderTownSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index eaf72b515..ac52fa203 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -1,3 +1,12 @@ +const_value set 2 + const MAHOGANYGYM_PRYCE + const MAHOGANYGYM_BUENA1 + const MAHOGANYGYM_ROCKER1 + const MAHOGANYGYM_BUENA2 + const MAHOGANYGYM_ROCKER2 + const MAHOGANYGYM_ROCKER3 + const MAHOGANYGYM_GYM_GUY + MahoganyGym_MapScriptHeader: .MapTriggers: db 0 @@ -7,21 +16,21 @@ MahoganyGym_MapScriptHeader: PryceScript_0x199a9e: faceplayer - loadfont + opentext checkevent EVENT_BEAT_PRYCE iftrue .FightDone writetext UnknownText_0x199b8d + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x199cb3, 0 loadtrainer PRYCE, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_PRYCE - loadfont + opentext writetext UnknownText_0x199d3b playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_GLACIERBADGE checkcode VAR_BADGES scall MahoganyGymTriggerRockets @@ -34,20 +43,20 @@ PryceScript_0x199a9e: setevent EVENT_BEAT_BOARDER_BRAD setevent EVENT_BEAT_BOARDER_DOUGLAS writetext UnknownText_0x199d55 - keeptextopen + buttonsound verbosegiveitem TM_ICY_WIND iffalse UnknownScript_0x199af4 setevent EVENT_GOT_TM16_ICY_WIND writetext UnknownText_0x199def + waitbutton closetext - loadmovesprites end UnknownScript_0x199af0: writetext UnknownText_0x199e59 - closetext + waitbutton UnknownScript_0x199af4: - loadmovesprites + closetext end MahoganyGymTriggerRockets: @@ -65,71 +74,71 @@ TrainerSkierRoxanne: trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, SkierRoxanneScript SkierRoxanneScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19a116 + waitbutton closetext - loadmovesprites end TrainerSkierClarissa: trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, SkierClarissaScript SkierClarissaScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19a18f + waitbutton closetext - loadmovesprites end TrainerBoarderRonald: trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, BoarderRonaldScript BoarderRonaldScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x199f2d + waitbutton closetext - loadmovesprites end TrainerBoarderBrad: trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, BoarderBradScript BoarderBradScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x199fdd + waitbutton closetext - loadmovesprites end TrainerBoarderDouglas: trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, BoarderDouglasScript BoarderDouglasScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19a047 + waitbutton closetext - loadmovesprites end MahoganyGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_PRYCE iftrue .MahoganyGymGuyWinScript writetext MahoganyGymGuyText + waitbutton closetext - loadmovesprites end .MahoganyGymGuyWinScript writetext MahoganyGymGuyWinText + waitbutton closetext - loadmovesprites end MahoganyGymStatue: diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 50aa6c407..3bb527c2c 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const MAHOGANYMART1F_PHARMACIST + const MAHOGANYMART1F_BLACK_BELT + const MAHOGANYMART1F_LANCE + const MAHOGANYMART1F_DRAGON + const MAHOGANYMART1F_GRANNY + MahoganyMart1F_MapScriptHeader: .MapTriggers: db 2 @@ -31,83 +38,83 @@ UnknownScript_0x6c362: PharmacistScript_0x6c367: faceplayer - loadfont + opentext checkevent EVENT_DECIDED_TO_HELP_LANCE iftrue UnknownScript_0x6c375 pokemart MARTTYPE_STANDARD, MART_MAHOGANY_1 - loadmovesprites + closetext end UnknownScript_0x6c375: writetext UnknownText_0x6c46b + waitbutton closetext - loadmovesprites end BlackBeltScript_0x6c37b: faceplayer - loadfont + opentext checkevent EVENT_DECIDED_TO_HELP_LANCE iftrue UnknownScript_0x6c389 writetext UnknownText_0x6c494 + waitbutton closetext - loadmovesprites end UnknownScript_0x6c389: writetext UnknownText_0x6c501 + waitbutton closetext - loadmovesprites end UnknownScript_0x6c38f: pause 15 - loadfont + opentext writetext UnknownText_0x6c52a pause 15 - loadmovesprites + closetext playsound SFX_TACKLE - applymovement $5, MovementData_0x6c3f6 - applymovement $3, MovementData_0x6c3fb + applymovement MAHOGANYMART1F_DRAGON, MovementData_0x6c3f6 + applymovement MAHOGANYMART1F_BLACK_BELT, MovementData_0x6c3fb pause 15 - disappear $5 + disappear MAHOGANYMART1F_DRAGON pause 15 - applymovement $4, MovementData_0x6c407 - loadfont + applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c407 + opentext writetext UnknownText_0x6c549 + waitbutton closetext - loadmovesprites - follow $4, PLAYER - applymovement $4, MovementData_0x6c40a - applymovement $2, MovementData_0x6c403 - applymovement $4, MovementData_0x6c40e + follow MAHOGANYMART1F_LANCE, PLAYER + applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40a + applymovement MAHOGANYMART1F_PHARMACIST, MovementData_0x6c403 + applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40e stopfollow - loadfont + opentext writetext UnknownText_0x6c59e - closetext - showemote EMOTE_SHOCK, $2, 10 + waitbutton + showemote EMOTE_SHOCK, MAHOGANYMART1F_PHARMACIST, 10 playsound SFX_FAINT changeblock $6, $2, $1e reloadmappart - loadmovesprites + closetext setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART - spriteface $4, LEFT - loadfont + spriteface MAHOGANYMART1F_LANCE, LEFT + opentext writetext UnknownText_0x6c5ba + waitbutton closetext - loadmovesprites - applymovement $4, MovementData_0x6c412 + applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412 playsound SFX_EXIT_BUILDING - disappear $4 + disappear MAHOGANYMART1F_LANCE dotrigger $0 - waitbutton + waitsfx end GrannyScript_0x6c3ee: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_MAHOGANY_2 - loadmovesprites + closetext end MovementData_0x6c3f6: diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokeCenter1F.asm index 24e03dd22..eab6b6299 100644 --- a/maps/MahoganyPokeCenter1F.asm +++ b/maps/MahoganyPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const MAHOGANYPOKECENTER1F_NURSE + const MAHOGANYPOKECENTER1F_POKEFAN_M + const MAHOGANYPOKECENTER1F_YOUNGSTER + const MAHOGANYPOKECENTER1F_COOLTRAINER_F + MahoganyPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 5ae52fe85..a2681e9bf 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const MAHOGANYREDGYARADOSSPEECHHOUSE_BLACK_BELT + const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER + MahoganyRedGyaradosSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -10,18 +14,18 @@ BlackBeltScript_0x19997f: TeacherScript_0x199982: faceplayer - loadfont + opentext checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0x199990 writetext UnknownText_0x199a0e + waitbutton closetext - loadmovesprites end UnknownScript_0x199990: writetext UnknownText_0x199a3d + waitbutton closetext - loadmovesprites end UnknownScript_0x195996: diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 7700fa518..4eeafd92c 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -1,10 +1,16 @@ +const_value set 2 + const MAHOGANYTOWN_POKEFAN_M + const MAHOGANYTOWN_GRAMPS + const MAHOGANYTOWN_FISHER + const MAHOGANYTOWN_LASS + MahoganyTown_MapScriptHeader: .MapTriggers: db 2 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 - dw .Trigger2, 0 .MapCallbacks: db 1 @@ -12,10 +18,10 @@ MahoganyTown_MapScriptHeader: ; callbacks dbw 5, .FlyPoint -.Trigger1 +.Trigger0 end -.Trigger2 +.Trigger1 end .FlyPoint @@ -23,14 +29,14 @@ MahoganyTown_MapScriptHeader: return UnknownScript_0x190013: - showemote EMOTE_SHOCK, $2, 15 - applymovement $2, MovementData_0x1900a9 - follow PLAYER, $2 + showemote EMOTE_SHOCK, MAHOGANYTOWN_POKEFAN_M, 15 + applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900a9 + follow PLAYER, MAHOGANYTOWN_POKEFAN_M applymovement PLAYER, MovementData_0x1900a7 stopfollow spriteface PLAYER, RIGHT scall UnknownScript_0x19002f - applymovement $2, MovementData_0x1900ad + applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900ad end PokefanMScript_0x19002e: @@ -42,63 +48,63 @@ UnknownScript_0x19002f: end UnknownScript_0x190039: - loadfont + opentext writetext UnknownText_0x1901a6 + waitbutton closetext - loadmovesprites end UnknownScript_0x190040: - loadfont + opentext writetext UnknownText_0x1900b0 - special PlaceMoneyTopRightOW + special PlaceMoneyTopRight yesorno iffalse UnknownScript_0x190072 checkmoney $0, 300 if_equal $2, UnknownScript_0x19006c giveitem RAGECANDYBAR iffalse UnknownScript_0x190078 - waitbutton + waitsfx playsound SFX_TRANSACTION takemoney $0, 300 - special PlaceMoneyTopRightOW + special PlaceMoneyTopRight writetext UnknownText_0x19014a + waitbutton closetext - loadmovesprites end UnknownScript_0x19006c: writetext UnknownText_0x19015b + waitbutton closetext - loadmovesprites end UnknownScript_0x190072: writetext UnknownText_0x190178 + waitbutton closetext - loadmovesprites end UnknownScript_0x190078: writetext UnknownText_0x190188 + waitbutton closetext - loadmovesprites end GrampsScript_0x19007e: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19008c writetext UnknownText_0x1901e5 + waitbutton closetext - loadmovesprites end UnknownScript_0x19008c: writetext UnknownText_0x19021d + waitbutton closetext - loadmovesprites end FisherScript_0x190092: diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index f07170951..7c19eed47 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const MANIASHOUSE_ROCKER + ManiasHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,7 +10,7 @@ ManiasHouse_MapScriptHeader: ManiaScript: faceplayer - loadfont + opentext checkevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM iftrue .default_postevent checkevent EVENT_GOT_SHUCKIE @@ -18,12 +21,12 @@ ManiaScript: special SpecialGiveShuckle iffalse .partyfull writetext ManiaText_TakeCareOfShuckle - keeptextopen - waitbutton + buttonsound + waitsfx writetext ManiaText_GotShuckle playsound SFX_KEY_ITEM - waitbutton - loadmovesprites + waitsfx + closetext setevent EVENT_GOT_SHUCKIE end @@ -31,20 +34,20 @@ ManiaScript: checkflag ENGINE_SHUCKLE_GIVEN iffalse .returnshuckie writetext ManiaText_TakeCareOfShuckle + waitbutton closetext - loadmovesprites end .partyfull: writetext ManiaText_PartyFull + waitbutton closetext - loadmovesprites end .refusetotakeshuckie: writetext ManiaText_IfHeComesBack + waitbutton closetext - loadmovesprites end .returnshuckie: @@ -57,40 +60,40 @@ ManiaScript: if_equal $3, .superhappy if_equal $4, .default_postevent writetext ManiaText_ThankYou + waitbutton closetext - loadmovesprites setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM end .wrong: writetext ManiaText_ShuckleNotThere + waitbutton closetext - loadmovesprites end .superhappy: writetext ManiaText_ShuckleLikesYou + waitbutton closetext - loadmovesprites setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM end .refused: writetext ManiaText_SameAsBeingRobbed + waitbutton closetext - loadmovesprites end .nothingleft: writetext ManiaText_ShuckleIsYourLastMon + waitbutton closetext - loadmovesprites end .default_postevent: writetext ManiaText_HappinessSpeech + waitbutton closetext - loadmovesprites end UnknownScript_0x9d300: diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index c672c3b69..05e4c4b1d 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -1,19 +1,20 @@ + MobileBattleRoom_MapScriptHeader: .MapTriggers: db 2 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 - dw .Trigger2, 0 .MapCallbacks: db 0 -.Trigger1: +.Trigger0: priorityjump MobileBattleRoom_Initialize end -.Trigger2: +.Trigger1: end MobileBattleRoom_Initialize: @@ -34,7 +35,7 @@ MapMobileBattleRoomSignpost0Script: .one_: writetext MobileBattleRoom_HealText pause 20 - loadmovesprites + closetext special FadeOutPalettes playmusic MUSIC_HEAL special LoadMapPalettes @@ -50,11 +51,11 @@ MapMobileBattleRoomSignpost0Script: .one: special Function10387b writetext MobileBattleRoom_EstablishingCommsText - closetext + waitbutton reloadmappart special Function101225 .false: - loadmovesprites + closetext end MobileBattleRoom_EstablishingCommsText: diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 5b6ce591e..e0eb4df2f 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -1,19 +1,20 @@ + MobileTradeRoomMobile_MapScriptHeader: .MapTriggers: db 2 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 - dw .Trigger2, 0 .MapCallbacks: db 0 -.Trigger1: +.Trigger0: priorityjump MobileTradeRoomMobile_Initialize end -.Trigger2: +.Trigger1: end MobileTradeRoomMobile_Initialize: @@ -25,10 +26,10 @@ MapMobileTradeRoomMobileSignpost0Script: refreshscreen $0 special Function1037c2 writetext MobileTradeRoomMobile_EstablishingCommsText - closetext + waitbutton reloadmappart special Function101231 - loadmovesprites + closetext end MobileTradeRoomMobile_EstablishingCommsText: diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 7ef6e7022..5c1fdb985 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -1,82 +1,85 @@ +const_value set 2 + const MOUNTMOON_SILVER + MountMoon_MapScriptHeader: .MapTriggers: db 2 ; triggers - dw UnknownScript_0x74089, 0 - dw UnknownScript_0x7408d, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 .MapCallbacks: db 0 -UnknownScript_0x74089: - priorityjump UnknownScript_0x7408e +.Trigger0: + priorityjump .RivalBattle end -UnknownScript_0x7408d: +.Trigger1: end -UnknownScript_0x7408e: +.RivalBattle: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic pause 15 - applymovement $2, MovementData_0x740f9 + applymovement MOUNTMOON_SILVER, MountMoonSilverMovementBefore playmusic MUSIC_RIVAL_ENCOUNTER - loadfont - writetext UnknownText_0x74105 + opentext + writetext MountMoonSilverTextBefore + waitbutton closetext - loadmovesprites checkevent EVENT_GOT_TOTODILE_FROM_ELM - iftrue UnknownScript_0x740c3 + iftrue .Totodile checkevent EVENT_GOT_CHIKORITA_FROM_ELM - iftrue UnknownScript_0x740d3 - winlosstext UnknownText_0x7419d, UnknownText_0x742e0 - setlasttalked $2 + iftrue .Chikorita + winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss + setlasttalked MOUNTMOON_SILVER loadtrainer RIVAL2, 3 startbattle - reloadmapmusic - returnafterbattle - jump UnknownScript_0x740e3 + dontrestartmapmusic + reloadmapafterbattle + jump .FinishBattle -UnknownScript_0x740c3: - winlosstext UnknownText_0x7419d, UnknownText_0x742e0 - setlasttalked $2 +.Totodile: + winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss + setlasttalked MOUNTMOON_SILVER loadtrainer RIVAL2, 1 startbattle - reloadmapmusic - returnafterbattle - jump UnknownScript_0x740e3 + dontrestartmapmusic + reloadmapafterbattle + jump .FinishBattle -UnknownScript_0x740d3: - winlosstext UnknownText_0x7419d, UnknownText_0x742e0 - setlasttalked $2 +.Chikorita: + winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss + setlasttalked MOUNTMOON_SILVER loadtrainer RIVAL2, 2 startbattle - reloadmapmusic - returnafterbattle - jump UnknownScript_0x740e3 + dontrestartmapmusic + reloadmapafterbattle + jump .FinishBattle -UnknownScript_0x740e3: +.FinishBattle: playmusic MUSIC_RIVAL_AFTER - loadfont - writetext UnknownText_0x741fa + opentext + writetext MountMoonSilverTextAfter + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x740fd - disappear $2 + applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter + disappear MOUNTMOON_SILVER dotrigger $1 setevent EVENT_BEAT_RIVAL_IN_MT_MOON playmapmusic end -MovementData_0x740f9: +MountMoonSilverMovementBefore: step_left step_left step_left step_end -MovementData_0x740fd: +MountMoonSilverMovementAfter: step_right step_right step_down @@ -86,7 +89,7 @@ MovementData_0x740fd: step_down step_end -UnknownText_0x74105: +MountMoonSilverTextBefore: text "<......> <......> <......>" para "It's been a while," @@ -106,7 +109,7 @@ UnknownText_0x74105: line "show you!" done -UnknownText_0x7419d: +MountMoonSilverTextWin: text "<......> <......> <......>" para "I thought I raised" @@ -119,7 +122,7 @@ UnknownText_0x7419d: line "wasn't enough…" done -UnknownText_0x741fa: +MountMoonSilverTextAfter: text "<......> <......> <......>" para "…You won, fair" @@ -145,7 +148,7 @@ UnknownText_0x741fa: line "beating you." done -UnknownText_0x742e0: +MountMoonSilverTextLoss: text "<......> <......> <......>" para "I've repaid my" diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index 5fa8925e3..1df1c2279 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -1,3 +1,9 @@ +const_value set 2 + const MOUNTMOONGIFTSHOP_GRAMPS1 + const MOUNTMOONGIFTSHOP_GRAMPS2 + const MOUNTMOONGIFTSHOP_LASS1 + const MOUNTMOONGIFTSHOP_LASS2 + MountMoonGiftShop_MapScriptHeader: .MapTriggers: db 0 @@ -7,9 +13,9 @@ MountMoonGiftShop_MapScriptHeader: GrampsScript_0x771a8: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_MT_MOON - loadmovesprites + closetext end LassScript_0x771b0: diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 299d4eab7..c897757cb 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -1,3 +1,8 @@ +const_value set 2 + const MOUNTMOONSQUARE_FAIRY1 + const MOUNTMOONSQUARE_FAIRY2 + const MOUNTMOONSQUARE_ROCK + MountMoonSquare_MapScriptHeader: .MapTriggers: db 1 @@ -22,7 +27,7 @@ UnknownScript_0x77093: return UnknownScript_0x77097: - disappear $4 + disappear MOUNTMOONSQUARE_ROCK return UnknownScript_0x7709a: @@ -32,41 +37,41 @@ UnknownScript_0x7709a: if_not_equal MONDAY, .NoDancing checknite iffalse .NoDancing - appear $2 - appear $3 + appear MOUNTMOONSQUARE_FAIRY1 + appear MOUNTMOONSQUARE_FAIRY2 applymovement PLAYER, MovementData_0x77121 pause 15 - appear $4 - spriteface $2, RIGHT + appear MOUNTMOONSQUARE_ROCK + spriteface MOUNTMOONSQUARE_FAIRY1, RIGHT cry CLEFAIRY - waitbutton + waitsfx pause 30 - follow $2, $3 + follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2 cry CLEFAIRY - applymovement $2, MovementData_0x77123 + applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x77123 cry CLEFAIRY - applymovement $2, MovementData_0x77126 + applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x77126 cry CLEFAIRY - applymovement $2, MovementData_0x77128 + applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x77128 cry CLEFAIRY - applymovement $2, MovementData_0x7712b + applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x7712b cry CLEFAIRY - applymovement $2, MovementData_0x7712d + applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x7712d stopfollow - applymovement $3, MovementData_0x77130 - follow $2, $3 - applymovement $2, MovementData_0x77132 + applymovement MOUNTMOONSQUARE_FAIRY2, MovementData_0x77130 + follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2 + applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x77132 stopfollow - spriteface $2, DOWN + spriteface MOUNTMOONSQUARE_FAIRY1, DOWN pause 10 - showemote EMOTE_SHOCK, $2, 15 - spriteface $2, DOWN + showemote EMOTE_SHOCK, MOUNTMOONSQUARE_FAIRY1, 15 + spriteface MOUNTMOONSQUARE_FAIRY1, DOWN cry CLEFAIRY pause 15 - follow $2, $3 - applymovement $2, MovementData_0x77134 - disappear $2 - disappear $3 + follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2 + applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x77134 + disappear MOUNTMOONSQUARE_FAIRY1 + disappear MOUNTMOONSQUARE_FAIRY2 stopfollow clearevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE setflag ENGINE_MT_MOON_SQUARE_CLEFAIRY @@ -75,7 +80,7 @@ UnknownScript_0x7709a: .NoDancing: end -MapMountMoonSquareSignpostItem0: +MountMoonSquareHiddenMoonStone: dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE @@ -150,7 +155,7 @@ MountMoonSquare_MapEventHeader: .Signposts: db 2 - signpost 7, 7, SIGNPOST_ITEM, MapMountMoonSquareSignpostItem0 + signpost 7, 7, SIGNPOST_ITEM, MountMoonSquareHiddenMoonStone signpost 7, 17, SIGNPOST_READ, MapMountMoonSquareSignpost1Script .PersonEvents: diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 345305172..a9d25bb7b 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -1,3 +1,15 @@ +const_value set 2 + const MOUNTMORTAR1FINSIDE_BOULDER + const MOUNTMORTAR1FINSIDE_POKE_BALL1 + const MOUNTMORTAR1FINSIDE_POKE_BALL2 + const MOUNTMORTAR1FINSIDE_POKE_BALL3 + const MOUNTMORTAR1FINSIDE_POKE_BALL4 + const MOUNTMORTAR1FINSIDE_POKE_BALL5 + const MOUNTMORTAR1FINSIDE_SUPER_NERD1 + const MOUNTMORTAR1FINSIDE_SUPER_NERD2 + const MOUNTMORTAR1FINSIDE_POKE_BALL6 + const MOUNTMORTAR1FINSIDE_POKE_BALL7 + MountMortar1FInside_MapScriptHeader: .MapTriggers: db 0 @@ -9,49 +21,49 @@ TrainerPokemaniacMiller: trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, PokemaniacMillerScript PokemaniacMillerScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7debd + waitbutton closetext - loadmovesprites end TrainerSupernerdMarkus: trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, SupernerdMarkusScript SupernerdMarkusScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7df97 + waitbutton closetext - loadmovesprites end MountMortar1FBoulder: jumpstd strengthboulder -ItemFragment_0x7de7c: - db ESCAPE_ROPE, 1 +MountMortar1FInsideEscapeRope: + itemball ESCAPE_ROPE -ItemFragment_0x7de7e: - db MAX_REVIVE, 1 +MountMortar1FInsideMaxRevive: + itemball MAX_REVIVE -ItemFragment_0x7de80: - db HYPER_POTION, 1 +MountMortar1FInsideHyperPotion: + itemball HYPER_POTION -ItemFragment_0x7de82: - db MAX_POTION, 1 +MountMortar1FInsideMaxPotion: + itemball MAX_POTION -ItemFragment_0x7de84: - db NUGGET, 1 +MountMortar1FInsideNugget: + itemball NUGGET -ItemFragment_0x7de86: - db IRON, 1 +MountMortar1FInsideIron: + itemball IRON -ItemFragment_0x7de88: - db ULTRA_BALL, 1 +MountMortar1FInsideUltraBall: + itemball ULTRA_BALL -MapMountMortar1FInsideSignpostItem0: +MountMortar1FInsideHiddenMaxRepel: dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL @@ -123,17 +135,17 @@ MountMortar1FInside_MapEventHeader: .Signposts: db 1 - signpost 11, 30, SIGNPOST_ITEM, MapMountMortar1FInsideSignpostItem0 + signpost 11, 30, SIGNPOST_ITEM, MountMortar1FInsideHiddenMaxRepel .PersonEvents: db 10 person_event SPRITE_BOULDER, 43, 21, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MountMortar1FBoulder, -1 - person_event SPRITE_POKE_BALL, 38, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7de7c, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE - person_event SPRITE_POKE_BALL, 10, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7de7e, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE - person_event SPRITE_POKE_BALL, 27, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7de80, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION - person_event SPRITE_POKE_BALL, 20, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7de82, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION - person_event SPRITE_POKE_BALL, 19, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7de84, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET + person_event SPRITE_POKE_BALL, 38, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE + person_event SPRITE_POKE_BALL, 10, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE + person_event SPRITE_POKE_BALL, 27, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideHyperPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION + person_event SPRITE_POKE_BALL, 20, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideMaxPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION + person_event SPRITE_POKE_BALL, 19, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET person_event SPRITE_SUPER_NERD, 43, 33, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacMiller, -1 person_event SPRITE_SUPER_NERD, 28, 24, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerSupernerdMarkus, -1 - person_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7de86, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON - person_event SPRITE_POKE_BALL, 17, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7de88, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL + person_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON + person_event SPRITE_POKE_BALL, 17, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index b6612d2bf..ebaa40bf1 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -1,3 +1,7 @@ +const_value set 2 + const MOUNTMORTAR1FOUTSIDE_POKE_BALL1 + const MOUNTMORTAR1FOUTSIDE_POKE_BALL2 + MountMortar1FOutside_MapScriptHeader: .MapTriggers: db 0 @@ -5,13 +9,13 @@ MountMortar1FOutside_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x7ddf6: - db ETHER, 1 +MountMortar1FOutsideEther: + itemball ETHER -ItemFragment_0x7ddf8: - db REVIVE, 1 +MountMortar1FOutsideRevive: + itemball REVIVE -MapMountMortar1FOutsideSignpostItem0: +MountMortar1FOutsideHiddenHyperPotion: dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION @@ -36,9 +40,9 @@ MountMortar1FOutside_MapEventHeader: .Signposts: db 1 - signpost 22, 25, SIGNPOST_ITEM, MapMountMortar1FOutsideSignpostItem0 + signpost 22, 25, SIGNPOST_ITEM, MountMortar1FOutsideHiddenHyperPotion .PersonEvents: db 2 - person_event SPRITE_POKE_BALL, 15, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7ddf6, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER - person_event SPRITE_POKE_BALL, 18, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7ddf8, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE + person_event SPRITE_POKE_BALL, 15, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER + person_event SPRITE_POKE_BALL, 18, 31, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index d27f9b082..6d08a7d22 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -1,3 +1,12 @@ +const_value set 2 + const MOUNTMORTAR2FINSIDE_POKE_BALL1 + const MOUNTMORTAR2FINSIDE_POKE_BALL2 + const MOUNTMORTAR2FINSIDE_POKE_BALL3 + const MOUNTMORTAR2FINSIDE_POKE_BALL4 + const MOUNTMORTAR2FINSIDE_POKE_BALL5 + const MOUNTMORTAR2FINSIDE_POKE_BALL6 + const MOUNTMORTAR2FINSIDE_SUPER_NERD + MountMortar2FInside_MapScriptHeader: .MapTriggers: db 0 @@ -9,32 +18,32 @@ TrainerSupernerdHugh: trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, SupernerdHughScript SupernerdHughScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7e10e + waitbutton closetext - loadmovesprites end -ItemFragment_0x7e0de: - db MAX_POTION, 1 +MountMortar2FInsideMaxPotion: + itemball MAX_POTION -ItemFragment_0x7e0e0: - db RARE_CANDY, 1 +MountMortar2FInsideRareCandy: + itemball RARE_CANDY -ItemFragment_0x7e0e2: - db TM_DEFENSE_CURL, 1 +MountMortar2FInsideTMDefenseCurl: + itemball TM_DEFENSE_CURL -ItemFragment_0x7e0e4: - db DRAGON_SCALE, 1 +MountMortar2FInsideDragonScale: + itemball DRAGON_SCALE -ItemFragment_0x7e0e6: - db ELIXER, 1 +MountMortar2FInsideElixer: + itemball ELIXER -ItemFragment_0x7e0e8: - db ESCAPE_ROPE, 1 +MountMortar2FInsideEscapeRope: + itemball ESCAPE_ROPE -MapMountMortar2FInsideSignpostItem0: +MountMortar2FInsideHiddenFullRestore: dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE @@ -72,14 +81,14 @@ MountMortar2FInside_MapEventHeader: .Signposts: db 1 - signpost 8, 24, SIGNPOST_ITEM, MapMountMortar2FInsideSignpostItem0 + signpost 8, 24, SIGNPOST_ITEM, MountMortar2FInsideHiddenFullRestore .PersonEvents: db 7 - person_event SPRITE_POKE_BALL, 22, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0de, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION - person_event SPRITE_POKE_BALL, 33, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0e0, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY - person_event SPRITE_POKE_BALL, 17, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0e2, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL - person_event SPRITE_POKE_BALL, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0e4, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE - person_event SPRITE_POKE_BALL, 11, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0e6, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER - person_event SPRITE_POKE_BALL, 5, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e0e8, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE + person_event SPRITE_POKE_BALL, 22, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION + person_event SPRITE_POKE_BALL, 33, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY + person_event SPRITE_POKE_BALL, 17, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL + person_event SPRITE_POKE_BALL, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE + person_event SPRITE_POKE_BALL, 11, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER + person_event SPRITE_POKE_BALL, 5, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE person_event SPRITE_SUPER_NERD, 26, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdHugh, -1 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index b10adf856..e523f5fcd 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -1,3 +1,12 @@ +const_value set 2 + const MOUNTMORTARB1F_POKE_BALL1 + const MOUNTMORTARB1F_POKE_BALL2 + const MOUNTMORTARB1F_BOULDER + const MOUNTMORTARB1F_BLACK_BELT + const MOUNTMORTARB1F_POKE_BALL3 + const MOUNTMORTARB1F_POKE_BALL4 + const MOUNTMORTARB1F_POKE_BALL5 + MountMortarB1F_MapScriptHeader: .MapTriggers: db 0 @@ -7,62 +16,62 @@ MountMortarB1F_MapScriptHeader: BlackBeltScript_0x7e1f6: faceplayer - loadfont + opentext checkevent EVENT_GOT_TYROGUE_FROM_KIYO iftrue UnknownScript_0x7e231 checkevent EVENT_BEAT_BLACKBELT_KIYO iftrue UnknownScript_0x7e217 writetext UnknownText_0x7e24d + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x7e2a9, 0 loadtrainer BLACKBELT_T, KIYO startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_BLACKBELT_KIYO - loadfont + opentext UnknownScript_0x7e217: writetext UnknownText_0x7e2c0 - keeptextopen - waitbutton + buttonsound + waitsfx checkcode VAR_PARTYCOUNT if_equal $6, UnknownScript_0x7e237 writetext UnknownText_0x7e355 playsound SFX_CAUGHT_MON - waitbutton + waitsfx givepoke TYROGUE, 10 setevent EVENT_GOT_TYROGUE_FROM_KIYO UnknownScript_0x7e231: writetext UnknownText_0x7e36a + waitbutton closetext - loadmovesprites end UnknownScript_0x7e237: writetext UnknownText_0x7e3df + waitbutton closetext - loadmovesprites end MountMortarB1FBoulder: jumpstd strengthboulder -ItemFragment_0x7e240: - db HYPER_POTION, 1 +MountMortarB1FHyperPotion: + itemball HYPER_POTION -ItemFragment_0x7e242: - db CARBOS, 1 +MountMortarB1FCarbos: + itemball CARBOS -ItemFragment_0x7e244: - db FULL_RESTORE, 1 +MountMortarB1FFullRestore: + itemball FULL_RESTORE -ItemFragment_0x7e246: - db MAX_ETHER, 1 +MountMortarB1FMaxEther: + itemball MAX_ETHER -ItemFragment_0x7e248: - db PP_UP, 1 +MountMortarB1FPPUp: + itemball PP_UP -MapMountMortarB1FSignpostItem0: +MountMortarB1FHiddenMaxRevive: dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE @@ -140,14 +149,14 @@ MountMortarB1F_MapEventHeader: .Signposts: db 1 - signpost 6, 4, SIGNPOST_ITEM, MapMountMortarB1FSignpostItem0 + signpost 6, 4, SIGNPOST_ITEM, MountMortarB1FHiddenMaxRevive .PersonEvents: db 7 - person_event SPRITE_POKE_BALL, 12, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e240, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION - person_event SPRITE_POKE_BALL, 16, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e242, EVENT_MOUNT_MORTAR_B1F_CARBOS + person_event SPRITE_POKE_BALL, 12, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION + person_event SPRITE_POKE_BALL, 16, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS person_event SPRITE_BOULDER, 10, 9, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1 person_event SPRITE_BLACK_BELT, 4, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1 - person_event SPRITE_POKE_BALL, 24, 34, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e244, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE - person_event SPRITE_POKE_BALL, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e246, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER - person_event SPRITE_POKE_BALL, 26, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7e248, EVENT_MOUNT_MORTAR_B1F_PP_UP + person_event SPRITE_POKE_BALL, 24, 34, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE + person_event SPRITE_POKE_BALL, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER + person_event SPRITE_POKE_BALL, 26, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 59bf15c35..1d054f235 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const MOVEDELETERSHOUSE_SUPER_NERD + MoveDeletersHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,10 +10,10 @@ MoveDeletersHouse_MapScriptHeader: MoveDeleter: faceplayer - loadfont + opentext special MoveDeletion + waitbutton closetext - loadmovesprites end MoveDeletersHouseBookshelf: diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 2bb05c813..243678c9e 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -1,3 +1,10 @@ +const_value set 2 + const MRFUJISHOUSE_SUPER_NERD + const MRFUJISHOUSE_LASS + const MRFUJISHOUSE_RHYDON + const MRFUJISHOUSE_GROWLITHE + const MRFUJISHOUSE_MOLTRES + MrFujisHouse_MapScriptHeader: .MapTriggers: db 0 @@ -12,27 +19,27 @@ LassScript_0x7e8cd: jumptextfaceplayer UnknownText_0x7e940 MrFujisPsyduck: - loadfont + opentext writetext MrFujisPsyduckText cry PSYDUCK + waitbutton closetext - loadmovesprites end MrFujisNidorino: - loadfont + opentext writetext MrFujisNidorinoText cry NIDORINO + waitbutton closetext - loadmovesprites end MrFujisPidgey: - loadfont + opentext writetext MrFujisPidgeyText cry PIDGEY + waitbutton closetext - loadmovesprites end MrFujisHouseBookshelf: diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index aeac05928..227a334d9 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const MRPOKEMONSHOUSE_GENTLEMAN + const MRPOKEMONSHOUSE_OAK + MrPokemonsHouse_MapScriptHeader: .MapTriggers: db 2 @@ -17,52 +21,52 @@ UnknownScript_0x196e55: end UnknownScript_0x196e56: - showemote EMOTE_SHOCK, $2, 15 - spriteface $2, DOWN - loadfont + showemote EMOTE_SHOCK, MRPOKEMONSHOUSE_GENTLEMAN, 15 + spriteface MRPOKEMONSHOUSE_GENTLEMAN, DOWN + opentext writetext UnknownText_0x196f66 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x196f5a - loadfont + opentext writetext UnknownText_0x196fa8 - keeptextopen - waitbutton + buttonsound + waitsfx giveitem MYSTERY_EGG writetext UnknownText_0x196fd2 playsound SFX_KEY_ITEM - waitbutton + waitsfx itemnotify setevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON blackoutmod CHERRYGROVE_CITY writetext UnknownText_0x196feb - keeptextopen - spriteface $2, RIGHT + buttonsound + spriteface MRPOKEMONSHOUSE_GENTLEMAN, RIGHT writetext UnknownText_0x197092 - keeptextopen - spriteface $2, DOWN - spriteface $3, LEFT + buttonsound + spriteface MRPOKEMONSHOUSE_GENTLEMAN, DOWN + spriteface MRPOKEMONSHOUSE_OAK, LEFT writetext UnknownText_0x1970b7 + waitbutton closetext - loadmovesprites jump UnknownScript_0x196ec9 GentlemanScript_0x196e97: faceplayer - loadfont + opentext checkitem RED_SCALE iftrue UnknownScript_0x196eb0 checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196eaa writetext UnknownText_0x197134 + waitbutton closetext - loadmovesprites end UnknownScript_0x196eaa: writetext UnknownText_0x19714a + waitbutton closetext - loadmovesprites end UnknownScript_0x196eb0: @@ -76,38 +80,38 @@ UnknownScript_0x196eb0: UnknownScript_0x196ec3: writetext UnknownText_0x19750d - closetext + waitbutton UnknownScript_0x196ec7: - loadmovesprites + closetext end UnknownScript_0x196ec9: playmusic MUSIC_PROF_OAK - applymovement $3, MovementData_0x196f5d + applymovement MRPOKEMONSHOUSE_OAK, MovementData_0x196f5d spriteface PLAYER, RIGHT - loadfont + opentext writetext UnknownText_0x197185 - keeptextopen - waitbutton + buttonsound + waitsfx writetext UnknownText_0x1973cc playsound SFX_ITEM - waitbutton + waitsfx setflag ENGINE_POKEDEX writetext UnknownText_0x1973de + waitbutton closetext - loadmovesprites spriteface PLAYER, DOWN - applymovement $3, MovementData_0x196f61 + applymovement MRPOKEMONSHOUSE_OAK, MovementData_0x196f61 playsound SFX_EXIT_BUILDING - disappear $3 - waitbutton + disappear MRPOKEMONSHOUSE_OAK + waitsfx special RestartMapMusic pause 15 spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x1970ed + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes playmusic MUSIC_HEAL @@ -116,10 +120,10 @@ UnknownScript_0x196ec9: pause 60 special Special_FadeInQuickly special RestartMapMusic - loadfont + opentext writetext UnknownText_0x197134 + waitbutton closetext - loadmovesprites setevent EVENT_RIVAL_NEW_BARK_TOWN setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 6fdd2b9f5..04deea556 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const MRPSYCHICSHOUSE_FISHING_GURU + MrPsychicsHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,19 +10,19 @@ MrPsychicsHouse_MapScriptHeader: MrPsychic: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM29_PSYCHIC iftrue .AlreadyGotItem writetext MrPsychicText1 - keeptextopen + buttonsound verbosegiveitem TM_PSYCHIC iffalse .Done setevent EVENT_GOT_TM29_PSYCHIC .AlreadyGotItem writetext MrPsychicText2 - closetext + waitbutton .Done - loadmovesprites + closetext end MrPsychicsHouseBookshelf: diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index a689fbca5..81d7b0209 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -1,3 +1,19 @@ +const_value set 2 + const NATIONALPARK_LASS1 + const NATIONALPARK_POKEFAN_F1 + const NATIONALPARK_TEACHER1 + const NATIONALPARK_YOUNGSTER1 + const NATIONALPARK_YOUNGSTER2 + const NATIONALPARK_TEACHER2 + const NATIONALPARK_GROWLITHE + const NATIONALPARK_YOUNGSTER3 + const NATIONALPARK_POKEFAN_F2 + const NATIONALPARK_POKEFAN_M + const NATIONALPARK_LASS2 + const NATIONALPARK_POKE_BALL1 + const NATIONALPARK_GAMEBOY_KID + const NATIONALPARK_POKE_BALL2 + NationalPark_MapScriptHeader: .MapTriggers: db 0 @@ -13,19 +29,19 @@ PokefanFScript_0x5c005: TeacherScript_0x5c008: faceplayer - loadfont + opentext checkevent EVENT_GOT_QUICK_CLAW iftrue UnknownScript_0x5c01d writetext UnknownText_0x5c265 - keeptextopen + buttonsound verbosegiveitem QUICK_CLAW iffalse UnknownScript_0x5c021 setevent EVENT_GOT_QUICK_CLAW UnknownScript_0x5c01d: writetext UnknownText_0x5c30d - closetext + waitbutton UnknownScript_0x5c021: - loadmovesprites + closetext end YoungsterScript_0x5c023: @@ -39,20 +55,20 @@ TeacherScript_0x5c029: GrowlitheScript_0x5c02c: faceplayer - loadfont + opentext writetext UnknownText_0x5c416 cry PERSIAN + waitbutton closetext - loadmovesprites end GameboyKidScript_0x5c037: faceplayer - loadfont + opentext writetext UnknownText_0x5c42a + waitbutton closetext - loadmovesprites - spriteface $e, DOWN + spriteface NATIONALPARK_GAMEBOY_KID, DOWN end TrainerSchoolboyJack1: @@ -60,8 +76,8 @@ TrainerSchoolboyJack1: SchoolboyJack1Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_JACK iftrue UnknownScript_0x5c088 checkcellnum PHONE_SCHOOLBOY_JACK @@ -69,7 +85,7 @@ SchoolboyJack1Script: checkevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x5c071 writetext UnknownText_0x5c4f3 - keeptextopen + buttonsound setevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x5c0fc jump UnknownScript_0x5c074 @@ -108,7 +124,7 @@ UnknownScript_0x5c088: .LoadFight0 loadtrainer SCHOOLBOY, JACK1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJackFightCount, 1 clearflag ENGINE_JACK end @@ -116,7 +132,7 @@ UnknownScript_0x5c088: .LoadFight1 loadtrainer SCHOOLBOY, JACK2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJackFightCount, 2 clearflag ENGINE_JACK end @@ -124,7 +140,7 @@ UnknownScript_0x5c088: .LoadFight2 loadtrainer SCHOOLBOY, JACK3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJackFightCount, 3 clearflag ENGINE_JACK end @@ -132,7 +148,7 @@ UnknownScript_0x5c088: .LoadFight3 loadtrainer SCHOOLBOY, JACK4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJackFightCount, 4 clearflag ENGINE_JACK end @@ -140,7 +156,7 @@ UnknownScript_0x5c088: .LoadFight4 loadtrainer SCHOOLBOY, JACK5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_JACK end @@ -176,11 +192,11 @@ TrainerPokefanmWilliam: trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, PokefanmWilliamScript PokefanmWilliamScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5c645 + waitbutton closetext - loadmovesprites end TrainerPokefanfBeverly1: @@ -188,8 +204,8 @@ TrainerPokefanfBeverly1: PokefanfBeverly1Script: writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_BEVERLY_HAS_NUGGET iftrue UnknownScript_0x5c177 checkcellnum PHONE_POKEFAN_BEVERLY @@ -199,7 +215,7 @@ PokefanfBeverly1Script: checkevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x5c160 writetext UnknownText_0x5c5bd - keeptextopen + buttonsound setevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x5c18f jump UnknownScript_0x5c163 @@ -226,8 +242,8 @@ UnknownScript_0x5c186: UnknownScript_0x5c189: writetext UnknownText_0x5c68a + waitbutton closetext - loadmovesprites end UnknownScript_0x5c18f: @@ -266,11 +282,11 @@ TrainerLassKrise: trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, LassKriseScript LassKriseScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5c71d + waitbutton closetext - loadmovesprites end MapNationalParkSignpost0Script: @@ -282,13 +298,13 @@ MapNationalParkSignpost1Script: MapNationalParkSignpost3Script: jumptext UnknownText_0x5c7c6 -ItemFragment_0x5c1cc: - db PARLYZ_HEAL, 1 +NationalParkParlyzHeal: + itemball PARLYZ_HEAL -ItemFragment_0x5c1ce: - db TM_DIG, 1 +NationalParkTMDig: + itemball TM_DIG -MapNationalParkSignpostItem2: +NationalParkHiddenFullHeal: dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL @@ -516,7 +532,7 @@ NationalPark_MapEventHeader: db 4 signpost 44, 14, SIGNPOST_READ, MapNationalParkSignpost0Script signpost 31, 27, SIGNPOST_READ, MapNationalParkSignpost1Script - signpost 47, 6, SIGNPOST_ITEM, MapNationalParkSignpostItem2 + signpost 47, 6, SIGNPOST_ITEM, NationalParkHiddenFullHeal signpost 4, 12, SIGNPOST_READ, MapNationalParkSignpost3Script .PersonEvents: @@ -532,6 +548,6 @@ NationalPark_MapEventHeader: person_event SPRITE_POKEFAN_F, 29, 18, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1 person_event SPRITE_POKEFAN_M, 9, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1 person_event SPRITE_LASS, 14, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassKrise, -1 - person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5c1cc, EVENT_NATIONAL_PARK_PARLYZ_HEAL + person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL person_event SPRITE_GAMEBOY_KID, 6, 26, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1 - person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5c1ce, EVENT_NATIONAL_PARK_TM_DIG + person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index c2c4c130e..113fd6f96 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -1,3 +1,17 @@ +const_value set 2 + const NATIONALPARKBUGCONTEST_YOUNGSTER1 + const NATIONALPARKBUGCONTEST_YOUNGSTER2 + const NATIONALPARKBUGCONTEST_ROCKER + const NATIONALPARKBUGCONTEST_POKEFAN_M + const NATIONALPARKBUGCONTEST_YOUNGSTER3 + const NATIONALPARKBUGCONTEST_YOUNGSTER4 + const NATIONALPARKBUGCONTEST_LASS + const NATIONALPARKBUGCONTEST_YOUNGSTER5 + const NATIONALPARKBUGCONTEST_YOUNGSTER6 + const NATIONALPARKBUGCONTEST_YOUNGSTER7 + const NATIONALPARKBUGCONTEST_POKE_BALL1 + const NATIONALPARKBUGCONTEST_POKE_BALL2 + NationalParkBugContest_MapScriptHeader: .MapTriggers: db 0 @@ -7,82 +21,82 @@ NationalParkBugContest_MapScriptHeader: YoungsterScript_0x5c8ec: faceplayer - loadfont + opentext writetext UnknownText_0x5c94c + waitbutton closetext - loadmovesprites end YoungsterScript_0x5c8f4: faceplayer - loadfont + opentext writetext UnknownText_0x5c973 + waitbutton closetext - loadmovesprites end RockerScript_0x5c8fc: faceplayer - loadfont + opentext writetext UnknownText_0x5c9a3 + waitbutton closetext - loadmovesprites end PokefanMScript_0x5c904: faceplayer - loadfont + opentext writetext UnknownText_0x5c9cc + waitbutton closetext - loadmovesprites end YoungsterScript_0x5c90c: faceplayer - loadfont + opentext writetext UnknownText_0x5ca15 + waitbutton closetext - loadmovesprites end YoungsterScript_0x5c914: faceplayer - loadfont + opentext writetext UnknownText_0x5ca52 + waitbutton closetext - loadmovesprites end LassScript_0x5c91c: faceplayer - loadfont + opentext writetext UnknownText_0x5ca8f + waitbutton closetext - loadmovesprites end YoungsterScript_0x5c924: faceplayer - loadfont + opentext writetext UnknownText_0x5cac8 + waitbutton closetext - loadmovesprites end YoungsterScript_0x5c92c: faceplayer - loadfont + opentext writetext UnknownText_0x5cb25 + waitbutton closetext - loadmovesprites end YoungsterScript_0x5c934: faceplayer - loadfont + opentext writetext UnknownText_0x5cb64 + waitbutton closetext - loadmovesprites end MapNationalParkBugContestSignpost0Script: @@ -94,13 +108,13 @@ MapNationalParkBugContestSignpost1Script: MapNationalParkBugContestSignpost3Script: jumptext UnknownText_0x5cc1d -ItemFragment_0x5c945: - db PARLYZ_HEAL, 1 +NationalParkBugContestParlyzHeal: + itemball PARLYZ_HEAL -ItemFragment_0x5c947: - db TM_DIG, 1 +NationalParkBugContestTMDig: + itemball TM_DIG -MapNationalParkBugContestSignpostItem2: +NationalParkBugContestHiddenFullHeal: dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL @@ -225,7 +239,7 @@ NationalParkBugContest_MapEventHeader: db 4 signpost 44, 14, SIGNPOST_READ, MapNationalParkBugContestSignpost0Script signpost 31, 27, SIGNPOST_READ, MapNationalParkBugContestSignpost1Script - signpost 47, 6, SIGNPOST_ITEM, MapNationalParkBugContestSignpostItem2 + signpost 47, 6, SIGNPOST_ITEM, NationalParkBugContestHiddenFullHeal signpost 4, 12, SIGNPOST_READ, MapNationalParkBugContestSignpost3Script .PersonEvents: @@ -240,5 +254,5 @@ NationalParkBugContest_MapEventHeader: person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A person_event SPRITE_YOUNGSTER, 8, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A person_event SPRITE_YOUNGSTER, 34, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A - person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5c945, EVENT_NATIONAL_PARK_PARLYZ_HEAL - person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5c947, EVENT_NATIONAL_PARK_TM_DIG + person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL + person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 915da5ff2..cf25d1a18 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -1,10 +1,15 @@ +const_value set 2 + const NEWBARKTOWN_TEACHER + const NEWBARKTOWN_FISHER + const NEWBARKTOWN_SILVER + NewBarkTown_MapScriptHeader: .MapTriggers: db 2 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 - dw .Trigger2, 0 .MapCallbacks: db 1 @@ -12,10 +17,10 @@ NewBarkTown_MapScriptHeader: ; callbacks dbw 5, .FlyPoint -.Trigger1 +.Trigger0 end -.Trigger2 +.Trigger1 end .FlyPoint @@ -23,129 +28,129 @@ NewBarkTown_MapScriptHeader: clearevent EVENT_FIRST_TIME_BANKING_WITH_MOM return -UnknownScript_0x1a8016: +NewBarkTown_TeacherStopsYouTrigger1: playmusic MUSIC_MOM - spriteface $2, LEFT - loadfont - writetext UnknownText_0x1a8134 + spriteface NEWBARKTOWN_TEACHER, LEFT + opentext + writetext Text_WaitPlayer + waitbutton closetext - loadmovesprites spriteface PLAYER, RIGHT - applymovement $2, MovementData_0x1a80d4 - loadfont - writetext UnknownText_0x1a813e + applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou1_NBT + opentext + writetext Text_WhatDoYouThinkYoureDoing + waitbutton closetext - loadmovesprites - follow $2, PLAYER - applymovement $2, MovementData_0x1a80e0 + follow NEWBARKTOWN_TEACHER, PLAYER + applymovement NEWBARKTOWN_TEACHER, Movement_TeacherBringsYouBack1_NBT stopfollow - loadfont - writetext UnknownText_0x1a815e + opentext + writetext Text_ItsDangerousToGoAlone + waitbutton closetext - loadmovesprites special RestartMapMusic end -UnknownScript_0x1a8041: +NewBarkTown_TeacherStopsYouTrigger2: playmusic MUSIC_MOM - spriteface $2, LEFT - loadfont - writetext UnknownText_0x1a8134 + spriteface NEWBARKTOWN_TEACHER, LEFT + opentext + writetext Text_WaitPlayer + waitbutton closetext - loadmovesprites spriteface PLAYER, RIGHT - applymovement $2, MovementData_0x1a80d9 + applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou2_NBT spriteface PLAYER, UP - loadfont - writetext UnknownText_0x1a813e + opentext + writetext Text_WhatDoYouThinkYoureDoing + waitbutton closetext - loadmovesprites - follow $2, PLAYER - applymovement $2, MovementData_0x1a80e6 + follow NEWBARKTOWN_TEACHER, PLAYER + applymovement NEWBARKTOWN_TEACHER, Movement_TeacherBringsYouBack2_NBT stopfollow - loadfont - writetext UnknownText_0x1a815e + opentext + writetext Text_ItsDangerousToGoAlone + waitbutton closetext - loadmovesprites special RestartMapMusic end -TeacherScript_0x1a806f: +NewBarkTownTeacherScript: faceplayer - loadfont + 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 - loadmovesprites end -UnknownScript_0x1a8089: - writetext UnknownText_0x1a81c4 +.MonIsAdorable: + writetext Text_YourMonIsAdorable + waitbutton closetext - loadmovesprites end -UnknownScript_0x1a808f: - writetext UnknownText_0x1a81f2 +.TellMomYoureLeaving: + writetext Text_TellMomIfLeaving + waitbutton closetext - loadmovesprites end -UnknownScript_0x1a8095: - writetext UnknownText_0x1a8236 +.CallMom: + writetext Text_CallMomOnGear + waitbutton closetext - loadmovesprites end -FisherScript_0x1a809b: - jumptextfaceplayer UnknownText_0x1a8274 +NewBarkTownFisherScript: + jumptextfaceplayer Text_ElmDiscoveredNewMon -SilverScript_0x1a809e: - loadfont - writetext UnknownText_0x1a82a6 +NewBarkTownSilverScript: + opentext + writetext NewBarkTownRivalText1 + waitbutton closetext - loadmovesprites - spriteface $4, LEFT - loadfont - writetext UnknownText_0x1a82cd + spriteface NEWBARKTOWN_SILVER, LEFT + opentext + writetext NewBarkTownRivalText2 + waitbutton closetext - loadmovesprites - follow PLAYER, $4 - applymovement PLAYER, MovementData_0x1a80ed + follow PLAYER, NEWBARKTOWN_SILVER + applymovement PLAYER, Movement_SilverPushesYouAway_NBT stopfollow pause 5 - spriteface $4, DOWN + spriteface NEWBARKTOWN_SILVER, DOWN pause 5 playsound SFX_TACKLE - applymovement PLAYER, MovementData_0x1a80f0 - applymovement $4, 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 @@ -154,7 +159,7 @@ MovementData_0x1a80d9: turn_head_down step_end -MovementData_0x1a80e0: +Movement_TeacherBringsYouBack1_NBT: step_right step_right step_right @@ -162,7 +167,7 @@ MovementData_0x1a80e0: turn_head_left step_end -MovementData_0x1a80e6: +Movement_TeacherBringsYouBack2_NBT: step_right step_right step_right @@ -171,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!" @@ -195,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!" @@ -216,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?" @@ -231,7 +236,7 @@ UnknownText_0x1a81f2: cont "are leaving." done -UnknownText_0x1a8236: +Text_CallMomOnGear: text "Call your mom on" line "your #GEAR to" @@ -239,7 +244,7 @@ UnknownText_0x1a8236: line "you're doing." done -UnknownText_0x1a8274: +Text_ElmDiscoveredNewMon: text "Yo, <PLAYER>!" para "I hear PROF.ELM" @@ -247,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" @@ -268,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 @@ -293,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 @@ -305,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/OaksLab.asm b/maps/OaksLab.asm index 7eb650378..55aa4f72c 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -1,3 +1,9 @@ +const_value set 2 + const OAKSLAB_OAK + const OAKSLAB_SCIENTIST1 + const OAKSLAB_SCIENTIST2 + const OAKSLAB_SCIENTIST3 + OaksLab_MapScriptHeader: .MapTriggers: db 0 @@ -5,58 +11,58 @@ OaksLab_MapScriptHeader: .MapCallbacks: db 0 -UnknownScript_0x19b3c7: +.DummyTrigger: end Oak: faceplayer - loadfont + opentext checkevent EVENT_OPENED_MT_SILVER iftrue .CheckPokedex checkevent EVENT_TALKED_TO_OAK_IN_KANTO iftrue .CheckBadges writetext OakWelcomeKantoText - keeptextopen + buttonsound setevent EVENT_TALKED_TO_OAK_IN_KANTO .CheckBadges checkcode VAR_BADGES if_equal 16, .OpenMtSilver - if_equal 8, .Complain + if_equal 8, .Complain jump .AhGood .CheckPokedex writetext OakLabDexCheckText - closetext + waitbutton special ProfOaksPCBoot writetext OakLabGoodbyeText + waitbutton closetext - loadmovesprites end .OpenMtSilver writetext OakOpenMtSilverText - keeptextopen + buttonsound setevent EVENT_OPENED_MT_SILVER jump .CheckPokedex .Complain writetext OakNoKantoBadgesText - keeptextopen + buttonsound jump .CheckPokedex .AhGood writetext OakYesKantoBadgesText - keeptextopen + buttonsound jump .CheckPokedex -ScientistScript_0x19b40f: - jumptextfaceplayer UnknownText_0x19b7fb +OaksAssistant1Script: + jumptextfaceplayer OaksAssistant1Text -ScientistScript_0x19b412: - jumptextfaceplayer UnknownText_0x19b859 +OaksAssistant2Script: + jumptextfaceplayer OaksAssistant2Text -ScientistScript_0x19b415: - jumptextfaceplayer UnknownText_0x19b8a7 +OaksAssistant3Script: + jumptextfaceplayer OaksAssistant3Text OaksLabBookshelf: jumpstd difficultbookshelf @@ -178,7 +184,7 @@ OakYesKantoBadgesText: line "<PLAY_G>!" done -UnknownText_0x19b7fb: +OaksAssistant1Text: text "The PROF's #MON" line "TALK radio program" @@ -189,7 +195,7 @@ UnknownText_0x19b7fb: line "like to hear it." done -UnknownText_0x19b859: +OaksAssistant2Text: text "Thanks to your" line "work on the #-" cont "DEX, the PROF's" @@ -198,7 +204,7 @@ UnknownText_0x19b859: line "along great." done -UnknownText_0x19b8a7: +OaksAssistant3Text: text "Don't tell anyone," line "but PROF.OAK'S" @@ -284,6 +290,6 @@ OaksLab_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_OAK, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Oak, -1 - person_event SPRITE_SCIENTIST, 8, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x19b40f, -1 - person_event SPRITE_SCIENTIST, 9, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x19b412, -1 - person_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x19b415, -1 + person_event SPRITE_SCIENTIST, 8, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant1Script, -1 + person_event SPRITE_SCIENTIST, 9, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant2Script, -1 + person_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant3Script, -1 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 80dc08b3a..9cf4e67f6 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -1,3 +1,8 @@ +const_value set 2 + const OLIVINECAFE_SAILOR1 + const OLIVINECAFE_FISHING_GURU + const OLIVINECAFE_SAILOR2 + OlivineCafe_MapScriptHeader: .MapTriggers: db 0 @@ -7,17 +12,17 @@ OlivineCafe_MapScriptHeader: SailorScript_0x9c8c1: faceplayer - loadfont + opentext checkevent EVENT_GOT_HM04_STRENGTH iftrue UnknownScript_0x9c8d3 writetext UnknownText_0x9c8df - keeptextopen + buttonsound verbosegiveitem HM_STRENGTH setevent EVENT_GOT_HM04_STRENGTH UnknownScript_0x9c8d3: writetext UnknownText_0x9c965 + waitbutton closetext - loadmovesprites end FishingGuruScript_0x9c8d9: diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index ed89b3f1f..09c4a26c7 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -1,10 +1,16 @@ +const_value set 2 + const OLIVINECITY_SAILOR1 + const OLIVINECITY_STANDING_YOUNGSTER + const OLIVINECITY_SAILOR2 + const OLIVINECITY_OLIVINE_RIVAL + OlivineCity_MapScriptHeader: .MapTriggers: db 2 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 - dw .Trigger2, 0 .MapCallbacks: db 1 @@ -12,10 +18,10 @@ OlivineCity_MapScriptHeader: ; callbacks dbw 5, .FlyPoint -.Trigger1 +.Trigger0 end -.Trigger2 +.Trigger1 end .FlyPoint @@ -25,22 +31,22 @@ OlivineCity_MapScriptHeader: UnknownScript_0x1a8833: spriteface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic pause 15 playsound SFX_ENTER_DOOR - appear $5 - waitbutton - applymovement $5, MovementData_0x1a88d2 + appear OLIVINECITY_OLIVINE_RIVAL + waitsfx + applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88d2 playmusic MUSIC_RIVAL_ENCOUNTER - loadfont + opentext writetext UnknownText_0x1a88fa + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x1a88f4 spriteface PLAYER, RIGHT - applymovement $5, MovementData_0x1a88db + applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db dotrigger $1 - disappear $5 + disappear OLIVINECITY_OLIVINE_RIVAL special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY special RunCallback_04 @@ -49,21 +55,21 @@ UnknownScript_0x1a8833: UnknownScript_0x1a886b: spriteface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic pause 15 playsound SFX_ENTER_DOOR - appear $5 - waitbutton - applymovement $5, MovementData_0x1a88d6 + appear OLIVINECITY_OLIVINE_RIVAL + waitsfx + applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88d6 playmusic MUSIC_RIVAL_ENCOUNTER - loadfont + opentext writetext UnknownText_0x1a88fa + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x1a88f7 spriteface PLAYER, RIGHT - applymovement $5, MovementData_0x1a88e8 - disappear $5 + applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8 + disappear OLIVINECITY_OLIVINE_RIVAL dotrigger $1 special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY @@ -75,18 +81,18 @@ SailorScript_0x1a88a3: StandingYoungsterScript_0x1a88a6: faceplayer - loadfont + opentext random $2 if_equal $0, UnknownScript_0x1a88b4 writetext UnknownText_0x1a8b04 + waitbutton closetext - loadmovesprites end UnknownScript_0x1a88b4: writetext UnknownText_0x1a8b41 + waitbutton closetext - loadmovesprites end SailorScript_0x1a88ba: diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index c704bc967..51b9bd86c 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const OLIVINEGOODRODHOUSE_FISHING_GURU + OlivineGoodRodHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,31 +10,31 @@ OlivineGoodRodHouse_MapScriptHeader: GoodRodGuru: faceplayer - loadfont + opentext checkevent EVENT_GOT_GOOD_ROD iftrue .AlreadyGotItem writetext OfferGoodRodText yesorno iffalse .DontWantIt writetext GiveGoodRodText - keeptextopen + buttonsound verbosegiveitem GOOD_ROD writetext GaveGoodRodText + waitbutton closetext - loadmovesprites setevent EVENT_GOT_GOOD_ROD end .DontWantIt writetext DontWantGoodRodText + waitbutton closetext - loadmovesprites end .AlreadyGotItem writetext HaveGoodRodText + waitbutton closetext - loadmovesprites end GoodRodHouseBookshelf: diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index ce45363e7..bece5068c 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -1,3 +1,7 @@ +const_value set 2 + const OLIVINEGYM_JASMINE + const OLIVINEGYM_GYM_GUY + OlivineGym_MapScriptHeader: .MapTriggers: db 0 @@ -7,21 +11,21 @@ OlivineGym_MapScriptHeader: JasmineScript_0x9c12f: faceplayer - loadfont + opentext checkevent EVENT_BEAT_JASMINE iftrue .FightDone writetext UnknownText_0x9c1b9 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x9c2bb, 0 loadtrainer JASMINE, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_JASMINE - loadfont + opentext writetext UnknownText_0x9c33a playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_MINERALBADGE checkcode VAR_BADGES scall OlivineGymTriggerRockets @@ -29,20 +33,20 @@ JasmineScript_0x9c12f: checkevent EVENT_GOT_TM23_IRON_TAIL iftrue UnknownScript_0x9c172 writetext UnknownText_0x9c354 - keeptextopen + buttonsound verbosegiveitem TM_IRON_TAIL iffalse UnknownScript_0x9c176 setevent EVENT_GOT_TM23_IRON_TAIL writetext UnknownText_0x9c3a5 + waitbutton closetext - loadmovesprites end UnknownScript_0x9c172: writetext UnknownText_0x9c3d1 - closetext + waitbutton UnknownScript_0x9c176: - loadmovesprites + closetext end OlivineGymTriggerRockets: @@ -62,24 +66,24 @@ OlivineGymGuyScript: iftrue .OlivineGymGuyWinScript checkevent EVENT_JASMINE_RETURNED_TO_GYM iffalse .OlivineGymGuyPreScript - loadfont + opentext writetext OlivineGymGuyText + waitbutton closetext - loadmovesprites end .OlivineGymGuyWinScript - loadfont + opentext writetext OlivineGymGuyWinText + waitbutton closetext - loadmovesprites end .OlivineGymGuyPreScript - loadfont + opentext writetext OlivineGymGuyPreText + waitbutton closetext - loadmovesprites end OlivineGymStatue: diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 7f7b8d237..06cffbe27 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -1,3 +1,7 @@ +const_value set 2 + const OLIVINEHOUSEBETA_TEACHER + const OLIVINEHOUSEBETA_RHYDON + OlivineHouseBeta_MapScriptHeader: .MapTriggers: db 0 @@ -9,11 +13,11 @@ TeacherScript_0x9c58f: jumptextfaceplayer UnknownText_0x9c5a2 RhydonScript_0x9c592: - loadfont + opentext writetext UnknownText_0x9c5f0 cry RHYDON + waitbutton closetext - loadmovesprites end OlivineHouseBetaBookshelf1: diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index d5269f1e5..422e86ad2 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const OLIVINELIGHTHOUSE1F_SAILOR + const OLIVINELIGHTHOUSE1F_POKEFAN_F + OlivineLighthouse1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 50528ea7b..06b8a04ea 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const OLIVINELIGHTHOUSE2F_SAILOR + const OLIVINELIGHTHOUSE2F_GENTLEMAN + OlivineLighthouse2F_MapScriptHeader: .MapTriggers: db 0 @@ -9,11 +13,11 @@ TrainerGentlemanAlfred: trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, GentlemanAlfredScript GentlemanAlfredScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5b13e + waitbutton closetext - loadmovesprites end TrainerSailorHuey1: @@ -21,8 +25,8 @@ TrainerSailorHuey1: SailorHuey1Script: writecode VAR_CALLERID, PHONE_SAILOR_HUEY - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_HUEY iftrue UnknownScript_0x5afc7 checkcellnum PHONE_SAILOR_HUEY @@ -63,7 +67,7 @@ UnknownScript_0x5afc7: .LoadFight0 loadtrainer SAILOR, HUEY1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wHueyFightCount, 1 clearflag ENGINE_HUEY end @@ -71,7 +75,7 @@ UnknownScript_0x5afc7: .LoadFight1 loadtrainer SAILOR, HUEY2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wHueyFightCount, 2 clearflag ENGINE_HUEY end @@ -79,7 +83,7 @@ UnknownScript_0x5afc7: .LoadFight2 loadtrainer SAILOR, HUEY3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wHueyFightCount, 3 clearflag ENGINE_HUEY end @@ -87,7 +91,7 @@ UnknownScript_0x5afc7: .LoadFight3 loadtrainer SAILOR, HUEY4 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_HUEY checkevent EVENT_HUEY_PROTEIN iftrue UnknownScript_0x5b03f @@ -103,9 +107,9 @@ UnknownScript_0x5b03e: end UnknownScript_0x5b03f: - loadfont + opentext writetext UnknownText_0x5b1b6 - closetext + waitbutton verbosegiveitem PROTEIN iffalse UnknownScript_0x5b06f clearevent EVENT_HUEY_PROTEIN diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 21eb3d72c..ea1c26ac3 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const OLIVINELIGHTHOUSE3F_SAILOR + const OLIVINELIGHTHOUSE3F_GENTLEMAN + const OLIVINELIGHTHOUSE3F_YOUNGSTER + const OLIVINELIGHTHOUSE3F_POKE_BALL + OlivineLighthouse3F_MapScriptHeader: .MapTriggers: db 0 @@ -9,37 +15,37 @@ TrainerBird_keeperTheo: trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, Bird_keeperTheoScript Bird_keeperTheoScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5b2df + waitbutton closetext - loadmovesprites end TrainerGentlemanPreston: trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, GentlemanPrestonScript GentlemanPrestonScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5b457 + waitbutton closetext - loadmovesprites end TrainerSailorTerrell: trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, SailorTerrellScript SailorTerrellScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5b384 + waitbutton closetext - loadmovesprites end -ItemFragment_0x5b279: - db ETHER, 1 +OlivineLighthouse3FEther: + itemball ETHER Bird_keeperTheoSeenText: text "Why are you here?" @@ -133,4 +139,4 @@ OlivineLighthouse3F_MapEventHeader: person_event SPRITE_SAILOR, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerSailorTerrell, -1 person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 person_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperTheo, -1 - person_event SPRITE_POKE_BALL, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5b279, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER + person_event SPRITE_POKE_BALL, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 9a9f5fc78..ae5571dec 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const OLIVINELIGHTHOUSE4F_SAILOR + const OLIVINELIGHTHOUSE4F_LASS + OlivineLighthouse4F_MapScriptHeader: .MapTriggers: db 0 @@ -9,22 +13,22 @@ TrainerLassConnie: trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, 0, LassConnie1Script LassConnie1Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5b63c + waitbutton closetext - loadmovesprites end TrainerSailorKent: trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, 0, SailorKentScript SailorKentScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5b584 + waitbutton closetext - loadmovesprites end SailorKentSeenText: diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 3db655189..cbc8bc441 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const OLIVINELIGHTHOUSE5F_SAILOR + const OLIVINELIGHTHOUSE5F_YOUNGSTER + const OLIVINELIGHTHOUSE5F_POKE_BALL1 + const OLIVINELIGHTHOUSE5F_POKE_BALL2 + const OLIVINELIGHTHOUSE5F_POKE_BALL3 + OlivineLighthouse5F_MapScriptHeader: .MapTriggers: db 0 @@ -9,34 +16,34 @@ TrainerBird_keeperDenis: trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, 0, Bird_keeperDenisScript Bird_keeperDenisScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x60ac3 + waitbutton closetext - loadmovesprites end TrainerSailorErnest: trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, SailorErnestScript SailorErnestScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x60a1f + waitbutton closetext - loadmovesprites end -ItemFragment_0x609aa: - db RARE_CANDY, 1 +OlivineLighthouse5FRareCandy: + itemball RARE_CANDY -ItemFragment_0x609ac: - db SUPER_REPEL, 1 +OlivineLighthouse5FSuperRepel: + itemball SUPER_REPEL -ItemFragment_0x609ae: - db TM_SWAGGER, 1 +OlivineLighthouse5FTMSwagger: + itemball TM_SWAGGER -MapOlivineLighthouse5FSignpostItem0: +OlivineLighthouse5FHiddenHyperPotion: dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION @@ -103,12 +110,12 @@ OlivineLighthouse5F_MapEventHeader: .Signposts: db 1 - signpost 13, 3, SIGNPOST_ITEM, MapOlivineLighthouse5FSignpostItem0 + signpost 13, 3, SIGNPOST_ITEM, OlivineLighthouse5FHiddenHyperPotion .PersonEvents: db 5 person_event SPRITE_SAILOR, 11, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorErnest, -1 person_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerBird_keeperDenis, -1 - person_event SPRITE_POKE_BALL, 12, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x609aa, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY - person_event SPRITE_POKE_BALL, 15, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x609ac, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL - person_event SPRITE_POKE_BALL, 13, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x609ae, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER + person_event SPRITE_POKE_BALL, 12, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY + person_event SPRITE_POKE_BALL, 15, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL + person_event SPRITE_POKE_BALL, 13, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index aae5ed42e..d1c6527c9 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const OLIVINELIGHTHOUSE6F_JASMINE + const OLIVINELIGHTHOUSE6F_MONSTER + const OLIVINELIGHTHOUSE6F_POKE_BALL + OlivineLighthouse6F_MapScriptHeader: .MapTriggers: db 0 @@ -7,18 +12,18 @@ OlivineLighthouse6F_MapScriptHeader: JasmineScript_0x60b91: faceplayer - loadfont + opentext checkitem SECRETPOTION iftrue UnknownScript_0x60bab checkevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS iftrue UnknownScript_0x60ba5 writetext UnknownText_0x60c81 - keeptextopen + buttonsound setevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS UnknownScript_0x60ba5: writetext UnknownText_0x60d64 + waitbutton closetext - loadmovesprites end UnknownScript_0x60bab: @@ -26,72 +31,72 @@ UnknownScript_0x60bab: yesorno iffalse UnknownScript_0x60c25 writetext UnknownText_0x60dc3 - keeptextopen + buttonsound takeitem SECRETPOTION writetext UnknownText_0x60dea + waitbutton closetext - loadmovesprites - spriteface $2, RIGHT + spriteface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT pause 15 - spriteface $3, LEFT - loadfont + spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT + opentext playmusic MUSIC_HEAL writetext UnknownText_0x60e44 pause 60 - keeptextopen - loadmovesprites + buttonsound + closetext special RestartMapMusic cry AMPHAROS special FadeOutPalettes pause 10 special FadeInPalettes - loadfont + opentext writetext UnknownText_0x60f3d + waitbutton closetext - loadmovesprites - spriteface $3, RIGHT + spriteface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT pause 10 - spriteface $3, LEFT + spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT pause 10 - spriteface $3, RIGHT + spriteface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT pause 10 - spriteface $3, LEFT + spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT pause 10 faceplayer - loadfont + opentext writetext UnknownText_0x60e6c + waitbutton closetext - loadmovesprites setevent EVENT_JASMINE_RETURNED_TO_GYM clearevent EVENT_OLIVINE_GYM_JASMINE checkcode VAR_FACING - if_equal $0, UnknownScript_0x60c17 - if_equal $3, UnknownScript_0x60c1e - applymovement $2, MovementData_0x60c68 - disappear $2 + if_equal DOWN, UnknownScript_0x60c17 + if_equal RIGHT, UnknownScript_0x60c1e + applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c68 + disappear OLIVINELIGHTHOUSE6F_JASMINE end UnknownScript_0x60c17: - applymovement $2, MovementData_0x60c70 - disappear $2 + applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c70 + disappear OLIVINELIGHTHOUSE6F_JASMINE end UnknownScript_0x60c1e: - applymovement $2, MovementData_0x60c79 - disappear $2 + applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c79 + disappear OLIVINELIGHTHOUSE6F_JASMINE end UnknownScript_0x60c25: writetext UnknownText_0x60edf + waitbutton closetext - loadmovesprites - spriteface $2, RIGHT + spriteface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT pause 15 - spriteface $3, LEFT - loadfont + spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT + opentext writetext UnknownText_0x60ef1 + waitbutton closetext - loadmovesprites end UnknownScript_0x60c39: @@ -99,31 +104,31 @@ UnknownScript_0x60c39: MonsterScript_0x60c3a: faceplayer - loadfont + opentext checkevent EVENT_JASMINE_RETURNED_TO_GYM iftrue UnknownScript_0x60c51 writetext UnknownText_0x60f03 writebyte AMPHAROS special PlaySlowCry - keeptextopen + buttonsound writetext UnknownText_0x60f19 + waitbutton closetext - loadmovesprites end UnknownScript_0x60c51: writetext UnknownText_0x60f3d cry AMPHAROS + waitbutton closetext - loadmovesprites special FadeOutPalettes special FadeInPalettes special FadeOutPalettes special FadeInPalettes end -ItemFragment_0x60c66: - db SUPER_POTION, 1 +OlivineLighthouse6FSuperPotion: + itemball SUPER_POTION MovementData_0x60c68: slow_step_up @@ -272,4 +277,4 @@ OlivineLighthouse6F_MapEventHeader: db 3 person_event SPRITE_JASMINE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE person_event SPRITE_MONSTER, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1 - person_event SPRITE_POKE_BALL, 4, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x60c66, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION + person_event SPRITE_POKE_BALL, 4, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index b16f96d6f..06c999876 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const OLIVINEMART_CLERK + const OLIVINEMART_COOLTRAINER_F + const OLIVINEMART_LASS + OlivineMart_MapScriptHeader: .MapTriggers: db 0 @@ -6,9 +11,9 @@ OlivineMart_MapScriptHeader: db 0 ClerkScript_0x9cac7: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_OLIVINE - loadmovesprites + closetext end CooltrainerFScript_0x9cace: diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokeCenter1F.asm index f2e39540f..e0f0dbb69 100644 --- a/maps/OlivinePokeCenter1F.asm +++ b/maps/OlivinePokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const OLIVINEPOKECENTER1F_NURSE + const OLIVINEPOKECENTER1F_FISHING_GURU + const OLIVINEPOKECENTER1F_FISHER + const OLIVINEPOKECENTER1F_TEACHER + OlivinePokeCenter1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 38941d295..734d72dbb 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -1,3 +1,12 @@ +const_value set 2 + const OLIVINEPORT_SAILOR1 + const OLIVINEPORT_SAILOR2 + const OLIVINEPORT_SAILOR3 + const OLIVINEPORT_FISHING_GURU1 + const OLIVINEPORT_FISHING_GURU2 + const OLIVINEPORT_YOUNGSTER + const OLIVINEPORT_COOLTRAINER_F + OlivinePort_MapScriptHeader: .MapTriggers: db 2 @@ -18,7 +27,7 @@ UnknownScript_0x748ad: UnknownScript_0x748b1: applymovement PLAYER, MovementData_0x74a32 - appear $2 + appear OLIVINEPORT_SAILOR1 dotrigger $0 setevent EVENT_GAVE_KURT_APRICORNS blackoutmod OLIVINE_CITY @@ -26,21 +35,21 @@ UnknownScript_0x748b1: SailorScript_0x748c0: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74919 writetext UnknownText_0x74a55 + waitbutton closetext - loadmovesprites - spriteface $2, DOWN + spriteface OLIVINEPORT_SAILOR1, DOWN pause 10 playsound SFX_EXIT_BUILDING - disappear $2 - waitbutton + disappear OLIVINEPORT_SAILOR1 + waitsfx applymovement PLAYER, MovementData_0x74a30 playsound SFX_EXIT_BUILDING special FadeOutPalettes - waitbutton + waitsfx checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7490a clearevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND @@ -56,25 +65,25 @@ SailorScript_0x748c0: clearevent EVENT_BEAT_BLACKBELT_WAI UnknownScript_0x7490a: clearevent EVENT_FAST_SHIP_DESTINATION_OLIVINE - appear $2 + appear OLIVINEPORT_SAILOR1 domaptrigger FAST_SHIP_1F, $1 warp FAST_SHIP_1F, $19, $1 end UnknownScript_0x74919: writetext UnknownText_0x74a80 + waitbutton closetext - loadmovesprites end UnknownScript_0x7491f: - spriteface $4, RIGHT + spriteface OLIVINEPORT_SAILOR3, RIGHT checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x7498b checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue UnknownScript_0x7498b spriteface PLAYER, LEFT - loadfont + opentext checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7494e checkcode VAR_WEEKDAY @@ -88,34 +97,34 @@ UnknownScript_0x7494e: yesorno iffalse UnknownScript_0x74992 writetext UnknownText_0x74ada - keeptextopen + buttonsound checkitem S_S_TICKET iffalse UnknownScript_0x7496d writetext UnknownText_0x74b11 + waitbutton closetext - loadmovesprites setevent EVENT_RECEIVED_BALLS_FROM_KURT applymovement PLAYER, MovementData_0x74a37 jump SailorScript_0x748c0 UnknownScript_0x7496d: writetext UnknownText_0x74b41 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x74a34 end UnknownScript_0x74977: writetext UnknownText_0x74ba8 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x74a34 end UnknownScript_0x74981: writetext UnknownText_0x74bce + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x74a34 end @@ -124,20 +133,20 @@ UnknownScript_0x7498b: UnknownScript_0x7498c: writetext UnknownText_0x74af6 + waitbutton closetext - loadmovesprites end UnknownScript_0x74992: writetext UnknownText_0x74af6 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x74a34 end SailorScript_0x7499c: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74919 checkevent EVENT_FAST_SHIP_FIRST_TIME @@ -153,15 +162,15 @@ UnknownScript_0x749c0: yesorno iffalse UnknownScript_0x7498c writetext UnknownText_0x74ada - keeptextopen + buttonsound checkitem S_S_TICKET iffalse UnknownScript_0x749ec writetext UnknownText_0x74b11 + waitbutton closetext - loadmovesprites setevent EVENT_RECEIVED_BALLS_FROM_KURT checkcode VAR_FACING - if_equal $3, UnknownScript_0x749e5 + if_equal RIGHT, UnknownScript_0x749e5 applymovement PLAYER, MovementData_0x74a3f jump SailorScript_0x748c0 @@ -171,20 +180,20 @@ UnknownScript_0x749e5: UnknownScript_0x749ec: writetext UnknownText_0x74b41 + waitbutton closetext - loadmovesprites end UnknownScript_0x749f2: writetext UnknownText_0x74ba8 + waitbutton closetext - loadmovesprites end UnknownScript_0x749f8: writetext UnknownText_0x74bce + waitbutton closetext - loadmovesprites end SailorScript_0x749fe: @@ -192,41 +201,41 @@ SailorScript_0x749fe: FishingGuruScript_0x74a01: faceplayer - loadfont + opentext writetext UnknownText_0x74bf4 + waitbutton closetext - loadmovesprites - spriteface $5, UP + spriteface OLIVINEPORT_FISHING_GURU1, UP end FishingGuruScript_0x74a0c: faceplayer - loadfont + opentext writetext UnknownText_0x74c35 + waitbutton closetext - loadmovesprites - spriteface $6, UP + spriteface OLIVINEPORT_FISHING_GURU2, UP end YoungsterScript_0x74a17: faceplayer - loadfont + opentext writetext UnknownText_0x74c76 + waitbutton closetext - loadmovesprites - spriteface $7, DOWN + spriteface OLIVINEPORT_YOUNGSTER, DOWN end CooltrainerFScript_0x74a22: faceplayer - loadfont + opentext writetext UnknownText_0x74ca2 + waitbutton closetext - loadmovesprites - spriteface $8, DOWN + spriteface OLIVINEPORT_COOLTRAINER_F, DOWN end -MapOlivinePortSignpostItem0: +OlivinePortHiddenProtein: dwb EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN @@ -393,7 +402,7 @@ OlivinePort_MapEventHeader: .Signposts: db 1 - signpost 22, 1, SIGNPOST_ITEM, MapOlivinePortSignpostItem0 + signpost 22, 1, SIGNPOST_ITEM, OlivinePortHiddenProtein .PersonEvents: db 7 diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 0083332b3..116a05dfd 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -1,3 +1,6 @@ +const_value set 2 + const OLIVINEPORTPASSAGE_POKEFAN_M + OlivinePortPassage_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index d1c28edbb..b819ab567 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const OLIVINEPUNISHMENTSPEECHHOUSE_POKEFAN_M + const OLIVINEPUNISHMENTSPEECHHOUSE_LASS + OlivinePunishmentSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/OlivineVoltorbHouse.asm b/maps/OlivineVoltorbHouse.asm index 083cda395..acd87e47e 100644 --- a/maps/OlivineVoltorbHouse.asm +++ b/maps/OlivineVoltorbHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const OLIVINEVOLTORBHOUSE_FISHING_GURU + OlivineVoltorbHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,10 +10,10 @@ OlivineVoltorbHouse_MapScriptHeader: Tim: faceplayer - loadfont + opentext trade $2 + waitbutton closetext - loadmovesprites end TimsHouseBookshelf: diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index bf6fd50fc..3b63dada5 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -1,3 +1,7 @@ +const_value set 2 + const PALLETTOWN_TEACHER + const PALLETTOWN_FISHER + PalletTown_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index ef3dfe610..5baaf418d 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -1,3 +1,10 @@ +const_value set 2 + const PEWTERCITY_COOLTRAINER_F + const PEWTERCITY_BUG_CATCHER + const PEWTERCITY_GRAMPS + const PEWTERCITY_FRUIT_TREE1 + const PEWTERCITY_FRUIT_TREE2 + PewterCity_MapScriptHeader: .MapTriggers: db 0 @@ -20,20 +27,20 @@ BugCatcherScript_0x18c00c: GrampsScript_0x18c00f: faceplayer - loadfont + opentext checkevent EVENT_GOT_SILVER_WING iftrue UnknownScript_0x18c023 writetext UnknownText_0x18c0c6 - keeptextopen + buttonsound verbosegiveitem SILVER_WING setevent EVENT_GOT_SILVER_WING - loadmovesprites + closetext end UnknownScript_0x18c023: writetext UnknownText_0x18c1aa + waitbutton closetext - loadmovesprites end PewterCitySign: diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 9585b7320..8fce69b13 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -1,3 +1,8 @@ +const_value set 2 + const PEWTERGYM_BROCK + const PEWTERGYM_YOUNGSTER + const PEWTERGYM_GYM_GUY + PewterGym_MapScriptHeader: .MapTriggers: db 0 @@ -7,59 +12,59 @@ PewterGym_MapScriptHeader: BrockScript_0x1a2864: faceplayer - loadfont + opentext checkflag ENGINE_BOULDERBADGE iftrue .FightDone writetext UnknownText_0x1a28d0 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x1a29bb, 0 loadtrainer BROCK, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_BROCK setevent EVENT_BEAT_CAMPER_JERRY - loadfont + opentext writetext UnknownText_0x1a2a3d playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_BOULDERBADGE writetext UnknownText_0x1a2a57 + waitbutton closetext - loadmovesprites end .FightDone writetext UnknownText_0x1a2ada + waitbutton closetext - loadmovesprites end TrainerCamperJerry: trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, CamperJerryScript CamperJerryScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a2c0f + waitbutton closetext - loadmovesprites end PewterGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_BROCK iftrue .PewterGymGuyWinScript writetext PewterGymGuyText + waitbutton closetext - loadmovesprites end .PewterGymGuyWinScript writetext PewterGymGuyWinText + waitbutton closetext - loadmovesprites end PewterGymStatue: diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index 0cfc70011..6ee67b720 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const PEWTERMART_CLERK + const PEWTERMART_YOUNGSTER + const PEWTERMART_SUPER_NERD + PewterMart_MapScriptHeader: .MapTriggers: db 0 @@ -6,9 +11,9 @@ PewterMart_MapScriptHeader: db 0 ClerkScript_0x1a2dcb: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_PEWTER - loadmovesprites + closetext end YoungsterScript_0x1a2dd2: diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 42c0fc63b..47d8a1481 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const PEWTERNIDORANSPEECHHOUSE_SUPER_NERD + const PEWTERNIDORANSPEECHHOUSE_GROWLITHE + PewterNidoranSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -9,11 +13,11 @@ SuperNerdScript_0x1a2807: jumptextfaceplayer UnknownText_0x1a2814 GrowlitheScript_0x1a280a: - loadfont + opentext writetext UnknownText_0x1a2825 cry NIDORAN_M + waitbutton closetext - loadmovesprites end UnknownText_0x1a2814: diff --git a/maps/PewterPokeCEnter2FBeta.asm b/maps/PewterPokeCEnter2FBeta.asm index 74bd290ff..9a78c7c59 100644 --- a/maps/PewterPokeCEnter2FBeta.asm +++ b/maps/PewterPokeCEnter2FBeta.asm @@ -1,3 +1,4 @@ + PewterPokeCEnter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm index b8f0d960e..1ab6012a8 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokeCenter1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const PEWTERPOKECENTER1F_NURSE + const PEWTERPOKECENTER1F_TEACHER + const PEWTERPOKECENTER1F_JIGGLYPUFF + const PEWTERPOKECENTER1F_BUG_CATCHER + const PEWTERPOKECENTER1F_POKEFAN_M + PewterPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -12,11 +19,11 @@ TeacherScript_0x1a2eea: jumptextfaceplayer UnknownText_0x1a2f01 JigglypuffScript_0x1a2eed: - loadfont + opentext writetext UnknownText_0x1a2f5d cry JIGGLYPUFF + waitbutton closetext - loadmovesprites end BugCatcherScript_0x1a2ef7: @@ -24,10 +31,10 @@ BugCatcherScript_0x1a2ef7: PokefanMScript_0x1a2efa: faceplayer - loadfont + opentext trade $4 + waitbutton closetext - loadmovesprites end UnknownText_0x1a2f01: diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 4660ed2e1..41d0c10ba 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const PEWTERSNOOZESPEECHHOUSE_GRAMPS + PewterSnoozeSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index b5596bb9c..c285fc8c2 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -1,74 +1,80 @@ +const_value set 2 + const POKECENTER2F_TRADE_RECEPTIONIST + const POKECENTER2F_BATTLE_RECEPTIONIST + const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST + const POKECENTER2F_OFFICER + PokeCenter2F_MapScriptHeader: .MapTriggers: db 6 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 dw .Trigger2, 0 dw .Trigger3, 0 dw .Trigger4, 0 dw .Trigger5, 0 - dw .Trigger6, 0 .MapCallbacks: db 0 -.Trigger1: +.Trigger0: special Special_CheckMysteryGift - if_equal $0, .Trigger1Done + if_equal $0, .Trigger0Done clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY checkevent EVENT_RECEIVED_BALLS_FROM_KURT - iftrue .Trigger1Done + iftrue .Trigger0Done priorityjump PokeCenter2F_AppearMysteryGiftDeliveryGuy -.Trigger1Done: +.Trigger0Done: end -.Trigger2: +.Trigger1: priorityjump Script_LeftCableTradeCenter end -.Trigger3: +.Trigger2: priorityjump Script_LeftCableColosseum end -.Trigger4: +.Trigger3: priorityjump Script_LeftTimeCapsule end -.Trigger5: +.Trigger4: priorityjump Script_LeftMobileTradeRoom end -.Trigger6: +.Trigger5: priorityjump Script_LeftMobileBattleRoom end PokeCenter2F_AppearMysteryGiftDeliveryGuy: - appear $5 + appear POKECENTER2F_OFFICER setevent EVENT_RECEIVED_BALLS_FROM_KURT end Script_TradeCenterClosed: faceplayer - loadfont + opentext writetext Text_TradeRoomClosed + waitbutton closetext - loadmovesprites end Script_BattleRoomClosed: faceplayer - loadfont + opentext writetext Text_BattleRoomClosed + waitbutton closetext - loadmovesprites end LinkReceptionistScript_Trade: checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iffalse Script_TradeCenterClosed - loadfont + opentext writetext Text_TradeReceptionistIntro yesorno iffalse .Cancel @@ -96,29 +102,29 @@ LinkReceptionistScript_Trade: special Special_CheckBothSelectedSameRoom iffalse .IncompatibleRooms writetext Text_PleaseComeIn2 + waitbutton closetext - loadmovesprites scall PokeCenter2F_CheckGender warpcheck end .FriendNotReady: - special Special_AbortLink + special WaitForOtherPlayerToExit writetext Text_FriendNotReady - loadmovesprites + closetext end .LinkedToFirstGen: special Special_FailedLinkToPast writetext Text_CantLinkToThePast special Special_CloseLink - loadmovesprites + closetext end .IncompatibleRooms: writetext Text_IncompatibleRooms special Special_CloseLink - loadmovesprites + closetext end .LinkTimedOut: @@ -128,9 +134,9 @@ LinkReceptionistScript_Trade: .DidNotSave: writetext Text_PleaseComeAgain .AbortLink: - special Special_AbortLink + special WaitForOtherPlayerToExit .Cancel: - loadmovesprites + closetext end .Mobile: @@ -151,26 +157,26 @@ LinkReceptionistScript_Trade: iffalse .Mobile_DidNotSave special Function1011f1 writetext Text_PleaseComeIn2 + waitbutton closetext - loadmovesprites writebyte $0 end .Mobile_DidNotSave: writetext Text_PleaseComeAgain - loadmovesprites + closetext writebyte $1 end BattleTradeMobile_WalkIn: - applymovement2 MovementData_0x192cce - applymovement PLAYER, MovementData_0x192ce7 + applymovement2 PokeCenter2FMobileMobileMovementData_ReceptionistWalksUpAndLeft_LookDown + applymovement PLAYER, PokeCenter2FMobileMovementData_PlayerWalksIntoMobileBattleRoom end LinkReceptionistScript_Battle: checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iffalse Script_BattleRoomClosed - loadfont + opentext writetext Text_BattleReceptionistIntro yesorno iffalse .Cancel @@ -198,29 +204,29 @@ LinkReceptionistScript_Battle: special Special_CheckBothSelectedSameRoom iffalse .IncompatibleRooms writetext Text_PleaseComeIn2 + waitbutton closetext - loadmovesprites scall PokeCenter2F_CheckGender warpcheck end .FriendNotReady: - special Special_AbortLink + special WaitForOtherPlayerToExit writetext Text_FriendNotReady - loadmovesprites + closetext end .LinkedToFirstGen: special Special_FailedLinkToPast writetext Text_CantLinkToThePast special Special_CloseLink - loadmovesprites + closetext end .IncompatibleRooms: writetext Text_IncompatibleRooms special Special_CloseLink - loadmovesprites + closetext end .LinkTimedOut: @@ -230,9 +236,9 @@ LinkReceptionistScript_Battle: .DidNotSave: writetext Text_PleaseComeAgain .AbortLink: - special Special_AbortLink + special WaitForOtherPlayerToExit .Cancel: - loadmovesprites + closetext end .Mobile: @@ -255,14 +261,14 @@ LinkReceptionistScript_Battle: iffalse .Mobile_DidNotSave special Function1011f1 writetext Text_PleaseComeIn2 + waitbutton closetext - loadmovesprites writebyte $0 end .Mobile_DidNotSave: writetext Text_PleaseComeAgain - loadmovesprites + closetext writebyte $1 end @@ -276,9 +282,9 @@ LinkReceptionistScript_Battle: .Mobile_InvalidParty: writetext Text_BrokeStadiumRules - closetext + waitbutton .Mobile_DidNotSelect: - loadmovesprites + closetext writebyte $0 end @@ -288,10 +294,10 @@ LinkReceptionistScript_Battle: Script_TimeCapsuleClosed: faceplayer - loadfont + opentext writetext Text_TimeCapsuleClosed + waitbutton closetext - loadmovesprites end LinkReceptionistScript_TimeCapsule: @@ -301,7 +307,7 @@ LinkReceptionistScript_TimeCapsule: iftrue Script_TimeCapsuleClosed special Special_SetBitsForTimeCapsuleRequest faceplayer - loadfont + opentext writetext Text_TimeCapsuleReceptionistIntro yesorno iffalse .Cancel @@ -325,22 +331,22 @@ LinkReceptionistScript_TimeCapsule: special Special_CheckBothSelectedSameRoom writetext Text_IncompatibleRooms special Special_CloseLink - loadmovesprites + closetext end .OK: special Special_EnterTimeCapsule writetext Text_PleaseComeIn2 + waitbutton closetext - loadmovesprites scall TimeCapsuleScript_CheckPlayerGender warpcheck end .FriendNotReady: - special Special_AbortLink + special WaitForOtherPlayerToExit writetext Text_FriendNotReady - loadmovesprites + closetext end .LinkTimedOut: @@ -350,28 +356,28 @@ LinkReceptionistScript_TimeCapsule: .DidNotSave: writetext Text_PleaseComeAgain .Cancel: - special Special_AbortLink - loadmovesprites + special WaitForOtherPlayerToExit + closetext end .MonTooNew: writetext Text_RejectNewMon - loadmovesprites + closetext end .MonMoveTooNew: writetext Text_RejectMonWithNewMove - loadmovesprites + closetext end .MonHasMail: writetext Text_RejectMonWithMail - loadmovesprites + closetext end Script_LeftCableTradeCenter: - special Special_AbortLink - scall Script_CleanUpFemaleFlagAfterTrade + special WaitForOtherPlayerToExit + scall Script_WalkOutOfLinkTradeRoom dotrigger $0 domaptrigger TRADE_CENTER, $0 end @@ -384,14 +390,14 @@ Script_LeftMobileTradeRoom: end Script_WalkOutOfMobileTradeRoom: - applymovement $2, MovementData_0x192d0b - applymovement PLAYER, MovementData_0x192d0f - applymovement $2, MovementData_0x192d14 + applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMobileMovementData_ReceptionistWalksUpAndLeft + applymovement PLAYER, PokeCenter2FMovementData_PlayerWalksOutOfMobileRoom + applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMobileMovementData_ReceptionistWalksRightAndDown end Script_LeftCableColosseum: - special Special_AbortLink - scall Script_CleanUpFemaleFlagAfterBattle + special WaitForOtherPlayerToExit + scall Script_WalkOutOfLinkBattleRoom dotrigger $0 domaptrigger COLOSSEUM, $0 end @@ -404,88 +410,88 @@ Script_LeftMobileBattleRoom: end Script_WalkOutOfMobileBattleRoom: - applymovement $3, MovementData_0x192d0b - applymovement PLAYER, MovementData_0x192d0f - applymovement $3, MovementData_0x192d14 + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMobileMovementData_ReceptionistWalksUpAndLeft + applymovement PLAYER, PokeCenter2FMovementData_PlayerWalksOutOfMobileRoom + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMobileMovementData_ReceptionistWalksRightAndDown end PokeCenter2F_CheckGender: checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Female - applymovement2 MovementData_0x192cca - applymovement PLAYER, MovementData_0x192cde + applymovement2 PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesThreeStepsUp end .Female: - applymovement2 MovementData_0x192cd8 - applymovement PLAYER, MovementData_0x192ce2 - loadfont + applymovement2 PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight_2 + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsUp + opentext writetext Text_OhPleaseWait + waitbutton closetext - loadmovesprites - applymovement2 MovementData_0x192cdc + applymovement2 PokeCenter2FMovementData_ReceptionistLooksRight spriteface PLAYER, LEFT - loadfont + opentext writetext Text_ChangeTheLook + waitbutton closetext - loadmovesprites playsound SFX_TINGLE - applymovement PLAYER, MovementData_0x192d17 + applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (1 << 7) | (PAL_OW_RED << 4) special Special_SetPlayerPalette - applymovement PLAYER, MovementData_0x192d1c + applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft setflag ENGINE_KRIS_IN_CABLE_CLUB special ReplaceKrisSprite - loadfont + opentext writetext Text_LikeTheLook + waitbutton closetext - loadmovesprites showemote EMOTE_SHOCK, PLAYER, 15 - applymovement PLAYER, MovementData_0x192ce5 + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepUp end -Script_CleanUpFemaleFlagAfterTrade: +Script_WalkOutOfLinkTradeRoom: checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female - applymovement $2, MovementData_0x192d04 - applymovement PLAYER, MovementData_0x192cf5 - applymovement $2, MovementData_0x192cfe + applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3 + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesThreeStepsDown + applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightAndDown end .Female: - applymovement $2, MovementData_0x192d04 - applymovement PLAYER, MovementData_0x192d28 + applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3 + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepDown_2 clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE - applymovement PLAYER, MovementData_0x192d17 + applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (1 << 7) | (PAL_OW_BLUE << 4) special Special_SetPlayerPalette - applymovement PLAYER, MovementData_0x192d1c + applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite - applymovement PLAYER, MovementData_0x192d2a - applymovement $2, MovementData_0x192cfe + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsDown_2 + applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightAndDown end -Script_CleanUpFemaleFlagAfterBattle: +Script_WalkOutOfLinkBattleRoom: checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female - applymovement $3, MovementData_0x192d04 - applymovement PLAYER, MovementData_0x192cf5 - applymovement $3, MovementData_0x192cfe + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3 + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesThreeStepsDown + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightAndDown end .Female: - applymovement $3, MovementData_0x192d04 - applymovement PLAYER, MovementData_0x192d28 + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3 + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepDown_2 clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE - applymovement PLAYER, MovementData_0x192d17 + applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (1 << 7) | (PAL_OW_BLUE << 4) special Special_SetPlayerPalette - applymovement PLAYER, MovementData_0x192d1c + applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite - applymovement PLAYER, MovementData_0x192d2a - applymovement $3, MovementData_0x192cfe + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsDown_2 + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightAndDown end TimeCapsuleScript_CheckPlayerGender: @@ -494,86 +500,86 @@ TimeCapsuleScript_CheckPlayerGender: checkcode VAR_FACING if_equal LEFT, .MaleFacingLeft if_equal RIGHT, .MaleFacingRight - applymovement2 MovementData_0x192cd2 - applymovement PLAYER, MovementData_0x192cec + applymovement2 PokeCenter2FMovementData_ReceptionistStepsLeftLooksDown + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsUp_2 end .MaleFacingLeft: - applymovement2 MovementData_0x192cd2 - applymovement PLAYER, MovementData_0x192cef + applymovement2 PokeCenter2FMovementData_ReceptionistStepsLeftLooksDown + applymovement PLAYER, PokeCenter2FMovementData_PlayerWalksLeftAndUp end .MaleFacingRight: - applymovement2 MovementData_0x192cd5 - applymovement PLAYER, MovementData_0x192cf2 + applymovement2 PokeCenter2FMovementData_ReceptionistStepsRightLooksDown + applymovement PLAYER, PokeCenter2FMovementData_PlayerWalksRightAndUp end .Female: checkcode VAR_FACING if_equal RIGHT, .FemaleFacingRight if_equal LEFT, .FemaleFacingLeft - applymovement2 MovementData_0x192d33 - applymovement PLAYER, MovementData_0x192d2d + applymovement2 PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight_2 + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepUp_2 jump .FemaleContinue .FemaleFacingRight: - applymovement2 MovementData_0x192d36 - applymovement PLAYER, MovementData_0x192d2f + applymovement2 PokeCenter2FMovementData_ReceptionistStepsRightLooksLeft_2 + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepRight jump .FemaleContinue .FemaleFacingLeft: - applymovement2 MovementData_0x192d33 - applymovement PLAYER, MovementData_0x192d31 + applymovement2 PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight_2 + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepLeft .FemaleContinue: - loadfont + opentext writetext Text_OhPleaseWait + waitbutton closetext - loadmovesprites checkcode VAR_FACING if_not_equal UP, .FemaleChangeApperance spriteface PLAYER, LEFT .FemaleChangeApperance: - loadfont + opentext writetext Text_ChangeTheLook + waitbutton closetext - loadmovesprites playsound SFX_TINGLE - applymovement PLAYER, MovementData_0x192d17 + applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (1 << 7) | (PAL_OW_RED << 4) special Special_SetPlayerPalette - applymovement PLAYER, MovementData_0x192d22 - faceperson PLAYER, $4 + applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown + faceperson PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST setflag ENGINE_KRIS_IN_CABLE_CLUB special ReplaceKrisSprite - loadfont + opentext writetext Text_LikeTheLook + waitbutton closetext - loadmovesprites showemote EMOTE_SHOCK, PLAYER, 15 - applymovement PLAYER, MovementData_0x192d2d + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepUp_2 end Script_LeftTimeCapsule: - special Special_AbortLink + special WaitForOtherPlayerToExit checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female - applymovement $4, MovementData_0x192d08 - applymovement PLAYER, MovementData_0x192cf9 - applymovement $4, MovementData_0x192d01 + applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsDown + applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_2 jump .Done .Female: - applymovement $4, MovementData_0x192d08 - applymovement PLAYER, MovementData_0x192cfc + applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepDown clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE - applymovement PLAYER, MovementData_0x192d17 + applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (1 << 7) | (PAL_OW_BLUE << 4) special Special_SetPlayerPalette - applymovement PLAYER, MovementData_0x192d1c + applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite - applymovement PLAYER, MovementData_0x192cfc - applymovement $4, MovementData_0x192d01 + applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepDown + applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_2 .Done: dotrigger $0 domaptrigger TIME_CAPSULE, $0 @@ -582,173 +588,173 @@ Script_LeftTimeCapsule: MapPokeCenter2FSignpost0Script: refreshscreen $0 special Special_DisplayLinkRecord - loadmovesprites + closetext end OfficerScript_0x192c9a: faceplayer - loadfont + opentext checkevent EVENT_MYSTERY_GIFT_DELIVERY_GUY iftrue .AlreadyGotGift writetext Text_MysteryGiftDeliveryGuy_Intro yesorno iffalse .RefusedGift writetext Text_MysteryGiftDeliveryGuy_HereYouGo - keeptextopen - waitbutton + buttonsound + waitsfx special Special_GetMysteryGiftItem iffalse .BagIsFull itemnotify setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY .AlreadyGotGift: writetext Text_MysteryGiftDeliveryGuy_Outro + waitbutton closetext - loadmovesprites end .BagIsFull: writetext Text_MysteryGiftDeliveryGuy_NoRoom + waitbutton closetext - loadmovesprites end .RefusedGift: writetext Text_MysteryGiftDeliveryGuy_SaidNo + waitbutton closetext - loadmovesprites end -MovementData_0x192cca: +PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight: slow_step_up slow_step_left turn_head_right step_end -MovementData_0x192cce: +PokeCenter2FMobileMobileMovementData_ReceptionistWalksUpAndLeft_LookDown: slow_step_up slow_step_left turn_head_down step_end -MovementData_0x192cd2: +PokeCenter2FMovementData_ReceptionistStepsLeftLooksDown: slow_step_left turn_head_down step_end -MovementData_0x192cd5: +PokeCenter2FMovementData_ReceptionistStepsRightLooksDown: slow_step_right turn_head_down step_end -MovementData_0x192cd8: +PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight_2: slow_step_up slow_step_left turn_head_right step_end -MovementData_0x192cdc: +PokeCenter2FMovementData_ReceptionistLooksRight: turn_head_right step_end -MovementData_0x192cde: +PokeCenter2FMovementData_PlayerTakesThreeStepsUp: step_up step_up step_up step_end -MovementData_0x192ce2: +PokeCenter2FMovementData_PlayerTakesTwoStepsUp: step_up step_up step_end -MovementData_0x192ce5: +PokeCenter2FMovementData_PlayerTakesOneStepUp: step_up step_end -MovementData_0x192ce7: +PokeCenter2FMobileMovementData_PlayerWalksIntoMobileBattleRoom: step_up step_up step_right step_up step_end -MovementData_0x192cec: +PokeCenter2FMovementData_PlayerTakesTwoStepsUp_2: step_up step_up step_end -MovementData_0x192cef: +PokeCenter2FMovementData_PlayerWalksLeftAndUp: step_left step_up step_end -MovementData_0x192cf2: +PokeCenter2FMovementData_PlayerWalksRightAndUp: step_right step_up step_end -MovementData_0x192cf5: +PokeCenter2FMovementData_PlayerTakesThreeStepsDown: step_down step_down step_down step_end -MovementData_0x192cf9: +PokeCenter2FMovementData_PlayerTakesTwoStepsDown: step_down step_down step_end -MovementData_0x192cfc: +PokeCenter2FMovementData_PlayerTakesOneStepDown: step_down step_end -MovementData_0x192cfe: +PokeCenter2FMovementData_ReceptionistStepsRightAndDown: slow_step_right slow_step_down step_end -MovementData_0x192d01: +PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_2: slow_step_right turn_head_down step_end -MovementData_0x192d04: +PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3: slow_step_up slow_step_left turn_head_right step_end -MovementData_0x192d08: +PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight: slow_step_left turn_head_right step_end -MovementData_0x192d0b: +PokeCenter2FMobileMovementData_ReceptionistWalksUpAndLeft: slow_step_up slow_step_left turn_head_right step_end -MovementData_0x192d0f: +PokeCenter2FMovementData_PlayerWalksOutOfMobileRoom: step_down step_left step_down step_down step_end -MovementData_0x192d14: +PokeCenter2FMobileMovementData_ReceptionistWalksRightAndDown: slow_step_right slow_step_down step_end -MovementData_0x192d17: +PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight: turn_head_down turn_head_left turn_head_up turn_head_right step_end -MovementData_0x192d1c: +PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft: turn_head_down turn_head_left turn_head_up @@ -756,7 +762,7 @@ MovementData_0x192d1c: turn_head_left step_end -MovementData_0x192d22: +PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown: turn_head_down turn_head_left turn_head_up @@ -764,33 +770,33 @@ MovementData_0x192d22: turn_head_down step_end -MovementData_0x192d28: +PokeCenter2FMovementData_PlayerTakesOneStepDown_2: step_down step_end -MovementData_0x192d2a: +PokeCenter2FMovementData_PlayerTakesTwoStepsDown_2: step_down step_down step_end -MovementData_0x192d2d: +PokeCenter2FMovementData_PlayerTakesOneStepUp_2: step_up step_end -MovementData_0x192d2f: +PokeCenter2FMovementData_PlayerTakesOneStepRight: step_right step_end -MovementData_0x192d31: +PokeCenter2FMovementData_PlayerTakesOneStepLeft: step_left step_end -MovementData_0x192d33: +PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight_2: slow_step_left turn_head_right step_end -MovementData_0x192d36: +PokeCenter2FMovementData_ReceptionistStepsRightLooksLeft_2: slow_step_right turn_head_left step_end diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index f371cb300..40c039f83 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const POKESEERSHOUSE_GRANNY + PokeSeersHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,10 +10,10 @@ PokeSeersHouse_MapScriptHeader: SeerScript: faceplayer - loadfont + opentext special SpecialPokeSeer + waitbutton closetext - loadmovesprites end PokeSeersHouse_MapEventHeader: diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index ccb1156a7..9331b6681 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -1,3 +1,11 @@ +const_value set 2 + const POKEMONFANCLUB_GENTLEMAN + const POKEMONFANCLUB_RECEPTIONIST + const POKEMONFANCLUB_FISHER + const POKEMONFANCLUB_TEACHER + const POKEMONFANCLUB_FAIRY + const POKEMONFANCLUB_ODDISH + PokemonFanClub_MapScriptHeader: .MapTriggers: db 0 @@ -7,7 +15,7 @@ PokemonFanClub_MapScriptHeader: GentlemanScript_0x1917e9: faceplayer - loadfont + opentext checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT iftrue UnknownScript_0x191815 checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL @@ -16,29 +24,29 @@ GentlemanScript_0x1917e9: yesorno iffalse UnknownScript_0x19181b writetext UnknownText_0x191911 - keeptextopen + buttonsound UnknownScript_0x191802: writetext UnknownText_0x191a3d - keeptextopen + buttonsound verbosegiveitem RARE_CANDY iffalse UnknownScript_0x19181f setevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT writetext UnknownText_0x191a72 + waitbutton closetext - loadmovesprites end UnknownScript_0x191815: writetext UnknownText_0x191ae0 + waitbutton closetext - loadmovesprites end UnknownScript_0x19181b: writetext UnknownText_0x191b38 - closetext + waitbutton UnknownScript_0x19181f: - loadmovesprites + closetext end ReceptionistScript_0x191821: @@ -46,50 +54,50 @@ ReceptionistScript_0x191821: FisherScript_0x191824: faceplayer - loadfont + opentext checkevent EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB iftrue UnknownScript_0x19185f checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x191838 writetext UnknownText_0x191ba0 + waitbutton closetext - loadmovesprites end UnknownScript_0x191838: writetext UnknownText_0x191bff checkevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM iftrue UnknownScript_0x191844 + waitbutton closetext - loadmovesprites end UnknownScript_0x191844: - keeptextopen + buttonsound writetext UnknownText_0x191c5a - keeptextopen - waitbutton + buttonsound + waitsfx giveitem LOST_ITEM iffalse UnknownScript_0x191865 - disappear $6 + disappear POKEMONFANCLUB_FAIRY writetext UnknownText_0x191d0a playsound SFX_KEY_ITEM - waitbutton + waitsfx itemnotify setevent EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB - loadmovesprites + closetext end UnknownScript_0x19185f: writetext UnknownText_0x191d1e + waitbutton closetext - loadmovesprites end UnknownScript_0x191865: writetext UnknownText_0x191d58 + waitbutton closetext - loadmovesprites end TeacherScript_0x19186b: @@ -99,11 +107,11 @@ FairyScript_0x19186e: jumptext UnknownText_0x191db1 OddishScript_0x191871: - loadfont + opentext writetext UnknownText_0x191de9 cry BAYLEEF + waitbutton closetext - loadmovesprites end MapPokemonFanClubSignpost0Script: diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 1c97b73fc..41cd2e816 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -1,3 +1,12 @@ +const_value set 2 + const POWERPLANT_OFFICER1 + const POWERPLANT_GYM_GUY1 + const POWERPLANT_GYM_GUY2 + const POWERPLANT_OFFICER2 + const POWERPLANT_GYM_GUY3 + const POWERPLANT_FISHER + const POWERPLANT_GYM_GUY4 + PowerPlant_MapScriptHeader: .MapTriggers: db 2 @@ -17,118 +26,118 @@ UnknownScript_0x188dc4: UnknownScript_0x188dc5: playsound SFX_CALL - showemote EMOTE_SHOCK, $2, 15 - waitbutton + showemote EMOTE_SHOCK, POWERPLANT_OFFICER1, 15 + waitsfx pause 30 - applymovement $2, MovementData_0x188ed5 - spriteface $3, DOWN - spriteface $4, DOWN - loadfont + applymovement POWERPLANT_OFFICER1, MovementData_0x188ed5 + spriteface POWERPLANT_GYM_GUY1, DOWN + spriteface POWERPLANT_GYM_GUY2, DOWN + opentext writetext UnknownText_0x188f22 + waitbutton closetext - loadmovesprites - spriteface $2, LEFT + spriteface POWERPLANT_OFFICER1, LEFT spriteface PLAYER, RIGHT - loadfont + opentext writetext UnknownText_0x188f7f + waitbutton closetext - loadmovesprites spriteface PLAYER, DOWN - applymovement $2, MovementData_0x188eda + applymovement POWERPLANT_OFFICER1, MovementData_0x188eda dotrigger $0 end OfficerScript_0x188df5: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e0f checkevent EVENT_MET_MANAGER_AT_POWER_PLANT iftrue UnknownScript_0x188e09 writetext UnknownText_0x188ee0 + waitbutton closetext - loadmovesprites end UnknownScript_0x188e09: writetext UnknownText_0x188f7f + waitbutton closetext - loadmovesprites end UnknownScript_0x188e0f: writetext UnknownText_0x188fa2 + waitbutton closetext - loadmovesprites end GymGuyScript_0x188e15: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e23 writetext UnknownText_0x188fcf + waitbutton closetext - loadmovesprites end UnknownScript_0x188e23: writetext UnknownText_0x189038 + waitbutton closetext - loadmovesprites end GymGuyScript_0x188e29: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e37 writetext UnknownText_0x189079 + waitbutton closetext - loadmovesprites end UnknownScript_0x188e37: writetext UnknownText_0x1890ef + waitbutton closetext - loadmovesprites end OfficerScript_0x188e3d: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e4b writetext UnknownText_0x18910e + waitbutton closetext - loadmovesprites end UnknownScript_0x188e4b: writetext UnknownText_0x18917f + waitbutton closetext - loadmovesprites end GymGuyScript_0x188e51: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e5f writetext UnknownText_0x1891c2 + waitbutton closetext - loadmovesprites end UnknownScript_0x188e5f: writetext UnknownText_0x189225 + waitbutton closetext - loadmovesprites end PowerPlantManager: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188eac checkitem MACHINE_PART @@ -136,8 +145,8 @@ PowerPlantManager: checkevent EVENT_MET_MANAGER_AT_POWER_PLANT iftrue UnknownScript_0x188e8d writetext UnknownText_0x189264 + waitbutton closetext - loadmovesprites setevent EVENT_MET_MANAGER_AT_POWER_PLANT clearevent EVENT_CERULEAN_GYM_ROCKET clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM @@ -147,13 +156,13 @@ PowerPlantManager: UnknownScript_0x188e8d: writetext UnknownText_0x189308 + waitbutton closetext - loadmovesprites end UnknownScript_0x188e93: writetext UnknownText_0x18936e - keeptextopen + buttonsound takeitem MACHINE_PART setevent EVENT_RETURNED_MACHINE_PART clearevent EVENT_SAFFRON_TRAIN_STATION_POPULATION @@ -165,28 +174,28 @@ UnknownScript_0x188eac: checkevent EVENT_GOT_TM07_ZAP_CANNON iftrue UnknownScript_0x188ec5 writetext UnknownText_0x1893c4 - keeptextopen + buttonsound verbosegiveitem TM_ZAP_CANNON iffalse UnknownScript_0x188ec3 setevent EVENT_GOT_TM07_ZAP_CANNON writetext UnknownText_0x1893f4 - closetext + waitbutton UnknownScript_0x188ec3: - loadmovesprites + closetext end UnknownScript_0x188ec5: writetext UnknownText_0x189475 + waitbutton closetext - loadmovesprites end GymGuyScript_0x188ecb: faceplayer - loadfont + opentext trade $6 + waitbutton closetext - loadmovesprites end PowerPlantBookshelf: diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 78cfd8f0e..a15cefda5 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const RADIOTOWER1F_RECEPTIONIST + const RADIOTOWER1F_LASS + const RADIOTOWER1F_YOUNGSTER + const RADIOTOWER1F_ROCKET + const RADIOTOWER1F_GENTLEMAN + const RADIOTOWER1F_COOLTRAINER_F + RadioTower1F_MapScriptHeader: .MapTriggers: db 0 @@ -7,25 +15,25 @@ RadioTower1F_MapScriptHeader: ReceptionistScript_0x5cd29: faceplayer - loadfont + opentext checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0x5cd37 writetext UnknownText_0x5ce77 + waitbutton closetext - loadmovesprites end UnknownScript_0x5cd37: writetext UnknownText_0x5ce81 + waitbutton closetext - loadmovesprites end GentlemanScript_0x5cd3d: faceplayer - loadfont + opentext writetext UnknownText_0x5ceba - keeptextopen + buttonsound special Special_CheckLuckyNumberShowFlag iffalse .skip special Special_ResetLuckyNumberShowFlag @@ -34,21 +42,21 @@ GentlemanScript_0x5cd3d: checkflag ENGINE_LUCKY_NUMBER_SHOW iftrue .GameOver writetext UnknownText_0x5cf3a - keeptextopen - loadmovesprites - applymovement $6, MovementData_0x5ce71 - loadfont + buttonsound + closetext + applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce71 + opentext writetext UnknownText_0x5cf5a - keeptextopen - waitbutton + buttonsound + waitsfx writetext UnknownText_0x5cf79 playsound SFX_DEX_FANFARE_20_49 - waitbutton - keeptextopen + waitsfx + buttonsound special Special_CheckForLuckyNumberWinners - loadmovesprites - applymovement $6, MovementData_0x5ce74 - loadfont + closetext + applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce74 + opentext if_equal 1, .FirstPlace if_equal 2, .SecondPlace if_equal 3, .ThirdPlace @@ -56,15 +64,15 @@ GentlemanScript_0x5cd3d: .GameOver writetext UnknownText_0x5cf7e + waitbutton closetext - loadmovesprites end .FirstPlace writetext UnknownText_0x5cfb5 playsound SFX_1ST_PLACE - waitbutton - keeptextopen + waitsfx + buttonsound giveitem MASTER_BALL iffalse .BagFull itemnotify @@ -74,8 +82,8 @@ GentlemanScript_0x5cd3d: .SecondPlace writetext UnknownText_0x5d023 playsound SFX_2ND_PLACE - waitbutton - keeptextopen + waitsfx + buttonsound giveitem EXP_SHARE iffalse .BagFull itemnotify @@ -85,8 +93,8 @@ GentlemanScript_0x5cd3d: .ThirdPlace writetext UnknownText_0x5d076 playsound SFX_3RD_PLACE - waitbutton - keeptextopen + waitsfx + buttonsound giveitem PP_UP iffalse .BagFull itemnotify @@ -95,19 +103,19 @@ GentlemanScript_0x5cd3d: .NoPrize writetext UnknownText_0x5d0c0 + waitbutton closetext - loadmovesprites end .BagFull: writetext UnknownText_0x5d0e6 + waitbutton closetext - loadmovesprites end CooltrainerFScript_0x5cdd5: faceplayer - loadfont + opentext checkflag ENGINE_RADIO_CARD iftrue UnknownScript_0x5ce2d writetext UnknownText_0x5d12d @@ -117,38 +125,38 @@ CooltrainerFScript_0x5cdd5: yesorno iffalse UnknownScript_0x5ce42 playsound SFX_ELEVATOR_END - waitbutton + waitsfx writetext UnknownText_0x5d231 yesorno iffalse UnknownScript_0x5ce42 playsound SFX_ELEVATOR_END - waitbutton + waitsfx writetext UnknownText_0x5d282 yesorno iftrue UnknownScript_0x5ce42 playsound SFX_ELEVATOR_END - waitbutton + waitsfx writetext UnknownText_0x5d2bc yesorno iffalse UnknownScript_0x5ce42 playsound SFX_ELEVATOR_END - waitbutton + waitsfx writetext UnknownText_0x5d30e yesorno iftrue UnknownScript_0x5ce42 playsound SFX_ELEVATOR_END - waitbutton + waitsfx writetext UnknownText_0x5d37b - keeptextopen + buttonsound stringtotext RadioCardText, $1 scall UnknownScript_0x5ce3e writetext UnknownText_0x5d3c0 - keeptextopen + buttonsound setflag ENGINE_RADIO_CARD UnknownScript_0x5ce2d: writetext UnknownText_0x5d3e5 + waitbutton closetext - loadmovesprites end RadioCardText: @@ -161,14 +169,14 @@ UnknownScript_0x5ce3e: UnknownScript_0x5ce42: playsound SFX_WRONG writetext UnknownText_0x5d409 + waitbutton closetext - loadmovesprites end UnknownScript_0x5ce4b: writetext UnknownText_0x5d443 + waitbutton closetext - loadmovesprites end LassScript_0x5ce51: @@ -181,11 +189,11 @@ TrainerGruntM3: trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, 3, GruntM3SeenText, GruntM3BeatenText, 0, GruntM3Script GruntM3Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5d5a2 + waitbutton closetext - loadmovesprites end MapRadioTower1FSignpost0Script: diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index b4f5117ac..13835e96b 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -1,3 +1,16 @@ +const_value set 2 + const RADIOTOWER2F_SUPER_NERD + const RADIOTOWER2F_TEACHER + const RADIOTOWER2F_ROCKET1 + const RADIOTOWER2F_ROCKET2 + const RADIOTOWER2F_ROCKET3 + const RADIOTOWER2F_ROCKET_GIRL + const RADIOTOWER2F_BLACK_BELT1 + const RADIOTOWER2F_BLACK_BELT2 + const RADIOTOWER2F_JIGGLYPUFF + const RADIOTOWER2F_BUENA + const RADIOTOWER2F_RECEPTIONIST + RadioTower2F_MapScriptHeader: .MapTriggers: db 0 @@ -13,26 +26,26 @@ SuperNerdScript_0x5d6fe: TeacherScript_0x5d701: faceplayer - loadfont + opentext checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0x5d70f writetext UnknownText_0x5d956 + waitbutton closetext - loadmovesprites end UnknownScript_0x5d70f: writetext UnknownText_0x5d983 + waitbutton closetext - loadmovesprites end JigglypuffScript_0x5d715: - loadfont + opentext writetext UnknownText_0x5d9b6 cry JIGGLYPUFF + waitbutton closetext - loadmovesprites end BlackBeltScript_0x5d71f: @@ -45,49 +58,49 @@ TrainerGruntM4: trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, 4, GruntM4SeenText, GruntM4BeatenText, 0, GruntM4Script GruntM4Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5db07 + waitbutton closetext - loadmovesprites end TrainerGruntM5: trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, 5, GruntM5SeenText, GruntM5BeatenText, 0, GruntM5Script GruntM5Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5db99 + waitbutton closetext - loadmovesprites end TrainerGruntM6: trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, 6, GruntM6SeenText, GruntM6BeatenText, 0, GruntM6Script GruntM6Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5dc00 + waitbutton closetext - loadmovesprites end TrainerGruntF2: trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, 2, GruntF2SeenText, GruntF2BeatenText, 0, GruntF2Script GruntF2Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5dcd0 + waitbutton closetext - loadmovesprites end Buena: faceplayer - loadfont + opentext checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0x5d865 checkevent EVENT_MET_BUENA @@ -107,40 +120,40 @@ Buena: special AskRememberPassword iffalse UnknownScript_0x5d81e writetext UnknownText_0x5de84 + waitbutton closetext - loadmovesprites - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT checkcode VAR_FACING - if_not_equal $3, UnknownScript_0x5d7be + if_not_equal RIGHT, UnknownScript_0x5d7be applymovement PLAYER, MovementData_0x5d921 UnknownScript_0x5d7be: spriteface PLAYER, RIGHT - loadfont + opentext writetext UnknownText_0x5dedd + waitbutton closetext - loadmovesprites - spriteface $b, DOWN + spriteface RADIOTOWER2F_BUENA, DOWN refreshscreen $0 special SpecialBuenasPassword - loadmovesprites + closetext iffalse UnknownScript_0x5d845 - loadfont + opentext writetext UnknownText_0x5dfc1 + waitbutton closetext - loadmovesprites checkcode VAR_BLUECARDBALANCE addvar $1 writevarcode VAR_BLUECARDBALANCE - waitbutton + waitsfx playsound SFX_TRANSACTION setflag ENGINE_BUENAS_PASSWORD_2 pause 20 - spriteface $b, RIGHT - loadfont + spriteface RADIOTOWER2F_BUENA, RIGHT + opentext writetext UnknownText_0x5e054 + waitbutton closetext - loadmovesprites - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic pause 20 special RestartMapMusic checkcode VAR_BLUECARDBALANCE @@ -149,96 +162,96 @@ UnknownScript_0x5d7be: UnknownScript_0x5d800: writetext UnknownText_0x5dcf4 - keeptextopen + buttonsound setevent EVENT_MET_BUENA verbosegiveitem BLUE_CARD UnknownScript_0x5d80a: writetext UnknownText_0x5de10 + waitbutton closetext - loadmovesprites checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d81a checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc UnknownScript_0x5d81a: - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT end UnknownScript_0x5d81e: writetext UnknownText_0x5df29 + waitbutton closetext - loadmovesprites - spriteface $b, RIGHT - special Special_RotatePalettesRightMusic + spriteface RADIOTOWER2F_BUENA, RIGHT + special Special_FadeOutMusic pause 20 special RestartMapMusic end UnknownScript_0x5d82f: writetext UnknownText_0x5df6c + waitbutton closetext - loadmovesprites checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d83f checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc UnknownScript_0x5d83f: - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT pause 10 end UnknownScript_0x5d845: setflag ENGINE_BUENAS_PASSWORD_2 - loadfont + opentext writetext UnknownText_0x5e01c + waitbutton closetext - loadmovesprites - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT pause 20 - loadfont + opentext writetext UnknownText_0x5e054 + waitbutton closetext - loadmovesprites - spriteface $b, RIGHT - special Special_RotatePalettesRightMusic + spriteface RADIOTOWER2F_BUENA, RIGHT + special Special_FadeOutMusic pause 20 special RestartMapMusic end UnknownScript_0x5d865: writetext UnknownText_0x5e0c2 + waitbutton closetext - loadmovesprites end UnknownScript_0x5d86b: writetext UnknownText_0x5e192 + waitbutton closetext - loadmovesprites checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d87b checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc UnknownScript_0x5d87b: - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT end UnknownScript_0x5d87f: writetext UnknownText_0x5e0f1 + waitbutton closetext - loadmovesprites checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d88f checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc UnknownScript_0x5d88f: - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT end UnknownScript_0x5d893: writetext UnknownText_0x5e131 + waitbutton closetext - loadmovesprites checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d8a3 checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER @@ -250,21 +263,21 @@ UnknownScript_0x5d8a4: checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d8fe pause 20 - spriteface $b, DOWN + spriteface RADIOTOWER2F_BUENA, DOWN pause 15 spriteface PLAYER, UP pause 15 checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc - showemote EMOTE_SHOCK, $b, 15 + showemote EMOTE_SHOCK, RADIOTOWER2F_BUENA, 15 setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER - loadfont + opentext writetext UnknownText_0x5e1ee jump UnknownScript_0x5d8d0 UnknownScript_0x5d8cc: - loadfont + opentext writetext UnknownText_0x5e2bf UnknownScript_0x5d8d0: askforphonenumber PHONE_BUENA @@ -272,45 +285,45 @@ UnknownScript_0x5d8d0: if_equal $2, UnknownScript_0x5d8ed writetext UnknownText_0x5e2f3 playsound SFX_REGISTER_PHONE_NUMBER - waitbutton - keeptextopen + waitsfx + buttonsound writetext UnknownText_0x5e310 + waitbutton closetext - loadmovesprites - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT addcellnum PHONE_BUENA end UnknownScript_0x5d8ed: writetext UnknownText_0x5e33c + waitbutton closetext - loadmovesprites - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT end UnknownScript_0x5d8f6: writetext UnknownText_0x5e35e + waitbutton closetext - loadmovesprites - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT UnknownScript_0x5d8fe: end ReceptionistScript_0x5d8ff: faceplayer - loadfont + opentext checkitem BLUE_CARD iffalse UnknownScript_0x5d90f writetext UnknownText_0x5e392 - keeptextopen + buttonsound special SpecialBuenaPrize - loadmovesprites + closetext end UnknownScript_0x5d90f: writetext UnknownText_0x5e3d8 - keeptextopen - loadmovesprites + buttonsound + closetext end MapRadioTower2FSignpost0Script: diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 676bcfb83..d848ddd09 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -1,3 +1,12 @@ +const_value set 2 + const RADIOTOWER3F_SUPER_NERD + const RADIOTOWER3F_GYM_GUY + const RADIOTOWER3F_COOLTRAINER_F + const RADIOTOWER3F_ROCKET1 + const RADIOTOWER3F_ROCKET2 + const RADIOTOWER3F_ROCKET3 + const RADIOTOWER3F_SCIENTIST + RadioTower3F_MapScriptHeader: .MapTriggers: db 0 @@ -24,23 +33,23 @@ SuperNerdScript_0x5e553: GymGuyScript_0x5e556: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5e564 writetext UnknownText_0x5e682 + waitbutton closetext - loadmovesprites end UnknownScript_0x5e564: writetext UnknownText_0x5e6eb + waitbutton closetext - loadmovesprites end CooltrainerFScript_0x5e56a: faceplayer - loadfont + opentext checkevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER iftrue UnknownScript_0x5e59d checkevent EVENT_CLEARED_RADIO_TOWER @@ -48,100 +57,100 @@ CooltrainerFScript_0x5e56a: checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue UnknownScript_0x5e584 writetext UnknownText_0x5e754 + waitbutton closetext - loadmovesprites end UnknownScript_0x5e584: writetext UnknownText_0x5e7cb + waitbutton closetext - loadmovesprites end UnknownScript_0x5e58a: writetext UnknownText_0x5e7e2 - keeptextopen + buttonsound verbosegiveitem TM_SUNNY_DAY iffalse UnknownScript_0x5e5a1 writetext UnknownText_0x5e821 + waitbutton closetext - loadmovesprites setevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER end UnknownScript_0x5e59d: writetext UnknownText_0x5e85c - closetext + waitbutton UnknownScript_0x5e5a1: - loadmovesprites + closetext end TrainerGruntM7: trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, 7, GruntM7SeenText, GruntM7BeatenText, 0, GruntM7Script GruntM7Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5e8d0 + waitbutton closetext - loadmovesprites end TrainerGruntM8: trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, 8, GruntM8SeenText, GruntM8BeatenText, 0, GruntM8Script GruntM8Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5e944 + waitbutton closetext - loadmovesprites end TrainerGruntM9: trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, 9, GruntM9SeenText, GruntM9BeatenText, 0, GruntM9Script GruntM9Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5e9d0 + waitbutton closetext - loadmovesprites end TrainerScientistMarc: trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, ScientistMarcScript ScientistMarcScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5ea61 + waitbutton closetext - loadmovesprites end MapRadioTower3FSignpost2Script:: - loadfont + opentext writetext UnknownText_0x5eaa4 - closetext + waitbutton checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue UnknownScript_0x5e603 checkitem CARD_KEY iftrue UnknownScript_0x5e605 UnknownScript_0x5e603: - loadmovesprites + closetext end UnknownScript_0x5e605: writetext UnknownText_0x5eabc - closetext + waitbutton setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER playsound SFX_ENTER_DOOR changeblock $e, $2, $2a changeblock $e, $4, $1 reloadmappart - loadmovesprites - waitbutton + closetext + waitsfx end MapRadioTower3FSignpost0Script: diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 061b11a17..398a9d337 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -1,3 +1,12 @@ +const_value set 2 + const RADIOTOWER4F_FISHER + const RADIOTOWER4F_TEACHER + const RADIOTOWER4F_GROWLITHE + const RADIOTOWER4F_ROCKET1 + const RADIOTOWER4F_ROCKET2 + const RADIOTOWER4F_ROCKET_GIRL + const RADIOTOWER4F_SCIENTIST + RadioTower4F_MapScriptHeader: .MapTriggers: db 0 @@ -10,84 +19,84 @@ FisherScript_0x5eb82: TeacherScript_0x5eb85: faceplayer - loadfont + opentext checkevent EVENT_GOT_PINK_BOW_FROM_MARY iftrue UnknownScript_0x5ebac checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5eb99 writetext UnknownText_0x5ec68 + waitbutton closetext - loadmovesprites end UnknownScript_0x5eb99: writetext UnknownText_0x5ecab - keeptextopen + buttonsound verbosegiveitem PINK_BOW iffalse UnknownScript_0x5ebb0 writetext UnknownText_0x5ecef + waitbutton closetext - loadmovesprites setevent EVENT_GOT_PINK_BOW_FROM_MARY end UnknownScript_0x5ebac: writetext UnknownText_0x5ed2c - closetext + waitbutton UnknownScript_0x5ebb0: - loadmovesprites + closetext end GrowlitheScript_0x5ebb2: - loadfont + opentext writetext UnknownText_0x5ed66 cry MEOWTH + waitbutton closetext - loadmovesprites end TrainerGruntM10: trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, 10, GruntM10SeenText, GruntM10BeatenText, 0, GruntM10Script GruntM10Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5ede2 + waitbutton closetext - loadmovesprites end TrainerExecutivem2: trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, 2, Executivem2SeenText, Executivem2BeatenText, 0, Executivem2Script Executivem2Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5ee69 + waitbutton closetext - loadmovesprites end TrainerGruntF4: trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, 4, GruntF4SeenText, GruntF4BeatenText, 0, GruntF4Script GruntF4Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5ef31 + waitbutton closetext - loadmovesprites end TrainerScientistRich: trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, ScientistRichScript ScientistRichScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5efcb + waitbutton closetext - loadmovesprites end MapRadioTower4FSignpost0Script: diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 32a363e55..eee02b34c 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -1,99 +1,106 @@ +const_value set 2 + const RADIOTOWER5F_DIRECTOR + const RADIOTOWER5F_ROCKET + const RADIOTOWER5F_ROCKET_GIRL + const RADIOTOWER5F_ROCKER + const RADIOTOWER5F_POKE_BALL + RadioTower5F_MapScriptHeader: .MapTriggers: db 3 ; triggers - dw UnknownScript_0x6000e, 0 - dw UnknownScript_0x6000f, 0 - dw UnknownScript_0x60010, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 0 -UnknownScript_0x6000e: +.Trigger0: end -UnknownScript_0x6000f: +.Trigger1: end -UnknownScript_0x60010: +.Trigger2: end -UnknownScript_0x60011: - spriteface $2, UP - showemote EMOTE_SHOCK, $2, 15 - loadfont - writetext UnknownText_0x60128 +FakeDirectorScript: + spriteface RADIOTOWER5F_DIRECTOR, UP + showemote EMOTE_SHOCK, RADIOTOWER5F_DIRECTOR, 15 + opentext + writetext FakeDirectorTextBefore1 + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x60109 + applymovement RADIOTOWER5F_DIRECTOR, FakeDirectorMovement playmusic MUSIC_ROCKET_ENCOUNTER - loadfont - writetext UnknownText_0x60147 + opentext + writetext FakeDirectorTextBefore2 + waitbutton closetext - loadmovesprites - winlosstext UnknownText_0x60223, 0 - setlasttalked $2 + winlosstext FakeDirectorWinText, 0 + setlasttalked RADIOTOWER5F_DIRECTOR loadtrainer EXECUTIVEM, 3 startbattle - returnafterbattle - loadfont - writetext UnknownText_0x60246 - keeptextopen + reloadmapafterbattle + opentext + writetext FakeDirectorTextAfter + buttonsound verbosegiveitem BASEMENT_KEY - loadmovesprites + closetext dotrigger $1 setevent EVENT_BEAT_ROCKET_EXECUTIVEM_3 end Director: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x60054 - writetext UnknownText_0x60246 + iftrue .TrueDirector + writetext FakeDirectorTextAfter + waitbutton closetext - loadmovesprites end -UnknownScript_0x60054: - writetext UnknownText_0x60824 +.TrueDirector: + writetext RadioTower5FDirectorText + waitbutton closetext - loadmovesprites end TrainerExecutivef1: trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, 1, Executivef1SeenText, Executivef1BeatenText, 0, Executivef1Script Executivef1Script: - talkaftercancel - loadfont - writetext UnknownText_0x60358 + end_if_just_battled + opentext + writetext Executivef1AfterText + waitbutton closetext - loadmovesprites end -UnknownScript_0x6006e: +RadioTower5FRocketBossTrigger: applymovement PLAYER, MovementData_0x60125 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface $3, RIGHT - loadfont - writetext UnknownText_0x603d1 + spriteface RADIOTOWER5F_ROCKET, RIGHT + opentext + writetext RadioTower5FRocketBossBeforeText + waitbutton closetext - loadmovesprites - winlosstext UnknownText_0x604f3, 0 - setlasttalked $3 + winlosstext RadioTower5FRocketBossWinText, 0 + setlasttalked RADIOTOWER5F_ROCKET loadtrainer EXECUTIVEM, 1 startbattle - returnafterbattle - loadfont - writetext UnknownText_0x6050e + reloadmapafterbattle + opentext + writetext RadioTower5FRocketBossAfterText + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes - disappear $3 - disappear $4 + disappear RADIOTOWER5F_ROCKET + disappear RADIOTOWER5F_ROCKET_GIRL pause 15 special Special_FadeInQuickly setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1 @@ -109,46 +116,46 @@ UnknownScript_0x6006e: setevent EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM clearevent EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM special PlayMapMusic - disappear $2 - moveperson $2, $c, $0 - appear $2 - applymovement $2, MovementData_0x6010f + disappear RADIOTOWER5F_DIRECTOR + moveperson RADIOTOWER5F_DIRECTOR, $c, $0 + appear RADIOTOWER5F_DIRECTOR + applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksIn spriteface PLAYER, RIGHT - loadfont - writetext UnknownText_0x605b2 - keeptextopen + opentext + writetext RadioTower5FDirectorThankYouText + buttonsound verbosegiveitem CLEAR_BELL - writetext UnknownText_0x6062c + writetext RadioTower5FDirectorDescribeClearBellText + waitbutton closetext - loadmovesprites dotrigger $2 domaptrigger ECRUTEAK_HOUSE, $0 setevent EVENT_GOT_CLEAR_BELL setevent EVENT_TEAM_ROCKET_DISBANDED - jump UnknownScript_0x600f1 + jump .UselessJump -UnknownScript_0x600f1: - applymovement $2, MovementData_0x6011a +.UselessJump: + applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksOut playsound SFX_EXIT_BUILDING - disappear $2 + disappear RADIOTOWER5F_DIRECTOR end Ben: jumptextfaceplayer BenText -ItemFragment_0x600fe: - db ULTRA_BALL, 1 +RadioTower5FUltraBall: + itemball ULTRA_BALL MapRadioTower5FSignpost0Script: - jumptext UnknownText_0x608e0 + jumptext SignpostRadioTower5FOffice MapRadioTower5FSignpost2Script: - jumptext UnknownText_0x608f9 + jumptext SignpostRadioTower5FStudio RadioTower5FBookshelf: jumpstd magazinebookshelf -MovementData_0x60109: +FakeDirectorMovement: step_left step_left step_left @@ -156,7 +163,7 @@ MovementData_0x60109: step_up step_end -MovementData_0x6010f: +RadioTower5FDirectorWalksIn: step_down step_down step_right @@ -169,7 +176,7 @@ MovementData_0x6010f: step_left step_end -MovementData_0x6011a: +RadioTower5FDirectorWalksOut: step_right step_up step_up @@ -187,12 +194,12 @@ MovementData_0x60125: step_left step_end -UnknownText_0x60128: +FakeDirectorTextBefore1: text "Y-you! You came to" line "rescue me?" done -UnknownText_0x60147: +FakeDirectorTextBefore2: text "Is that what you" line "were expecting?" @@ -214,12 +221,12 @@ UnknownText_0x60147: cont "you can beat me!" done -UnknownText_0x60223: +FakeDirectorWinText: text "OK, OK. I'll tell" line "you where he is." done -UnknownText_0x60246: +FakeDirectorTextAfter: text "We stashed the" line "real DIRECTOR in" @@ -251,7 +258,7 @@ Executivef1BeatenText: line "I still lost…" done -UnknownText_0x60358: +Executivef1AfterText: text "<PLAYER>, isn't it?" para "A brat like you" @@ -265,7 +272,7 @@ UnknownText_0x60358: cont "your power." done -UnknownText_0x603d1: +RadioTower5FRocketBossBeforeText: text "Oh? You managed to" line "get this far?" @@ -294,12 +301,12 @@ UnknownText_0x603d1: cont "our plans." done -UnknownText_0x604f3: +RadioTower5FRocketBossWinText: text "No! Forgive me," line "GIOVANNI!" done -UnknownText_0x6050e: +RadioTower5FRocketBossAfterText: text "How could this be?" para "Our dreams have" @@ -317,7 +324,7 @@ UnknownText_0x6050e: para "Farewell." done -UnknownText_0x605b2: +RadioTower5FDirectorThankYouText: text "DIRECTOR: <PLAY_G>," line "thank you!" @@ -332,7 +339,7 @@ UnknownText_0x605b2: cont "take this." done -UnknownText_0x6062c: +RadioTower5FDirectorDescribeClearBellText: text "There used to be a" line "tower right here" cont "in GOLDENROD CITY." @@ -383,7 +390,7 @@ UnknownText_0x6062c: line "my OFFICE." done -UnknownText_0x60824: +RadioTower5FDirectorText: text "DIRECTOR: Hello," line "<PLAY_G>!" @@ -406,12 +413,12 @@ BenText: line "to our music?" done -UnknownText_0x608e0: +SignpostRadioTower5FOffice: text "5F DIRECTOR'S" line " OFFICE" done -UnknownText_0x608f9: +SignpostRadioTower5FStudio: text "5F STUDIO 1" done @@ -426,8 +433,8 @@ RadioTower5F_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $3, $0, $0, UnknownScript_0x60011, $0, $0 - xy_trigger 1, $5, $10, $0, UnknownScript_0x6006e, $0, $0 + xy_trigger 0, $3, $0, $0, FakeDirectorScript, $0, $0 + xy_trigger 1, $5, $10, $0, RadioTower5FRocketBossTrigger, $0, $0 .Signposts: db 5 @@ -443,4 +450,4 @@ RadioTower5F_MapEventHeader: person_event SPRITE_ROCKET, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET_GIRL, 2, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKER, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER - person_event SPRITE_POKE_BALL, 5, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x600fe, EVENT_RADIO_TOWER_5F_ULTRA_BALL + person_event SPRITE_POKE_BALL, 5, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 43c953e45..a7e4af0e6 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -1,3 +1,6 @@ +const_value set 2 + const REDSHOUSE1F_REDS_MOM + RedsHouse1F_MapScriptHeader: .MapTriggers: db 1 @@ -13,18 +16,18 @@ RedsHouse1F_MapScriptHeader: RedsMom: faceplayer - loadfont + opentext checkevent EVENT_MET_REDS_MOM iftrue .MetAlready writetext RedsMomText1 + waitbutton closetext - loadmovesprites setevent EVENT_MET_REDS_MOM end .MetAlready writetext RedsMomText2 + waitbutton closetext - loadmovesprites end RedsHouse1FTV: diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index 5704cdcaf..76380d2e5 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -1,3 +1,4 @@ + RedsHouse2F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index b795f5e64..14156a01f 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROCKTUNNEL1F_POKE_BALL1 + const ROCKTUNNEL1F_POKE_BALL2 + RockTunnel1F_MapScriptHeader: .MapTriggers: db 0 @@ -5,17 +9,17 @@ RockTunnel1F_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x743b5: - db ELIXER, 1 +RockTunnel1FElixer: + itemball ELIXER -ItemFragment_0x743b7: - db TM_STEEL_WING, 1 +RockTunnel1FTMSteelWing: + itemball TM_STEEL_WING -MapRockTunnel1FSignpostItem0: +RockTunnel1FHiddenXAccuracy: dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY -MapRockTunnel1FSignpostItem1: +RockTunnel1FHiddenXDefend: dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND @@ -37,10 +41,10 @@ RockTunnel1F_MapEventHeader: .Signposts: db 2 - signpost 4, 24, SIGNPOST_ITEM, MapRockTunnel1FSignpostItem0 - signpost 15, 21, SIGNPOST_ITEM, MapRockTunnel1FSignpostItem1 + signpost 4, 24, SIGNPOST_ITEM, RockTunnel1FHiddenXAccuracy + signpost 15, 21, SIGNPOST_ITEM, RockTunnel1FHiddenXDefend .PersonEvents: db 2 - person_event SPRITE_POKE_BALL, 18, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x743b5, EVENT_ROCK_TUNNEL_1F_ELIXER - person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x743b7, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING + person_event SPRITE_POKE_BALL, 18, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER + person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index f25f4b013..7d061d45d 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROCKTUNNELB1F_POKE_BALL1 + const ROCKTUNNELB1F_POKE_BALL2 + const ROCKTUNNELB1F_POKE_BALL3 + RockTunnelB1F_MapScriptHeader: .MapTriggers: db 0 @@ -5,16 +10,16 @@ RockTunnelB1F_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x74409: - db IRON, 1 +RockTunnelB1FIron: + itemball IRON -ItemFragment_0x7440b: - db PP_UP, 1 +RockTunnelB1FPPUp: + itemball PP_UP -ItemFragment_0x7440d: - db REVIVE, 1 +RockTunnelB1FRevive: + itemball REVIVE -MapRockTunnelB1FSignpostItem0: +RockTunnelB1FHiddenMaxPotion: dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION @@ -34,10 +39,10 @@ RockTunnelB1F_MapEventHeader: .Signposts: db 1 - signpost 14, 4, SIGNPOST_ITEM, MapRockTunnelB1FSignpostItem0 + signpost 14, 4, SIGNPOST_ITEM, RockTunnelB1FHiddenMaxPotion .PersonEvents: db 3 - person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x74409, EVENT_ROCK_TUNNEL_B1F_IRON - person_event SPRITE_POKE_BALL, 17, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7440b, EVENT_ROCK_TUNNEL_B1F_PP_UP - person_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7440d, EVENT_ROCK_TUNNEL_B1F_REVIVE + person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON + person_event SPRITE_POKE_BALL, 17, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP + person_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE diff --git a/maps/Route1.asm b/maps/Route1.asm index cb29e65ed..79d7190dc 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE1_YOUNGSTER + const ROUTE1_COOLTRAINER_F + const ROUTE1_FRUIT_TREE + Route1_MapScriptHeader: .MapTriggers: db 0 @@ -9,22 +14,22 @@ TrainerSchoolboyDanny: trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, SchoolboyDannyScript SchoolboyDannyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ac5d7 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfQuinn: trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, CooltrainerfQuinnScript CooltrainerfQuinnScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ac640 + waitbutton closetext - loadmovesprites end MapRoute1Signpost0Script: diff --git a/maps/Route10North.asm b/maps/Route10North.asm index 29b345fed..21dc630ab 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -1,3 +1,4 @@ + Route10North_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index 76b39967f..720421fda 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const ROUTE10POKECENTER1F_NURSE + const ROUTE10POKECENTER1F_GENTLEMAN + const ROUTE10POKECENTER1F_GYM_GUY + const ROUTE10POKECENTER1F_COOLTRAINER_F + Route10PokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -13,18 +19,18 @@ GentlemanScript_0x188bd7: GymGuyScript_0x188bda: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188be8 writetext UnknownText_0x188c26 + waitbutton closetext - loadmovesprites end UnknownScript_0x188be8: writetext UnknownText_0x188c9e + waitbutton closetext - loadmovesprites end CooltrainerFScript_0x188bee: diff --git a/maps/Route10PokeCenter2FBeta.asm b/maps/Route10PokeCenter2FBeta.asm index a4a4aed6f..308b7c752 100644 --- a/maps/Route10PokeCenter2FBeta.asm +++ b/maps/Route10PokeCenter2FBeta.asm @@ -1,3 +1,4 @@ + Route10PokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 2e4c36ff4..840895a97 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE10SOUTH_POKEFAN_M1 + const ROUTE10SOUTH_POKEFAN_M2 + Route10South_MapScriptHeader: .MapTriggers: db 0 @@ -9,22 +13,22 @@ TrainerHikerJim: trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, HikerJimScript HikerJimScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ae43b + waitbutton closetext - loadmovesprites end TrainerPokefanmRobert: trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, PokefanmRobertScript PokefanmRobertScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ae4a9 + waitbutton closetext - loadmovesprites end MapRoute10SouthSignpost0Script: diff --git a/maps/Route11.asm b/maps/Route11.asm index fde0d1544..5dd00f6a7 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -1,3 +1,10 @@ +const_value set 2 + const ROUTE11_YOUNGSTER1 + const ROUTE11_YOUNGSTER2 + const ROUTE11_YOUNGSTER3 + const ROUTE11_YOUNGSTER4 + const ROUTE11_FRUIT_TREE + Route11_MapScriptHeader: .MapTriggers: db 0 @@ -9,44 +16,44 @@ TrainerYoungsterOwen: trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, YoungsterOwenScript YoungsterOwenScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x680b2 + waitbutton closetext - loadmovesprites end TrainerYoungsterJason: trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, YoungsterJasonScript YoungsterJasonScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x6814a + waitbutton closetext - loadmovesprites end TrainerPsychicHerman: trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, PsychicHermanScript PsychicHermanScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x6817b + waitbutton closetext - loadmovesprites end TrainerPsychicFidel: trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, PsychicFidelScript PsychicFidelScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x681ec + waitbutton closetext - loadmovesprites end MapRoute11Signpost0Script: @@ -55,7 +62,7 @@ MapRoute11Signpost0Script: FruitTreeScript_0x68055: fruittree FRUITTREE_ROUTE_11 -MapRoute11SignpostItem1: +Route11HiddenRevive: dwb EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE @@ -152,7 +159,7 @@ Route11_MapEventHeader: .Signposts: db 2 signpost 7, 3, SIGNPOST_READ, MapRoute11Signpost0Script - signpost 5, 32, SIGNPOST_ITEM, MapRoute11SignpostItem1 + signpost 5, 32, SIGNPOST_ITEM, Route11HiddenRevive .PersonEvents: db 5 diff --git a/maps/Route12.asm b/maps/Route12.asm index 3f4d06fa4..b947333d7 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -1,3 +1,11 @@ +const_value set 2 + const ROUTE12_FISHER1 + const ROUTE12_FISHER2 + const ROUTE12_FISHER3 + const ROUTE12_FISHER4 + const ROUTE12_POKE_BALL1 + const ROUTE12_POKE_BALL2 + Route12_MapScriptHeader: .MapTriggers: db 0 @@ -9,44 +17,44 @@ TrainerFisherKyle: trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, FisherKyleScript FisherKyleScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a7238 + waitbutton closetext - loadmovesprites end TrainerFisherMartin: trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, FisherMartinScript FisherMartinScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a704c + waitbutton closetext - loadmovesprites end TrainerFisherStephen: trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, FisherStephenScript FisherStephenScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a70d4 + waitbutton closetext - loadmovesprites end TrainerFisherBarney: trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, FisherBarneyScript FisherBarneyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a716d + waitbutton closetext - loadmovesprites end MapRoute12Signpost0Script: @@ -55,13 +63,13 @@ MapRoute12Signpost0Script: MapRoute12Signpost1Script: jumptext UnknownText_0x1a72c1 -ItemFragment_0x1a700b: - db CALCIUM, 1 +Route12Calcium: + itemball CALCIUM -ItemFragment_0x1a700d: - db NUGGET, 1 +Route12Nugget: + itemball NUGGET -MapRoute12SignpostItem2: +Route12HiddenElixer: dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER @@ -174,7 +182,7 @@ Route12_MapEventHeader: db 3 signpost 27, 11, SIGNPOST_READ, MapRoute12Signpost0Script signpost 9, 13, SIGNPOST_READ, MapRoute12Signpost1Script - signpost 13, 14, SIGNPOST_ITEM, MapRoute12SignpostItem2 + signpost 13, 14, SIGNPOST_ITEM, Route12HiddenElixer .PersonEvents: db 6 @@ -182,5 +190,5 @@ Route12_MapEventHeader: person_event SPRITE_FISHER, 23, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherStephen, -1 person_event SPRITE_FISHER, 38, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 5, TrainerFisherBarney, -1 person_event SPRITE_FISHER, 7, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherKyle, -1 - person_event SPRITE_POKE_BALL, 43, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a700b, EVENT_ROUTE_12_CALCIUM - person_event SPRITE_POKE_BALL, 51, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a700d, EVENT_ROUTE_12_NUGGET + person_event SPRITE_POKE_BALL, 43, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM + person_event SPRITE_POKE_BALL, 51, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 8c5840b95..f19594e20 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE12SUPERRODHOUSE_FISHING_GURU + Route12SuperRodHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,28 +10,28 @@ Route12SuperRodHouse_MapScriptHeader: FishingGuruScript_0x7f484: faceplayer - loadfont + opentext checkevent EVENT_GOT_SUPER_ROD iftrue UnknownScript_0x7f4a0 writetext UnknownText_0x7f4af yesorno iffalse UnknownScript_0x7f4a6 writetext UnknownText_0x7f52f - keeptextopen + buttonsound verbosegiveitem SUPER_ROD iffalse UnknownScript_0x7f4aa setevent EVENT_GOT_SUPER_ROD UnknownScript_0x7f4a0: writetext UnknownText_0x7f57c + waitbutton closetext - loadmovesprites end UnknownScript_0x7f4a6: writetext UnknownText_0x7f5ec - closetext + waitbutton UnknownScript_0x7f4aa: - loadmovesprites + closetext end SuperRodHouseBookshelf: diff --git a/maps/Route13.asm b/maps/Route13.asm index 77b5b1fe5..4237878d3 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -1,3 +1,10 @@ +const_value set 2 + const ROUTE13_YOUNGSTER1 + const ROUTE13_YOUNGSTER2 + const ROUTE13_POKEFAN_M1 + const ROUTE13_POKEFAN_M2 + const ROUTE13_POKEFAN_M3 + Route13_MapScriptHeader: .MapTriggers: db 0 @@ -9,55 +16,55 @@ TrainerPokefanmAlex: trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, PokefanmAlexScript PokefanmAlexScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a24e3 + waitbutton closetext - loadmovesprites end TrainerPokefanmJoshua: trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, PokefanmJoshuaScript PokefanmJoshuaScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a254f + waitbutton closetext - loadmovesprites end TrainerBird_keeperPerry: trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, 0, Bird_keeperPerryScript Bird_keeperPerryScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a25db + waitbutton closetext - loadmovesprites end TrainerBird_keeperBret: trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, 0, Bird_keeperBretScript Bird_keeperBretScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a2662 + waitbutton closetext - loadmovesprites end TrainerHikerKenny: trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, HikerKennyScript HikerKennyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a26c2 + waitbutton closetext - loadmovesprites end MapRoute13Signpost0Script: @@ -69,7 +76,7 @@ MapRoute13Signpost1Script: MapRoute13Signpost2Script: jumptext UnknownText_0x1a277d -MapRoute13SignpostItem3: +Route13HiddenCalcium: dwb EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM @@ -200,7 +207,7 @@ Route13_MapEventHeader: signpost 13, 29, SIGNPOST_READ, MapRoute13Signpost0Script signpost 11, 41, SIGNPOST_READ, MapRoute13Signpost1Script signpost 13, 17, SIGNPOST_READ, MapRoute13Signpost2Script - signpost 13, 30, SIGNPOST_ITEM, MapRoute13SignpostItem3 + signpost 13, 30, SIGNPOST_ITEM, Route13HiddenCalcium .PersonEvents: db 5 diff --git a/maps/Route14.asm b/maps/Route14.asm index 0c62003d7..bef460b42 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -1,3 +1,9 @@ +const_value set 2 + const ROUTE14_POKEFAN_M1 + const ROUTE14_YOUNGSTER + const ROUTE14_POKEFAN_M2 + const ROUTE14_TEACHER + Route14_MapScriptHeader: .MapTriggers: db 0 @@ -7,43 +13,43 @@ Route14_MapScriptHeader: TeacherScript_0x1ad47f: faceplayer - loadfont + opentext trade $5 + waitbutton closetext - loadmovesprites end TrainerPokefanmCarter: trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, PokefanmCarterScript PokefanmCarterScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ad508 + waitbutton closetext - loadmovesprites end TrainerBird_keeperRoy: trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, 0, Bird_keeperRoyScript Bird_keeperRoyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ad5a4 + waitbutton closetext - loadmovesprites end TrainerPokefanmTrevor: trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, PokefanmTrevorScript PokefanmTrevorScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ad660 + waitbutton closetext - loadmovesprites end PokefanmCarterSeenText: diff --git a/maps/Route15.asm b/maps/Route15.asm index 0f52d8daa..bd8ea4839 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -1,3 +1,12 @@ +const_value set 2 + const ROUTE15_YOUNGSTER1 + const ROUTE15_YOUNGSTER2 + const ROUTE15_YOUNGSTER3 + const ROUTE15_YOUNGSTER4 + const ROUTE15_TEACHER1 + const ROUTE15_TEACHER2 + const ROUTE15_POKE_BALL + Route15_MapScriptHeader: .MapTriggers: db 0 @@ -9,73 +18,73 @@ TrainerTeacherColette: trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, TeacherColetteScript TeacherColetteScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1aa60d + waitbutton closetext - loadmovesprites end TrainerTeacherHillary: trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, TeacherHillaryScript TeacherHillaryScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1aa6ca + waitbutton closetext - loadmovesprites end TrainerSchoolboyKipp: trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, SchoolboyKippScript SchoolboyKippScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1aa740 + waitbutton closetext - loadmovesprites end TrainerSchoolboyTommy: trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, SchoolboyTommyScript SchoolboyTommyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1aa7bc + waitbutton closetext - loadmovesprites end TrainerSchoolboyJohnny: trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, SchoolboyJohnnyScript SchoolboyJohnnyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1aa84a + waitbutton closetext - loadmovesprites end TrainerSchoolboyBilly: trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, SchoolboyBillyScript SchoolboyBillyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1aa8b0 + waitbutton closetext - loadmovesprites end MapRoute15Signpost0Script: jumptext UnknownText_0x1aa8e3 -ItemFragment_0x1aa5e4: - db PP_UP, 1 +Route15PPUp: + itemball PP_UP TeacherColetteSeenText: text "Have you forgotten" @@ -216,4 +225,4 @@ Route15_MapEventHeader: person_event SPRITE_YOUNGSTER, 10, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1 person_event SPRITE_TEACHER, 12, 30, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerTeacherColette, -1 person_event SPRITE_TEACHER, 10, 20, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerTeacherHillary, -1 - person_event SPRITE_POKE_BALL, 5, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1aa5e4, EVENT_ROUTE_15_PP_UP + person_event SPRITE_POKE_BALL, 5, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 9576ccd51..00ba666bb 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE15FUCHSIAGATE_OFFICER + Route15FuchsiaGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route16.asm b/maps/Route16.asm index 21a4a5962..d5c1454d0 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -1,3 +1,4 @@ + Route16_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 80bcfbb26..76cc7fa15 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD + Route16FuchsiaSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index bae75eac6..5ed348e52 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE16GATE_OFFICER + Route16Gate_MapScriptHeader: .MapTriggers: db 1 @@ -20,12 +23,12 @@ UnknownScript_0x733ed: end UnknownScript_0x733f3: - showemote EMOTE_SHOCK, $2, 15 + showemote EMOTE_SHOCK, ROUTE16GATE_OFFICER, 15 spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x73496 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x73405 end diff --git a/maps/Route17.asm b/maps/Route17.asm index 994f91628..1520d3eeb 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -1,3 +1,9 @@ +const_value set 2 + const ROUTE17_BIKER1 + const ROUTE17_BIKER2 + const ROUTE17_BIKER3 + const ROUTE17_BIKER4 + Route17_MapScriptHeader: .MapTriggers: db 0 @@ -18,51 +24,51 @@ TrainerBikerCharles: trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, BikerCharlesScript BikerCharlesScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ad293 + waitbutton closetext - loadmovesprites end TrainerBikerRiley: trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, BikerRileyScript BikerRileyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ad13b + waitbutton closetext - loadmovesprites end TrainerBikerJoel: trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, BikerJoelScript BikerJoelScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ad196 + waitbutton closetext - loadmovesprites end TrainerBikerGlenn: trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, BikerGlennScript BikerGlennScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ad225 + waitbutton closetext - loadmovesprites end -MapRoute17SignpostItem0: +Route17HiddenMaxEther: dwb EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER -MapRoute17SignpostItem1: +Route17HiddenMaxElixer: dwb EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER @@ -145,8 +151,8 @@ Route17_MapEventHeader: .Signposts: db 2 - signpost 54, 9, SIGNPOST_ITEM, MapRoute17SignpostItem0 - signpost 77, 8, SIGNPOST_ITEM, MapRoute17SignpostItem1 + signpost 54, 9, SIGNPOST_ITEM, Route17HiddenMaxEther + signpost 77, 8, SIGNPOST_ITEM, Route17HiddenMaxElixer .PersonEvents: db 4 diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index 1d8b9eb43..a09dde909 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE1718GATE_OFFICER + Route1718Gate_MapScriptHeader: .MapTriggers: db 1 @@ -20,12 +23,12 @@ UnknownScript_0x73611: end UnknownScript_0x73617: - showemote EMOTE_SHOCK, $2, 15 + showemote EMOTE_SHOCK, ROUTE1718GATE_OFFICER, 15 spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x7364d + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x73629 end diff --git a/maps/Route18.asm b/maps/Route18.asm index e846e52f9..276fa7bea 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE18_YOUNGSTER1 + const ROUTE18_YOUNGSTER2 + Route18_MapScriptHeader: .MapTriggers: db 0 @@ -9,22 +13,22 @@ TrainerBird_keeperBoris: trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, 0, Bird_keeperBorisScript Bird_keeperBorisScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1acfa5 + waitbutton closetext - loadmovesprites end TrainerBird_keeperBob: trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, 0, Bird_keeperBobScript Bird_keeperBobScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ad00d + waitbutton closetext - loadmovesprites end MapRoute18Signpost0Script: diff --git a/maps/Route19.asm b/maps/Route19.asm index aa38af4ed..bf1fc5dcb 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -1,3 +1,11 @@ +const_value set 2 + const ROUTE19_SWIMMER_GIRL + const ROUTE19_SWIMMER_GUY1 + const ROUTE19_SWIMMER_GUY2 + const ROUTE19_SWIMMER_GUY3 + const ROUTE19_FISHER1 + const ROUTE19_FISHER2 + Route19_MapScriptHeader: .MapTriggers: db 0 @@ -25,76 +33,76 @@ TrainerSwimmerfDawn: trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, SwimmerfDawnScript SwimmerfDawnScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19ebad + waitbutton closetext - loadmovesprites end TrainerSwimmermHarold: trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, SwimmermHaroldScript SwimmermHaroldScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19eab4 + waitbutton closetext - loadmovesprites end TrainerSwimmermJerome: trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, SwimmermJeromeScript SwimmermJeromeScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19ec7e + waitbutton closetext - loadmovesprites end TrainerSwimmermTucker: trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, SwimmermTuckerScript SwimmermTuckerScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19eb3b + waitbutton closetext - loadmovesprites end FisherScript_0x19ea4d: faceplayer - loadfont + opentext checkevent EVENT_CINNABAR_ROCKS_CLEARED iftrue UnknownScript_0x19ea5b writetext UnknownText_0x19ecaf + waitbutton closetext - loadmovesprites end UnknownScript_0x19ea5b: writetext UnknownText_0x19ed24 + waitbutton closetext - loadmovesprites end FisherScript_0x19ea61: faceplayer - loadfont + opentext checkevent EVENT_CINNABAR_ROCKS_CLEARED iftrue UnknownScript_0x19ea6f writetext UnknownText_0x19ed45 + waitbutton closetext - loadmovesprites end UnknownScript_0x19ea6f: writetext UnknownText_0x19ed7d + waitbutton closetext - loadmovesprites end MapRoute19Signpost0Script: diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 7fb3fb0a4..a958c7af4 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE19FUCHSIAGATE_OFFICER + Route19FuchsiaGate_MapScriptHeader: .MapTriggers: db 0 @@ -7,18 +10,18 @@ Route19FuchsiaGate_MapScriptHeader: OfficerScript_0x1ab3f6: faceplayer - loadfont + opentext checkevent EVENT_CINNABAR_ROCKS_CLEARED iftrue .RocksCleared writetext UnknownText_0x1ab40a + waitbutton closetext - loadmovesprites end .RocksCleared writetext UnknownText_0x1ab48a + waitbutton closetext - loadmovesprites end UnknownText_0x1ab40a: diff --git a/maps/Route2.asm b/maps/Route2.asm index b97a27845..28eb3e43b 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -1,3 +1,13 @@ +const_value set 2 + const ROUTE2_BUG_CATCHER1 + const ROUTE2_BUG_CATCHER2 + const ROUTE2_BUG_CATCHER3 + const ROUTE2_POKE_BALL1 + const ROUTE2_POKE_BALL2 + const ROUTE2_POKE_BALL3 + const ROUTE2_POKE_BALL4 + const ROUTE2_FRUIT_TREE + Route2_MapScriptHeader: .MapTriggers: db 0 @@ -9,33 +19,33 @@ TrainerBug_catcherRob: trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, 0, Bug_catcherRobScript Bug_catcherRobScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ac34d + waitbutton closetext - loadmovesprites end TrainerBug_catcherEd: trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, 0, Bug_catcherEdScript Bug_catcherEdScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ac3cf + waitbutton closetext - loadmovesprites end TrainerBug_catcherDoug: trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, 0, Bug_catcherDougScript Bug_catcherDougScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ac423 + waitbutton closetext - loadmovesprites end MapRoute2Signpost0Script: @@ -44,31 +54,31 @@ MapRoute2Signpost0Script: MapRoute2Signpost1Script: jumptext UnknownText_0x1ac49f -ItemFragment_0x1ac2fe: - db DIRE_HIT, 1 +Route2DireHit: + itemball DIRE_HIT -ItemFragment_0x1ac300: - db MAX_POTION, 1 +Route2MaxPotion: + itemball MAX_POTION -ItemFragment_0x1ac302: - db CARBOS, 1 +Route2Carbos: + itemball CARBOS -ItemFragment_0x1ac304: - db ELIXER, 1 +Route2Elixer: + itemball ELIXER FruitTreeScript_0x1ac306: fruittree FRUITTREE_ROUTE_2 -MapRoute2SignpostItem2: +Route2HiddenMaxEther: dwb EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER -MapRoute2SignpostItem3: +Route2HiddenFullHeal: dwb EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL -MapRoute2SignpostItem4: +Route2HiddenFullRestore: dwb EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE -MapRoute2SignpostItem5: +Route2HiddenRevive: dwb EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE Bug_catcherRobSeenText: @@ -155,18 +165,18 @@ Route2_MapEventHeader: db 6 signpost 51, 7, SIGNPOST_READ, MapRoute2Signpost0Script signpost 9, 11, SIGNPOST_READ, MapRoute2Signpost1Script - signpost 23, 7, SIGNPOST_ITEM, MapRoute2SignpostItem2 - signpost 14, 4, SIGNPOST_ITEM, MapRoute2SignpostItem3 - signpost 27, 4, SIGNPOST_ITEM, MapRoute2SignpostItem4 - signpost 30, 11, SIGNPOST_ITEM, MapRoute2SignpostItem5 + signpost 23, 7, SIGNPOST_ITEM, Route2HiddenMaxEther + signpost 14, 4, SIGNPOST_ITEM, Route2HiddenFullHeal + signpost 27, 4, SIGNPOST_ITEM, Route2HiddenFullRestore + signpost 30, 11, SIGNPOST_ITEM, Route2HiddenRevive .PersonEvents: db 8 person_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 5, TrainerBug_catcherRob, -1 person_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherEd, -1 person_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherDoug, -1 - person_event SPRITE_POKE_BALL, 29, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1ac2fe, EVENT_ROUTE_2_DIRE_HIT - person_event SPRITE_POKE_BALL, 23, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1ac300, EVENT_ROUTE_2_MAX_POTION - person_event SPRITE_POKE_BALL, 2, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1ac302, EVENT_ROUTE_2_CARBOS - person_event SPRITE_POKE_BALL, 50, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1ac304, EVENT_ROUTE_2_ELIXER + person_event SPRITE_POKE_BALL, 29, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT + person_event SPRITE_POKE_BALL, 23, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION + person_event SPRITE_POKE_BALL, 2, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS + person_event SPRITE_POKE_BALL, 50, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER person_event SPRITE_FRUIT_TREE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1 diff --git a/maps/Route20.asm b/maps/Route20.asm index 86a0ad424..69cfea8eb 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE20_SWIMMER_GIRL1 + const ROUTE20_SWIMMER_GIRL2 + const ROUTE20_SWIMMER_GUY + Route20_MapScriptHeader: .MapTriggers: db 0 @@ -17,33 +22,33 @@ TrainerSwimmerfNicole: trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, SwimmerfNicoleScript SwimmerfNicoleScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1acd93 + waitbutton closetext - loadmovesprites end TrainerSwimmerfLori: trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, SwimmerfLoriScript SwimmerfLoriScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ace15 + waitbutton closetext - loadmovesprites end TrainerSwimmermCameron: trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, SwimmermCameronScript SwimmermCameronScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ace8b + waitbutton closetext - loadmovesprites end MapRoute20Signpost0Script: diff --git a/maps/Route21.asm b/maps/Route21.asm index 36620ae53..bb3a2cb59 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE21_SWIMMER_GIRL + const ROUTE21_SWIMMER_GUY + const ROUTE21_FISHER + Route21_MapScriptHeader: .MapTriggers: db 0 @@ -9,33 +14,33 @@ TrainerSwimmermSeth: trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, SwimmermSethScript SwimmermSethScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ac873 + waitbutton closetext - loadmovesprites end TrainerSwimmerfNikki: trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, SwimmerfNikkiScript SwimmerfNikkiScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ac8f1 + waitbutton closetext - loadmovesprites end TrainerFisherArnold: trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, FisherArnoldScript FisherArnoldScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ac95c + waitbutton closetext - loadmovesprites end SwimmermSethSeenText: diff --git a/maps/Route22.asm b/maps/Route22.asm index 875651460..e5466fe15 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -1,3 +1,4 @@ + Route22_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route23.asm b/maps/Route23.asm index 29f3c0ba6..8f4fc6a56 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -1,3 +1,4 @@ + Route23_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route24.asm b/maps/Route24.asm index b828c9e89..ef8570fe2 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE24_ROCKET + Route24_MapScriptHeader: .MapTriggers: db 0 @@ -8,26 +11,26 @@ Route24_MapScriptHeader: RocketScript_0x1adbfa: faceplayer playmusic MUSIC_ROCKET_ENCOUNTER - loadfont + opentext writetext UnknownText_0x1adc2e + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x1add67, -1 loadtrainer GRUNTM, 31 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle playmusic MUSIC_ROCKET_ENCOUNTER - loadfont + opentext writetext UnknownText_0x1addc0 - keeptextopen - special Special_RotatePalettesRightMusic + buttonsound + special Special_FadeOutMusic writetext UnknownText_0x1adee1 + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes - disappear $2 + disappear ROUTE24_ROCKET pause 25 special Special_FadeInQuickly playmapmusic diff --git a/maps/Route25.asm b/maps/Route25.asm index 12a60ef65..48ef12917 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -1,3 +1,16 @@ +const_value set 2 + const ROUTE25_MISTY + const ROUTE25_COOLTRAINER_M1 + const ROUTE25_YOUNGSTER1 + const ROUTE25_LASS1 + const ROUTE25_YOUNGSTER2 + const ROUTE25_LASS2 + const ROUTE25_YOUNGSTER3 + const ROUTE25_LASS3 + const ROUTE25_SUPER_NERD + const ROUTE25_COOLTRAINER_M2 + const ROUTE25_POKE_BALL + Route25_MapScriptHeader: .MapTriggers: db 2 @@ -16,52 +29,52 @@ UnknownScript_0x19ee9f: end UnknownScript_0x19eea0: - showemote EMOTE_HEART, $2, 15 + showemote EMOTE_HEART, ROUTE25_MISTY, 15 pause 30 - showemote EMOTE_SHOCK, $3, 10 - spriteface $2, DOWN - applymovement $3, MovementData_0x19efe8 - disappear $3 + showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10 + spriteface ROUTE25_MISTY, DOWN + applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efe8 + disappear ROUTE25_COOLTRAINER_M1 pause 15 playmusic MUSIC_BEAUTY_ENCOUNTER - spriteface $2, UP + spriteface ROUTE25_MISTY, UP pause 10 - applymovement $2, MovementData_0x19efed - loadfont + applymovement ROUTE25_MISTY, MovementData_0x19efed + opentext writetext UnknownText_0x19f006 + waitbutton closetext - loadmovesprites spriteface PLAYER, DOWN - applymovement $2, MovementData_0x19effa + applymovement ROUTE25_MISTY, MovementData_0x19effa spriteface PLAYER, LEFT - applymovement $2, MovementData_0x19f000 - disappear $2 + applymovement ROUTE25_MISTY, MovementData_0x19f000 + disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM dotrigger $0 special RestartMapMusic end UnknownScript_0x19eee0: - showemote EMOTE_HEART, $2, 15 + showemote EMOTE_HEART, ROUTE25_MISTY, 15 pause 30 - showemote EMOTE_SHOCK, $3, 10 - spriteface $2, DOWN - applymovement $3, MovementData_0x19efea - disappear $3 + showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10 + spriteface ROUTE25_MISTY, DOWN + applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efea + disappear ROUTE25_COOLTRAINER_M1 pause 15 playmusic MUSIC_BEAUTY_ENCOUNTER - spriteface $2, UP + spriteface ROUTE25_MISTY, UP pause 10 - applymovement $2, MovementData_0x19eff4 - loadfont + applymovement ROUTE25_MISTY, MovementData_0x19eff4 + opentext writetext UnknownText_0x19f006 + waitbutton closetext - loadmovesprites spriteface PLAYER, UP - applymovement $2, MovementData_0x19effd + applymovement ROUTE25_MISTY, MovementData_0x19effd spriteface PLAYER, LEFT - applymovement $2, MovementData_0x19f000 - disappear $2 + applymovement ROUTE25_MISTY, MovementData_0x19f000 + disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM dotrigger $0 special RestartMapMusic @@ -71,115 +84,115 @@ TrainerSchoolboyDudley: trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, SchoolboyDudleyScript SchoolboyDudleyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19f1b5 + waitbutton closetext - loadmovesprites end TrainerLassEllen: trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, LassEllenScript LassEllenScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19f208 + waitbutton closetext - loadmovesprites end TrainerSchoolboyJoe: trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, SchoolboyJoeScript SchoolboyJoeScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19f25c + waitbutton closetext - loadmovesprites end TrainerLassLaura: trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, LassLauraScript LassLauraScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19f2a6 + waitbutton closetext - loadmovesprites end TrainerCamperLloyd: trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, CamperLloydScript CamperLloydScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19f2f8 + waitbutton closetext - loadmovesprites end TrainerLassShannon: trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, LassShannonScript LassShannonScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19f35b + waitbutton closetext - loadmovesprites end TrainerSupernerdPat: trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, SupernerdPatScript SupernerdPatScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19f41a + waitbutton closetext - loadmovesprites end CooltrainerMScript_0x19efac: faceplayer - loadfont + opentext checkevent EVENT_BEAT_COOLTRAINERM_KEVIN iftrue UnknownScript_0x19efda checkevent EVENT_CLEARED_NUGGET_BRIDGE iftrue UnknownScript_0x19efc7 writetext UnknownText_0x19f43b - keeptextopen + buttonsound verbosegiveitem NUGGET iffalse UnknownScript_0x19efde setevent EVENT_CLEARED_NUGGET_BRIDGE UnknownScript_0x19efc7: writetext UnknownText_0x19f49d + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x19f4fd, 0 loadtrainer COOLTRAINERM, KEVIN startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_COOLTRAINERM_KEVIN - loadfont + opentext UnknownScript_0x19efda: writetext UnknownText_0x19f520 - closetext + waitbutton UnknownScript_0x19efde: - loadmovesprites + closetext end MapRoute25Signpost0Script: jumptext UnknownText_0x19f567 -ItemFragment_0x19efe3: - db PROTEIN, 1 +Route25Protein: + itemball PROTEIN -MapRoute25SignpostItem1: +Route25HiddenPotion: dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION @@ -435,7 +448,7 @@ Route25_MapEventHeader: .Signposts: db 2 signpost 5, 45, SIGNPOST_READ, MapRoute25Signpost0Script - signpost 5, 4, SIGNPOST_ITEM, MapRoute25SignpostItem1 + signpost 5, 4, SIGNPOST_ITEM, Route25HiddenPotion .PersonEvents: db 11 @@ -449,4 +462,4 @@ Route25_MapEventHeader: person_event SPRITE_LASS, 11, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassShannon, -1 person_event SPRITE_SUPER_NERD, 7, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerSupernerdPat, -1 person_event SPRITE_COOLTRAINER_M, 8, 37, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1 - person_event SPRITE_POKE_BALL, 4, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19efe3, EVENT_ROUTE_25_PROTEIN + person_event SPRITE_POKE_BALL, 4, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN diff --git a/maps/Route26.asm b/maps/Route26.asm index c1e4d38c9..f4ddbf8f6 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -1,3 +1,13 @@ +const_value set 2 + const ROUTE26_COOLTRAINER_M1 + const ROUTE26_COOLTRAINER_M2 + const ROUTE26_COOLTRAINER_F1 + const ROUTE26_COOLTRAINER_F2 + const ROUTE26_YOUNGSTER + const ROUTE26_FISHER + const ROUTE26_FRUIT_TREE + const ROUTE26_POKE_BALL + Route26_MapScriptHeader: .MapTriggers: db 0 @@ -9,11 +19,11 @@ TrainerCooltrainermJake: trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, CooltrainermJakeScript CooltrainermJakeScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a4f08 + waitbutton closetext - loadmovesprites end TrainerCooltrainermGaven3: @@ -21,8 +31,8 @@ TrainerCooltrainermGaven3: CooltrainermGaven3Script: writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_GAVEN iftrue UnknownScript_0x1a4d79 checkcellnum PHONE_COOLTRAINERM_GAVEN @@ -30,7 +40,7 @@ CooltrainermGaven3Script: checkevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a4d62 writetext UnknownText_0x1a4fe4 - keeptextopen + buttonsound setevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x1a4dbf jump UnknownScript_0x1a4d65 @@ -61,7 +71,7 @@ UnknownScript_0x1a4d79: .LoadFight0 loadtrainer COOLTRAINERM, GAVEN3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wGavenFightCount, 1 clearflag ENGINE_GAVEN end @@ -69,7 +79,7 @@ UnknownScript_0x1a4d79: .LoadFight1 loadtrainer COOLTRAINERM, GAVEN1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wGavenFightCount, 2 clearflag ENGINE_GAVEN end @@ -77,7 +87,7 @@ UnknownScript_0x1a4d79: .LoadFight2 loadtrainer COOLTRAINERM, GAVEN2 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_GAVEN end @@ -113,11 +123,11 @@ TrainerCooltrainerfJoyce: trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, CooltrainerfJoyceScript CooltrainerfJoyceScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a50d7 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfBeth1: @@ -125,8 +135,8 @@ TrainerCooltrainerfBeth1: CooltrainerfBeth1Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_BETH iftrue UnknownScript_0x1a4e35 checkcellnum PHONE_COOLTRAINERF_BETH @@ -134,7 +144,7 @@ CooltrainerfBeth1Script: checkevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a4e1e writetext UnknownText_0x1a51d9 - keeptextopen + buttonsound setevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x1a4e7b jump UnknownScript_0x1a4e21 @@ -165,7 +175,7 @@ UnknownScript_0x1a4e35: .LoadFight0 loadtrainer COOLTRAINERF, BETH1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wBethFightCount, 1 clearflag ENGINE_BETH end @@ -173,7 +183,7 @@ UnknownScript_0x1a4e35: .LoadFight1 loadtrainer COOLTRAINERF, BETH2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wBethFightCount, 2 clearflag ENGINE_BETH end @@ -181,7 +191,7 @@ UnknownScript_0x1a4e35: .LoadFight2 loadtrainer COOLTRAINERF, BETH3 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_BETH end @@ -217,22 +227,22 @@ TrainerPsychicRichard: trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, PsychicRichardScript PsychicRichardScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a5278 + waitbutton closetext - loadmovesprites end TrainerFisherScott: trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, FisherScottScript FisherScottScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a5326 + waitbutton closetext - loadmovesprites end MapRoute26Signpost0Script: @@ -241,8 +251,8 @@ MapRoute26Signpost0Script: FruitTreeScript_0x1a4ec2: fruittree FRUITTREE_ROUTE_26 -ItemFragment_0x1a4ec4: - db MAX_ELIXER, 1 +Route26MaxElixer: + itemball MAX_ELIXER CooltrainermJakeSeenText: text "I'm making my" @@ -428,4 +438,4 @@ Route26_MapEventHeader: person_event SPRITE_YOUNGSTER, 79, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPsychicRichard, -1 person_event SPRITE_FISHER, 92, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherScott, -1 person_event SPRITE_FRUIT_TREE, 54, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1 - person_event SPRITE_POKE_BALL, 15, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a4ec4, EVENT_ROUTE_26_MAX_ELIXER + person_event SPRITE_POKE_BALL, 15, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index ae8cd10b5..6463ba89e 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE26DAYOFWEEKSIBLINGSHOUSE_POKEDEX + Route26DayofWeekSiblingsHouse_MapScriptHeader: .MapTriggers: db 0 @@ -6,7 +9,7 @@ Route26DayofWeekSiblingsHouse_MapScriptHeader: db 0 PokedexScript_0x7b1e4: - loadfont + opentext writetext UnknownText_0x7b1f9 yesorno iffalse UnknownText_0x7b1f7 @@ -14,9 +17,9 @@ PokedexScript_0x7b1e4: yesorno iffalse UnknownText_0x7b1f7 writetext UnknownText_0x7b2b9 - closetext + waitbutton UnknownText_0x7b1f7: - loadmovesprites + closetext end UnknownText_0x7b1f9: diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 785daaeb2..7dd01776a 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE26HEALSPEECHHOUSE_TEACHER + Route26HealSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,10 +10,10 @@ Route26HealSpeechHouse_MapScriptHeader: TeacherScript_0x7b125: faceplayer - loadfont + opentext writetext UnknownText_0x7b14d + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes special Mobile_HealParty @@ -19,10 +22,10 @@ TeacherScript_0x7b125: pause 60 special Special_FadeInQuickly special RestartMapMusic - loadfont + opentext writetext UnknownText_0x7b18b + waitbutton closetext - loadmovesprites end Route26HealHouseBookshelf: diff --git a/maps/Route27.asm b/maps/Route27.asm index 08351a33c..fa199f2ad 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -1,3 +1,14 @@ +const_value set 2 + const ROUTE27_COOLTRAINER_M1 + const ROUTE27_COOLTRAINER_M2 + const ROUTE27_COOLTRAINER_F1 + const ROUTE27_COOLTRAINER_F2 + const ROUTE27_YOUNGSTER1 + const ROUTE27_YOUNGSTER2 + const ROUTE27_POKE_BALL1 + const ROUTE27_POKE_BALL2 + const ROUTE27_FISHER + Route27_MapScriptHeader: .MapTriggers: db 2 @@ -16,23 +27,23 @@ UnknownScript_0x1a0872: end UnknownScript_0x1a0873: - spriteface $a, LEFT - showemote EMOTE_SHOCK, $a, 15 - applymovement $a, MovementData_0x1a0a66 + spriteface ROUTE27_FISHER, LEFT + showemote EMOTE_SHOCK, ROUTE27_FISHER, 15 + applymovement ROUTE27_FISHER, MovementData_0x1a0a66 jump UnknownScript_0x1a088c UnknownScript_0x1a0881: - spriteface $a, LEFT - showemote EMOTE_SHOCK, $a, 15 - applymovement $a, MovementData_0x1a0a69 + spriteface ROUTE27_FISHER, LEFT + showemote EMOTE_SHOCK, ROUTE27_FISHER, 15 + applymovement ROUTE27_FISHER, MovementData_0x1a0a69 UnknownScript_0x1a088c: spriteface PLAYER, RIGHT - loadfont + opentext writetext UnknownText_0x1a0a6b - keeptextopen + buttonsound writetext UnknownText_0x1a0a71 + waitbutton closetext - loadmovesprites dotrigger $1 end @@ -43,11 +54,11 @@ TrainerPsychicGilbert: trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, PsychicGilbertScript PsychicGilbertScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a0dd2 + waitbutton closetext - loadmovesprites end TrainerBird_keeperJose2: @@ -55,8 +66,8 @@ TrainerBird_keeperJose2: Bird_keeperJose2Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_JOSE iftrue UnknownScript_0x1a08ff checkflag ENGINE_JOSE_HAS_STAR_PIECE @@ -66,7 +77,7 @@ Bird_keeperJose2Script: checkevent EVENT_JOSE_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a08e8 writetext UnknownText_0x1a0e42 - keeptextopen + buttonsound setevent EVENT_JOSE_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x1a0957 jump UnknownScript_0x1a08eb @@ -97,7 +108,7 @@ UnknownScript_0x1a08ff: .LoadFight0 loadtrainer BIRD_KEEPER, JOSE2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJoseFightCount, 1 clearflag ENGINE_JOSE end @@ -105,7 +116,7 @@ UnknownScript_0x1a08ff: .LoadFight1 loadtrainer BIRD_KEEPER, JOSE1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJoseFightCount, 2 clearflag ENGINE_JOSE end @@ -113,7 +124,7 @@ UnknownScript_0x1a08ff: .LoadFight2 loadtrainer BIRD_KEEPER, JOSE3 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_JOSE end @@ -167,22 +178,22 @@ TrainerCooltrainermBlake: trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, CooltrainermBlakeScript CooltrainermBlakeScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a0b0b + waitbutton closetext - loadmovesprites end TrainerCooltrainermBrian: trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, CooltrainermBrianScript CooltrainermBrianScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a0bac + waitbutton closetext - loadmovesprites end TrainerCooltrainerfReena: @@ -190,8 +201,8 @@ TrainerCooltrainerfReena: CooltrainerfReena1Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_REENA iftrue UnknownScript_0x1a09e9 checkcellnum PHONE_COOLTRAINERF_REENA @@ -199,7 +210,7 @@ CooltrainerfReena1Script: checkevent EVENT_REENA_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a09d2 writetext UnknownText_0x1a0c35 - keeptextopen + buttonsound setevent EVENT_REENA_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x1a0a2f jump UnknownScript_0x1a09d5 @@ -230,7 +241,7 @@ UnknownScript_0x1a09e9: .LoadFight0 loadtrainer COOLTRAINERF, REENA1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wReenaFightCount, 1 clearflag ENGINE_REENA end @@ -238,7 +249,7 @@ UnknownScript_0x1a09e9: .LoadFight1 loadtrainer COOLTRAINERF, REENA2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wReenaFightCount, 2 clearflag ENGINE_REENA end @@ -246,7 +257,7 @@ UnknownScript_0x1a09e9: .LoadFight2 loadtrainer COOLTRAINERF, REENA3 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_REENA end @@ -282,21 +293,21 @@ TrainerCooltrainerfMegan: trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, CooltrainerfMeganScript CooltrainerfMeganScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a0cce + waitbutton closetext - loadmovesprites end MapRoute27Signpost0Script: jumptext UnknownText_0x1a0e7f -ItemFragment_0x1a0a62: - db TM_SOLARBEAM, 1 +Route27TMSolarbeam: + itemball TM_SOLARBEAM -ItemFragment_0x1a0a64: - db RARE_CANDY, 1 +Route27RareCandy: + itemball RARE_CANDY MovementData_0x1a0a66: step_left @@ -485,6 +496,6 @@ Route27_MapEventHeader: person_event SPRITE_COOLTRAINER_F, 6, 37, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1 person_event SPRITE_YOUNGSTER, 7, 65, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicGilbert, -1 person_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperJose2, -1 - person_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a0a62, EVENT_ROUTE_27_TM_SOLARBEAM - person_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a0a64, EVENT_ROUTE_27_RARE_CANDY + person_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM + person_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY person_event SPRITE_FISHER, 10, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 3, FisherScript_0x1a089c, -1 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index afb5b69e6..b00862edd 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE27SANDSTORMHOUSE_GRANNY + Route27SandstormHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,32 +10,32 @@ Route27SandstormHouse_MapScriptHeader: SandstormHouseWoman: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM37_SANDSTORM iftrue .AlreadyGotItem special GetFirstPokemonHappiness writetext SandstormHouseWomanText1 - keeptextopen + buttonsound if_greater_than $95, .Loyal jump .Disloyal .Loyal writetext SandstormHouseWomanLoyalText - keeptextopen + buttonsound verbosegiveitem TM_SANDSTORM iffalse .Done setevent EVENT_GOT_TM37_SANDSTORM .AlreadyGotItem writetext SandstormHouseSandstormDescription - closetext + waitbutton .Done - loadmovesprites + closetext end .Disloyal writetext SandstormHouseWomanDisloyalText + waitbutton closetext - loadmovesprites end SandstormHouseBookshelf: diff --git a/maps/Route28.asm b/maps/Route28.asm index 320e62d4c..ea65d5e1e 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -1,3 +1,4 @@ + Route28_MapScriptHeader: .MapTriggers: db 0 @@ -8,7 +9,7 @@ Route28_MapScriptHeader: MapRoute28Signpost0Script: jumptext UnknownText_0x1a5413 -MapRoute28SignpostItem1: +Route28HiddenRareCandy: dwb EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY @@ -31,7 +32,7 @@ Route28_MapEventHeader: .Signposts: db 2 signpost 5, 31, SIGNPOST_READ, MapRoute28Signpost0Script - signpost 2, 25, SIGNPOST_ITEM, MapRoute28SignpostItem1 + signpost 2, 25, SIGNPOST_ITEM, Route28HiddenRareCandy .PersonEvents: db 0 diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index c72bfaea3..3f30815fd 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE28FAMOUSSPEECHHOUSE_COOLTRAINER_F + const ROUTE28FAMOUSSPEECHHOUSE_MOLTRES + Route28FamousSpeechHouse_MapScriptHeader: .MapTriggers: db 1 @@ -13,29 +17,29 @@ Route28FamousSpeechHouse_MapScriptHeader: Celebrity: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM47_STEEL_WING iftrue .AlreadyGotItem writetext CelebrityText1 - keeptextopen + buttonsound verbosegiveitem TM_STEEL_WING iffalse .Done setevent EVENT_GOT_TM47_STEEL_WING .Done - loadmovesprites + closetext end .AlreadyGotItem writetext CelebrityText2 + waitbutton closetext - loadmovesprites end CelebritysFearow: - loadfont + opentext writetext CelebritysFearowText cry FEAROW + waitbutton closetext - loadmovesprites end CelebrityHouseBookshelf: diff --git a/maps/Route29.asm b/maps/Route29.asm index d33e4050b..cdd5fc426 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -1,169 +1,179 @@ +const_value set 2 + const ROUTE29_COOLTRAINER_M1 + const ROUTE29_YOUNGSTER + const ROUTE29_TEACHER1 + const ROUTE29_FRUIT_TREE + const ROUTE29_FISHER + const ROUTE29_COOLTRAINER_M2 + const ROUTE29_TEACHER2 + const ROUTE29_POKE_BALL + Route29_MapScriptHeader: .MapTriggers: 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 .TuscanyDisappears - disappear $8 + disappear ROUTE29_TEACHER2 return .DoesTuscanyAppear checkcode VAR_WEEKDAY if_not_equal TUESDAY, .TuscanyDisappears - appear $8 + appear ROUTE29_TEACHER2 return -UnknownScript_0x1a0f6d: - spriteface $2, UP - showemote EMOTE_SHOCK, $2, 15 - applymovement $2, MovementData_0x1a108d +Route29Tutorial1: + spriteface ROUTE29_COOLTRAINER_M1, UP + showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15 + applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1a spriteface PLAYER, LEFT setevent EVENT_DUDE_TALKED_TO_YOU - loadfont - writetext UnknownText_0x1a10df + opentext + writetext CatchingTutorialIntroText yesorno - iffalse UnknownScript_0x1a0fd9 - loadmovesprites - follow $2, PLAYER - applymovement $2, MovementData_0x1a109a + iffalse Script_RefusedTutorial1 + closetext + follow ROUTE29_COOLTRAINER_M1, PLAYER + applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b stopfollow - loadpokedata RATTATA, 5 + loadwildmon RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL - spriteface $2, UP - loadfont - writetext UnknownText_0x1a114d + spriteface ROUTE29_COOLTRAINER_M1, UP + opentext + writetext CatchingTutorialDebriefText + waitbutton closetext - loadmovesprites dotrigger $0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end -UnknownScript_0x1a0fa3: - spriteface $2, UP - showemote EMOTE_SHOCK, $2, 15 - applymovement $2, MovementData_0x1a1094 +Route29Tutorial2: + spriteface ROUTE29_COOLTRAINER_M1, UP + showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15 + applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2a spriteface PLAYER, LEFT setevent EVENT_DUDE_TALKED_TO_YOU - loadfont - writetext UnknownText_0x1a10df + opentext + writetext CatchingTutorialIntroText yesorno - iffalse UnknownScript_0x1a0fe5 - loadmovesprites - follow $2, PLAYER - applymovement $2, MovementData_0x1a10a1 + iffalse Script_RefusedTutorial2 + closetext + follow ROUTE29_COOLTRAINER_M1, PLAYER + applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b stopfollow - loadpokedata RATTATA, 5 + loadwildmon RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL - spriteface $2, UP - loadfont - writetext UnknownText_0x1a114d + spriteface ROUTE29_COOLTRAINER_M1, UP + opentext + writetext CatchingTutorialDebriefText + waitbutton closetext - loadmovesprites dotrigger $0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end -UnknownScript_0x1a0fd9: - writetext UnknownText_0x1a1197 +Script_RefusedTutorial1: + writetext CatchingTutorialDeclinedText + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x1a109a + applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b dotrigger $0 end -UnknownScript_0x1a0fe5: - writetext UnknownText_0x1a1197 +Script_RefusedTutorial2: + writetext CatchingTutorialDeclinedText + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x1a10a1 + applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b dotrigger $0 end -CooltrainerMScript_0x1a0ff1: +CatchingTutorialDudeScript: faceplayer - loadfont + 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 - loadmovesprites - loadpokedata RATTATA, 5 + iffalse .Declined + closetext + loadwildmon RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL - loadfont - writetext UnknownText_0x1a114d + opentext + writetext CatchingTutorialDebriefText + waitbutton closetext - loadmovesprites setevent EVENT_LEARNED_TO_CATCH_POKEMON end -UnknownScript_0x1a101c: +.BoxFull: writetext UnknownText_0x1a10a7 + waitbutton closetext - loadmovesprites end -UnknownScript_0x1a1022: - writetext UnknownText_0x1a1197 +.Declined: + writetext CatchingTutorialDeclinedText + waitbutton closetext - loadmovesprites 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 - loadfont + 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 - loadmovesprites end -UnknownScript_0x1a1043: - writetext UnknownText_0x1a137c +.nite: + writetext Text_WaitingForMorning + waitbutton closetext - loadmovesprites end TuscanyScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_PINK_BOW_FROM_TUSCANY iftrue TuscanyTuesdayScript checkcode VAR_WEEKDAY @@ -171,45 +181,45 @@ TuscanyScript: checkevent EVENT_MET_TUSCANY_OF_TUESDAY iftrue .MetTuscany writetext MeetTuscanyText - keeptextopen + buttonsound setevent EVENT_MET_TUSCANY_OF_TUESDAY .MetTuscany writetext TuscanyGivesGiftText - keeptextopen + buttonsound verbosegiveitem PINK_BOW iffalse TuscanyDoneScript setevent EVENT_GOT_PINK_BOW_FROM_TUSCANY writetext TuscanyGaveGiftText + waitbutton closetext - loadmovesprites end TuscanyTuesdayScript: writetext TuscanyTuesdayText - closetext + waitbutton TuscanyDoneScript: - loadmovesprites + closetext end TuscanyNotTuesdayScript: writetext TuscanyNotTuesdayText + waitbutton closetext - loadmovesprites end MapRoute29Signpost0Script: - jumptext UnknownText_0x1a158e + jumptext Route29SignText1 MapRoute29Signpost1Script: - jumptext UnknownText_0x1a15b9 + jumptext Route29SignText2 -FruitTreeScript_0x1a1089: +Route29FruitTree: fruittree FRUITTREE_ROUTE_29 -ItemFragment_0x1a108b: - db POTION, 1 +Route29Potion: + itemball POTION -MovementData_0x1a108d: +DudeMovementData1a: step_up step_up step_up @@ -218,7 +228,7 @@ MovementData_0x1a108d: step_right step_end -MovementData_0x1a1094: +DudeMovementData2a: step_up step_up step_up @@ -226,7 +236,7 @@ MovementData_0x1a1094: step_right step_end -MovementData_0x1a109a: +DudeMovementData1b: step_left step_left step_down @@ -235,7 +245,7 @@ MovementData_0x1a109a: step_down step_end -MovementData_0x1a10a1: +DudeMovementData2b: step_left step_left step_down @@ -251,7 +261,7 @@ UnknownText_0x1a10a7: line "pop out…" done -UnknownText_0x1a10df: +CatchingTutorialIntroText: text "I've seen you a" line "couple times. How" @@ -263,7 +273,7 @@ UnknownText_0x1a10df: cont "catch #MON?" done -UnknownText_0x1a114d: +CatchingTutorialDebriefText: text "That's how you do" line "it." @@ -272,7 +282,7 @@ UnknownText_0x1a114d: cont "easier to catch." done -UnknownText_0x1a1197: +CatchingTutorialDeclinedText: text "Oh. Fine, then." para "Anyway, if you" @@ -282,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?" @@ -299,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." @@ -311,7 +321,7 @@ UnknownText_0x1a126c: line "the grass." done -UnknownText_0x1a12d9: +Route29FisherText: text "I wanted to take a" line "break, so I saved" @@ -320,7 +330,7 @@ UnknownText_0x1a12d9: done ; possibly unused -UnknownText_0x1a1316: +Text_WaitingForDay: text "I'm waiting for" line "#MON that" @@ -328,7 +338,7 @@ UnknownText_0x1a1316: line "daytime." done -UnknownText_0x1a134c: +Text_WaitingForNight: text "I'm waiting for" line "#MON that" @@ -336,7 +346,7 @@ UnknownText_0x1a134c: line "night." done -UnknownText_0x1a137c: +Text_WaitingForMorning: text "I'm waiting for" line "#MON that" @@ -396,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 -" @@ -420,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 @@ -430,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_ITEMFRAGMENT, 0, ItemFragment_0x1a108b, EVENT_ROUTE_29_POTION + 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/Route2946Gate.asm b/maps/Route2946Gate.asm index 476574864..2101fbe64 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE2946GATE_OFFICER + const ROUTE2946GATE_YOUNGSTER + Route2946Gate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index e93fa496c..f567dd3ae 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE2GATE_SCIENTIST + Route2Gate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index bb0cbad93..3a269d536 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE2NUGGETSPEECHHOUSE_FISHER + Route2NuggetSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,19 +10,19 @@ Route2NuggetSpeechHouse_MapScriptHeader: FisherScript_0x9b847: faceplayer - loadfont + opentext checkevent EVENT_GOT_NUGGET_FROM_GUY iftrue .GotItem writetext UnknownText_0x9b865 - keeptextopen + buttonsound verbosegiveitem NUGGET iffalse .Done setevent EVENT_GOT_NUGGET_FROM_GUY .GotItem writetext UnknownText_0x9b8e5 - closetext + waitbutton .Done - loadmovesprites + closetext end Route2NuggetSpeechHouseBookshelf: diff --git a/maps/Route3.asm b/maps/Route3.asm index e8333b9a4..b5e08faf9 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -1,3 +1,9 @@ +const_value set 2 + const ROUTE3_FISHER1 + const ROUTE3_YOUNGSTER1 + const ROUTE3_YOUNGSTER2 + const ROUTE3_FISHER2 + Route3_MapScriptHeader: .MapTriggers: db 0 @@ -9,44 +15,44 @@ TrainerFirebreatherOtis: trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, FirebreatherOtisScript FirebreatherOtisScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1adff7 + waitbutton closetext - loadmovesprites end TrainerYoungsterWarren: trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, YoungsterWarrenScript YoungsterWarrenScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ae051 + waitbutton closetext - loadmovesprites end TrainerYoungsterJimmy: trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, YoungsterJimmyScript YoungsterJimmyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ae0a9 + waitbutton closetext - loadmovesprites end TrainerFirebreatherBurt: trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, FirebreatherBurtScript FirebreatherBurtScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ae118 + waitbutton closetext - loadmovesprites end MapRoute3Signpost0Script: diff --git a/maps/Route30.asm b/maps/Route30.asm index 0eab41100..e5ca13fe3 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -1,3 +1,16 @@ +const_value set 2 + const ROUTE30_YOUNGSTER1 + const ROUTE30_YOUNGSTER2 + const ROUTE30_YOUNGSTER3 + const ROUTE30_BUG_CATCHER + const ROUTE30_YOUNGSTER4 + const ROUTE30_MONSTER1 + const ROUTE30_MONSTER2 + const ROUTE30_FRUIT_TREE1 + const ROUTE30_FRUIT_TREE2 + const ROUTE30_COOLTRAINER_F + const ROUTE30_POKE_BALL + Route30_MapScriptHeader: .MapTriggers: db 0 @@ -5,57 +18,57 @@ Route30_MapScriptHeader: .MapCallbacks: db 0 -YoungsterScript_0x1a1673: - waitbutton +YoungsterJoey_ImportantBattleScript: + waitsfx playmusic MUSIC_JOHTO_TRAINER_BATTLE - loadfont - writetext UnknownText_0x1a1806 + opentext + writetext Text_UseTackle pause 30 - loadmovesprites + closetext playsound SFX_TACKLE - applymovement $8, MovementData_0x1a17fe - loadfont + applymovement ROUTE30_MONSTER2, Route30_JoeysRattataAttacksMovement + opentext faceplayer - writetext UnknownText_0x1a181c + writetext Text_ThisIsABigBattle + waitbutton + spriteface ROUTE30_YOUNGSTER1, UP closetext - spriteface $2, UP - loadmovesprites playsound SFX_TACKLE - applymovement $7, 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 - talkaftercancel - loadfont + 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 - keeptextopen + 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 @@ -78,7 +91,7 @@ UnknownScript_0x1a16e0: .LoadFight0 loadtrainer YOUNGSTER, JOEY1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJoeyFightCount, 1 clearflag ENGINE_JOEY end @@ -86,7 +99,7 @@ UnknownScript_0x1a16e0: .LoadFight1 loadtrainer YOUNGSTER, JOEY2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJoeyFightCount, 2 clearflag ENGINE_JOEY end @@ -94,7 +107,7 @@ UnknownScript_0x1a16e0: .LoadFight2 loadtrainer YOUNGSTER, JOEY3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJoeyFightCount, 3 clearflag ENGINE_JOEY end @@ -102,7 +115,7 @@ UnknownScript_0x1a16e0: .LoadFight3 loadtrainer YOUNGSTER, JOEY4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wJoeyFightCount, 4 clearflag ENGINE_JOEY end @@ -110,153 +123,153 @@ UnknownScript_0x1a16e0: .LoadFight4 loadtrainer YOUNGSTER, JOEY5 startbattle - returnafterbattle + reloadmapafterbattle 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: - loadfont - writetext UnknownText_0x1a1bc0 - closetext +.GiveHPUp: + opentext + 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: - talkaftercancel - loadfont - writetext UnknownText_0x1a197d +.Script: + end_if_just_battled + opentext + writetext YoungsterMikeyAfterText + waitbutton closetext - loadmovesprites 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: - talkaftercancel - loadfont - writetext UnknownText_0x1a1a1c +.Script: + end_if_just_battled + opentext + writetext Bug_catcherDonAfterText + waitbutton closetext - loadmovesprites end -YoungsterScript_0x1a17d2: +Route30YoungsterScript: faceplayer - loadfont + opentext checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - iftrue UnknownScript_0x1a17e0 - writetext UnknownText_0x1a1a6a + iftrue .CompletedEggQuest + writetext Route30YoungsterText_DirectionsToMrPokemonsHouse + waitbutton closetext - loadmovesprites end -UnknownScript_0x1a17e0: - writetext UnknownText_0x1a1a94 +.CompletedEggQuest: + writetext Route30YoungsterText_EveryoneIsBattling + waitbutton closetext - loadmovesprites 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 -ItemFragment_0x1a17f5: - db ANTIDOTE, 1 +Route30Antidote: + itemball ANTIDOTE -FruitTreeScript_0x1a17f7: +Route30FruitTree1: fruittree FRUITTREE_ROUTE_30_1 -FruitTreeScript_0x1a17f9: +Route30FruitTree2: fruittree FRUITTREE_ROUTE_30_2 -MapRoute30SignpostItem4: +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!" @@ -277,7 +290,7 @@ YoungsterJoey1BeatenText: line "Doggone it!" done -UnknownText_0x1a18c2: +YoungsterJoey1AfterText: text "Do I have to have" line "more #MON in" @@ -302,7 +315,7 @@ YoungsterMikeyBeatenText: line "I won before." done -UnknownText_0x1a197d: +YoungsterMikeyAfterText: text "Becoming a good" line "trainer is really" cont "tough." @@ -323,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." @@ -332,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" @@ -352,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" @@ -379,7 +392,7 @@ UnknownText_0x1a1b66: cont "wild #MON!" done -UnknownText_0x1a1bc0: +YoungsterJoeyText_GiveHPUpAfterBattle: text "I lost again…" line "Gee, you're tough!" @@ -412,18 +425,18 @@ Route30_MapEventHeader: signpost 29, 13, SIGNPOST_READ, MapRoute30Signpost1Script signpost 5, 15, SIGNPOST_READ, MapRoute30Signpost2Script signpost 21, 3, SIGNPOST_READ, MapRoute30Signpost3Script - signpost 9, 14, SIGNPOST_ITEM, MapRoute30SignpostItem4 + signpost 9, 14, SIGNPOST_ITEM, Route30HiddenPotion .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_POKE_BALL, 35, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a17f5, EVENT_ROUTE_30_ANTIDOTE + 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/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index e0c100815..d05258f3f 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE30BERRYSPEECHHOUSE_POKEFAN_M + Route30BerrySpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,19 +10,19 @@ Route30BerrySpeechHouse_MapScriptHeader: PokefanMScript_0x196d64: faceplayer - loadfont + opentext checkevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE iftrue UnknownScript_0x196d79 writetext UnknownText_0x196d82 - keeptextopen + buttonsound verbosegiveitem BERRY iffalse UnknownScript_0x196d7d setevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE UnknownScript_0x196d79: writetext UnknownText_0x196dec - closetext + waitbutton UnknownScript_0x196d7d: - loadmovesprites + closetext end Route30BerrySpeechHouseBookshelf: diff --git a/maps/Route31.asm b/maps/Route31.asm index aa32861ae..3309e292a 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -1,3 +1,12 @@ +const_value set 2 + const ROUTE31_FISHER + const ROUTE31_YOUNGSTER + const ROUTE31_BUG_CATCHER + const ROUTE31_COOLTRAINER_M + const ROUTE31_FRUIT_TREE + const ROUTE31_POKE_BALL1 + const ROUTE31_POKE_BALL2 + Route31_MapScriptHeader: .MapTriggers: db 0 @@ -19,12 +28,12 @@ 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 - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_WADE iftrue .WadeRematch checkflag ENGINE_WADE_HAS_ITEM @@ -33,8 +42,8 @@ Bug_catcherWade1Script: iftrue .AcceptedNumberSTD checkevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain - writetext UnknownText_0x1a5671 - closetext + writetext Bug_catcherWade1AfterText + waitbutton setevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER scall .AskPhoneNumberSTD jump .Continue @@ -73,7 +82,7 @@ Bug_catcherWade1Script: .LoadFight0 loadtrainer BUG_CATCHER, WADE1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wWadeFightCount, 1 clearflag ENGINE_WADE end @@ -81,7 +90,7 @@ Bug_catcherWade1Script: .LoadFight1 loadtrainer BUG_CATCHER, WADE2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wWadeFightCount, 2 clearflag ENGINE_WADE end @@ -89,7 +98,7 @@ Bug_catcherWade1Script: .LoadFight2 loadtrainer BUG_CATCHER, WADE3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wWadeFightCount, 3 clearflag ENGINE_WADE end @@ -97,7 +106,7 @@ Bug_catcherWade1Script: .LoadFight3 loadtrainer BUG_CATCHER, WADE4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wWadeFightCount, 4 clearflag ENGINE_WADE end @@ -105,7 +114,7 @@ Bug_catcherWade1Script: .LoadFight4 loadtrainer BUG_CATCHER, WADE5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_WADE end @@ -176,91 +185,91 @@ Bug_catcherWade1Script: jumpstd packfullm end -FisherScript_0x1a5570: +Route31MailRecipientScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM50_NIGHTMARE iftrue .DescribeNightmare checkevent EVENT_GOT_KENYA iftrue .TryGiveKenya - writetext UnknownText_0x1a56d9 + writetext Text_Route31SleepyMan + waitbutton closetext - loadmovesprites end .TryGiveKenya: - writetext UnknownText_0x1a5761 - keeptextopen + 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 - keeptextopen - writetext UnknownText_0x1a57ba - keeptextopen + writetext Text_Route31HandOverMailMon + buttonsound + writetext Text_Route31ReadingMail + buttonsound setevent EVENT_GAVE_KENYA verbosegiveitem TM_NIGHTMARE iffalse .NoRoomForItems setevent EVENT_GOT_TM50_NIGHTMARE .DescribeNightmare: - writetext UnknownText_0x1a5896 - closetext + writetext Text_Route31DescribeNightmare + waitbutton .NoRoomForItems: - loadmovesprites + closetext end .WrongMail: - writetext UnknownText_0x1a5921 + writetext Text_Route31WrongMail + waitbutton closetext - loadmovesprites end .NoMail: - writetext UnknownText_0x1a5939 + writetext Text_Route31MissingMail + waitbutton closetext - loadmovesprites end .Refused: - writetext UnknownText_0x1a5972 + writetext Text_Route31DeclinedToHandOverMail + waitbutton closetext - loadmovesprites end .LastMon: - writetext UnknownText_0x1a5991 + writetext Text_Route31CantTakeLastMon + waitbutton closetext - loadmovesprites end 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 -ItemFragment_0x1a55fb: - db POTION, 1 +Route31Potion: + itemball POTION -ItemFragment_0x1a55fd: - db POKE_BALL, 1 +Route31PokeBall: + itemball POKE_BALL -UnknownText_0x1a55ff: +Route31CooltrainerMText: text "DARK CAVE…" para "If #MON could" @@ -278,7 +287,7 @@ Bug_catcherWade1BeatenText: text "Awwwww…" done -UnknownText_0x1a5671: +Bug_catcherWade1AfterText: text "You can catch" line "#MON even if" @@ -290,7 +299,7 @@ UnknownText_0x1a5671: cont "BOX automatically." done -UnknownText_0x1a56d9: +Text_Route31SleepyMan: text "… Hnuurg… Huh?" para "I walked too far" @@ -307,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" @@ -344,7 +353,7 @@ UnknownText_0x1a57ba: line "to have this!" done -UnknownText_0x1a5896: +Text_Route31DescribeNightmare: text "TM50 is NIGHTMARE." para "It's a wicked move" @@ -360,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?" @@ -373,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," @@ -386,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." @@ -399,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 @@ -430,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_POKE_BALL, 5, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a55fb, EVENT_ROUTE_31_POTION - person_event SPRITE_POKE_BALL, 15, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a55fd, EVENT_ROUTE_31_POKE_BALL + 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/Route31VioletGate.asm b/maps/Route31VioletGate.asm index e55b02d6f..68155a705 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE31VIOLETGATE_OFFICER + const ROUTE31VIOLETGATE_COOLTRAINER_F + Route31VioletGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route32.asm b/maps/Route32.asm index da557fde9..63f29e81c 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -1,192 +1,208 @@ +const_value set 2 + const ROUTE32_FISHER1 + const ROUTE32_FISHER2 + const ROUTE32_FISHER3 + const ROUTE32_YOUNGSTER1 + const ROUTE32_YOUNGSTER2 + const ROUTE32_YOUNGSTER3 + const ROUTE32_LASS1 + const ROUTE32_COOLTRAINER_M + const ROUTE32_YOUNGSTER4 + const ROUTE32_FISHER4 + const ROUTE32_POKE_BALL1 + const ROUTE32_FISHER5 + const ROUTE32_LASS2 + const ROUTE32_POKE_BALL2 + Route32_MapScriptHeader: .MapTriggers: 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 $e + disappear ROUTE32_LASS2 return .FriedaAppears - appear $e + appear ROUTE32_LASS2 return -CooltrainerMScript_0x19046f: +Route32CooltrainerMScript: faceplayer -UnknownScript_0x190470: - loadfont +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 - loadmovesprites end -UnknownScript_0x190489: - writetext UnknownText_0x190820 +.Unused: + writetext Route32CooltrainerMText_UnusedSproutTower + waitbutton closetext - loadmovesprites end -UnknownScript_0x19048f: - writetext UnknownText_0x190925 - keeptextopen +.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 - loadmovesprites end -UnknownScript_0x1904a5: - writetext UnknownText_0x190a15 +.GotMiracleSeed: + writetext Route32CooltrainerMText_ExperiencesShouldBeUseful + waitbutton +.BagFull: closetext -UnknownScript_0x1904a9: - loadmovesprites end -UnknownScript_0x1904ab: - spriteface $9, LEFT +Route32CooltrainerMStopsYou: + spriteface ROUTE32_COOLTRAINER_M, LEFT spriteface PLAYER, RIGHT - loadfont - writetext UnknownText_0x190790 + opentext + writetext Route32CooltrainerMText_WhatsTheHurry + waitbutton closetext - loadmovesprites - follow PLAYER, $9 - applymovement PLAYER, MovementData_0x190789 + follow PLAYER, ROUTE32_COOLTRAINER_M + applymovement PLAYER, Movement_Route32CooltrainerMPushesYouBackToViolet stopfollow spriteface PLAYER, DOWN - scall UnknownScript_0x190470 - applymovement $9, MovementData_0x19078c - applymovement $9, MovementData_0x19078e + scall Route32CooltrainerMTrigger + applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset1 + applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset2 end -FisherScript_0x1904ce: +Route32RoarTMGuyScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM05_ROAR - iftrue UnknownScript_0x1904e3 - writetext UnknownText_0x191133 - keeptextopen + 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 +.Finish: closetext -UnknownScript_0x1904e7: - loadmovesprites end -UnknownScript_0x1904e9: - spriteface $b, DOWN +Route32WannaBuyASlowpokeTailScript: + spriteface ROUTE32_FISHER4, DOWN spriteface PLAYER, UP - jump UnknownScript_0x1904f3 + jump _OfferToSellSlowpokeTail -FisherScript_0x1904f2: +SlowpokeTailSalesmanScript: faceplayer -UnknownScript_0x1904f3: +_OfferToSellSlowpokeTail: dotrigger $2 - loadfont - writetext UnknownText_0x190a59 + opentext + writetext Text_MillionDollarSlowpokeTail yesorno - iffalse UnknownScript_0x190503 - writetext UnknownText_0x190acf + iffalse .refused + writetext Text_ThoughtKidsWereLoaded + waitbutton closetext - loadmovesprites end -UnknownScript_0x190503: - writetext UnknownText_0x190afc +.refused: + writetext Text_RefusedToBuySlowpokeTail + waitbutton closetext - loadmovesprites 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: - talkaftercancel - loadfont - writetext UnknownText_0x190faa +.Script: + end_if_just_battled + opentext + writetext CamperRolandAfterText + waitbutton closetext - loadmovesprites 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: - talkaftercancel - loadfont - writetext UnknownText_0x190b4e +.Script: + end_if_just_battled + opentext + writetext FisherJustinAfterText + waitbutton closetext - loadmovesprites 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 - talkaftercancel - loadfont + 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 - keeptextopen + 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 @@ -209,7 +225,7 @@ UnknownScript_0x19057d: .LoadFight0 loadtrainer FISHER, RALPH1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wRalphFightCount, 1 clearflag ENGINE_RALPH end @@ -217,7 +233,7 @@ UnknownScript_0x19057d: .LoadFight1 loadtrainer FISHER, RALPH2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wRalphFightCount, 2 clearflag ENGINE_RALPH end @@ -225,7 +241,7 @@ UnknownScript_0x19057d: .LoadFight2 loadtrainer FISHER, RALPH3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wRalphFightCount, 3 clearflag ENGINE_RALPH end @@ -233,7 +249,7 @@ UnknownScript_0x19057d: .LoadFight3 loadtrainer FISHER, RALPH4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wRalphFightCount, 4 clearflag ENGINE_RALPH end @@ -241,86 +257,86 @@ UnknownScript_0x19057d: .LoadFight4 loadtrainer FISHER, RALPH5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_RALPH end -UnknownScript_0x1905f1: - writetext UnknownText_0x190c37 +.Swarm: + writetext FisherRalphSwarmText + waitbutton closetext - loadmovesprites 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: - talkaftercancel - loadfont - writetext UnknownText_0x190df2 +.Script: + end_if_just_battled + opentext + writetext FisherHenryAfterText + waitbutton closetext - loadmovesprites 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 - talkaftercancel - loadfont + 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 - keeptextopen + 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 @@ -343,7 +359,7 @@ UnknownScript_0x19066d: .LoadFight0 loadtrainer PICNICKER, LIZ1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wLizFightCount, 1 clearflag ENGINE_LIZ end @@ -351,7 +367,7 @@ UnknownScript_0x19066d: .LoadFight1 loadtrainer PICNICKER, LIZ2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wLizFightCount, 2 clearflag ENGINE_LIZ end @@ -359,7 +375,7 @@ UnknownScript_0x19066d: .LoadFight2 loadtrainer PICNICKER, LIZ3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wLizFightCount, 3 clearflag ENGINE_LIZ end @@ -367,7 +383,7 @@ UnknownScript_0x19066d: .LoadFight3 loadtrainer PICNICKER, LIZ4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wLizFightCount, 4 clearflag ENGINE_LIZ end @@ -375,112 +391,112 @@ UnknownScript_0x19066d: .LoadFight4 loadtrainer PICNICKER, LIZ5 startbattle - returnafterbattle + reloadmapafterbattle 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: - talkaftercancel - loadfont - writetext UnknownText_0x190e82 +.Script: + end_if_just_battled + opentext + writetext YoungsterAlbertAfterText + waitbutton closetext - loadmovesprites 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: - talkaftercancel - loadfont - writetext UnknownText_0x190f49 +.Script: + end_if_just_battled + opentext + writetext YoungsterGordonAfterText + waitbutton closetext - loadmovesprites 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: - talkaftercancel - loadfont - writetext UnknownText_0x1910d4 +.Script: + end_if_just_battled + opentext + writetext Bird_keeperPeterAfterText + waitbutton closetext - loadmovesprites end FriedaScript: faceplayer - loadfont + 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 - keeptextopen + buttonsound setevent EVENT_MET_FRIEDA_OF_FRIDAY .MetFrieda writetext FriedaGivesGiftText - keeptextopen + buttonsound verbosegiveitem POISON_BARB - iffalse FriedaDoneScript + iffalse .Done setevent EVENT_GOT_POISON_BARB_FROM_FRIEDA writetext FriedaGaveGiftText + waitbutton closetext - loadmovesprites end -FriedaFridayScript: +.Friday: writetext FriedaFridayText + waitbutton +.Done: closetext -FriedaDoneScript: - loadmovesprites end -FriedaNotFridayScript: +.NotFriday: writetext FriedaNotFridayText + waitbutton closetext - loadmovesprites end -ItemFragment_0x190773: - db GREAT_BALL, 1 +Route32GreatBall: + itemball GREAT_BALL -ItemFragment_0x190775: - db REPEL, 1 +Route32Repel: + itemball REPEL Route32Sign: jumptext Route32SignText @@ -494,33 +510,33 @@ Route32UnionCaveSign: Route32PokeCenterSign: jumpstd pokecentersign -MapRoute32SignpostItem4: +Route32HiddenGreatBall: dwb EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL -MapRoute32SignpostItem5: +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" @@ -535,7 +551,7 @@ UnknownText_0x1907ab: done ; might not be referenced anywhere -UnknownText_0x190820: +Route32CooltrainerMText_UnusedSproutTower: text "Have you gone to" line "SPROUT TOWER?" @@ -550,7 +566,7 @@ UnknownText_0x190820: cont "SPROUT TOWER!" done -UnknownText_0x1908b0: +Route32CooltrainerMText_VioletGym: text "Have you gone to" line "the #MON GYM?" @@ -563,7 +579,7 @@ UnknownText_0x1908b0: cont "trainers!" done -UnknownText_0x190925: +Route32CooltrainerMText_HaveThisSeed: text "You have some good" line "#MON there." @@ -588,7 +604,7 @@ UnknownText_0x190925: cont "type moves." done -UnknownText_0x190a15: +Route32CooltrainerMText_ExperiencesShouldBeUseful: text "Your experiences" line "in VIOLET CITY" @@ -596,7 +612,7 @@ UnknownText_0x190a15: line "for your journey." done -UnknownText_0x190a59: +Text_MillionDollarSlowpokeTail: text "How would you like" line "to have this" @@ -609,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 @@ -631,7 +647,7 @@ FisherJustinBeatenText: text "Sploosh!" done -UnknownText_0x190b4e: +FisherJustinAfterText: text "Calm, collected…" line "The essence of" @@ -653,7 +669,7 @@ FisherRalph1BeatenText: line "rush things…" done -UnknownText_0x190bf8: +FisherRalphAfterText: text "Fishing is a life-" line "long passion." @@ -661,7 +677,7 @@ UnknownText_0x190bf8: line "long friends!" done -UnknownText_0x190c37: +FisherRalphSwarmText: text "One, two, three…" line "Muahahaha, what a" @@ -674,7 +690,7 @@ UnknownText_0x190c37: ; --- start a segment of possibly unused texts -UnknownText_0x190c9c: +Route32UnusedFisher1SeenText: text "I keep catching" line "the same #MON…" @@ -683,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" @@ -724,7 +740,7 @@ FisherHenryBeatenText: text "SPLASH?" done -UnknownText_0x190df2: +FisherHenryAfterText: text "Freshly caught" line "#MON are no" @@ -744,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." @@ -768,7 +784,7 @@ YoungsterGordonBeatenText: line "could win." done -UnknownText_0x190f49: +YoungsterGordonAfterText: text "The grass is full" line "of clingy things." done @@ -783,7 +799,7 @@ CamperRolandBeatenText: line "disappointing." done -UnknownText_0x190faa: +CamperRolandAfterText: text "If you don't want" line "to battle, just" cont "avoid eye contact." @@ -805,7 +821,7 @@ PicnickerLiz1BeatenText: line "relieve my anger!" done -UnknownText_0x191060: +PicnickerLiz1AfterText: text "I was having a" line "nice chat too." done @@ -822,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" @@ -846,7 +862,7 @@ UnknownText_0x191133: line "NOW TAKE THIS!" done -UnknownText_0x19118c: +Text_RoarOutro: text "WROOOAR!" line "IT'S ROAR!" @@ -932,17 +948,17 @@ 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, MapRoute32SignpostItem4 - signpost 40, 11, SIGNPOST_ITEM, MapRoute32SignpostItem5 + signpost 67, 12, SIGNPOST_ITEM, Route32HiddenGreatBall + signpost 40, 11, SIGNPOST_ITEM, Route32HiddenSuperPotion .PersonEvents: db 14 @@ -953,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_POKE_BALL, 53, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x190773, 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, 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, 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_ITEMFRAGMENT, 0, ItemFragment_0x190775, EVENT_ROUTE_32_REPEL + 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/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index 439aecbb6..ae1b641ff 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE32POKECENTER1F_NURSE + const ROUTE32POKECENTER1F_FISHING_GURU + const ROUTE32POKECENTER1F_COOLTRAINER_F + Route32PokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -10,31 +15,31 @@ NurseScript_0x69b52: FishingGuruScript_0x69b55: faceplayer - loadfont + opentext checkevent EVENT_GOT_OLD_ROD iftrue UnknownScript_0x69b7a writetext UnknownText_0x69b83 yesorno iffalse UnknownScript_0x69b74 writetext UnknownText_0x69be8 - keeptextopen + buttonsound verbosegiveitem OLD_ROD writetext UnknownText_0x69c1b + waitbutton closetext - loadmovesprites setevent EVENT_GOT_OLD_ROD end UnknownScript_0x69b74: writetext UnknownText_0x69c6c + waitbutton closetext - loadmovesprites end UnknownScript_0x69b7a: writetext UnknownText_0x69c8d + waitbutton closetext - loadmovesprites end CooltrainerFScript_0x69b80: diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm index 4f43f5121..404bb1a5f 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE32RUINSOFALPHGATE_OFFICER + const ROUTE32RUINSOFALPHGATE_POKEFAN_M + const ROUTE32RUINSOFALPHGATE_YOUNGSTER + Route32RuinsofAlphGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route33.asm b/maps/Route33.asm index c56188c71..3d1db419c 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE33_POKEFAN_M + const ROUTE33_LASS + const ROUTE33_FRUIT_TREE + Route33_MapScriptHeader: .MapTriggers: db 0 @@ -5,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 - talkaftercancel - loadfont + 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 - keeptextopen + 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 @@ -63,7 +68,7 @@ UnknownScript_0x1ac051: .LoadFight0 loadtrainer HIKER, ANTHONY2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAnthonyFightCount, 1 clearflag ENGINE_ANTHONY end @@ -71,7 +76,7 @@ UnknownScript_0x1ac051: .LoadFight1 loadtrainer HIKER, ANTHONY1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAnthonyFightCount, 2 clearflag ENGINE_ANTHONY end @@ -79,7 +84,7 @@ UnknownScript_0x1ac051: .LoadFight2 loadtrainer HIKER, ANTHONY3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAnthonyFightCount, 3 clearflag ENGINE_ANTHONY end @@ -87,7 +92,7 @@ UnknownScript_0x1ac051: .LoadFight3 loadtrainer HIKER, ANTHONY4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAnthonyFightCount, 4 clearflag ENGINE_ANTHONY end @@ -95,48 +100,48 @@ UnknownScript_0x1ac051: .LoadFight4 loadtrainer HIKER, ANTHONY5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_ANTHONY end -UnknownScript_0x1ac0c5: - writetext UnknownText_0x1ac180 +.Swarm: + writetext HikerAnthonyDunsparceText + waitbutton closetext - loadmovesprites 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: @@ -152,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?" @@ -169,7 +174,7 @@ UnknownText_0x1ac180: cont "got a funny face!" done -UnknownText_0x1ac1e7: +Route33LassText: text "Pant, pant…" para "I finally got" @@ -185,7 +190,7 @@ UnknownText_0x1ac1e7: line "outside." done -UnknownText_0x1ac279: +Route33RouteSignText: text "ROUTE 33" done @@ -207,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/Route34.asm b/maps/Route34.asm index 0b336311e..d17dea61c 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -1,3 +1,18 @@ +const_value set 2 + const ROUTE34_YOUNGSTER1 + const ROUTE34_YOUNGSTER2 + const ROUTE34_YOUNGSTER3 + const ROUTE34_LASS + const ROUTE34_OFFICER + const ROUTE34_POKEFAN_M + const ROUTE34_GRAMPS + const ROUTE34_DAYCARE_MON_1 + const ROUTE34_DAYCARE_MON_2 + const ROUTE34_COOLTRAINER_F1 + const ROUTE34_COOLTRAINER_F2 + const ROUTE34_COOLTRAINER_F3 + const ROUTE34_POKE_BALL + Route34_MapScriptHeader: .MapTriggers: db 0 @@ -7,107 +22,107 @@ Route34_MapScriptHeader: ; callbacks - dbw 2, UnknownScript_0x78005 + dbw 2, .EggCheckCallback -UnknownScript_0x78005: - checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE - iftrue UnknownScript_0x78014 +.EggCheckCallback: + checkflag ENGINE_DAYCARE_MAN_HAS_EGG + iftrue .PutDaycareManOutside clearevent EVENT_DAYCARE_MAN_IN_DAYCARE setevent EVENT_DAYCARE_MAN_ON_ROUTE_34 - jump UnknownScript_0x7801d + jump .CheckMon1 -UnknownScript_0x78014: +.PutDaycareManOutside: setevent EVENT_DAYCARE_MAN_IN_DAYCARE clearevent EVENT_DAYCARE_MAN_ON_ROUTE_34 - jump UnknownScript_0x7801d + jump .CheckMon1 -UnknownScript_0x7801d: +.CheckMon1: checkflag ENGINE_DAYCARE_MAN_HAS_MON - iffalse UnknownScript_0x78029 + iffalse .HideMon1 clearevent EVENT_DAYCARE_MON_1 - jump UnknownScript_0x7802f + jump .CheckMon2 -UnknownScript_0x78029: +.HideMon1: setevent EVENT_DAYCARE_MON_1 - jump UnknownScript_0x7802f + jump .CheckMon2 -UnknownScript_0x7802f: +.CheckMon2: checkflag ENGINE_DAYCARE_LADY_HAS_MON - iffalse UnknownScript_0x78039 + iffalse .HideMon2 clearevent EVENT_DAYCARE_MON_2 return -UnknownScript_0x78039: +.HideMon2: setevent EVENT_DAYCARE_MON_2 return -GrampsScript_0x7803d: +DayCareManScript_Outside: faceplayer - loadfont + opentext special Special_DayCareManOutside + waitbutton closetext - loadmovesprites - if_equal $1, UnknownScript_0x7805a - clearflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE + if_equal $1, .end_fail + clearflag ENGINE_DAYCARE_MAN_HAS_EGG checkcode VAR_FACING - if_equal $3, UnknownScript_0x7805b - applymovement $8, MovementData_0x78333 + if_equal RIGHT, .walk_around_player + applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside playsound SFX_ENTER_DOOR - disappear $8 -UnknownScript_0x7805a: + disappear ROUTE34_GRAMPS +.end_fail: end -UnknownScript_0x7805b: - applymovement $8, MovementData_0x78337 +.walk_around_player: + applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside_WalkAroundPlayer playsound SFX_ENTER_DOOR - disappear $8 + disappear ROUTE34_GRAMPS end -DaycareMon1Script_0x78065: - loadfont +DaycareMon1Script: + opentext special Special_DayCareMon1 - loadmovesprites + closetext end -DaycareMon2Script_0x7806b: - loadfont +DaycareMon2Script: + opentext special Special_DayCareMon2 - loadmovesprites + closetext end TrainerCamperTodd1: - trainer EVENT_BEAT_CAMPER_TODD, CAMPER, TODD1, CamperTodd1SeenText, CamperTodd1BeatenText, 0, CamperTodd1Script + trainer EVENT_BEAT_CAMPER_TODD, CAMPER, TODD1, CamperTodd1SeenText, CamperTodd1BeatenText, 0, .Script -CamperTodd1Script: +.Script: writecode VAR_CALLERID, PHONE_CAMPER_TODD - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_TODD - iftrue UnknownScript_0x780bd + iftrue .Rematch checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON - iftrue UnknownScript_0x78131 + iftrue .SaleIsOn checkcellnum PHONE_CAMPER_TODD - iftrue UnknownScript_0x78143 + iftrue .NumberAccepted checkevent EVENT_TODD_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x780a6 - writetext UnknownText_0x784f0 - keeptextopen + iftrue .AskAgain + writetext CamperTodd1AfterText + buttonsound setevent EVENT_TODD_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x78137 - jump UnknownScript_0x780a9 + scall .AskNumber + jump .FinishAsk -UnknownScript_0x780a6: - scall UnknownScript_0x7813b -UnknownScript_0x780a9: +.AskAgain: + scall .AskNumber2 +.FinishAsk: askforphonenumber PHONE_CAMPER_TODD - if_equal $1, UnknownScript_0x7814b - if_equal $2, UnknownScript_0x78147 + if_equal $1, .PhoneFull + if_equal $2, .NumberDeclined trainertotext CAMPER, TODD1, $0 - scall UnknownScript_0x7813f - jump UnknownScript_0x78143 + scall .RegisteredNumber + jump .NumberAccepted -UnknownScript_0x780bd: - scall UnknownScript_0x7814f +.Rematch: + scall .RematchStd winlosstext CamperTodd1BeatenText, 0 copybytetovar wToddFightCount if_equal 4, .Fight4 @@ -130,7 +145,7 @@ UnknownScript_0x780bd: .LoadFight0 loadtrainer CAMPER, TODD1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wToddFightCount, 1 clearflag ENGINE_TODD end @@ -138,7 +153,7 @@ UnknownScript_0x780bd: .LoadFight1 loadtrainer CAMPER, TODD2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wToddFightCount, 2 clearflag ENGINE_TODD end @@ -146,7 +161,7 @@ UnknownScript_0x780bd: .LoadFight2 loadtrainer CAMPER, TODD3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wToddFightCount, 3 clearflag ENGINE_TODD end @@ -154,7 +169,7 @@ UnknownScript_0x780bd: .LoadFight3 loadtrainer CAMPER, TODD4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wToddFightCount, 4 clearflag ENGINE_TODD end @@ -162,77 +177,77 @@ UnknownScript_0x780bd: .LoadFight4 loadtrainer CAMPER, TODD5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_TODD end -UnknownScript_0x78131: - writetext UnknownText_0x78532 +.SaleIsOn: + writetext CamperToddSaleText + waitbutton closetext - loadmovesprites end -UnknownScript_0x78137: +.AskNumber: jumpstd asknumber1m end -UnknownScript_0x7813b: +.AskNumber2: jumpstd asknumber2m end -UnknownScript_0x7813f: +.RegisteredNumber: jumpstd registerednumberm end -UnknownScript_0x78143: +.NumberAccepted: jumpstd numberacceptedm end -UnknownScript_0x78147: +.NumberDeclined: jumpstd numberdeclinedm end -UnknownScript_0x7814b: +.PhoneFull: jumpstd phonefullm end -UnknownScript_0x7814f: +.RematchStd: jumpstd rematchm end TrainerPicnickerGina1: - trainer EVENT_BEAT_PICNICKER_GINA, PICNICKER, GINA1, PicnickerGina1SeenText, PicnickerGina1BeatenText, 0, PicnickerGina1Script + trainer EVENT_BEAT_PICNICKER_GINA, PICNICKER, GINA1, PicnickerGina1SeenText, PicnickerGina1BeatenText, 0, .Script -PicnickerGina1Script: +.Script: writecode VAR_CALLERID, PHONE_PICNICKER_GINA - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_GINA - iftrue UnknownScript_0x7819f + iftrue .Rematch checkflag ENGINE_GINA_HAS_LEAF_STONE - iftrue UnknownScript_0x78213 + iftrue .LeafStone checkcellnum PHONE_PICNICKER_GINA - iftrue UnknownScript_0x78234 + iftrue .NumberAccepted checkevent EVENT_GINA_ASKED_FOR_PHONE_NUMBER - iftrue UnknownScript_0x78188 - writetext UnknownText_0x785b8 - keeptextopen + iftrue .AskAgain + writetext PicnickerGina1AfterText + buttonsound setevent EVENT_GINA_ASKED_FOR_PHONE_NUMBER - scall UnknownScript_0x78228 - jump UnknownScript_0x7818b + scall .AskNumber1 + jump .FinishAsk -UnknownScript_0x78188: - scall UnknownScript_0x7822c -UnknownScript_0x7818b: +.AskAgain: + scall .AskNumber2 +.FinishAsk: askforphonenumber PHONE_PICNICKER_GINA - if_equal $1, UnknownScript_0x7823c - if_equal $2, UnknownScript_0x78238 + if_equal $1, .PhoneFull + if_equal $2, .NumberDeclined trainertotext PICNICKER, GINA1, $0 - scall UnknownScript_0x78230 - jump UnknownScript_0x78234 + scall .RegisteredNumber + jump .NumberAccepted -UnknownScript_0x7819f: - scall UnknownScript_0x78240 +.Rematch: + scall .RematchStd winlosstext PicnickerGina1BeatenText, 0 copybytetovar wGinaFightCount if_equal 4, .Fight4 @@ -255,7 +270,7 @@ UnknownScript_0x7819f: .LoadFight0 loadtrainer PICNICKER, GINA1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wGinaFightCount, 1 clearflag ENGINE_GINA end @@ -263,7 +278,7 @@ UnknownScript_0x7819f: .LoadFight1 loadtrainer PICNICKER, GINA2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wGinaFightCount, 2 clearflag ENGINE_GINA end @@ -271,7 +286,7 @@ UnknownScript_0x7819f: .LoadFight2 loadtrainer PICNICKER, GINA3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wGinaFightCount, 3 clearflag ENGINE_GINA end @@ -279,7 +294,7 @@ UnknownScript_0x7819f: .LoadFight3 loadtrainer PICNICKER, GINA4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wGinaFightCount, 4 clearflag ENGINE_GINA end @@ -287,209 +302,209 @@ UnknownScript_0x7819f: .LoadFight4 loadtrainer PICNICKER, GINA5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_GINA end -UnknownScript_0x78213: - scall UnknownScript_0x78244 +.LeafStone: + scall .Gift verbosegiveitem LEAF_STONE - iffalse UnknownScript_0x78225 + iffalse .BagFull clearflag ENGINE_GINA_HAS_LEAF_STONE setevent EVENT_GINA_GAVE_LEAF_STONE - jump UnknownScript_0x78234 + jump .NumberAccepted -UnknownScript_0x78225: - jump UnknownScript_0x78248 +.BagFull: + jump .PackFull -UnknownScript_0x78228: +.AskNumber1: jumpstd asknumber1f end -UnknownScript_0x7822c: +.AskNumber2: jumpstd asknumber2f end -UnknownScript_0x78230: +.RegisteredNumber: jumpstd registerednumberf end -UnknownScript_0x78234: +.NumberAccepted: jumpstd numberacceptedf end -UnknownScript_0x78238: +.NumberDeclined: jumpstd numberdeclinedf end -UnknownScript_0x7823c: +.PhoneFull: jumpstd phonefullf end -UnknownScript_0x78240: +.RematchStd: jumpstd rematchf end -UnknownScript_0x78244: +.Gift: jumpstd giftf end -UnknownScript_0x78248: +.PackFull: jumpstd packfullf end -OfficerScript_0x7824c: +OfficerKeithScript: faceplayer - loadfont + opentext checknite - iffalse UnknownScript_0x78276 + iffalse .NoFight checkevent EVENT_BEAT_OFFICER_KEITH - iftrue UnknownScript_0x78270 + iftrue .AfterScript playmusic MUSIC_OFFICER_ENCOUNTER - writetext UnknownText_0x785e4 + writetext OfficerKeithSeenText + waitbutton closetext - loadmovesprites - winlosstext UnknownText_0x78609, 0 + winlosstext OfficerKeithWinText, 0 loadtrainer OFFICER, KEITH startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_OFFICER_KEITH - loadmovesprites + closetext end -UnknownScript_0x78270: - writetext UnknownText_0x78624 +.AfterScript: + writetext OfficerKeithAfterText + waitbutton closetext - loadmovesprites end -UnknownScript_0x78276: - writetext UnknownText_0x7866a +.NoFight: + writetext OfficerKeithDaytimeText + waitbutton closetext - loadmovesprites end TrainerYoungsterSamuel: - trainer EVENT_BEAT_YOUNGSTER_SAMUEL, YOUNGSTER, SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, YoungsterSamuelScript + trainer EVENT_BEAT_YOUNGSTER_SAMUEL, YOUNGSTER, SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, .Script -YoungsterSamuelScript: - talkaftercancel - loadfont - writetext UnknownText_0x783d8 +.Script: + end_if_just_battled + opentext + writetext YoungsterSamuelAfterText + waitbutton closetext - loadmovesprites end TrainerYoungsterIan: - trainer EVENT_BEAT_YOUNGSTER_IAN, YOUNGSTER, IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, YoungsterIanScript + trainer EVENT_BEAT_YOUNGSTER_IAN, YOUNGSTER, IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, .Script -YoungsterIanScript: - talkaftercancel - loadfont - writetext UnknownText_0x78469 +.Script: + end_if_just_battled + opentext + writetext YoungsterIanAfterText + waitbutton closetext - loadmovesprites end TrainerPokefanmBrandon: - trainer EVENT_BEAT_POKEFANM_BRANDON, POKEFANM, BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, PokefanmBrandonScript + trainer EVENT_BEAT_POKEFANM_BRANDON, POKEFANM, BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, .Script -PokefanmBrandonScript: - talkaftercancel - loadfont - writetext UnknownText_0x786fc +.Script: + end_if_just_battled + opentext + writetext PokefanmBrandonAfterText + waitbutton closetext - loadmovesprites end TrainerCooltrainerfIrene: - trainer EVENT_BEAT_COOLTRAINERF_IRENE, COOLTRAINERF, IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, CooltrainerfIreneScript + trainer EVENT_BEAT_COOLTRAINERF_IRENE, COOLTRAINERF, IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, .Script -CooltrainerfIreneScript: - talkaftercancel - loadfont +.Script: + end_if_just_battled + opentext checkevent EVENT_GOT_SOFT_SAND_FROM_KATE - iftrue UnknownScript_0x782d2 - writetext UnknownText_0x7877f + iftrue .GotSoftSand + writetext CooltrainerfIreneAfterText1 + waitbutton closetext - loadmovesprites end -UnknownScript_0x782d2: - writetext UnknownText_0x787ad +.GotSoftSand: + writetext CooltrainerfIreneAfterText2 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfJenn: - trainer EVENT_BEAT_COOLTRAINERF_JENN, COOLTRAINERF, JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, CooltrainerfJennScript + trainer EVENT_BEAT_COOLTRAINERF_JENN, COOLTRAINERF, JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, .Script -CooltrainerfJennScript: - talkaftercancel - loadfont +.Script: + end_if_just_battled + opentext checkevent EVENT_GOT_SOFT_SAND_FROM_KATE - iftrue UnknownScript_0x782f2 - writetext UnknownText_0x78836 + iftrue .GotSoftSand + writetext CooltrainerfJennAfterText1 + waitbutton closetext - loadmovesprites end -UnknownScript_0x782f2: - writetext UnknownText_0x78866 +.GotSoftSand: + writetext CooltrainerfJennAfterText2 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfKate: - trainer EVENT_BEAT_COOLTRAINERF_KATE, COOLTRAINERF, KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, CooltrainerfKateScript + trainer EVENT_BEAT_COOLTRAINERF_KATE, COOLTRAINERF, KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, .Script -CooltrainerfKateScript: - talkaftercancel - loadfont +.Script: + end_if_just_battled + opentext checkevent EVENT_GOT_SOFT_SAND_FROM_KATE - iftrue UnknownScript_0x78319 - writetext UnknownText_0x788e2 - keeptextopen + iftrue .GotSoftSand + writetext CooltrainerfKateOfferSoftSandText + buttonsound verbosegiveitem SOFT_SAND - iffalse UnknownScript_0x7831d + iffalse .BagFull setevent EVENT_GOT_SOFT_SAND_FROM_KATE -UnknownScript_0x78319: - writetext UnknownText_0x7892b +.GotSoftSand: + writetext CooltrainerfKateAfterText + waitbutton +.BagFull: closetext -UnknownScript_0x7831d: - loadmovesprites end -UnknownScript_0x7831f: - jumptext UnknownText_0x7898a +MapRoute34UnusedSignpostScript: + jumptext MapRoute34UnusedSignpostText MapRoute34Signpost0Script: - jumptext UnknownText_0x789a8 + jumptext MapRoute34Signpost0Text MapRoute34Signpost1Script: - jumptext UnknownText_0x789ed + jumptext MapRoute34Signpost1Text MapRoute34Signpost2Script: - jumptext UnknownText_0x78a52 + jumptext MapRoute34Signpost2Text -ItemFragment_0x7832b: - db NUGGET, 1 +Route34Nugget: + itemball NUGGET -MapRoute34SignpostItem3: +Route34HiddenRareCandy: dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY -MapRoute34SignpostItem4: +Route34HiddenSuperPotion: dwb EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION -MovementData_0x78333: +Route34MovementData_DayCareManWalksBackInside: slow_step_left slow_step_left slow_step_up step_end -MovementData_0x78337: +Route34MovementData_DayCareManWalksBackInside_WalkAroundPlayer: slow_step_down slow_step_left slow_step_left @@ -507,7 +522,7 @@ YoungsterSamuelBeatenText: line "passing stranger!" done -UnknownText_0x7837d: +YoungsterSamuelMobileText: text "Have you been to" line "GOLDENROD CITY?" @@ -518,7 +533,7 @@ UnknownText_0x7837d: line "#MON CENTER?" done -UnknownText_0x783d8: +YoungsterSamuelAfterText: text "I'm going to train" line "even harder." @@ -537,7 +552,7 @@ YoungsterIanBeatenText: line "ter trainers…" done -UnknownText_0x78469: +YoungsterIanAfterText: text "I'm trying hard so" line "I can be the star" cont "in my class." @@ -556,7 +571,7 @@ CamperTodd1BeatenText: line "training?" done -UnknownText_0x784f0: +CamperTodd1AfterText: text "Maybe I should" line "take one to a DAY-" @@ -564,7 +579,7 @@ UnknownText_0x784f0: line "some items…" done -UnknownText_0x78532: +CamperToddSaleText: text "Shopping under the" line "sky!" @@ -584,24 +599,24 @@ PicnickerGina1BeatenText: line "can't win…" done -UnknownText_0x785b8: +PicnickerGina1AfterText: text "You're too strong" line "to be a practice" cont "partner." done -UnknownText_0x785e4: +OfficerKeithSeenText: text "Who goes there?" line "What are you up" cont "to?" done -UnknownText_0x78609: +OfficerKeithWinText: text "You're a tough" line "little kid." done -UnknownText_0x78624: +OfficerKeithAfterText: text "Yep, I see nothing" line "wrong today. You" @@ -609,7 +624,7 @@ UnknownText_0x78624: line "out of trouble." done -UnknownText_0x7866a: +OfficerKeithDaytimeText: text "I'm on patrol for" line "suspicious indi-" cont "viduals." @@ -629,7 +644,7 @@ PokefanmBrandonBeatenText: line "this way?" done -UnknownText_0x786fc: +PokefanmBrandonAfterText: text "My #MON knew" line "moves I didn't" cont "know it had." @@ -648,13 +663,13 @@ CooltrainerfIreneBeatenText: line "Too strong!" done -UnknownText_0x7877f: +CooltrainerfIreneAfterText1: text "IRENE: My sister" line "KATE will get you" cont "for this!" done -UnknownText_0x787ad: +CooltrainerfIreneAfterText2: text "IRENE: Isn't this" line "beach great?" @@ -673,13 +688,13 @@ CooltrainerfJennBeatenText: line "IRENE! Sis!" done -UnknownText_0x78836: +CooltrainerfJennAfterText1: text "JENN: Don't get" line "cocky! My sister" cont "KATE is tough!" done -UnknownText_0x78866: +CooltrainerfJennAfterText2: text "JENN: Sunlight" line "makes your body" cont "stronger." @@ -696,7 +711,7 @@ CooltrainerfKateBeatenText: line "believe I lost." done -UnknownText_0x788e2: +CooltrainerfKateOfferSoftSandText: text "KATE: You're too" line "strong. I didn't" cont "stand a chance." @@ -705,7 +720,7 @@ UnknownText_0x788e2: line "this." done -UnknownText_0x7892b: +CooltrainerfKateAfterText: text "KATE: I'm sorry we" line "jumped you." @@ -716,12 +731,12 @@ UnknownText_0x7892b: line "startled us." done -UnknownText_0x7898a: +MapRoute34UnusedSignpostText: text "ILEX FOREST" line "THROUGH THE GATE" done -UnknownText_0x789a8: +MapRoute34Signpost0Text: text "ROUTE 34" para "GOLDENROD CITY -" @@ -731,7 +746,7 @@ UnknownText_0x789a8: line "SOMEWHERE BETWEEN" done -UnknownText_0x789ed: +MapRoute34Signpost1Text: text "TRAINER TIPS" para "BERRY trees grow" @@ -743,7 +758,7 @@ UnknownText_0x789ed: cont "which BERRIES." done -UnknownText_0x78a52: +MapRoute34Signpost2Text: text "DAY-CARE" para "LET US RAISE YOUR" @@ -770,8 +785,8 @@ Route34_MapEventHeader: signpost 6, 12, SIGNPOST_READ, MapRoute34Signpost0Script signpost 33, 13, SIGNPOST_READ, MapRoute34Signpost1Script signpost 13, 10, SIGNPOST_READ, MapRoute34Signpost2Script - signpost 32, 8, SIGNPOST_ITEM, MapRoute34SignpostItem3 - signpost 19, 17, SIGNPOST_ITEM, MapRoute34SignpostItem4 + signpost 32, 8, SIGNPOST_ITEM, Route34HiddenRareCandy + signpost 19, 17, SIGNPOST_ITEM, Route34HiddenSuperPotion .PersonEvents: db 13 @@ -779,12 +794,12 @@ Route34_MapEventHeader: person_event SPRITE_YOUNGSTER, 32, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1 person_event SPRITE_YOUNGSTER, 20, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterIan, -1 person_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerGina1, -1 - person_event SPRITE_OFFICER, 11, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7824c, -1 + person_event SPRITE_OFFICER, 11, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerKeithScript, -1 person_event SPRITE_POKEFAN_M, 28, 18, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1 - person_event SPRITE_GRAMPS, 16, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x7803d, EVENT_DAYCARE_MAN_ON_ROUTE_34 - person_event SPRITE_DAYCARE_MON_1, 18, 14, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaycareMon1Script_0x78065, EVENT_DAYCARE_MON_1 - person_event SPRITE_DAYCARE_MON_2, 19, 17, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaycareMon2Script_0x7806b, EVENT_DAYCARE_MON_2 + person_event SPRITE_GRAMPS, 16, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAYCARE_MAN_ON_ROUTE_34 + person_event SPRITE_DAYCARE_MON_1, 18, 14, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaycareMon1Script, EVENT_DAYCARE_MON_1 + person_event SPRITE_DAYCARE_MON_2, 19, 17, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaycareMon2Script, EVENT_DAYCARE_MON_2 person_event SPRITE_COOLTRAINER_F, 48, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1 person_event SPRITE_COOLTRAINER_F, 48, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1 person_event SPRITE_COOLTRAINER_F, 51, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1 - person_event SPRITE_POKE_BALL, 30, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7832b, EVENT_ROUTE_34_NUGGET + person_event SPRITE_POKE_BALL, 30, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 78c161082..ad3e5c5e0 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -1,3 +1,9 @@ +const_value set 2 + const ROUTE34ILEXFORESTGATE_TEACHER1 + const ROUTE34ILEXFORESTGATE_BUTTERFREE + const ROUTE34ILEXFORESTGATE_LASS + const ROUTE34ILEXFORESTGATE_TEACHER2 + Route34IlexForestGate_MapScriptHeader: .MapTriggers: db 0 @@ -12,64 +18,64 @@ Route34IlexForestGate_MapScriptHeader: UnknownScript_0x62d2d: checkevent EVENT_FOREST_IS_RESTLESS iffalse UnknownScript_0x62d38 - disappear $2 - appear $5 + disappear ROUTE34ILEXFORESTGATE_TEACHER1 + appear ROUTE34ILEXFORESTGATE_TEACHER2 return UnknownScript_0x62d38: - disappear $5 - appear $2 + disappear ROUTE34ILEXFORESTGATE_TEACHER2 + appear ROUTE34ILEXFORESTGATE_TEACHER1 return UnknownScript_0x62d3d: checkevent EVENT_FOREST_IS_RESTLESS iffalse UnknownScript_0x62d62 - showemote EMOTE_SHOCK, $5, 20 - spriteface $5, LEFT + showemote EMOTE_SHOCK, ROUTE34ILEXFORESTGATE_TEACHER2, 20 + spriteface ROUTE34ILEXFORESTGATE_TEACHER2, LEFT spriteface PLAYER, RIGHT - follow PLAYER, $5 + follow PLAYER, ROUTE34ILEXFORESTGATE_TEACHER2 applymovement PLAYER, MovementData_0x62d97 stopfollow spriteface PLAYER, DOWN - loadfont + opentext writetext UnknownText_0x62e41 + waitbutton closetext - loadmovesprites - applymovement $5, MovementData_0x62d9a + applymovement ROUTE34ILEXFORESTGATE_TEACHER2, MovementData_0x62d9a UnknownScript_0x62d62: end TeacherScript_0x62d63: faceplayer - loadfont + opentext checkevent EVENT_FOREST_IS_RESTLESS iftrue UnknownScript_0x62d84 checkevent EVENT_GOT_TM12_SWEET_SCENT iftrue UnknownScript_0x62d7e writetext UnknownText_0x62d9d - keeptextopen + buttonsound verbosegiveitem TM_SWEET_SCENT iffalse UnknownScript_0x62d82 setevent EVENT_GOT_TM12_SWEET_SCENT UnknownScript_0x62d7e: writetext UnknownText_0x62df6 - closetext + waitbutton UnknownScript_0x62d82: - loadmovesprites + closetext end UnknownScript_0x62d84: writetext UnknownText_0x62e41 - keeptextopen - loadmovesprites + buttonsound + closetext end ButterfreeScript_0x62d8a: - loadfont + opentext writetext UnknownText_0x62e83 cry BUTTERFREE + waitbutton closetext - loadmovesprites end LassScript_0x62d94: diff --git a/maps/Route35.asm b/maps/Route35.asm index c4175e7b6..68f00f694 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -1,3 +1,16 @@ +const_value set 2 + const ROUTE35_YOUNGSTER1 + const ROUTE35_YOUNGSTER2 + const ROUTE35_LASS1 + const ROUTE35_LASS2 + const ROUTE35_YOUNGSTER3 + const ROUTE35_FISHER + const ROUTE35_BUG_CATCHER + const ROUTE35_SUPER_NERD + const ROUTE35_OFFICER + const ROUTE35_FRUIT_TREE + const ROUTE35_POKE_BALL + Route35_MapScriptHeader: .MapTriggers: db 0 @@ -9,11 +22,11 @@ TrainerBird_keeperBryan: trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, 0, Bird_keeperBryanScript Bird_keeperBryanScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19cc87 + waitbutton closetext - loadmovesprites end TrainerJugglerIrwin: @@ -21,14 +34,14 @@ TrainerJugglerIrwin: JugglerIrwin1Script: writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN - talkaftercancel - loadfont + end_if_just_battled + opentext checkcellnum PHONE_JUGGLER_IRWIN iftrue UnknownScript_0x19c90f checkevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19c8ec writetext UnknownText_0x19cd5a - keeptextopen + buttonsound setevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x19c903 jump UnknownScript_0x19c8ef @@ -75,44 +88,44 @@ TrainerCamperIvan: trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, CamperIvanScript CamperIvanScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19cac4 + waitbutton closetext - loadmovesprites end TrainerCamperElliot: trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, CamperElliotScript CamperElliotScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19cb47 + waitbutton closetext - loadmovesprites end TrainerPicnickerBrooke: trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, PicnickerBrookeScript PicnickerBrookeScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19cbba + waitbutton closetext - loadmovesprites end TrainerPicnickerKim: trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, PicnickerKimScript PicnickerKimScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19cc21 + waitbutton closetext - loadmovesprites end TrainerBug_catcherArnie1: @@ -120,8 +133,8 @@ TrainerBug_catcherArnie1: Bug_catcherArnie1Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_ARNIE iftrue UnknownScript_0x19c9bb checkflag ENGINE_YANMA_SWARM @@ -131,7 +144,7 @@ Bug_catcherArnie1Script: checkevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19c9a4 writetext UnknownText_0x19cdf6 - keeptextopen + buttonsound setevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x19c903 jump UnknownScript_0x19c9a7 @@ -170,7 +183,7 @@ UnknownScript_0x19c9bb: .LoadFight0 loadtrainer BUG_CATCHER, ARNIE1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wArnieFightCount, 1 clearflag ENGINE_ARNIE end @@ -178,7 +191,7 @@ UnknownScript_0x19c9bb: .LoadFight1 loadtrainer BUG_CATCHER, ARNIE2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wArnieFightCount, 2 clearflag ENGINE_ARNIE end @@ -186,7 +199,7 @@ UnknownScript_0x19c9bb: .LoadFight2 loadtrainer BUG_CATCHER, ARNIE3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wArnieFightCount, 3 clearflag ENGINE_ARNIE end @@ -194,7 +207,7 @@ UnknownScript_0x19c9bb: .LoadFight3 loadtrainer BUG_CATCHER, ARNIE4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wArnieFightCount, 4 clearflag ENGINE_ARNIE end @@ -202,63 +215,63 @@ UnknownScript_0x19c9bb: .LoadFight4 loadtrainer BUG_CATCHER, ARNIE5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_ARNIE end UnknownScript_0x19ca2f: writetext UnknownText_0x19ce38 + waitbutton closetext - loadmovesprites end TrainerFirebreatherWalt: trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, FirebreatherWaltScript FirebreatherWaltScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19cebc + waitbutton closetext - loadmovesprites end OfficerScript_0x19ca49: faceplayer - loadfont + opentext checknite iffalse UnknownScript_0x19ca73 checkevent EVENT_BEAT_OFFICER_DIRK iftrue UnknownScript_0x19ca6d playmusic MUSIC_OFFICER_ENCOUNTER writetext UnknownText_0x19ceea + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x19cf06, 0 loadtrainer OFFICER, DIRK startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_OFFICER_DIRK - loadmovesprites + closetext end UnknownScript_0x19ca6d: writetext UnknownText_0x19cf0f + waitbutton closetext - loadmovesprites end UnknownScript_0x19ca73: writetext UnknownText_0x19cf56 + waitbutton closetext - loadmovesprites end MapRoute35Signpost1Script: jumptext UnknownText_0x19cf94 -ItemFragment_0x19ca7c: - db TM_ROLLOUT, 1 +Route35TMRollout: + itemball TM_ROLLOUT FruitTreeScript_0x19ca7e: fruittree FRUITTREE_ROUTE_35 @@ -479,4 +492,4 @@ Route35_MapEventHeader: person_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerJugglerIrwin, -1 person_event SPRITE_OFFICER, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1 person_event SPRITE_FRUIT_TREE, 25, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1 - person_event SPRITE_POKE_BALL, 16, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19ca7c, EVENT_ROUTE_35_TM_ROLLOUT + person_event SPRITE_POKE_BALL, 16, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index 161aa3e1f..b50ccbd91 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE35GOLDENRODGATE_OFFICER + const ROUTE35GOLDENRODGATE_POKEFAN_F + const ROUTE35GOLDENRODGATE_FISHER + Route35Goldenrodgate_MapScriptHeader: .MapTriggers: db 0 @@ -7,7 +12,7 @@ Route35Goldenrodgate_MapScriptHeader: OfficerScript_0x69d37: faceplayer - loadfont + opentext checkevent EVENT_GOT_HP_UP_FROM_RANDY iftrue .gothpup checkevent EVENT_GAVE_KENYA @@ -18,45 +23,45 @@ OfficerScript_0x69d37: yesorno iffalse .refused writetext UnknownText_0x69e48 - keeptextopen - waitbutton + buttonsound + waitsfx checkcode VAR_PARTYCOUNT if_equal PARTY_LENGTH, .partyfull writetext UnknownText_0x69eb8 playsound SFX_KEY_ITEM - waitbutton + waitsfx givepoke SPEAROW, 10, NO_ITEM, 1, GiftSpearowName, GiftSpearowOTName givepokeitem GiftSpearowMail setevent EVENT_GOT_KENYA .alreadyhavekenya: writetext UnknownText_0x69ed6 + waitbutton closetext - loadmovesprites end .partyfull: writetext UnknownText_0x69f56 + waitbutton closetext - loadmovesprites end .refused: writetext UnknownText_0x69f74 + waitbutton closetext - loadmovesprites end .questcomplete: writetext UnknownText_0x69f8b - keeptextopen + buttonsound verbosegiveitem HP_UP iffalse .bagfull setevent EVENT_GOT_HP_UP_FROM_RANDY .gothpup: writetext UnknownText_0x69fd9 - closetext + waitbutton .bagfull: - loadmovesprites + closetext end GiftSpearowMail: @@ -72,18 +77,18 @@ GiftSpearowOTName: PokefanFScript_0x69dc6: faceplayer - loadfont + opentext checkevent EVENT_FOUGHT_SUDOWOODO iftrue .aftersudowoodo writetext UnknownText_0x6a00a + waitbutton closetext - loadmovesprites end .aftersudowoodo: writetext UnknownText_0x6a09a + waitbutton closetext - loadmovesprites end FisherScript_0x69dda: diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index ba5c3516a..d0a770bbe 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE35NATIONALPARKGATE_OFFICER1 + const ROUTE35NATIONALPARKGATE_YOUNGSTER + const ROUTE35NATIONALPARKGATE_OFFICER2 + Route35NationalParkgate_MapScriptHeader: .MapTriggers: db 3 @@ -43,21 +48,21 @@ Route35NationalParkgate_CheckIfContestDay: if_equal SATURDAY, Route35NationalParkgate_IsContestDay checkflag ENGINE_BUG_CONTEST_TIMER iftrue Route35NationalParkgate_Yes - disappear $2 - appear $3 - appear $4 + disappear ROUTE35NATIONALPARKGATE_OFFICER1 + appear ROUTE35NATIONALPARKGATE_YOUNGSTER + appear ROUTE35NATIONALPARKGATE_OFFICER2 return Route35NationalParkgate_IsContestDay: - appear $2 - disappear $3 - disappear $4 + appear ROUTE35NATIONALPARKGATE_OFFICER1 + disappear ROUTE35NATIONALPARKGATE_YOUNGSTER + disappear ROUTE35NATIONALPARKGATE_OFFICER2 return Route35NationalParkGate_LeavingContestEarly: applymovement PLAYER, MovementData_0x6a2e2 - spriteface $2, RIGHT - loadfont + spriteface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT + opentext checkcode VAR_CONTESTMINUTES addvar $1 RAM2MEM $0 @@ -65,18 +70,18 @@ Route35NationalParkGate_LeavingContestEarly: yesorno iffalse Route35NationalParkgate_GoBackIn writetext UnknownText_0x6a7db + waitbutton closetext - loadmovesprites jumpstd bugcontestresultswarp Route35NationalParkgate_GoBackIn: writetext UnknownText_0x6a823 + waitbutton closetext - loadmovesprites scall Route35NationalParkgate_EnterContest playsound SFX_ENTER_DOOR special FadeOutPalettes - waitbutton + waitsfx warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f end @@ -87,7 +92,7 @@ OfficerScript_0x6a204: if_equal WEDNESDAY, Route35NationalParkgate_NoContestToday if_equal FRIDAY, Route35NationalParkgate_NoContestToday faceplayer - loadfont + opentext checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route35NationalParkgate_ContestIsOver scall Route35NationalParkgate_GetDayOfWeek @@ -102,18 +107,18 @@ Route35NationalParkgate_OkayToProceed: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic writetext UnknownText_0x6a39d - keeptextopen + buttonsound writetext UnknownText_0x6a3c7 playsound SFX_ITEM - waitbutton + waitsfx writetext UnknownText_0x6a3e2 + waitbutton closetext - loadmovesprites special Special_GiveParkBalls scall Route35NationalParkgate_EnterContest playsound SFX_ENTER_DOOR special FadeOutPalettes - waitbutton + waitsfx special Special_SelectRandomBugContestContestants warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f end @@ -144,47 +149,47 @@ Route35NationalParkgate_LessThanFullParty: ; 6a27d iftrue Route35NationalParkgate_FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6a537 - keeptextopen + buttonsound writetext UnknownText_0x6a56b playsound SFX_GOT_SAFARI_BALLS - waitbutton - keeptextopen + waitsfx + buttonsound jump Route35NationalParkgate_OkayToProceed Route35NationalParkgate_DeclinedToParticipate: writetext UnknownText_0x6a5dc + waitbutton closetext - loadmovesprites end Route35NationalParkgate_DeclinedToLeaveMonsBehind: writetext UnknownText_0x6a597 + waitbutton closetext - loadmovesprites end Route35NationalParkgate_FirstMonIsFainted: writetext UnknownText_0x6a608 + waitbutton closetext - loadmovesprites end Route35NationalParkgate_NoRoomInBox: writetext UnknownText_0x6a67c + waitbutton closetext - loadmovesprites end Route35NationalParkgate_FirstMonIsEgg: writetext UnknownText_0x6a71f + waitbutton closetext - loadmovesprites end Route35NationalParkgate_ContestIsOver: writetext UnknownText_0x6a84f + waitbutton closetext - loadmovesprites end Route35NationalParkgate_NoContestToday: @@ -192,12 +197,12 @@ Route35NationalParkgate_NoContestToday: OfficerScript_0x6a2ca: faceplayer - loadfont + opentext checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route35NationalParkgate_ContestIsOver writetext UnknownText_0x6a894 + waitbutton closetext - loadmovesprites end YoungsterScript_0x6a2d8: diff --git a/maps/Route36.asm b/maps/Route36.asm index 2fe3e7b28..87e44c101 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -1,3 +1,14 @@ +const_value set 2 + const ROUTE36_YOUNGSTER1 + const ROUTE36_YOUNGSTER2 + const ROUTE36_WEIRD_TREE + const ROUTE36_LASS1 + const ROUTE36_FISHER + const ROUTE36_FRUIT_TREE + const ROUTE36_YOUNGSTER3 + const ROUTE36_LASS2 + const ROUTE36_SUICUNE + Route36_MapScriptHeader: .MapTriggers: db 2 @@ -22,11 +33,11 @@ UnknownScript_0x19400e: ArthurCallback: checkcode VAR_WEEKDAY if_equal THURSDAY, .ArthurAppears - disappear $8 + disappear ROUTE36_YOUNGSTER3 return .ArthurAppears - appear $8 + appear ROUTE36_YOUNGSTER3 return UnknownScript_0x19401b: @@ -34,8 +45,8 @@ UnknownScript_0x19401b: pause 15 playsound SFX_WARP_FROM spriteface PLAYER, UP - applymovement $a, MovementData_0x194262 - disappear $a + applymovement ROUTE36_SUICUNE, MovementData_0x194262 + disappear ROUTE36_SUICUNE spriteface PLAYER, DOWN pause 10 dotrigger $0 @@ -46,48 +57,48 @@ UnknownScript_0x19401b: WeirdTreeScript_0x19403c: checkitem SQUIRTBOTTLE iftrue UnknownScript_0x19404a - waitbutton + waitsfx playsound SFX_SANDSTORM - applymovement $4, MovementData_0x194249 + applymovement ROUTE36_WEIRD_TREE, MovementData_0x194249 end UnknownScript_0x19404a: - loadfont + opentext writetext UnknownText_0x19426b yesorno iffalse UnknownScript_0x194079 - loadmovesprites + closetext ; fallthrough WateredWeirdTreeScript:: - loadfont + opentext writetext UnknownText_0x194290 - closetext - loadmovesprites waitbutton + closetext + waitsfx playsound SFX_SANDSTORM - applymovement $4, MovementData_0x194249 - loadfont + applymovement ROUTE36_WEIRD_TREE, MovementData_0x194249 + opentext writetext UnknownText_0x1942aa + waitbutton closetext - loadmovesprites - loadpokedata SUDOWOODO, 20 + loadwildmon SUDOWOODO, 20 startbattle setevent EVENT_FOUGHT_SUDOWOODO if_equal $2, UnknownScript_0x19407b - disappear $4 + disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN - returnafterbattle + reloadmapafterbattle end UnknownScript_0x194079: - loadmovesprites + closetext end UnknownScript_0x19407b: - returnafterbattle - applymovement $4, MovementData_0x19424b - disappear $4 + reloadmapafterbattle + applymovement ROUTE36_WEIRD_TREE, MovementData_0x19424b + disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN special RunCallback_04 special RefreshSprites @@ -95,70 +106,70 @@ UnknownScript_0x19407b: LassScript_0x19408c: faceplayer - loadfont + opentext checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP iftrue UnknownScript_0x1940b3 setevent EVENT_MET_FLORIA writetext UnknownText_0x1942f1 + waitbutton closetext - loadmovesprites clearevent EVENT_FLORIA_AT_FLOWER_SHOP checkcode VAR_FACING - if_equal $1, UnknownScript_0x1940ac - applymovement $9, MovementData_0x19424e - disappear $9 + if_equal UP, UnknownScript_0x1940ac + applymovement ROUTE36_LASS2, MovementData_0x19424e + disappear ROUTE36_LASS2 end UnknownScript_0x1940ac: - applymovement $9, MovementData_0x194258 - disappear $9 + applymovement ROUTE36_LASS2, MovementData_0x194258 + disappear ROUTE36_LASS2 end UnknownScript_0x1940b3: writetext UnknownText_0x1943ed + waitbutton closetext - loadmovesprites end FisherScript_0x1940b9: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM08_ROCK_SMASH iftrue UnknownScript_0x1940da checkevent EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x1940cd writetext UnknownText_0x19446f + waitbutton closetext - loadmovesprites end UnknownScript_0x1940cd: writetext UnknownText_0x1944d0 - keeptextopen + buttonsound verbosegiveitem TM_ROCK_SMASH iffalse UnknownScript_0x1940de setevent EVENT_GOT_TM08_ROCK_SMASH UnknownScript_0x1940da: writetext UnknownText_0x19452c - closetext + waitbutton UnknownScript_0x1940de: - loadmovesprites + closetext end LassScript_0x1940e0: faceplayer - loadfont + opentext checkevent EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x1940ee writetext UnknownText_0x194626 + waitbutton closetext - loadmovesprites end UnknownScript_0x1940ee: writetext UnknownText_0x19469e + waitbutton closetext - loadmovesprites end TrainerSchoolboyAlan1: @@ -166,8 +177,8 @@ TrainerSchoolboyAlan1: SchoolboyAlan1Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_ALAN - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_ALAN iftrue UnknownScript_0x194140 checkflag ENGINE_ALAN_HAS_FIRE_STONE @@ -177,7 +188,7 @@ SchoolboyAlan1Script: checkevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x194129 writetext UnknownText_0x1947aa - keeptextopen + buttonsound setevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x1941c9 jump UnknownScript_0x19412c @@ -216,7 +227,7 @@ UnknownScript_0x194140: .LoadFight0 loadtrainer SCHOOLBOY, ALAN1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAlanFightCount, 1 clearflag ENGINE_ALAN end @@ -224,7 +235,7 @@ UnknownScript_0x194140: .LoadFight1 loadtrainer SCHOOLBOY, ALAN2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAlanFightCount, 2 clearflag ENGINE_ALAN end @@ -232,7 +243,7 @@ UnknownScript_0x194140: .LoadFight2 loadtrainer SCHOOLBOY, ALAN3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAlanFightCount, 3 clearflag ENGINE_ALAN end @@ -240,7 +251,7 @@ UnknownScript_0x194140: .LoadFight3 loadtrainer SCHOOLBOY, ALAN4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wAlanFightCount, 4 clearflag ENGINE_ALAN end @@ -248,7 +259,7 @@ UnknownScript_0x194140: .LoadFight4 loadtrainer SCHOOLBOY, ALAN5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_ALAN end @@ -303,16 +314,16 @@ TrainerPsychicMark: trainer EVENT_BEAT_PSYCHIC_MARK, PSYCHIC_T, MARK, PsychicMarkSeenText, PsychicMarkBeatenText, 0, PsychicMarkScript PsychicMarkScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19471e + waitbutton closetext - loadmovesprites end ArthurScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_HARD_STONE_FROM_ARTHUR iftrue ArthurThursdayScript checkcode VAR_WEEKDAY @@ -320,30 +331,30 @@ ArthurScript: checkevent EVENT_MET_ARTHUR_OF_THURSDAY iftrue .MetArthur writetext MeetArthurText - keeptextopen + buttonsound setevent EVENT_MET_ARTHUR_OF_THURSDAY .MetArthur writetext ArthurGivesGiftText - keeptextopen + buttonsound verbosegiveitem HARD_STONE iffalse ArthurDoneScript setevent EVENT_GOT_HARD_STONE_FROM_ARTHUR writetext ArthurGaveGiftText + waitbutton closetext - loadmovesprites end ArthurThursdayScript: writetext ArthurThursdayText - closetext + waitbutton ArthurDoneScript: - loadmovesprites + closetext end ArthurNotThursdayScript: writetext ArthurNotThursdayText + waitbutton closetext - loadmovesprites end MapRoute36Signpost2Script: diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index 03c8c2474..0a93c0d98 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -1,11 +1,25 @@ +const_value set 2 + const ROUTE36NATIONALPARKGATE_OFFICER1 + const ROUTE36NATIONALPARKGATE_YOUNGSTER1 + const ROUTE36NATIONALPARKGATE_YOUNGSTER2 + const ROUTE36NATIONALPARKGATE_ROCKER + const ROUTE36NATIONALPARKGATE_POKEFAN_M + const ROUTE36NATIONALPARKGATE_YOUNGSTER3 + const ROUTE36NATIONALPARKGATE_YOUNGSTER4 + const ROUTE36NATIONALPARKGATE_LASS + const ROUTE36NATIONALPARKGATE_YOUNGSTER5 + const ROUTE36NATIONALPARKGATE_YOUNGSTER6 + const ROUTE36NATIONALPARKGATE_YOUNGSTER7 + const ROUTE36NATIONALPARKGATE_OFFICER2 + Route36NationalParkgate_MapScriptHeader: .MapTriggers: db 3 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 dw .Trigger2, 0 - dw .Trigger3, 0 .MapCallbacks: db 2 @@ -16,13 +30,13 @@ Route36NationalParkgate_MapScriptHeader: dbw 2, .CheckIfContestAvailable -.Trigger1: +.Trigger0: end -.Trigger2: +.Trigger1: end -.Trigger3: +.Trigger2: priorityjump .LeftTheContestEarly end @@ -45,19 +59,19 @@ Route36NationalParkgate_MapScriptHeader: if_equal SATURDAY, .SetContestOfficer checkflag ENGINE_BUG_CONTEST_TIMER iftrue .SetContestOfficer - disappear $2 - appear $d + disappear ROUTE36NATIONALPARKGATE_OFFICER1 + appear ROUTE36NATIONALPARKGATE_OFFICER2 return .SetContestOfficer: - appear $2 - disappear $d + appear ROUTE36NATIONALPARKGATE_OFFICER1 + disappear ROUTE36NATIONALPARKGATE_OFFICER2 .Return: return .LeftTheContestEarly: spriteface PLAYER, UP - loadfont + opentext checkcode VAR_CONTESTMINUTES addvar $1 RAM2MEM $0 @@ -65,13 +79,13 @@ Route36NationalParkgate_MapScriptHeader: yesorno iffalse .GoBackToContest writetext UnknownText_0x6b2c5 + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes scall .CopyContestants - disappear $2 - appear $d + disappear ROUTE36NATIONALPARKGATE_OFFICER1 + appear ROUTE36NATIONALPARKGATE_OFFICER2 applymovement PLAYER, MovementData_0x6add1 pause 15 special Special_FadeInQuickly @@ -79,55 +93,55 @@ Route36NationalParkgate_MapScriptHeader: .GoBackToContest: writetext UnknownText_0x6b300 + waitbutton closetext - loadmovesprites spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING special FadeOutPalettes - waitbutton + waitsfx warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 end .CopyContestants: checkevent EVENT_BUG_CATCHING_CONTESTANT_1A iftrue .Not1 - appear $3 + appear ROUTE36NATIONALPARKGATE_YOUNGSTER1 .Not1: checkevent EVENT_BUG_CATCHING_CONTESTANT_2A iftrue .Not2 - appear $4 + appear ROUTE36NATIONALPARKGATE_YOUNGSTER2 .Not2: checkevent EVENT_BUG_CATCHING_CONTESTANT_3A iftrue .Not3 - appear $5 + appear ROUTE36NATIONALPARKGATE_ROCKER .Not3: checkevent EVENT_BUG_CATCHING_CONTESTANT_4A iftrue .Not4 - appear $6 + appear ROUTE36NATIONALPARKGATE_POKEFAN_M .Not4: checkevent EVENT_BUG_CATCHING_CONTESTANT_5A iftrue .Not5 - appear $7 + appear ROUTE36NATIONALPARKGATE_YOUNGSTER3 .Not5: checkevent EVENT_BUG_CATCHING_CONTESTANT_6A iftrue .Not6 - appear $8 + appear ROUTE36NATIONALPARKGATE_YOUNGSTER4 .Not6: checkevent EVENT_BUG_CATCHING_CONTESTANT_7A iftrue .Not7 - appear $9 + appear ROUTE36NATIONALPARKGATE_LASS .Not7: checkevent EVENT_BUG_CATCHING_CONTESTANT_8A iftrue .Not8 - appear $a + appear ROUTE36NATIONALPARKGATE_YOUNGSTER5 .Not8: checkevent EVENT_BUG_CATCHING_CONTESTANT_9A iftrue .Not9 - appear $b + appear ROUTE36NATIONALPARKGATE_YOUNGSTER6 .Not9: checkevent EVENT_BUG_CATCHING_CONTESTANT_10A iftrue .Not10 - appear $c + appear ROUTE36NATIONALPARKGATE_YOUNGSTER7 .Not10: special UpdateSprites end @@ -139,7 +153,7 @@ Route36OfficerScriptContest: if_equal WEDNESDAY, _ContestNotOn if_equal FRIDAY, _ContestNotOn faceplayer - loadfont + opentext checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route36Officer_ContestHasConcluded scall Route36Parkgate_DayToText @@ -154,20 +168,20 @@ Route36OfficerScriptContest: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic writetext UnknownText_0x6ae87 - keeptextopen - waitbutton + buttonsound + waitsfx writetext UnknownText_0x6aeb1 playsound SFX_ITEM - waitbutton + waitsfx writetext UnknownText_0x6aecc + waitbutton closetext - loadmovesprites setflag ENGINE_BUG_CONTEST_TIMER special Special_GiveParkBalls spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING special FadeOutPalettes - waitbutton + waitsfx special Special_SelectRandomBugContestContestants warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 end @@ -187,41 +201,41 @@ Route36OfficerScriptContest: iftrue .FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6b021 - keeptextopen + buttonsound writetext UnknownText_0x6b055 playsound SFX_GOT_SAFARI_BALLS - waitbutton - keeptextopen + waitsfx + buttonsound jump .ResumeStartingContest .DecidedNotToJoinContest: writetext UnknownText_0x6b0c6 + waitbutton closetext - loadmovesprites end .RefusedToLeaveMons: writetext UnknownText_0x6b081 + waitbutton closetext - loadmovesprites end .FirstMonIsFainted: writetext UnknownText_0x6b0f2 + waitbutton closetext - loadmovesprites end .BoxFull: writetext UnknownText_0x6b166 + waitbutton closetext - loadmovesprites end .FirstMonIsEgg: writetext UnknownText_0x6b209 + waitbutton closetext - loadmovesprites end Route36Officer_ContestHasConcluded: @@ -234,50 +248,50 @@ Route36Officer_ContestHasConcluded: checkevent EVENT_CONTEST_OFFICER_HAS_BERRY iftrue .Berry writetext UnknownText_0x6b32b + waitbutton closetext - loadmovesprites end .Sunstone: writetext UnknownText_0x6b97f - keeptextopen + buttonsound verbosegiveitem SUN_STONE iffalse .BagFull clearevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE - loadmovesprites + closetext end .Everstone: writetext UnknownText_0x6b97f - keeptextopen + buttonsound verbosegiveitem EVERSTONE iffalse .BagFull clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE - loadmovesprites + closetext end .GoldBerry: writetext UnknownText_0x6b97f - keeptextopen + buttonsound verbosegiveitem GOLD_BERRY iffalse .BagFull clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY - loadmovesprites + closetext end .Berry: writetext UnknownText_0x6b97f - keeptextopen + buttonsound verbosegiveitem BERRY iffalse .BagFull clearevent EVENT_CONTEST_OFFICER_HAS_BERRY - loadmovesprites + closetext end .BagFull: writetext UnknownText_0x6b910 + waitbutton closetext - loadmovesprites end _ContestNotOn: @@ -285,12 +299,12 @@ _ContestNotOn: OfficerScript_0x6acf4: faceplayer - loadfont + opentext checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route36Officer_ContestHasConcluded writetext UnknownText_0x6b370 + waitbutton closetext - loadmovesprites end Route36Parkgate_DayToText: @@ -299,162 +313,162 @@ Route36Parkgate_DayToText: YoungsterScript_0x6ad06: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad14 writetext UnknownText_0x6b399 + waitbutton closetext - loadmovesprites end UnknownScript_0x6ad14: writetext UnknownText_0x6b3c4 + waitbutton closetext - loadmovesprites end YoungsterScript_0x6ad1a: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad28 writetext UnknownText_0x6b40f + waitbutton closetext - loadmovesprites end UnknownScript_0x6ad28: writetext UnknownText_0x6b440 + waitbutton closetext - loadmovesprites end RockerScript_0x6ad2e: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad3c writetext UnknownText_0x6b462 + waitbutton closetext - loadmovesprites end UnknownScript_0x6ad3c: writetext UnknownText_0x6b496 + waitbutton closetext - loadmovesprites end PokefanMScript_0x6ad42: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad50 writetext UnknownText_0x6b4da + waitbutton closetext - loadmovesprites end UnknownScript_0x6ad50: writetext UnknownText_0x6b50a + waitbutton closetext - loadmovesprites end YoungsterScript_0x6ad56: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad64 writetext UnknownText_0x6b54e + waitbutton closetext - loadmovesprites end UnknownScript_0x6ad64: writetext UnknownText_0x6b57c + waitbutton closetext - loadmovesprites end YoungsterScript_0x6ad6a: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad78 writetext UnknownText_0x6b5b0 + waitbutton closetext - loadmovesprites end UnknownScript_0x6ad78: writetext UnknownText_0x6b5dd + waitbutton closetext - loadmovesprites end LassScript_0x6ad7e: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad8c writetext UnknownText_0x6b64b + waitbutton closetext - loadmovesprites end UnknownScript_0x6ad8c: writetext UnknownText_0x6b698 + waitbutton closetext - loadmovesprites end YoungsterScript_0x6ad92: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ada0 writetext UnknownText_0x6b6b8 + waitbutton closetext - loadmovesprites end UnknownScript_0x6ada0: writetext UnknownText_0x6b6e9 + waitbutton closetext - loadmovesprites end YoungsterScript_0x6ada6: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6adb4 writetext UnknownText_0x6b71b + waitbutton closetext - loadmovesprites end UnknownScript_0x6adb4: writetext UnknownText_0x6b740 + waitbutton closetext - loadmovesprites end YoungsterScript_0x6adba: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6adc8 writetext UnknownText_0x6b76f + waitbutton closetext - loadmovesprites end UnknownScript_0x6adc8: writetext UnknownText_0x6b7af + waitbutton closetext - loadmovesprites end UnknownScript_0x6adce: diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm index b24097c80..88ba737f4 100644 --- a/maps/Route36RuinsofAlphgate.asm +++ b/maps/Route36RuinsofAlphgate.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE36RUINSOFALPHGATE_OFFICER + const ROUTE36RUINSOFALPHGATE_GRAMPS + Route36RuinsofAlphgate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route37.asm b/maps/Route37.asm index 47a5d5bda..54081e849 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -1,3 +1,12 @@ +const_value set 2 + const ROUTE37_WEIRD_TREE1 + const ROUTE37_WEIRD_TREE2 + const ROUTE37_YOUNGSTER + const ROUTE37_FRUIT_TREE1 + const ROUTE37_BUG_CATCHER + const ROUTE37_FRUIT_TREE2 + const ROUTE37_FRUIT_TREE3 + Route37_MapScriptHeader: .MapTriggers: db 0 @@ -12,49 +21,49 @@ Route37_MapScriptHeader: SunnyCallback: checkcode VAR_WEEKDAY if_equal SUNDAY, .SunnyAppears - disappear $6 + disappear ROUTE37_BUG_CATCHER return .SunnyAppears - appear $6 + appear ROUTE37_BUG_CATCHER return TrainerTwinsAnnandanne1: trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, TwinsAnnandanne1Script TwinsAnnandanne1Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a8e62 + waitbutton closetext - loadmovesprites end TrainerTwinsAnnandanne2: trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, TwinsAnnandanne2Script TwinsAnnandanne2Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a8eec + waitbutton closetext - loadmovesprites end TrainerPsychicGreg: trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, PsychicGregScript PsychicGregScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a8f80 + waitbutton closetext - loadmovesprites end SunnyScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_MAGNET_FROM_SUNNY iftrue SunnySundayScript checkcode VAR_WEEKDAY @@ -62,37 +71,37 @@ SunnyScript: checkevent EVENT_MET_SUNNY_OF_SUNDAY iftrue .MetSunny writetext MeetSunnyText - keeptextopen + buttonsound setevent EVENT_MET_SUNNY_OF_SUNDAY .MetSunny checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Kris writetext SunnyGivesGiftText1 - keeptextopen + buttonsound jump .next .Kris writetext SunnyGivesGiftText2 - keeptextopen + buttonsound .next verbosegiveitem MAGNET iffalse SunnyDoneScript setevent EVENT_GOT_MAGNET_FROM_SUNNY writetext SunnyGaveGiftText + waitbutton closetext - loadmovesprites end SunnySundayScript: writetext SunnySundayText - closetext + waitbutton SunnyDoneScript: - loadmovesprites + closetext end SunnyNotSundayScript: writetext SunnyNotSundayText + waitbutton closetext - loadmovesprites end MapRoute37Signpost0Script: @@ -107,7 +116,7 @@ FruitTreeScript_0x1a8e0b: FruitTreeScript_0x1a8e0d: fruittree FRUITTREE_ROUTE_37_3 -MapRoute37SignpostItem1: +Route37HiddenEther: dwb EVENT_ROUTE_37_HIDDEN_ETHER, ETHER @@ -245,7 +254,7 @@ Route37_MapEventHeader: .Signposts: db 2 signpost 3, 5, SIGNPOST_READ, MapRoute37Signpost0Script - signpost 2, 4, SIGNPOST_ITEM, MapRoute37SignpostItem1 + signpost 2, 4, SIGNPOST_ITEM, Route37HiddenEther .PersonEvents: db 7 diff --git a/maps/Route38.asm b/maps/Route38.asm index bf5bacf48..14d7cf852 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -1,3 +1,12 @@ +const_value set 2 + const ROUTE38_STANDING_YOUNGSTER1 + const ROUTE38_LASS + const ROUTE38_STANDING_YOUNGSTER2 + const ROUTE38_BUENA1 + const ROUTE38_SAILOR + const ROUTE38_FRUIT_TREE + const ROUTE38_BUENA2 + Route38_MapScriptHeader: .MapTriggers: db 0 @@ -9,22 +18,22 @@ TrainerBird_keeperToby: trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, .script .script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a1f86 + waitbutton closetext - loadmovesprites end TrainerSailorHarry: trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .script .script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a220c + waitbutton closetext - loadmovesprites end TrainerLassDana1: @@ -32,8 +41,8 @@ TrainerLassDana1: .script: writecode VAR_CALLERID, PHONE_LASS_DANA - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_DANA iftrue .DanaRematch checkflag ENGINE_DANA_HAS_THUNDERSTONE @@ -43,7 +52,7 @@ TrainerLassDana1: checkevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER iftrue .SecondTimeAsking writetext UnknownText_0x1a20ec - keeptextopen + buttonsound setevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER scall .AskNumber1F jump .AskForPhoneNumber @@ -82,7 +91,7 @@ TrainerLassDana1: .LoadFight0 loadtrainer LASS, DANA1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wDanaFightCount, 1 clearflag ENGINE_DANA end @@ -90,7 +99,7 @@ TrainerLassDana1: .LoadFight1 loadtrainer LASS, DANA2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wDanaFightCount, 2 clearflag ENGINE_DANA end @@ -98,7 +107,7 @@ TrainerLassDana1: .LoadFight2 loadtrainer LASS, DANA3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wDanaFightCount, 3 clearflag ENGINE_DANA end @@ -106,7 +115,7 @@ TrainerLassDana1: .LoadFight3 loadtrainer LASS, DANA4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wDanaFightCount, 4 clearflag ENGINE_DANA end @@ -114,7 +123,7 @@ TrainerLassDana1: .LoadFight4 loadtrainer LASS, DANA5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_DANA end @@ -170,8 +179,8 @@ TrainerSchoolboyChad1: .script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_CHAD iftrue .ChadRematch checkcellnum PHONE_SCHOOLBOY_CHAD @@ -179,7 +188,7 @@ TrainerSchoolboyChad1: checkevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER iftrue .SecondTimeAsking writetext UnknownText_0x1a200e - keeptextopen + buttonsound setevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER scall .AskPhoneNumber1 jump .AskToRegisterNumber @@ -218,7 +227,7 @@ TrainerSchoolboyChad1: .LoadFight0 loadtrainer SCHOOLBOY, CHAD1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wChadFightCount, 1 clearflag ENGINE_CHAD end @@ -226,7 +235,7 @@ TrainerSchoolboyChad1: .LoadFight1 loadtrainer SCHOOLBOY, CHAD2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wChadFightCount, 2 clearflag ENGINE_CHAD end @@ -234,7 +243,7 @@ TrainerSchoolboyChad1: .LoadFight2 loadtrainer SCHOOLBOY, CHAD3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wChadFightCount, 3 clearflag ENGINE_CHAD end @@ -242,7 +251,7 @@ TrainerSchoolboyChad1: .LoadFight3 loadtrainer SCHOOLBOY, CHAD4 startbattle - returnafterbattle + reloadmapafterbattle loadvar wChadFightCount, 4 clearflag ENGINE_CHAD end @@ -250,7 +259,7 @@ TrainerSchoolboyChad1: .LoadFight4 loadtrainer SCHOOLBOY, CHAD5 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_CHAD end @@ -286,22 +295,22 @@ TrainerBeautyValerie: trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .script .script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a2185 + waitbutton closetext - loadmovesprites end TrainerBeautyOlivia: trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .script .script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a229a + waitbutton closetext - loadmovesprites end MapRoute38Signpost0Script: diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index afeb6000c..7e376b413 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE38ECRUTEAKGATE_OFFICER + Route38EcruteakGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route39.asm b/maps/Route39.asm index 515314981..bf8b1c772 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -1,3 +1,15 @@ +const_value set 2 + const ROUTE39_SAILOR + const ROUTE39_POKEFAN_M + const ROUTE39_POKEFAN_F1 + const ROUTE39_TAUROS1 + const ROUTE39_TAUROS2 + const ROUTE39_TAUROS3 + const ROUTE39_TAUROS4 + const ROUTE39_STANDING_YOUNGSTER + const ROUTE39_FRUIT_TREE + const ROUTE39_POKEFAN_F2 + Route39_MapScriptHeader: .MapTriggers: db 0 @@ -6,11 +18,11 @@ Route39_MapScriptHeader: db 0 TaurosScript_0x1a5af5: - loadfont + opentext writetext UnknownText_0x1a5bf9 cry MILTANK + waitbutton closetext - loadmovesprites end TrainerPokefanmDerek1: @@ -18,8 +30,8 @@ TrainerPokefanmDerek1: PokefanmDerek1Script: writecode VAR_CALLERID, PHONE_POKEFANM_DEREK - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_DEREK_HAS_NUGGET iftrue UnknownScript_0x1a5b4a checkcellnum PHONE_POKEFANM_DEREK @@ -29,7 +41,7 @@ PokefanmDerek1Script: checkevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a5b33 writetext UnknownText_0x1a5cf8 - keeptextopen + buttonsound setevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x1a5b62 jump UnknownScript_0x1a5b36 @@ -56,8 +68,8 @@ UnknownScript_0x1a5b59: UnknownScript_0x1a5b5c: writetext UnknownText_0x1a5dec + waitbutton closetext - loadmovesprites end UnknownScript_0x1a5b62: @@ -96,63 +108,63 @@ TrainerPokefanfRuth: trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, PokefanfRuthScript PokefanfRuthScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a5db2 + waitbutton closetext - loadmovesprites end TrainerSailorEugene: trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, SailorEugeneScript SailorEugeneScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a5c4d + waitbutton closetext - loadmovesprites end TrainerPsychicNorman: trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, PsychicNormanScript PsychicNormanScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a5e57 + waitbutton closetext - loadmovesprites end PokefanFScript_0x1a5bbe: faceplayer - loadfont + opentext checknite iffalse UnknownScript_0x1a5be5 checkevent EVENT_BEAT_POKEFANF_JAIME iftrue UnknownScript_0x1a5bdf writetext UnknownText_0x1a5ee8 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x1a5f17, 0 loadtrainer POKEFANF, JAIME startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_POKEFANF_JAIME - loadmovesprites + closetext end UnknownScript_0x1a5bdf: writetext UnknownText_0x1a5f31 + waitbutton closetext - loadmovesprites end UnknownScript_0x1a5be5: writetext UnknownText_0x1a5ec4 + waitbutton closetext - loadmovesprites end MapRoute39Signpost2Script: @@ -167,7 +179,7 @@ MapRoute39Signpost0Script: FruitTreeScript_0x1a5bf4: fruittree FRUITTREE_ROUTE_39 -MapRoute39SignpostItem3: +Route39HiddenNugget: dwb EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET @@ -349,7 +361,7 @@ Route39_MapEventHeader: signpost 31, 5, SIGNPOST_READ, MapRoute39Signpost0Script signpost 5, 9, SIGNPOST_READ, MapRoute39Signpost1Script signpost 7, 15, SIGNPOST_READ, MapRoute39Signpost2Script - signpost 13, 5, SIGNPOST_ITEM, MapRoute39SignpostItem3 + signpost 13, 5, SIGNPOST_ITEM, Route39HiddenNugget .PersonEvents: db 10 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index d4574eac6..45cc8f92a 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE39BARN_TWIN1 + const ROUTE39BARN_TWIN2 + const ROUTE39BARN_TAUROS + Route39Barn_MapScriptHeader: .MapTriggers: db 0 @@ -7,57 +12,57 @@ Route39Barn_MapScriptHeader: TwinScript_0x9cc76: faceplayer - loadfont + opentext checkevent EVENT_HEALED_MOOMOO iftrue .FeedingMooMoo writetext Text_MoomooIsSick + waitbutton closetext - loadmovesprites - spriteface $2, RIGHT + spriteface ROUTE39BARN_TWIN1, RIGHT end .FeedingMooMoo: writetext Text_WereFeedingMoomoo + waitbutton closetext - loadmovesprites - spriteface $2, RIGHT + spriteface ROUTE39BARN_TWIN1, RIGHT end TwinScript_0x9cc90: faceplayer - loadfont + opentext checkevent EVENT_HEALED_MOOMOO iftrue .FeedingMooMoo writetext Text_MoomooIsSick + waitbutton closetext - loadmovesprites - spriteface $3, LEFT + spriteface ROUTE39BARN_TWIN2, LEFT end .FeedingMooMoo: writetext Text_WereFeedingMoomoo + waitbutton closetext - loadmovesprites - spriteface $3, LEFT + spriteface ROUTE39BARN_TWIN2, LEFT end TaurosScript_0x9ccaa: - loadfont + opentext checkevent EVENT_HEALED_MOOMOO iftrue .HappyCow writetext Text_WeakMoo writebyte MILTANK special PlaySlowCry - keeptextopen + buttonsound writetext Text_ItsCryIsWeak checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO iftrue .GiveBerry + waitbutton closetext - loadmovesprites end .GiveBerry: - keeptextopen + buttonsound writetext Text_AskGiveBerry yesorno iffalse .Refused @@ -71,55 +76,55 @@ TaurosScript_0x9ccaa: if_equal 5, .FiveBerries if_equal 7, .SevenBerries writetext Text_GaveBerry + waitbutton closetext - loadmovesprites end .ThreeBerries: writetext Text_GaveBerry - keeptextopen + buttonsound writetext Text_LittleHealthier + waitbutton closetext - loadmovesprites end .FiveBerries: writetext Text_GaveBerry - keeptextopen + buttonsound writetext Text_QuiteHealthy + waitbutton closetext - loadmovesprites end .SevenBerries: playmusic MUSIC_HEAL writetext Text_GaveBerry pause 60 - keeptextopen + buttonsound special RestartMapMusic writetext Text_TotallyHealthy + waitbutton closetext - loadmovesprites setevent EVENT_HEALED_MOOMOO end .NoBerriesInBag: writetext Text_NoBerries + waitbutton closetext - loadmovesprites end .Refused: writetext Text_RefusedToGiveBerry + waitbutton closetext - loadmovesprites end .HappyCow: writetext UnknownText_0x9cd92 cry MILTANK + waitbutton closetext - loadmovesprites end Text_MoomooIsSick: diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 6ca69ab49..ca483c8cc 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE39FARMHOUSE_POKEFAN_M + const ROUTE39FARMHOUSE_POKEFAN_F + Route39Farmhouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,12 +11,12 @@ Route39Farmhouse_MapScriptHeader: PokefanMScript_0x9ceb4: faceplayer - loadfont + opentext checkevent EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cec5 writetext UnknownText_0x9cf38 + waitbutton closetext - loadmovesprites setevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO end @@ -20,7 +24,7 @@ UnknownScript_0x9cec5: checkitem MOOMOO_MILK iftrue UnknownScript_0x9cf08 writetext UnknownText_0x9cfe1 - special PlaceMoneyTopRightOW + special PlaceMoneyTopRight yesorno iffalse UnknownScript_0x9cf02 checkmoney $0, 500 @@ -28,62 +32,62 @@ UnknownScript_0x9cec5: giveitem MOOMOO_MILK iffalse UnknownScript_0x9cefc takemoney $0, 500 - special PlaceMoneyTopRightOW - waitbutton + special PlaceMoneyTopRight + waitsfx playsound SFX_TRANSACTION writetext UnknownText_0x9d05d - keeptextopen + buttonsound itemnotify - loadmovesprites + closetext end UnknownScript_0x9cef6: writetext UnknownText_0x9d07c + waitbutton closetext - loadmovesprites end UnknownScript_0x9cefc: writetext UnknownText_0x9d09d + waitbutton closetext - loadmovesprites end UnknownScript_0x9cf02: writetext UnknownText_0x9d0b7 + waitbutton closetext - loadmovesprites end UnknownScript_0x9cf08: writetext UnknownText_0x9d0dc + waitbutton closetext - loadmovesprites end PokefanFScript_0x9cf0e: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM iftrue UnknownScript_0x9cf2f checkevent EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cf22 writetext UnknownText_0x9d0f6 + waitbutton closetext - loadmovesprites end UnknownScript_0x9cf22: writetext UnknownText_0x9d156 - keeptextopen + buttonsound verbosegiveitem TM_SNORE iffalse UnknownScript_0x9cf33 setevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM UnknownScript_0x9cf2f: writetext UnknownText_0x9d1c7 - closetext + waitbutton UnknownScript_0x9cf33: - loadmovesprites + closetext end FarmhouseBookshelf: diff --git a/maps/Route4.asm b/maps/Route4.asm index 281c97f38..b6ec5b98e 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -1,3 +1,9 @@ +const_value set 2 + const ROUTE4_YOUNGSTER + const ROUTE4_LASS1 + const ROUTE4_LASS2 + const ROUTE4_POKE_BALL + Route4_MapScriptHeader: .MapTriggers: db 0 @@ -9,42 +15,42 @@ TrainerBird_keeperHank: trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, 0, Bird_keeperHankScript Bird_keeperHankScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ae258 + waitbutton closetext - loadmovesprites end TrainerPicnickerHope: trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, PicnickerHopeScript PicnickerHopeScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ae320 + waitbutton closetext - loadmovesprites end TrainerPicnickerSharon: trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, PicnickerSharonScript PicnickerSharonScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ae369 + waitbutton closetext - loadmovesprites end MapRoute4Signpost0Script: jumptext UnknownText_0x1ae384 -ItemFragment_0x1ae20f: - db HP_UP, 1 +Route4HPUp: + itemball HP_UP -MapRoute4SignpostItem1: +Route4HiddenUltraBall: dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL @@ -129,11 +135,11 @@ Route4_MapEventHeader: .Signposts: db 2 signpost 7, 3, SIGNPOST_READ, MapRoute4Signpost0Script - signpost 3, 10, SIGNPOST_ITEM, MapRoute4SignpostItem1 + signpost 3, 10, SIGNPOST_ITEM, Route4HiddenUltraBall .PersonEvents: db 4 person_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperHank, -1 person_event SPRITE_LASS, 8, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerHope, -1 person_event SPRITE_LASS, 6, 21, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 - person_event SPRITE_POKE_BALL, 3, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1ae20f, EVENT_ROUTE_4_HP_UP + person_event SPRITE_POKE_BALL, 3, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP diff --git a/maps/Route40.asm b/maps/Route40.asm index d753be910..65e040604 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -1,3 +1,17 @@ +const_value set 2 + const ROUTE40_OLIVINE_RIVAL1 + const ROUTE40_OLIVINE_RIVAL2 + const ROUTE40_SWIMMER_GIRL1 + const ROUTE40_SWIMMER_GIRL2 + const ROUTE40_ROCK1 + const ROUTE40_ROCK2 + const ROUTE40_ROCK3 + const ROUTE40_LASS1 + const ROUTE40_BUENA + const ROUTE40_POKEFAN_M + const ROUTE40_LASS2 + const ROUTE40_STANDING_YOUNGSTER + Route40_MapScriptHeader: .MapTriggers: db 0 @@ -13,55 +27,55 @@ MonicaCallback: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR checkcode VAR_WEEKDAY if_equal MONDAY, .MonicaAppears - disappear $a + disappear ROUTE40_BUENA return .MonicaAppears - appear $a + appear ROUTE40_BUENA return TrainerSwimmerfElaine: trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, SwimmerfElaineScript SwimmerfElaineScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a637b + waitbutton closetext - loadmovesprites end TrainerSwimmerfPaula: trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, SwimmerfPaulaScript SwimmerfPaulaScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a63f5 + waitbutton closetext - loadmovesprites end TrainerSwimmermSimon: trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, SwimmermSimonScript SwimmermSimonScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a6282 + waitbutton closetext - loadmovesprites end TrainerSwimmermRandall: trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, SwimmermRandallScript SwimmermRandallScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a62fa + waitbutton closetext - loadmovesprites end LassScript_0x1a61c4: @@ -83,7 +97,7 @@ StandingYoungsterScript_0x1a61d6: MonicaScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_SHARP_BEAK_FROM_MONICA iftrue MonicaMondayScript checkcode VAR_WEEKDAY @@ -91,30 +105,30 @@ MonicaScript: checkevent EVENT_MET_MONICA_OF_MONDAY iftrue .MetMonica writetext MeetMonicaText - keeptextopen + buttonsound setevent EVENT_MET_MONICA_OF_MONDAY .MetMonica writetext MonicaGivesGiftText - keeptextopen + buttonsound verbosegiveitem SHARP_BEAK iffalse MonicaDoneScript setevent EVENT_GOT_SHARP_BEAK_FROM_MONICA writetext MonicaGaveGiftText + waitbutton closetext - loadmovesprites end MonicaMondayScript: writetext MonicaMondayText - closetext + waitbutton MonicaDoneScript: - loadmovesprites + closetext end MonicaNotMondayScript: writetext MonicaNotMondayText + waitbutton closetext - loadmovesprites end MapRoute40Signpost0Script: @@ -123,7 +137,7 @@ MapRoute40Signpost0Script: Route40Rock: jumpstd smashrock -MapRoute40SignpostItem1: +Route40HiddenHyperPotion: dwb EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION MovementData_0x1a621c: @@ -340,7 +354,7 @@ Route40_MapEventHeader: .Signposts: db 2 signpost 10, 14, SIGNPOST_READ, MapRoute40Signpost0Script - signpost 8, 7, SIGNPOST_ITEM, MapRoute40SignpostItem1 + signpost 8, 7, SIGNPOST_ITEM, Route40HiddenHyperPotion .PersonEvents: db 12 diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 9827690b3..ad98bb81e 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE40BATTLETOWERGATE_ROCKER + const ROUTE40BATTLETOWERGATE_TWIN + Route40BattleTowerGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route41.asm b/maps/Route41.asm index 31ecded71..6c4b5c0d5 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -1,3 +1,15 @@ +const_value set 2 + const ROUTE41_OLIVINE_RIVAL1 + const ROUTE41_OLIVINE_RIVAL2 + const ROUTE41_OLIVINE_RIVAL3 + const ROUTE41_OLIVINE_RIVAL4 + const ROUTE41_OLIVINE_RIVAL5 + const ROUTE41_SWIMMER_GIRL1 + const ROUTE41_SWIMMER_GIRL2 + const ROUTE41_SWIMMER_GIRL3 + const ROUTE41_SWIMMER_GIRL4 + const ROUTE41_SWIMMER_GIRL5 + Route41_MapScriptHeader: .MapTriggers: db 0 @@ -9,117 +21,117 @@ TrainerSwimmerfKaylee: trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, SwimmerfKayleeScript SwimmerfKayleeScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a6c7f + waitbutton closetext - loadmovesprites end TrainerSwimmerfSusie: trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, SwimmerfSusieScript SwimmerfSusieScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a6d11 + waitbutton closetext - loadmovesprites end TrainerSwimmerfDenise: trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, SwimmerfDeniseScript SwimmerfDeniseScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a6d79 + waitbutton closetext - loadmovesprites end TrainerSwimmerfKara: trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, SwimmerfKaraScript SwimmerfKaraScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a6e58 + waitbutton closetext - loadmovesprites end TrainerSwimmerfWendy: trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, SwimmerfWendyScript SwimmerfWendyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a6ec2 + waitbutton closetext - loadmovesprites end TrainerSwimmermCharlie: trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, SwimmermCharlieScript SwimmermCharlieScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a696e + waitbutton closetext - loadmovesprites end TrainerSwimmermGeorge: trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, SwimmermGeorgeScript SwimmermGeorgeScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a69d4 + waitbutton closetext - loadmovesprites end TrainerSwimmermBerke: trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, SwimmermBerkeScript SwimmermBerkeScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a6aa4 + waitbutton closetext - loadmovesprites end TrainerSwimmermKirk: trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, SwimmermKirkScript SwimmermKirkScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a6b6c + waitbutton closetext - loadmovesprites end TrainerSwimmermMathew: trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, SwimmermMathewScript SwimmermMathewScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a6bed + waitbutton closetext - loadmovesprites end Route41Rock: ; unused jumpstd smashrock -MapRoute41SignpostItem0: +Route41HiddenMaxEther: dwb EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER SwimmermCharlieSeenText: @@ -345,7 +357,7 @@ Route41_MapEventHeader: .Signposts: db 1 - signpost 35, 9, SIGNPOST_ITEM, MapRoute41SignpostItem0 + signpost 35, 9, SIGNPOST_ITEM, Route41HiddenMaxEther .PersonEvents: db 10 diff --git a/maps/Route42.asm b/maps/Route42.asm index 327c7b88d..a58e7c27b 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -1,3 +1,14 @@ +const_value set 2 + const ROUTE42_FISHER + const ROUTE42_POKEFAN_M + const ROUTE42_SUPER_NERD + const ROUTE42_FRUIT_TREE1 + const ROUTE42_FRUIT_TREE2 + const ROUTE42_FRUIT_TREE3 + const ROUTE42_POKE_BALL1 + const ROUTE42_POKE_BALL2 + const ROUTE42_SUICUNE + Route42_MapScriptHeader: .MapTriggers: db 2 @@ -19,8 +30,8 @@ UnknownScript_0x1a9218: showemote EMOTE_SHOCK, PLAYER, 15 pause 15 playsound SFX_WARP_FROM - applymovement $a, MovementData_0x1a9356 - disappear $a + applymovement ROUTE42_SUICUNE, MovementData_0x1a9356 + disappear ROUTE42_SUICUNE pause 10 dotrigger $0 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36 @@ -32,8 +43,8 @@ TrainerFisherTully1: FisherTully1Script: writecode VAR_CALLERID, PHONE_FISHER_TULLY - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_TULLY iftrue UnknownScript_0x1a927f checkflag ENGINE_TULLY_HAS_WATER_STONE @@ -43,7 +54,7 @@ FisherTully1Script: checkevent EVENT_TULLY_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a9268 writetext UnknownText_0x1a93ab - keeptextopen + buttonsound setevent EVENT_TULLY_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x1a92f1 jump UnknownScript_0x1a926b @@ -78,7 +89,7 @@ UnknownScript_0x1a927f: .LoadFight0 loadtrainer FISHER, TULLY1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wTullyFightCount, 1 clearflag ENGINE_TULLY end @@ -86,7 +97,7 @@ UnknownScript_0x1a927f: .LoadFight1 loadtrainer FISHER, TULLY2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wTullyFightCount, 2 clearflag ENGINE_TULLY end @@ -94,7 +105,7 @@ UnknownScript_0x1a927f: .LoadFight2 loadtrainer FISHER, TULLY3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wTullyFightCount, 3 clearflag ENGINE_TULLY end @@ -102,7 +113,7 @@ UnknownScript_0x1a927f: .LoadFight3 loadtrainer FISHER, TULLY4 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_TULLY end @@ -157,22 +168,22 @@ TrainerPokemaniacShane: trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, PokemaniacShaneScript PokemaniacShaneScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a94d6 + waitbutton closetext - loadmovesprites end TrainerHikerBenjamin: trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, HikerBenjaminScript HikerBenjaminScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a943f + waitbutton closetext - loadmovesprites end MapRoute42Signpost0Script: @@ -187,11 +198,11 @@ MapRoute42Signpost2Script: MapRoute42Signpost3Script: jumptext UnknownText_0x1a95a1 -ItemFragment_0x1a9349: - db ULTRA_BALL, 1 +Route42UltraBall: + itemball ULTRA_BALL -ItemFragment_0x1a934b: - db SUPER_POTION, 1 +Route42SuperPotion: + itemball SUPER_POTION FruitTreeScript_0x1a934d: fruittree FRUITTREE_ROUTE_42_1 @@ -202,7 +213,7 @@ FruitTreeScript_0x1a934f: FruitTreeScript_0x1a9351: fruittree FRUITTREE_ROUTE_42_3 -MapRoute42SignpostItem4: +Route42HiddenMaxPotion: dwb EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION @@ -332,7 +343,7 @@ Route42_MapEventHeader: signpost 5, 7, SIGNPOST_READ, MapRoute42Signpost1Script signpost 9, 45, SIGNPOST_READ, MapRoute42Signpost2Script signpost 8, 54, SIGNPOST_READ, MapRoute42Signpost3Script - signpost 11, 16, SIGNPOST_ITEM, MapRoute42SignpostItem4 + signpost 11, 16, SIGNPOST_ITEM, Route42HiddenMaxPotion .PersonEvents: db 9 @@ -342,6 +353,6 @@ Route42_MapEventHeader: person_event SPRITE_FRUIT_TREE, 16, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 person_event SPRITE_FRUIT_TREE, 16, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 person_event SPRITE_FRUIT_TREE, 16, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 - person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a9349, EVENT_ROUTE_42_ULTRA_BALL - person_event SPRITE_POKE_BALL, 8, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a934b, EVENT_ROUTE_42_SUPER_POTION + person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL + person_event SPRITE_POKE_BALL, 8, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION person_event SPRITE_SUICUNE, 16, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index 773b7279d..df7927010 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE42ECRUTEAKGATE_OFFICER + Route42EcruteakGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route43.asm b/maps/Route43.asm index 24e3a90ea..ddc2bfa1c 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -1,3 +1,13 @@ +const_value set 2 + const ROUTE43_SUPER_NERD1 + const ROUTE43_SUPER_NERD2 + const ROUTE43_SUPER_NERD3 + const ROUTE43_FISHER + const ROUTE43_LASS + const ROUTE43_YOUNGSTER + const ROUTE43_FRUIT_TREE + const ROUTE43_POKE_BALL + Route43_MapScriptHeader: .MapTriggers: db 0 @@ -23,22 +33,22 @@ TrainerCamperSpencer: trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, CamperSpencerScript CamperSpencerScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19d57e + waitbutton closetext - loadmovesprites end TrainerPokemaniacBen: trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, PokemaniacBenScript PokemaniacBenScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19d2d2 + waitbutton closetext - loadmovesprites end TrainerPokemaniacBrent1: @@ -46,8 +56,8 @@ TrainerPokemaniacBrent1: PokemaniacBrent1Script: writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_BRENT iftrue UnknownScript_0x19d0cf checkcellnum PHONE_POKEMANIAC_BRENT @@ -55,7 +65,7 @@ PokemaniacBrent1Script: checkevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19d0b8 writetext UnknownText_0x19d359 - keeptextopen + buttonsound setevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x19d12c jump UnknownScript_0x19d0bb @@ -90,7 +100,7 @@ UnknownScript_0x19d0cf: .LoadFight0 loadtrainer POKEMANIAC, BRENT1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wBrentFightCount, 1 clearflag ENGINE_BRENT end @@ -98,7 +108,7 @@ UnknownScript_0x19d0cf: .LoadFight1 loadtrainer POKEMANIAC, BRENT2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wBrentFightCount, 2 clearflag ENGINE_BRENT end @@ -106,7 +116,7 @@ UnknownScript_0x19d0cf: .LoadFight2 loadtrainer POKEMANIAC, BRENT3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wBrentFightCount, 3 clearflag ENGINE_BRENT end @@ -114,7 +124,7 @@ UnknownScript_0x19d0cf: .LoadFight3 loadtrainer POKEMANIAC, BRENT4 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_BRENT end @@ -150,22 +160,22 @@ TrainerPokemaniacRon: trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, PokemaniacRonScript PokemaniacRonScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19d3f8 + waitbutton closetext - loadmovesprites end TrainerFisherMarvin: trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, FisherMarvinScript FisherMarvinScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19d4d3 + waitbutton closetext - loadmovesprites end TrainerPicnickerTiffany3: @@ -173,8 +183,8 @@ TrainerPicnickerTiffany3: PicnickerTiffany3Script: writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_TIFFANY iftrue UnknownScript_0x19d1c1 checkflag ENGINE_TIFFANY_HAS_PINK_BOW @@ -186,7 +196,7 @@ PicnickerTiffany3Script: checkevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19d1aa writetext UnknownText_0x19d618 - keeptextopen + buttonsound setevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x19d239 jump UnknownScript_0x19d1ad @@ -221,7 +231,7 @@ UnknownScript_0x19d1c1: .LoadFight0 loadtrainer PICNICKER, TIFFANY3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wTiffanyFightCount, 1 clearflag ENGINE_TIFFANY end @@ -229,7 +239,7 @@ UnknownScript_0x19d1c1: .LoadFight1 loadtrainer PICNICKER, TIFFANY1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wTiffanyFightCount, 2 clearflag ENGINE_TIFFANY end @@ -237,7 +247,7 @@ UnknownScript_0x19d1c1: .LoadFight2 loadtrainer PICNICKER, TIFFANY2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wTiffanyFightCount, 3 clearflag ENGINE_TIFFANY end @@ -245,7 +255,7 @@ UnknownScript_0x19d1c1: .LoadFight3 loadtrainer PICNICKER, TIFFANY4 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_TIFFANY end @@ -262,8 +272,8 @@ UnknownScript_0x19d230: UnknownScript_0x19d233: writetext UnknownText_0x19d64b + waitbutton closetext - loadmovesprites end UnknownScript_0x19d239: @@ -314,8 +324,8 @@ MapRoute43Signpost2Script: FruitTreeScript_0x19d266: fruittree FRUITTREE_ROUTE_43 -ItemFragment_0x19d268: - db MAX_ETHER, 1 +Route43MaxEther: + itemball MAX_ETHER PokemaniacBenSeenText: text "I love #MON!" @@ -523,4 +533,4 @@ Route43_MapEventHeader: person_event SPRITE_LASS, 25, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerTiffany3, -1 person_event SPRITE_YOUNGSTER, 40, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperSpencer, -1 person_event SPRITE_FRUIT_TREE, 26, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1 - person_event SPRITE_POKE_BALL, 32, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19d268, EVENT_ROUTE_43_MAX_ETHER + person_event SPRITE_POKE_BALL, 32, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index c4fafdf81..602f016ac 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE43GATE_OFFICER + const ROUTE43GATE_ROCKET1 + const ROUTE43GATE_ROCKET2 + Route43Gate_MapScriptHeader: .MapTriggers: db 2 @@ -33,21 +38,21 @@ UnknownScript_0x19abd5: UnknownScript_0x19abda: playmusic MUSIC_ROCKET_ENCOUNTER checkcode VAR_FACING - if_equal $0, UnknownScript_0x19abea - if_equal $1, UnknownScript_0x19ac38 + if_equal DOWN, UnknownScript_0x19abea + if_equal UP, UnknownScript_0x19ac38 dotrigger $1 end UnknownScript_0x19abea: applymovement PLAYER, MovementData_0x19aca2 - showemote EMOTE_SHOCK, $4, 15 - applymovement $4, MovementData_0x19acbb - spriteface $3, UP - showemote EMOTE_SHOCK, $3, 15 - applymovement $3, MovementData_0x19aca4 - loadfont + showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15 + applymovement ROUTE43GATE_ROCKET2, MovementData_0x19acbb + spriteface ROUTE43GATE_ROCKET1, UP + showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15 + applymovement ROUTE43GATE_ROCKET1, MovementData_0x19aca4 + opentext writetext UnknownText_0x19acd2 - keeptextopen + buttonsound checkmoney $0, 999 if_equal $0, UnknownScript_0x19ac12 jump UnknownScript_0x19ac1d @@ -63,23 +68,23 @@ UnknownScript_0x19ac1d: jump UnknownScript_0x19ac28 UnknownScript_0x19ac28: - keeptextopen - loadmovesprites - applymovement $3, MovementData_0x19acaa - applymovement $4, MovementData_0x19acc1 + buttonsound + closetext + applymovement ROUTE43GATE_ROCKET1, MovementData_0x19acaa + applymovement ROUTE43GATE_ROCKET2, MovementData_0x19acc1 dotrigger $1 special RestartMapMusic end UnknownScript_0x19ac38: - showemote EMOTE_SHOCK, $3, 15 - applymovement $3, MovementData_0x19acaf - spriteface $4, DOWN - showemote EMOTE_SHOCK, $4, 15 - applymovement $4, MovementData_0x19acc7 - loadfont + showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15 + applymovement ROUTE43GATE_ROCKET1, MovementData_0x19acaf + spriteface ROUTE43GATE_ROCKET2, DOWN + showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15 + applymovement ROUTE43GATE_ROCKET2, MovementData_0x19acc7 + opentext writetext UnknownText_0x19acd2 - keeptextopen + buttonsound checkmoney $0, 999 if_equal $0, UnknownScript_0x19ac5c jump UnknownScript_0x19ac67 @@ -95,10 +100,10 @@ UnknownScript_0x19ac67: jump UnknownScript_0x19ac72 UnknownScript_0x19ac72: - keeptextopen - loadmovesprites - applymovement $4, MovementData_0x19accd - applymovement $3, MovementData_0x19acb5 + buttonsound + closetext + applymovement ROUTE43GATE_ROCKET2, MovementData_0x19accd + applymovement ROUTE43GATE_ROCKET1, MovementData_0x19acb5 dotrigger $1 special RestartMapMusic end @@ -108,22 +113,22 @@ RocketScript_0x19ac82: OfficerScript_0x19ac85: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM36_SLUDGE_BOMB iftrue UnknownScript_0x19ac9c writetext UnknownText_0x19ad9b - keeptextopen + buttonsound verbosegiveitem TM_SLUDGE_BOMB iffalse UnknownScript_0x19aca0 setevent EVENT_GOT_TM36_SLUDGE_BOMB - loadmovesprites + closetext end UnknownScript_0x19ac9c: writetext UnknownText_0x19ae2d - closetext + waitbutton UnknownScript_0x19aca0: - loadmovesprites + closetext end MovementData_0x19aca2: diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index e3f750a44..b60e5e160 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE43MAHOGANYGATE_OFFICER + Route43MahoganyGate_MapScriptHeader: .MapTriggers: db 0 @@ -7,18 +10,18 @@ Route43MahoganyGate_MapScriptHeader: OfficerScript_0x19ab0b: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19ab19 writetext UnknownText_0x19ab1f + waitbutton closetext - loadmovesprites end UnknownScript_0x19ab19: writetext UnknownText_0x19ab65 + waitbutton closetext - loadmovesprites end UnknownText_0x19ab1f: diff --git a/maps/Route44.asm b/maps/Route44.asm index 0692d8c71..371099ab8 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -1,3 +1,16 @@ +const_value set 2 + const ROUTE44_FISHER1 + const ROUTE44_FISHER2 + const ROUTE44_YOUNGSTER1 + const ROUTE44_SUPER_NERD + const ROUTE44_YOUNGSTER2 + const ROUTE44_COOLTRAINER_M + const ROUTE44_COOLTRAINER_F + const ROUTE44_FRUIT_TREE + const ROUTE44_POKE_BALL1 + const ROUTE44_POKE_BALL2 + const ROUTE44_POKE_BALL3 + Route44_MapScriptHeader: .MapTriggers: db 0 @@ -10,8 +23,8 @@ TrainerBird_keeperVance1: Bird_keeperVance1Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_VANCE iftrue UnknownScript_0x19d86a checkcellnum PHONE_BIRDKEEPER_VANCE @@ -19,7 +32,7 @@ Bird_keeperVance1Script: checkevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19d853 writetext UnknownText_0x19dbf3 - keeptextopen + buttonsound setevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x19d8df jump UnknownScript_0x19d856 @@ -50,7 +63,7 @@ UnknownScript_0x19d86a: .LoadFight0 loadtrainer BIRD_KEEPER, VANCE1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wVanceFightCount, 1 clearflag ENGINE_VANCE end @@ -58,7 +71,7 @@ UnknownScript_0x19d86a: .LoadFight1 loadtrainer BIRD_KEEPER, VANCE2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wVanceFightCount, 2 clearflag ENGINE_VANCE end @@ -66,7 +79,7 @@ UnknownScript_0x19d86a: .LoadFight2 loadtrainer BIRD_KEEPER, VANCE3 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_VANCE checkevent EVENT_VANCE_CARBOS iftrue UnknownScript_0x19d8cb @@ -82,9 +95,9 @@ UnknownScript_0x19d8ca: end UnknownScript_0x19d8cb: - loadfont + opentext writetext UnknownText_0x19dc67 - closetext + waitbutton verbosegiveitem CARBOS iffalse UnknownScript_0x19d903 clearevent EVENT_VANCE_CARBOS @@ -140,11 +153,11 @@ TrainerPsychicPhil: trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, PsychicPhilScript PsychicPhilScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19dcfc + waitbutton closetext - loadmovesprites end TrainerFisherWilton1: @@ -152,8 +165,8 @@ TrainerFisherWilton1: FisherWilton1Script: writecode VAR_CALLERID, PHONE_FISHER_WILTON - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_WILTON iftrue UnknownScript_0x19d96e checkflag ENGINE_WILTON_HAS_ITEM @@ -163,7 +176,7 @@ FisherWilton1Script: checkevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19d957 writetext UnknownText_0x19daa8 - keeptextopen + buttonsound setevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x19d8df jump UnknownScript_0x19d95a @@ -194,7 +207,7 @@ UnknownScript_0x19d96e: .LoadFight0 loadtrainer FISHER, WILTON1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wWiltonFightCount, 1 clearflag ENGINE_WILTON end @@ -202,7 +215,7 @@ UnknownScript_0x19d96e: .LoadFight1 loadtrainer FISHER, WILTON2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wWiltonFightCount, 2 clearflag ENGINE_WILTON end @@ -210,7 +223,7 @@ UnknownScript_0x19d96e: .LoadFight2 loadtrainer FISHER, WILTON3 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_WILTON end @@ -246,44 +259,44 @@ TrainerFisherEdgar: trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, FisherEdgarScript FisherEdgarScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19db6f + waitbutton closetext - loadmovesprites end TrainerCooltrainerfCybil: trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, CooltrainerfCybilScript CooltrainerfCybilScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19df4d + waitbutton closetext - loadmovesprites end TrainerPokemaniacZach: trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, PokemaniacZachScript PokemaniacZachScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19dd7e + waitbutton closetext - loadmovesprites end TrainerCooltrainermAllen: trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, CooltrainermAllenScript CooltrainermAllenScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19de66 + waitbutton closetext - loadmovesprites end MapRoute44Signpost0Script: @@ -295,16 +308,16 @@ MapRoute44Signpost1Script: FruitTreeScript_0x19da40: fruittree FRUITTREE_ROUTE_44 -ItemFragment_0x19da42: - db MAX_REVIVE, 1 +Route44MaxRevive: + itemball MAX_REVIVE -ItemFragment_0x19da44: - db ULTRA_BALL, 1 +Route44UltraBall: + itemball ULTRA_BALL -ItemFragment_0x19da46: - db MAX_REPEL, 1 +Route44MaxRepel: + itemball MAX_REPEL -MapRoute44SignpostItem2: +Route44HiddenElixer: dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER @@ -509,7 +522,7 @@ Route44_MapEventHeader: db 3 signpost 7, 53, SIGNPOST_READ, MapRoute44Signpost0Script signpost 10, 6, SIGNPOST_READ, MapRoute44Signpost1Script - signpost 9, 32, SIGNPOST_ITEM, MapRoute44SignpostItem2 + signpost 9, 32, SIGNPOST_ITEM, Route44HiddenElixer .PersonEvents: db 11 @@ -521,6 +534,6 @@ Route44_MapEventHeader: person_event SPRITE_COOLTRAINER_M, 15, 41, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1 person_event SPRITE_COOLTRAINER_F, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1 person_event SPRITE_FRUIT_TREE, 5, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1 - person_event SPRITE_POKE_BALL, 8, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19da42, EVENT_ROUTE_44_MAX_REVIVE - person_event SPRITE_POKE_BALL, 4, 45, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19da44, EVENT_ROUTE_44_ULTRA_BALL - person_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19da46, EVENT_ROUTE_44_MAX_REPEL + person_event SPRITE_POKE_BALL, 8, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE + person_event SPRITE_POKE_BALL, 4, 45, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL + person_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL diff --git a/maps/Route45.asm b/maps/Route45.asm index bab4302a5..d2ded8765 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -1,3 +1,18 @@ +const_value set 2 + const ROUTE45_POKEFAN_M1 + const ROUTE45_POKEFAN_M2 + const ROUTE45_POKEFAN_M3 + const ROUTE45_POKEFAN_M4 + const ROUTE45_BLACK_BELT + const ROUTE45_COOLTRAINER_M + const ROUTE45_COOLTRAINER_F + const ROUTE45_FRUIT_TREE + const ROUTE45_POKE_BALL1 + const ROUTE45_POKE_BALL2 + const ROUTE45_POKE_BALL3 + const ROUTE45_POKE_BALL4 + const ROUTE45_YOUNGSTER + Route45_MapScriptHeader: .MapTriggers: db 0 @@ -10,15 +25,15 @@ TrainerBlackbeltKenji: BlackbeltKenji3Script: writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI - talkaftercancel - loadfont + end_if_just_battled + opentext checkcellnum PHONE_BLACKBELT_KENJI iftrue UnknownScript_0x19e0e4 checkevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19e0cd special Special_SampleKenjiBreakCountdown writetext UnknownText_0x19e5e2 - closetext + waitbutton setevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x19e11b jump UnknownScript_0x19e0d0 @@ -51,14 +66,14 @@ UnknownScript_0x19e0e4: UnknownScript_0x19e10c: writetext UnknownText_0x19e634 + waitbutton closetext - loadmovesprites end UnknownScript_0x19e112: writetext UnknownText_0x19e66c + waitbutton closetext - loadmovesprites end UnknownScript_0x19e118: @@ -113,22 +128,22 @@ TrainerHikerErik: trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, 0, HikerErikScript HikerErikScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19e301 + waitbutton closetext - loadmovesprites end TrainerHikerMichael: trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, HikerMichaelScript HikerMichaelScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19e3b1 + waitbutton closetext - loadmovesprites end TrainerHikerParry: @@ -136,8 +151,8 @@ TrainerHikerParry: HikerParry3Script: writecode VAR_CALLERID, PHONE_HIKER_PARRY - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_PARRY iftrue UnknownScript_0x19e1b8 checkcellnum PHONE_HIKER_PARRY @@ -145,7 +160,7 @@ HikerParry3Script: checkevent EVENT_PARRY_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19e1a1 writetext UnknownText_0x19e434 - keeptextopen + buttonsound setevent EVENT_PARRY_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x19e11b jump UnknownScript_0x19e1a4 @@ -176,7 +191,7 @@ UnknownScript_0x19e1b8: .LoadFight0 loadtrainer HIKER, PARRY3 startbattle - returnafterbattle + reloadmapafterbattle loadvar wParryFightCount, 1 clearflag ENGINE_PARRY end @@ -184,7 +199,7 @@ UnknownScript_0x19e1b8: .LoadFight1 loadtrainer HIKER, PARRY1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wParryFightCount, 2 clearflag ENGINE_PARRY end @@ -192,7 +207,7 @@ UnknownScript_0x19e1b8: .LoadFight2 loadtrainer HIKER, PARRY2 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_PARRY checkevent EVENT_PARRY_IRON iftrue UnknownScript_0x19e219 @@ -208,9 +223,9 @@ UnknownScript_0x19e218: end UnknownScript_0x19e219: - loadfont + opentext writetext UnknownText_0x19e52c - closetext + waitbutton verbosegiveitem IRON iffalse UnknownScript_0x19e13f clearevent EVENT_PARRY_IRON @@ -221,61 +236,61 @@ TrainerHikerTimothy: trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, HikerTimothyScript HikerTimothyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19e4f1 + waitbutton closetext - loadmovesprites end TrainerCooltrainermRyan: trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, CooltrainermRyanScript CooltrainermRyanScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19e70d + waitbutton closetext - loadmovesprites end TrainerCooltrainerfKelly: trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, CooltrainerfKellyScript CooltrainerfKellyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19e7d1 + waitbutton closetext - loadmovesprites end YoungsterScript_0x19e269: faceplayer - loadfont + opentext checkevent EVENT_BEAT_CAMPER_QUENTIN iftrue UnknownScript_0x19e285 writetext UnknownText_0x19e87f + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x19e899, 0 loadtrainer CAMPER, QUENTIN startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_CAMPER_QUENTIN - loadmovesprites + closetext end UnknownScript_0x19e285: writetext UnknownText_0x19e8bb + waitbutton closetext - loadmovesprites end UnknownScript_0x19e28b: writetext UnknownText_0x19e830 + waitbutton closetext - loadmovesprites end MapRoute45Signpost0Script: @@ -284,19 +299,19 @@ MapRoute45Signpost0Script: FruitTreeScript_0x19e294: fruittree FRUITTREE_ROUTE_45 -ItemFragment_0x19e296: - db NUGGET, 1 +Route45Nugget: + itemball NUGGET -ItemFragment_0x19e298: - db REVIVE, 1 +Route45Revive: + itemball REVIVE -ItemFragment_0x19e29a: - db ELIXER, 1 +Route45Elixer: + itemball ELIXER -ItemFragment_0x19e29c: - db MAX_POTION, 1 +Route45MaxPotion: + itemball MAX_POTION -MapRoute45SignpostItem1: +Route45HiddenPpUp: dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP @@ -531,7 +546,7 @@ Route45_MapEventHeader: .Signposts: db 2 signpost 4, 10, SIGNPOST_READ, MapRoute45Signpost0Script - signpost 80, 13, SIGNPOST_ITEM, MapRoute45SignpostItem1 + signpost 80, 13, SIGNPOST_ITEM, Route45HiddenPpUp .PersonEvents: db 13 @@ -543,8 +558,8 @@ Route45_MapEventHeader: person_event SPRITE_COOLTRAINER_M, 18, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1 person_event SPRITE_COOLTRAINER_F, 36, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1 person_event SPRITE_FRUIT_TREE, 82, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1 - person_event SPRITE_POKE_BALL, 51, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19e296, EVENT_ROUTE_45_NUGGET - person_event SPRITE_POKE_BALL, 66, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19e298, EVENT_ROUTE_45_REVIVE - person_event SPRITE_POKE_BALL, 20, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19e29a, EVENT_ROUTE_45_ELIXER - person_event SPRITE_POKE_BALL, 33, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x19e29c, EVENT_ROUTE_45_MAX_POTION + person_event SPRITE_POKE_BALL, 51, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET + person_event SPRITE_POKE_BALL, 66, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE + person_event SPRITE_POKE_BALL, 20, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER + person_event SPRITE_POKE_BALL, 33, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION person_event SPRITE_YOUNGSTER, 70, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19e269, -1 diff --git a/maps/Route46.asm b/maps/Route46.asm index 493bd5303..ff7bcb463 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -1,3 +1,11 @@ +const_value set 2 + const ROUTE46_POKEFAN_M + const ROUTE46_YOUNGSTER + const ROUTE46_LASS + const ROUTE46_FRUIT_TREE1 + const ROUTE46_FRUIT_TREE2 + const ROUTE46_POKE_BALL + Route46_MapScriptHeader: .MapTriggers: db 0 @@ -9,11 +17,11 @@ TrainerCamperTed: trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, CamperTedScript CamperTedScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a9851 + waitbutton closetext - loadmovesprites end TrainerPicnickerErin1: @@ -21,8 +29,8 @@ TrainerPicnickerErin1: PicnickerErin1Script: writecode VAR_CALLERID, PHONE_PICNICKER_ERIN - talkaftercancel - loadfont + end_if_just_battled + opentext checkflag ENGINE_ERIN iftrue UnknownScript_0x1a96da checkcellnum PHONE_PICNICKER_ERIN @@ -30,7 +38,7 @@ PicnickerErin1Script: checkevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a96c3 writetext UnknownText_0x1a98c6 - keeptextopen + buttonsound setevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x1a974f jump UnknownScript_0x1a96c6 @@ -61,7 +69,7 @@ UnknownScript_0x1a96da: .LoadFight0 loadtrainer PICNICKER, ERIN1 startbattle - returnafterbattle + reloadmapafterbattle loadvar wErinFightCount, 1 clearflag ENGINE_ERIN end @@ -69,7 +77,7 @@ UnknownScript_0x1a96da: .LoadFight1 loadtrainer PICNICKER, ERIN2 startbattle - returnafterbattle + reloadmapafterbattle loadvar wErinFightCount, 2 clearflag ENGINE_ERIN end @@ -77,7 +85,7 @@ UnknownScript_0x1a96da: .LoadFight2 loadtrainer PICNICKER, ERIN3 startbattle - returnafterbattle + reloadmapafterbattle clearflag ENGINE_ERIN checkevent EVENT_ERIN_CALCIUM iftrue UnknownScript_0x1a973b @@ -93,9 +101,9 @@ UnknownScript_0x1a973a: end UnknownScript_0x1a973b: - loadfont + opentext writetext UnknownText_0x1a9927 - closetext + waitbutton verbosegiveitem CALCIUM iffalse UnknownScript_0x1a976b clearevent EVENT_ERIN_CALCIUM @@ -143,18 +151,18 @@ TrainerHikerBailey: trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, HikerBaileyScript HikerBaileyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1a97e8 + waitbutton closetext - loadmovesprites end MapRoute46Signpost0Script: jumptext UnknownText_0x1a99be -ItemFragment_0x1a978d: - db X_SPEED, 1 +Route46XSpeed: + itemball X_SPEED FruitTreeScript_0x1a978f: fruittree FRUITTREE_ROUTE_46_1 @@ -266,4 +274,4 @@ Route46_MapEventHeader: person_event SPRITE_LASS, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 person_event SPRITE_FRUIT_TREE, 5, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1 person_event SPRITE_FRUIT_TREE, 6, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1 - person_event SPRITE_POKE_BALL, 15, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a978d, EVENT_ROUTE_46_X_SPEED + person_event SPRITE_POKE_BALL, 15, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED diff --git a/maps/Route5.asm b/maps/Route5.asm index 607b98413..dfbf9b7cf 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE5_POKEFAN_M + Route5_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 9cafc81ea..299d80c76 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE5CLEANSETAGSPEECHHOUSE_GRANNY + const ROUTE5CLEANSETAGSPEECHHOUSE_TEACHER + Route5CleanseTagSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -7,19 +11,19 @@ Route5CleanseTagSpeechHouse_MapScriptHeader: GrannyScript_0x18b634: faceplayer - loadfont + opentext checkevent EVENT_GOT_CLEANSE_TAG iftrue UnknownScript_0x18b649 writetext UnknownText_0x18b655 - keeptextopen + buttonsound verbosegiveitem CLEANSE_TAG iffalse UnknownScript_0x18b64d setevent EVENT_GOT_CLEANSE_TAG UnknownScript_0x18b649: writetext UnknownText_0x18b6a7 - closetext + waitbutton UnknownScript_0x18b64d: - loadmovesprites + closetext end TeacherScript_0x18b64f: diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index 293d53121..cefe24e47 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE5SAFFRONCITYGATE_OFFICER + Route5SaffronCityGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm index d56a31b26..a9051d75b 100644 --- a/maps/Route5UndergroundEntrance.asm +++ b/maps/Route5UndergroundEntrance.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE5UNDERGROUNDENTRANCE_TEACHER + Route5UndergroundEntrance_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route6.asm b/maps/Route6.asm index d70ed689d..dea3a1e4e 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE6_POKEFAN_M1 + const ROUTE6_POKEFAN_M2 + const ROUTE6_POKEFAN_M3 + Route6_MapScriptHeader: .MapTriggers: db 0 @@ -9,22 +14,22 @@ TrainerPokefanmRex: trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, PokefanmRexScript PokefanmRexScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ad9ff + waitbutton closetext - loadmovesprites end TrainerPokefanmAllan: trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, PokefanmAllanScript PokefanmAllanScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ada88 + waitbutton closetext - loadmovesprites end PokefanMScript_0x1ad951: diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index cb32e10c6..9e3275d97 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE6SAFFRONGATE_OFFICER + Route6SaffronGate_MapScriptHeader: .MapTriggers: db 1 @@ -13,18 +16,18 @@ UnknownScript_0x1926e9: OfficerScript_0x1926ea: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x1926f8 writetext UnknownText_0x1926fe + waitbutton closetext - loadmovesprites end UnknownScript_0x1926f8: writetext UnknownText_0x1927cb + waitbutton closetext - loadmovesprites end UnknownText_0x1926fe: diff --git a/maps/Route6UndergroundEntrance.asm b/maps/Route6UndergroundEntrance.asm index e1dbd1b86..a294bce23 100644 --- a/maps/Route6UndergroundEntrance.asm +++ b/maps/Route6UndergroundEntrance.asm @@ -1,3 +1,4 @@ + Route6UndergroundEntrance_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route7.asm b/maps/Route7.asm index 5ccd0239c..59b260dd2 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -1,3 +1,4 @@ + Route7_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 29be287d4..df494e313 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE7SAFFRONGATE_OFFICER + Route7SaffronGate_MapScriptHeader: .MapTriggers: db 0 @@ -7,18 +10,18 @@ Route7SaffronGate_MapScriptHeader: OfficerScript_0x73518: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x73526 writetext UnknownText_0x7352c + waitbutton closetext - loadmovesprites end UnknownScript_0x73526: writetext UnknownText_0x73592 + waitbutton closetext - loadmovesprites end UnknownText_0x7352c: diff --git a/maps/Route8.asm b/maps/Route8.asm index e9d87f31b..4d60df521 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -1,3 +1,11 @@ +const_value set 2 + const ROUTE8_BIKER1 + const ROUTE8_BIKER2 + const ROUTE8_BIKER3 + const ROUTE8_SUPER_NERD1 + const ROUTE8_SUPER_NERD2 + const ROUTE8_FRUIT_TREE + Route8_MapScriptHeader: .MapTriggers: db 0 @@ -9,55 +17,55 @@ TrainerBikerDwayne: trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, BikerDwayneScript BikerDwayneScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x6c0c8 + waitbutton closetext - loadmovesprites end TrainerBikerHarris: trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, BikerHarrisScript BikerHarrisScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x6c143 + waitbutton closetext - loadmovesprites end TrainerBikerZeke: trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, BikerZekeScript BikerZekeScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x6c1a3 + waitbutton closetext - loadmovesprites end TrainerSupernerdSam: trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, SupernerdSamScript SupernerdSamScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x6c219 + waitbutton closetext - loadmovesprites end TrainerSupernerdTom: trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, SupernerdTomScript SupernerdTomScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x6c27e + waitbutton closetext - loadmovesprites end MapRoute8Signpost1Script: diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index 047599830..6f871c5fd 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE8SAFFRONGATE_OFFICER + Route8SaffronGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route9.asm b/maps/Route9.asm index 5d13a398c..8ba626286 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -1,3 +1,11 @@ +const_value set 2 + const ROUTE9_YOUNGSTER1 + const ROUTE9_LASS1 + const ROUTE9_YOUNGSTER2 + const ROUTE9_LASS2 + const ROUTE9_POKEFAN_M1 + const ROUTE9_POKEFAN_M2 + Route9_MapScriptHeader: .MapTriggers: db 0 @@ -9,72 +17,72 @@ TrainerCamperDean: trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, CamperDeanScript CamperDeanScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1aafd9 + waitbutton closetext - loadmovesprites end TrainerPicnickerHeidi: trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, PicnickerHeidiScript PicnickerHeidiScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ab07c + waitbutton closetext - loadmovesprites end TrainerCamperSid: trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, 0, CamperSidScript CamperSidScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ab0f6 + waitbutton closetext - loadmovesprites end TrainerPicnickerEdna: trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, PicnickerEdnaScript PicnickerEdnaScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ab15f + waitbutton closetext - loadmovesprites end TrainerHikerTim: trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, 0, HikerTimScript HikerTimScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ab210 + waitbutton closetext - loadmovesprites end TrainerHikerSidney: trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, HikerSidneyScript HikerSidneyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1ab278 + waitbutton closetext - loadmovesprites end MapRoute9Signpost0Script: jumptext UnknownText_0x1ab2a2 -MapRoute9SignpostItem1: +Route9HiddenEther: dwb EVENT_ROUTE_9_HIDDEN_ETHER, ETHER @@ -212,7 +220,7 @@ Route9_MapEventHeader: .Signposts: db 2 signpost 7, 15, SIGNPOST_READ, MapRoute9Signpost0Script - signpost 15, 41, SIGNPOST_ITEM, MapRoute9SignpostItem1 + signpost 15, 41, SIGNPOST_ITEM, Route9HiddenEther .PersonEvents: db 6 diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index 506884841..31a5a373f 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -1,3 +1,4 @@ + RuinsofAlphAerodactylChamber_MapScriptHeader: .MapTriggers: db 2 @@ -49,14 +50,14 @@ UnknownScript_0x58dd3: reloadmappart earthquake 50 dotrigger $1 - loadmovesprites + closetext end MapRuinsofAlphAerodactylChamberSignpost2Script: refreshscreen $0 writebyte $2 special Special_UnownPuzzle - loadmovesprites + closetext iftrue UnknownScript_0x58df7 end @@ -74,7 +75,7 @@ UnknownScript_0x58df7: earthquake 80 applymovement PLAYER, MovementData_0x58e4d playsound SFX_KINESIS - waitbutton + waitsfx pause 20 warpcheck end @@ -86,28 +87,28 @@ MapRuinsofAlphAerodactylChamberSignpost3Script: jumptext UnknownText_0x58ee7 MapRuinsofAlphAerodactylChamberSignpost4Script: - loadfont + opentext writetext UnknownText_0x58e4f writebyte $1 special Special_DisplayUnownWords - loadmovesprites + closetext end MapRuinsofAlphAerodactylChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER iftrue UnknownScript_0x58e46 - loadfont + opentext writetext UnknownText_0x58e81 writebyte $1 special Special_DisplayUnownWords - loadmovesprites + closetext end UnknownScript_0x58e46: - loadfont + opentext writetext UnknownText_0x58ea2 + waitbutton closetext - loadmovesprites end MovementData_0x58e4d: diff --git a/maps/RuinsofAlphAerodactylItemRoom.asm b/maps/RuinsofAlphAerodactylItemRoom.asm index 07e2a2103..5f9d5c9f0 100644 --- a/maps/RuinsofAlphAerodactylItemRoom.asm +++ b/maps/RuinsofAlphAerodactylItemRoom.asm @@ -1,3 +1,9 @@ +const_value set 2 + const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL1 + const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL2 + const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3 + const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4 + RuinsofAlphAerodactylItemRoom_MapScriptHeader: .MapTriggers: db 0 @@ -5,17 +11,17 @@ RuinsofAlphAerodactylItemRoom_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x59ab6: - db GOLD_BERRY, 1 +RuinsofAlphAerodactylItemRoomGoldBerry: + itemball GOLD_BERRY -ItemFragment_0x59ab8: - db MOON_STONE, 1 +RuinsofAlphAerodactylItemRoomMoonStone: + itemball MOON_STONE -ItemFragment_0x59aba: - db HEAL_POWDER, 1 +RuinsofAlphAerodactylItemRoomHealPowder: + itemball HEAL_POWDER -ItemFragment_0x59abc: - db ENERGY_ROOT, 1 +RuinsofAlphAerodactylItemRoomEnergyRoot: + itemball ENERGY_ROOT MapRuinsofAlphAerodactylItemRoomSignpost1Script: jumptext UnknownText_0x59ac1 @@ -47,7 +53,7 @@ RuinsofAlphAerodactylItemRoom_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59ab6, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59ab8, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59aba, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59abc, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM diff --git a/maps/RuinsofAlphAerodactylWordRoom.asm b/maps/RuinsofAlphAerodactylWordRoom.asm index e79ca5c21..0ff2f6028 100644 --- a/maps/RuinsofAlphAerodactylWordRoom.asm +++ b/maps/RuinsofAlphAerodactylWordRoom.asm @@ -1,3 +1,4 @@ + RuinsofAlphAerodactylWordRoom_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index ff04d56f2..e27439fdc 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -1,3 +1,4 @@ + RuinsofAlphHoOhChamber_MapScriptHeader: .MapTriggers: db 2 @@ -50,14 +51,14 @@ UnknownScript_0x58596: reloadmappart earthquake 50 dotrigger $1 - loadmovesprites + closetext end MapRuinsofAlphHoOhChamberSignpost2Script: refreshscreen $0 writebyte $3 special Special_UnownPuzzle - loadmovesprites + closetext iftrue UnknownScript_0x585ba end @@ -75,7 +76,7 @@ UnknownScript_0x585ba: earthquake 80 applymovement PLAYER, MovementData_0x58610 playsound SFX_KINESIS - waitbutton + waitsfx pause 20 warpcheck end @@ -87,28 +88,28 @@ MapRuinsofAlphHoOhChamberSignpost3Script: jumptext UnknownText_0x586aa MapRuinsofAlphHoOhChamberSignpost4Script: - loadfont + opentext writetext UnknownText_0x58612 writebyte $3 special Special_DisplayUnownWords - loadmovesprites + closetext end MapRuinsofAlphHoOhChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue UnknownScript_0x58609 - loadfont + opentext writetext UnknownText_0x58644 writebyte $3 special Special_DisplayUnownWords - loadmovesprites + closetext end UnknownScript_0x58609: - loadfont + opentext writetext UnknownText_0x58665 + waitbutton closetext - loadmovesprites end MovementData_0x58610: diff --git a/maps/RuinsofAlphHoOhItemRoom.asm b/maps/RuinsofAlphHoOhItemRoom.asm index 83d5720c4..85e988ce5 100644 --- a/maps/RuinsofAlphHoOhItemRoom.asm +++ b/maps/RuinsofAlphHoOhItemRoom.asm @@ -1,3 +1,9 @@ +const_value set 2 + const RUINSOFALPHHOOHITEMROOM_POKE_BALL1 + const RUINSOFALPHHOOHITEMROOM_POKE_BALL2 + const RUINSOFALPHHOOHITEMROOM_POKE_BALL3 + const RUINSOFALPHHOOHITEMROOM_POKE_BALL4 + RuinsofAlphHoOhItemRoom_MapScriptHeader: .MapTriggers: db 0 @@ -5,17 +11,17 @@ RuinsofAlphHoOhItemRoom_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x59918: - db GOLD_BERRY, 1 +RuinsofAlphHoOhItemRoomGoldBerry: + itemball GOLD_BERRY -ItemFragment_0x5991a: - db MYSTERYBERRY, 1 +RuinsofAlphHoOhItemRoomMysteryberry: + itemball MYSTERYBERRY -ItemFragment_0x5991c: - db REVIVAL_HERB, 1 +RuinsofAlphHoOhItemRoomRevivalHerb: + itemball REVIVAL_HERB -ItemFragment_0x5991e: - db CHARCOAL, 1 +RuinsofAlphHoOhItemRoomCharcoal: + itemball CHARCOAL MapRuinsofAlphHoOhItemRoomSignpost1Script: jumptext UnknownText_0x59923 @@ -47,7 +53,7 @@ RuinsofAlphHoOhItemRoom_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59918, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5991a, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5991c, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5991e, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM diff --git a/maps/RuinsofAlphHoOhWordRoom.asm b/maps/RuinsofAlphHoOhWordRoom.asm index e0d35fa14..eed98968a 100644 --- a/maps/RuinsofAlphHoOhWordRoom.asm +++ b/maps/RuinsofAlphHoOhWordRoom.asm @@ -1,3 +1,4 @@ + RuinsofAlphHoOhWordRoom_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index bb4b47d85..1f900da9e 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -1,3 +1,8 @@ +const_value set 2 + const RUINSOFALPHINNERCHAMBER_FISHER + const RUINSOFALPHINNERCHAMBER_TEACHER + const RUINSOFALPHINNERCHAMBER_GRAMPS + RuinsofAlphInnerChamber_MapScriptHeader: .MapTriggers: db 2 @@ -19,10 +24,10 @@ UnknownScript_0x58f6d: end UnknownScript_0x58f6e: - loadfont + opentext writetext UnknownText_0x58f89 + waitbutton closetext - loadmovesprites dotrigger $0 setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 63bd06be8..c27f000c3 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -1,3 +1,7 @@ +const_value set 2 + const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST + const RUINSOFALPHKABUTOCHAMBER_SCIENTIST + RuinsofAlphKabutoChamber_MapScriptHeader: .MapTriggers: db 2 @@ -51,7 +55,7 @@ UnknownScript_0x58751: reloadmappart earthquake 50 dotrigger $1 - loadmovesprites + closetext end ReceptionistScript_0x58769: @@ -61,7 +65,7 @@ MapRuinsofAlphKabutoChamberSignpost2Script: refreshscreen $0 writebyte $0 special Special_UnownPuzzle - loadmovesprites + closetext iftrue UnknownScript_0x58778 end @@ -80,14 +84,14 @@ UnknownScript_0x58778: earthquake 80 applymovement PLAYER, MovementData_0x587fe playsound SFX_KINESIS - waitbutton + waitsfx pause 20 warpcheck end ScientistScript_0x587a8: faceplayer - loadfont + opentext checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x587cf checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER @@ -95,24 +99,24 @@ ScientistScript_0x587a8: checkevent EVENT_SOLVED_KABUTO_PUZZLE iffalse UnknownScript_0x587c0 writetext UnknownText_0x589b8 - keeptextopen + buttonsound UnknownScript_0x587c0: writetext UnknownText_0x588f5 + waitbutton closetext - loadmovesprites - spriteface $3, UP + spriteface RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP end UnknownScript_0x587c9: writetext UnknownText_0x5897c + waitbutton closetext - loadmovesprites end UnknownScript_0x587cf: writetext UnknownText_0x594cb + waitbutton closetext - loadmovesprites end MapRuinsofAlphKabutoChamberSignpost1Script: @@ -122,28 +126,28 @@ MapRuinsofAlphKabutoChamberSignpost3Script: jumptext UnknownText_0x58b3f MapRuinsofAlphKabutoChamberSignpost4Script: - loadfont + opentext writetext UnknownText_0x58aa7 writebyte $0 special Special_DisplayUnownWords - loadmovesprites + closetext end MapRuinsofAlphKabutoChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x587f7 - loadfont + opentext writetext UnknownText_0x58ad9 writebyte $0 special Special_DisplayUnownWords - loadmovesprites + closetext end UnknownScript_0x587f7: - loadfont + opentext writetext UnknownText_0x58afa + waitbutton closetext - loadmovesprites end MovementData_0x587fe: diff --git a/maps/RuinsofAlphKabutoItemRoom.asm b/maps/RuinsofAlphKabutoItemRoom.asm index 19a991479..8b839efd9 100644 --- a/maps/RuinsofAlphKabutoItemRoom.asm +++ b/maps/RuinsofAlphKabutoItemRoom.asm @@ -1,3 +1,9 @@ +const_value set 2 + const RUINSOFALPHKABUTOITEMROOM_POKE_BALL1 + const RUINSOFALPHKABUTOITEMROOM_POKE_BALL2 + const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3 + const RUINSOFALPHKABUTOITEMROOM_POKE_BALL4 + RuinsofAlphKabutoItemRoom_MapScriptHeader: .MapTriggers: db 0 @@ -5,17 +11,17 @@ RuinsofAlphKabutoItemRoom_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x599a2: - db BERRY, 1 +RuinsofAlphKabutoItemRoomBerry: + itemball BERRY -ItemFragment_0x599a4: - db PSNCUREBERRY, 1 +RuinsofAlphKabutoItemRoomPsncureberry: + itemball PSNCUREBERRY -ItemFragment_0x599a6: - db HEAL_POWDER, 1 +RuinsofAlphKabutoItemRoomHealPowder: + itemball HEAL_POWDER -ItemFragment_0x599a8: - db ENERGYPOWDER, 1 +RuinsofAlphKabutoItemRoomEnergypowder: + itemball ENERGYPOWDER MapRuinsofAlphKabutoItemRoomSignpost1Script: jumptext UnknownText_0x599ad @@ -47,7 +53,7 @@ RuinsofAlphKabutoItemRoom_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x599a2, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x599a4, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x599a6, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x599a8, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM diff --git a/maps/RuinsofAlphKabutoWordRoom.asm b/maps/RuinsofAlphKabutoWordRoom.asm index 8d754f657..64aa21491 100644 --- a/maps/RuinsofAlphKabutoWordRoom.asm +++ b/maps/RuinsofAlphKabutoWordRoom.asm @@ -1,3 +1,4 @@ + RuinsofAlphKabutoWordRoom_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 29b96cdd2..701eca02d 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -1,3 +1,4 @@ + RuinsofAlphOmanyteChamber_MapScriptHeader: .MapTriggers: db 2 @@ -50,14 +51,14 @@ UnknownScript_0x58c12: reloadmappart earthquake 50 dotrigger $1 - loadmovesprites + closetext end MapRuinsofAlphOmanyteChamberSignpost2Script: refreshscreen $0 writebyte $1 special Special_UnownPuzzle - loadmovesprites + closetext iftrue UnknownScript_0x58c36 end @@ -75,7 +76,7 @@ UnknownScript_0x58c36: earthquake 80 applymovement PLAYER, MovementData_0x58c8c playsound SFX_KINESIS - waitbutton + waitsfx pause 20 warpcheck end @@ -87,28 +88,28 @@ MapRuinsofAlphOmanyteChamberSignpost3Script: jumptext UnknownText_0x58d26 MapRuinsofAlphOmanyteChamberSignpost4Script: - loadfont + opentext writetext UnknownText_0x58c8e writebyte $2 special Special_DisplayUnownWords - loadmovesprites + closetext end MapRuinsofAlphOmanyteChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue UnknownScript_0x58c85 - loadfont + opentext writetext UnknownText_0x58cc0 writebyte $2 special Special_DisplayUnownWords - loadmovesprites + closetext end UnknownScript_0x58c85: - loadfont + opentext writetext UnknownText_0x58ce1 + waitbutton closetext - loadmovesprites end MovementData_0x58c8c: diff --git a/maps/RuinsofAlphOmanyteItemRoom.asm b/maps/RuinsofAlphOmanyteItemRoom.asm index 0611de183..55d4cf9b4 100644 --- a/maps/RuinsofAlphOmanyteItemRoom.asm +++ b/maps/RuinsofAlphOmanyteItemRoom.asm @@ -1,3 +1,9 @@ +const_value set 2 + const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL1 + const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL2 + const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3 + const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4 + RuinsofAlphOmanyteItemRoom_MapScriptHeader: .MapTriggers: db 0 @@ -5,17 +11,17 @@ RuinsofAlphOmanyteItemRoom_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x59a2c: - db MYSTERYBERRY, 1 +RuinsofAlphOmanyteItemRoomMysteryberry: + itemball MYSTERYBERRY -ItemFragment_0x59a2e: - db MYSTIC_WATER, 1 +RuinsofAlphOmanyteItemRoomMysticWater: + itemball MYSTIC_WATER -ItemFragment_0x59a30: - db STARDUST, 1 +RuinsofAlphOmanyteItemRoomStardust: + itemball STARDUST -ItemFragment_0x59a32: - db STAR_PIECE, 1 +RuinsofAlphOmanyteItemRoomStarPiece: + itemball STAR_PIECE MapRuinsofAlphOmanyteItemRoomSignpost1Script: jumptext UnknownText_0x59a37 @@ -47,7 +53,7 @@ RuinsofAlphOmanyteItemRoom_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59a2c, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59a2e, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59a30, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59a32, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM diff --git a/maps/RuinsofAlphOmanyteWordRoom.asm b/maps/RuinsofAlphOmanyteWordRoom.asm index 7600f41d9..3f98b7fe4 100644 --- a/maps/RuinsofAlphOmanyteWordRoom.asm +++ b/maps/RuinsofAlphOmanyteWordRoom.asm @@ -1,3 +1,4 @@ + RuinsofAlphOmanyteWordRoom_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 4c5293821..6464b409e 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -1,3 +1,10 @@ +const_value set 2 + const RUINSOFALPHOUTSIDE_YOUNGSTER1 + const RUINSOFALPHOUTSIDE_SCIENTIST + const RUINSOFALPHOUTSIDE_FISHER + const RUINSOFALPHOUTSIDE_YOUNGSTER2 + const RUINSOFALPHOUTSIDE_YOUNGSTER3 + RuinsofAlphOutside_MapScriptHeader: .MapTriggers: db 2 @@ -32,36 +39,36 @@ UnknownScript_0x5801e: jump UnknownScript_0x5802c UnknownScript_0x58027: - appear $3 + appear RUINSOFALPHOUTSIDE_SCIENTIST dotrigger $1 return UnknownScript_0x5802c: - disappear $3 + disappear RUINSOFALPHOUTSIDE_SCIENTIST dotrigger $0 return UnknownScript_0x58031: - spriteface $3, UP + spriteface RUINSOFALPHOUTSIDE_SCIENTIST, UP spriteface PLAYER, DOWN jump UnknownScript_0x58044 UnknownScript_0x5803a: - spriteface $3, LEFT + spriteface RUINSOFALPHOUTSIDE_SCIENTIST, LEFT spriteface PLAYER, RIGHT jump UnknownScript_0x58044 ScientistScript_0x58043: faceplayer UnknownScript_0x58044: - loadfont + opentext writetext UnknownText_0x580c7 + waitbutton closetext - loadmovesprites playmusic MUSIC_SHOW_ME_AROUND - follow $3, PLAYER - applymovement $3, MovementData_0x580ba - disappear $3 + follow RUINSOFALPHOUTSIDE_SCIENTIST, PLAYER + applymovement RUINSOFALPHOUTSIDE_SCIENTIST, MovementData_0x580ba + disappear RUINSOFALPHOUTSIDE_SCIENTIST stopfollow applymovement PLAYER, MovementData_0x580c5 domaptrigger RUINS_OF_ALPH_RESEARCH_CENTER, $1 @@ -70,44 +77,44 @@ UnknownScript_0x58044: FisherScript_0x58061: faceplayer - loadfont + opentext checkevent EVENT_TALKED_TO_RUINS_COWARD iftrue .Next setevent EVENT_TALKED_TO_RUINS_COWARD writetext UnknownText_0x583a4 - keeptextopen + buttonsound .Next writetext UnknownText_0x58420 + waitbutton closetext - loadmovesprites end YoungsterScript_0x58076: faceplayer - loadfont + opentext writetext UnknownText_0x58449 + waitbutton closetext - loadmovesprites end YoungsterScript_0x5807e: faceplayer - loadfont + opentext writetext UnknownText_0x5848e + waitbutton closetext - loadmovesprites - spriteface $6, UP + spriteface RUINSOFALPHOUTSIDE_YOUNGSTER3, UP end TrainerPsychicNathan: trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, PsychicNathanScript PsychicNathanScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5830e + waitbutton closetext - loadmovesprites end @@ -115,11 +122,11 @@ TrainerSuperNerdStan: trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, UnknownScript_0x580a9 UnknownScript_0x580a9: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x58250 + waitbutton closetext - loadmovesprites end diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index 59262d20b..44e67ff83 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -1,3 +1,8 @@ +const_value set 2 + const RUINSOFALPHRESEARCHCENTER_SCIENTIST1 + const RUINSOFALPHRESEARCHCENTER_SCIENTIST2 + const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 + RuinsofAlphResearchCenter_MapScriptHeader: .MapTriggers: db 2 @@ -26,12 +31,12 @@ UnknownScript_0x59185: return UnknownScript_0x5918b: - moveperson $4, $3, $7 - appear $4 + moveperson RUINSOFALPHRESEARCHCENTER_SCIENTIST3, $3, $7 + appear RUINSOFALPHRESEARCHCENTER_SCIENTIST3 return UnknownScript_0x59192: - applymovement $4, MovementData_0x5926f + applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x5926f playsound SFX_BOOT_PC pause 60 playsound SFX_SWITCH_POKEMON @@ -40,44 +45,44 @@ UnknownScript_0x59192: pause 30 playsound SFX_TRANSACTION pause 30 - spriteface $4, DOWN - loadfont + spriteface RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN + opentext writetext UnknownText_0x59278 + waitbutton closetext - loadmovesprites - applymovement $4, MovementData_0x59274 - loadfont + applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59274 + opentext writetext UnknownText_0x592fa playsound SFX_ITEM - waitbutton + waitsfx setflag ENGINE_UNOWN_DEX writetext UnknownText_0x59311 + waitbutton closetext - loadmovesprites - applymovement $4, MovementData_0x59276 + applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59276 dotrigger $0 special RestartMapMusic end ScientistScript_0x591d1: faceplayer - loadfont + opentext checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x591df writetext UnknownText_0x59311 + waitbutton closetext - loadmovesprites end UnknownScript_0x591df: writetext UnknownText_0x5935f + waitbutton closetext - loadmovesprites end ScientistScript_0x591e5: faceplayer - loadfont + opentext checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x5920b checkflag ENGINE_UNOWN_DEX @@ -85,88 +90,88 @@ ScientistScript_0x591e5: checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x591ff writetext UnknownText_0x593ed + waitbutton closetext - loadmovesprites end UnknownScript_0x591ff: writetext UnknownText_0x59478 + waitbutton closetext - loadmovesprites end UnknownScript_0x59205: writetext UnknownText_0x59445 + waitbutton closetext - loadmovesprites end UnknownScript_0x5920b: writetext UnknownText_0x594cb + waitbutton closetext - loadmovesprites clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS end ScientistScript_0x59214: faceplayer - loadfont + opentext checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x5922e checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x59228 writetext UnknownText_0x5954f + waitbutton closetext - loadmovesprites end UnknownScript_0x59228: writetext UnknownText_0x595cb + waitbutton closetext - loadmovesprites end UnknownScript_0x5922e: writetext UnknownText_0x59769 + waitbutton closetext - loadmovesprites end MapRuinsofAlphResearchCenterSignpost1Script: - loadfont + opentext checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x59241 checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x59247 UnknownScript_0x59241: writetext UnknownText_0x597b6 + waitbutton closetext - loadmovesprites end UnknownScript_0x59247: writetext UnknownText_0x597d9 + waitbutton closetext - loadmovesprites end MapRuinsofAlphResearchCenterSignpost2Script: - loadfont + opentext checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x5925a checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x59260 UnknownScript_0x5925a: writetext UnknownText_0x5980e + waitbutton closetext - loadmovesprites end UnknownScript_0x59260: writetext UnknownText_0x5982d - closetext + waitbutton special Special_UnownPrinter - loadmovesprites + closetext end UnknownScript_0x59269: diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index 2f5fbe2ab..e3f5922f9 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -1,3 +1,4 @@ + SafariZoneBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index 60b24d4e1..4c046f012 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -1,3 +1,4 @@ + SafariZoneFuchsiaGateBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index a116519ba..94b030858 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -1,3 +1,4 @@ + SafariZoneMainOffice_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index e3ea7f4ed..56db1e283 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -1,3 +1,6 @@ +const_value set 2 + const SAFARIZONEWARDENSHOME_LASS + SafariZoneWardensHome_MapScriptHeader: .MapTriggers: db 0 @@ -7,18 +10,18 @@ SafariZoneWardensHome_MapScriptHeader: WardensGranddaughter: faceplayer - loadfont + opentext checkevent EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER iftrue .AlreadyMet writetext WardensGranddaughterText1 + waitbutton closetext - loadmovesprites setevent EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER end .AlreadyMet writetext WardensGranddaughterText2 + waitbutton closetext - loadmovesprites end WardenPhoto: diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 46fd6186f..c3bf50008 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -1,3 +1,13 @@ +const_value set 2 + const SAFFRONCITY_LASS1 + const SAFFRONCITY_POKEFAN_M + const SAFFRONCITY_COOLTRAINER_M + const SAFFRONCITY_COOLTRAINER_F + const SAFFRONCITY_FISHER + const SAFFRONCITY_YOUNGSTER1 + const SAFFRONCITY_YOUNGSTER2 + const SAFFRONCITY_LASS2 + SaffronCity_MapScriptHeader: .MapTriggers: db 0 @@ -14,34 +24,34 @@ SaffronCity_MapScriptHeader: LassScript_0x19932a: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x199338 writetext UnknownText_0x19938d + waitbutton closetext - loadmovesprites end UnknownScript_0x199338: writetext UnknownText_0x19940d + waitbutton closetext - loadmovesprites end PokefanMScript_0x19933e: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x19934c writetext UnknownText_0x199460 + waitbutton closetext - loadmovesprites end UnknownScript_0x19934c: writetext UnknownText_0x1994ae + waitbutton closetext - loadmovesprites end CooltrainerMScript_0x199352: @@ -52,18 +62,18 @@ CooltrainerFScript_0x199355: FisherScript_0x199358: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x199366 writetext UnknownText_0x1995fc + waitbutton closetext - loadmovesprites end UnknownScript_0x199366: writetext UnknownText_0x19964b + waitbutton closetext - loadmovesprites end YoungsterScript_0x19936c: diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 0813c904a..7ff9f504c 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -1,3 +1,11 @@ +const_value set 2 + const SAFFRONGYM_SABRINA + const SAFFRONGYM_GRANNY1 + const SAFFRONGYM_YOUNGSTER1 + const SAFFRONGYM_GRANNY2 + const SAFFRONGYM_YOUNGSTER2 + const SAFFRONGYM_GYM_GUY + SaffronGym_MapScriptHeader: .MapTriggers: db 0 @@ -7,95 +15,95 @@ SaffronGym_MapScriptHeader: SabrinaScript_0x189c2e: faceplayer - loadfont + opentext checkflag ENGINE_MARSHBADGE iftrue .FightDone writetext UnknownText_0x189cdf + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x189df4, 0 loadtrainer SABRINA, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_SABRINA setevent EVENT_BEAT_MEDIUM_REBECCA setevent EVENT_BEAT_MEDIUM_DORIS setevent EVENT_BEAT_PSYCHIC_FRANKLIN setevent EVENT_BEAT_PSYCHIC_JARED - loadfont + opentext writetext UnknownText_0x189e95 playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_MARSHBADGE writetext UnknownText_0x189ead + waitbutton closetext - loadmovesprites end .FightDone writetext UnknownText_0x189f6c + waitbutton closetext - loadmovesprites end TrainerMediumRebecca: trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, MediumRebeccaScript MediumRebeccaScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x18a034 + waitbutton closetext - loadmovesprites end TrainerPsychicFranklin: trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, PsychicFranklinScript PsychicFranklinScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x18a0a6 + waitbutton closetext - loadmovesprites end TrainerMediumDoris: trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, MediumDorisScript MediumDorisScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x18a136 + waitbutton closetext - loadmovesprites end TrainerPsychicJared: trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, PsychicJaredScript PsychicJaredScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x18a1b3 + waitbutton closetext - loadmovesprites end SaffronGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_SABRINA iftrue .SaffronGymGuyWinScript writetext SaffronGymGuyText + waitbutton closetext - loadmovesprites end .SaffronGymGuyWinScript writetext SaffronGymGuyWinText + waitbutton closetext - loadmovesprites end SaffronGymStatue: diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index de4f50a67..ed13ef074 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const SAFFRONMART_CLERK + const SAFFRONMART_COOLTRAINER_M + const SAFFRONMART_COOLTRAINER_F + SaffronMart_MapScriptHeader: .MapTriggers: db 0 @@ -6,9 +11,9 @@ SaffronMart_MapScriptHeader: db 0 ClerkScript_0x18a3bf: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_SAFFRON - loadmovesprites + closetext end CooltrainerMScript_0x18a3c6: diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index 21d6aa136..2b192dfd2 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const SAFFRONPOKECENTER1F_NURSE + const SAFFRONPOKECENTER1F_TEACHER + const SAFFRONPOKECENTER1F_FISHER + const SAFFRONPOKECENTER1F_YOUNGSTER + SaffronPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -18,18 +24,18 @@ TeacherScript_0x18a480: FisherScript_0x18a48c: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue .SolvedKantoPowerCrisis writetext UnknownText_0x18a5d3 + waitbutton closetext - loadmovesprites end .SolvedKantoPowerCrisis: writetext UnknownText_0x18a62e + waitbutton closetext - loadmovesprites end YoungsterScript_0x18a4a0: diff --git a/maps/SaffronPokeCenter2FBeta.asm b/maps/SaffronPokeCenter2FBeta.asm index 987236d0b..5fb7ed1eb 100644 --- a/maps/SaffronPokeCenter2FBeta.asm +++ b/maps/SaffronPokeCenter2FBeta.asm @@ -1,3 +1,4 @@ + SaffronPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index b79485c2e..cce353350 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -1,24 +1,30 @@ +const_value set 2 + const SAFFRONTRAINSTATION_OFFICER + const SAFFRONTRAINSTATION_GYM_GUY + const SAFFRONTRAINSTATION_TEACHER + const SAFFRONTRAINSTATION_LASS + SaffronTrainStation_MapScriptHeader: .MapTriggers: db 1 ; triggers - dw .Trigger1, 0 + dw .Trigger0, 0 .MapCallbacks: db 0 -.Trigger1: +.Trigger0: end OfficerScript_0x18a81e: faceplayer - loadfont + opentext checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .MagnetTrainToGoldenrod writetext UnknownText_0x18a8a9 + waitbutton closetext - loadmovesprites end .MagnetTrainToGoldenrod: @@ -28,9 +34,9 @@ OfficerScript_0x18a81e: checkitem PASS iffalse .PassNotInBag writetext UnknownText_0x18a917 + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x18a88f + applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a88f applymovement PLAYER, MovementData_0x18a898 writebyte $1 special Special_MagnetTrain @@ -46,40 +52,40 @@ OfficerScript_0x18a81e: .PassNotInBag: writetext UnknownText_0x18a956 + waitbutton closetext - loadmovesprites end .DecidedNotToRide: writetext UnknownText_0x18a978 + waitbutton closetext - loadmovesprites end Script_ArriveFromGoldenrod: - applymovement $2, MovementData_0x18a88f + applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a88f applymovement PLAYER, MovementData_0x18a8a1 - applymovement $2, MovementData_0x18a894 - loadfont + applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a894 + opentext writetext UnknownText_0x18a993 + waitbutton closetext - loadmovesprites end GymGuyScript_0x18a875: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18a883 writetext UnknownText_0x18a9ca + waitbutton closetext - loadmovesprites end UnknownScript_0x18a883: writetext UnknownText_0x18aa61 + waitbutton closetext - loadmovesprites end TeacherScript_0x18a889: diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 4b0a49491..82bfa156f 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -1,3 +1,7 @@ +const_value set 2 + const SEAFOAMGYM_BLAINE + const SEAFOAMGYM_GYM_GUY + SeafoamGym_MapScriptHeader: .MapTriggers: db 1 @@ -13,51 +17,51 @@ UnknownScript_0x1ab4fa: BlaineScript_0x1ab4fb: faceplayer - loadfont + opentext checkflag ENGINE_VOLCANOBADGE iftrue .FightDone writetext UnknownText_0x1ab548 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x1ab646, 0 loadtrainer BLAINE, 1 startbattle iftrue .ReturnAfterBattle - appear $3 + appear SEAFOAMGYM_GYM_GUY .ReturnAfterBattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_BLAINE - loadfont + opentext writetext UnknownText_0x1ab683 playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_VOLCANOBADGE writetext UnknownText_0x1ab69d + waitbutton closetext - loadmovesprites end .FightDone writetext UnknownText_0x1ab71c + waitbutton closetext - loadmovesprites end SeafoamGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE iftrue .TalkedToSeafoamGymGuyScript writetext SeafoamGymGuyWinText + waitbutton closetext - loadmovesprites setevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE end .TalkedToSeafoamGymGuyScript writetext SeafoamGymGuyWinText2 + waitbutton closetext - loadmovesprites end UnknownText_0x1ab548: diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index b5424ff25..be1d1977a 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const SILPHCO1F_RECEPTIONIST + const SILPHCO1F_OFFICER + SilphCo1F_MapScriptHeader: .MapTriggers: db 0 @@ -10,19 +14,19 @@ ReceptionistScript_0x18abe5: OfficerScript_0x18abe8: faceplayer - loadfont + opentext checkevent EVENT_GOT_UP_GRADE iftrue UnknownScript_0x18abfd writetext UnknownText_0x18ac36 - keeptextopen + buttonsound verbosegiveitem UP_GRADE iffalse UnknownScript_0x18ac01 setevent EVENT_GOT_UP_GRADE UnknownScript_0x18abfd: writetext UnknownText_0x18aca8 - closetext + waitbutton UnknownScript_0x18ac01: - loadmovesprites + closetext end UnknownText_0x18ac03: diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 19830802e..2996b9e84 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -1,3 +1,7 @@ +const_value set 2 + const SILVERCAVEITEMROOMS_POKE_BALL1 + const SILVERCAVEITEMROOMS_POKE_BALL2 + SilverCaveItemRooms_MapScriptHeader: .MapTriggers: db 0 @@ -5,11 +9,11 @@ SilverCaveItemRooms_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x18c65e: - db MAX_REVIVE, 1 +SilverCaveItemRoomsMaxRevive: + itemball MAX_REVIVE -ItemFragment_0x18c660: - db FULL_RESTORE, 1 +SilverCaveItemRoomsFullRestore: + itemball FULL_RESTORE SilverCaveItemRooms_MapEventHeader: ; filler @@ -28,5 +32,5 @@ SilverCaveItemRooms_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c65e, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE - person_event SPRITE_POKE_BALL, 11, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c660, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE + person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE + person_event SPRITE_POKE_BALL, 11, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 51718ba61..9e050cf72 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -1,3 +1,4 @@ + SilverCaveOutside_MapScriptHeader: .MapTriggers: db 0 @@ -18,7 +19,7 @@ MtSilverPokeCenterSign: MtSilverSign: jumptext MtSilverSignText -MapSilverCaveOutsideSignpostItem2: +SilverCaveOutsideHiddenFullRestore: dwb EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE MtSilverSignText: @@ -41,7 +42,7 @@ SilverCaveOutside_MapEventHeader: db 3 signpost 19, 24, SIGNPOST_READ, MtSilverPokeCenterSign signpost 13, 17, SIGNPOST_READ, MtSilverSign - signpost 25, 9, SIGNPOST_ITEM, MapSilverCaveOutsideSignpostItem2 + signpost 25, 9, SIGNPOST_ITEM, SilverCaveOutsideHiddenFullRestore .PersonEvents: db 0 diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokeCenter1F.asm index 32f11f61b..7aba170fe 100644 --- a/maps/SilverCavePokeCenter1F.asm +++ b/maps/SilverCavePokeCenter1F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const SILVERCAVEPOKECENTER1F_NURSE + const SILVERCAVEPOKECENTER1F_GRANNY + SilverCavePokeCenter1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 03c33bda2..6bca1da26 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -1,3 +1,9 @@ +const_value set 2 + const SILVERCAVEROOM1_POKE_BALL1 + const SILVERCAVEROOM1_POKE_BALL2 + const SILVERCAVEROOM1_POKE_BALL3 + const SILVERCAVEROOM1_POKE_BALL4 + SilverCaveRoom1_MapScriptHeader: .MapTriggers: db 0 @@ -5,23 +11,23 @@ SilverCaveRoom1_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x18c554: - db MAX_ELIXER, 1 +SilverCaveRoom1MaxElixer: + itemball MAX_ELIXER -ItemFragment_0x18c556: - db PROTEIN, 1 +SilverCaveRoom1Protein: + itemball PROTEIN -ItemFragment_0x18c558: - db ESCAPE_ROPE, 1 +SilverCaveRoom1EscapeRope: + itemball ESCAPE_ROPE -ItemFragment_0x18c55a: - db ULTRA_BALL, 1 +SilverCaveRoom1UltraBall: + itemball ULTRA_BALL -MapSilverCaveRoom1SignpostItem0: +SilverCaveRoom1HiddenDireHit: dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT -MapSilverCaveRoom1SignpostItem1: +SilverCaveRoom1HiddenUltraBall: dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL @@ -39,12 +45,12 @@ SilverCaveRoom1_MapEventHeader: .Signposts: db 2 - signpost 23, 16, SIGNPOST_ITEM, MapSilverCaveRoom1SignpostItem0 - signpost 12, 17, SIGNPOST_ITEM, MapSilverCaveRoom1SignpostItem1 + signpost 23, 16, SIGNPOST_ITEM, SilverCaveRoom1HiddenDireHit + signpost 12, 17, SIGNPOST_ITEM, SilverCaveRoom1HiddenUltraBall .PersonEvents: db 4 - person_event SPRITE_POKE_BALL, 9, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c554, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER - person_event SPRITE_POKE_BALL, 29, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c556, EVENT_SILVER_CAVE_ROOM_1_PROTEIN - person_event SPRITE_POKE_BALL, 30, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c558, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE - person_event SPRITE_POKE_BALL, 18, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c55a, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL + person_event SPRITE_POKE_BALL, 9, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER + person_event SPRITE_POKE_BALL, 29, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN + person_event SPRITE_POKE_BALL, 30, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE + person_event SPRITE_POKE_BALL, 18, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index c596024c1..274fea517 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -1,3 +1,8 @@ +const_value set 2 + const SILVERCAVEROOM2_POKE_BALL1 + const SILVERCAVEROOM2_POKE_BALL2 + const SILVERCAVEROOM2_POKE_BALL3 + SilverCaveRoom2_MapScriptHeader: .MapTriggers: db 0 @@ -5,16 +10,16 @@ SilverCaveRoom2_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x18c5b2: - db CALCIUM, 1 +SilverCaveRoom2Calcium: + itemball CALCIUM -ItemFragment_0x18c5b4: - db ULTRA_BALL, 1 +SilverCaveRoom2UltraBall: + itemball ULTRA_BALL -ItemFragment_0x18c5b6: - db PP_UP, 1 +SilverCaveRoom2PPUp: + itemball PP_UP -MapSilverCaveRoom2SignpostItem0: +SilverCaveRoom2HiddenMaxPotion: dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION @@ -34,10 +39,10 @@ SilverCaveRoom2_MapEventHeader: .Signposts: db 1 - signpost 31, 14, SIGNPOST_ITEM, MapSilverCaveRoom2SignpostItem0 + signpost 31, 14, SIGNPOST_ITEM, SilverCaveRoom2HiddenMaxPotion .PersonEvents: db 3 - person_event SPRITE_POKE_BALL, 10, 24, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c5b2, EVENT_SILVER_CAVE_ROOM_2_CALCIUM - person_event SPRITE_POKE_BALL, 24, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c5b4, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL - person_event SPRITE_POKE_BALL, 20, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c5b6, EVENT_SILVER_CAVE_ROOM_2_PP_UP + person_event SPRITE_POKE_BALL, 10, 24, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM + person_event SPRITE_POKE_BALL, 24, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL + person_event SPRITE_POKE_BALL, 20, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 08831af22..0a8933b67 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -1,3 +1,6 @@ +const_value set 2 + const SILVERCAVEROOM3_RED + SilverCaveRoom3_MapScriptHeader: .MapTriggers: db 0 @@ -6,25 +9,25 @@ SilverCaveRoom3_MapScriptHeader: db 0 RedScript_0x18c603: - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic faceplayer - loadfont + opentext writetext UnknownText_0x18c637 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x18c63c, UnknownText_0x18c63c loadtrainer RED, 1 startbattle - reloadmapmusic - returnafterbattle - special Special_RotatePalettesRightMusic - loadfont + dontrestartmapmusic + reloadmapafterbattle + special Special_FadeOutMusic + opentext writetext UnknownText_0x18c63f + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes - disappear $2 + disappear SILVERCAVEROOM3_RED pause 15 special Special_FadeInQuickly pause 30 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 27b397543..b905140f8 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -1,3 +1,14 @@ +const_value set 2 + const SLOWPOKEWELLB1F_ROCKET1 + const SLOWPOKEWELLB1F_ROCKET2 + const SLOWPOKEWELLB1F_ROCKET3 + const SLOWPOKEWELLB1F_ROCKET_GIRL + const SLOWPOKEWELLB1F_SLOWPOKE1 + const SLOWPOKEWELLB1F_SLOWPOKE2 + const SLOWPOKEWELLB1F_KURT + const SLOWPOKEWELLB1F_BOULDER + const SLOWPOKEWELLB1F_POKE_BALL + SlowpokeWellB1F_MapScriptHeader: .MapTriggers: db 0 @@ -12,38 +23,38 @@ TrainerGruntM29: trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, 29, GruntM29SeenText, GruntM29BeatenText, 0, GruntM29Script GruntM29Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext TrainerGruntM29SlowpokeProfitText + waitbutton closetext - loadmovesprites end TrainerGruntM1: trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, 1, GruntM1SeenText, GruntM1BeatenText, 0, GruntM1Script GruntM1Script: - loadfont + opentext writetext TrainerGruntM1WhenTalkText + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes - disappear $2 - disappear $3 - disappear $4 - disappear $5 + disappear SLOWPOKEWELLB1F_ROCKET1 + disappear SLOWPOKEWELLB1F_ROCKET2 + disappear SLOWPOKEWELLB1F_ROCKET3 + disappear SLOWPOKEWELLB1F_ROCKET_GIRL pause 15 special Special_FadeInQuickly - disappear $8 - moveperson $8, $b, $6 - appear $8 - applymovement $8, KurtSlowpokeWellVictoryMovementData + disappear SLOWPOKEWELLB1F_KURT + moveperson SLOWPOKEWELLB1F_KURT, $b, $6 + appear SLOWPOKEWELLB1F_KURT + applymovement SLOWPOKEWELLB1F_KURT, KurtSlowpokeWellVictoryMovementData spriteface PLAYER, RIGHT - loadfont + opentext writetext KurtLeaveSlowpokeWellText + waitbutton closetext - loadmovesprites setevent EVENT_CLEARED_SLOWPOKE_WELL variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER domaptrigger AZALEA_TOWN, $1 @@ -66,54 +77,54 @@ TrainerGruntM2: trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, 2, GruntM2SeenText, GruntM2BeatenText, 0, GruntM2Script GruntM2Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5aaf2 + waitbutton closetext - loadmovesprites end TrainerGruntF1: trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, 1, GruntF1SeenText, GruntF1BeatenText, 0, GruntF1Script GruntF1Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5ab8d + waitbutton closetext - loadmovesprites end SlowpokeScript_0x5a681: faceplayer - loadfont + opentext cry SLOWPOKE writetext UnknownText_0x5abcb yesorno iftrue UnknownScript_0x5a68f - loadmovesprites + closetext end UnknownScript_0x5a68f: writetext UnknownText_0x5ac09 + waitbutton closetext - loadmovesprites end SlowpokeScript_0x5a695: faceplayer - loadfont + opentext writetext UnknownText_0x5ac61 cry SLOWPOKE + waitbutton closetext - loadmovesprites end SlowpokeWellB1FBoulder: jumpstd strengthboulder -ItemFragment_0x5a6a3: - db SUPER_POTION, 1 +SlowpokeWellB1FSuperPotion: + itemball SUPER_POTION KurtSlowpokeWellVictoryMovementData: step_left @@ -334,4 +345,4 @@ SlowpokeWellB1F_MapEventHeader: person_event SPRITE_SLOWPOKE, 2, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES person_event SPRITE_KURT, 14, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtScript_0x5a5d5, EVENT_SLOWPOKE_WELL_KURT person_event SPRITE_BOULDER, 2, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1 - person_event SPRITE_POKE_BALL, 3, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5a6a3, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION + person_event SPRITE_POKE_BALL, 3, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index f33718b12..397203b94 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const SLOWPOKEWELLB2F_GYM_GUY + const SLOWPOKEWELLB2F_POKE_BALL + SlowpokeWellB2F_MapScriptHeader: .MapTriggers: db 0 @@ -7,26 +11,26 @@ SlowpokeWellB2F_MapScriptHeader: GymGuyScript_0x5ad0b: faceplayer - loadfont + opentext checkevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL iftrue UnknownScript_0x5ad22 writetext UnknownText_0x5ad2a - keeptextopen + buttonsound verbosegiveitem KINGS_ROCK iffalse UnknownScript_0x5ad20 setevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL UnknownScript_0x5ad20: - loadmovesprites + closetext end UnknownScript_0x5ad22: writetext UnknownText_0x5adf2 + waitbutton closetext - loadmovesprites end -ItemFragment_0x5ad28: - db TM_RAIN_DANCE, 1 +SlowpokeWellB2FTMRainDance: + itemball TM_RAIN_DANCE UnknownText_0x5ad2a: text "I'm waiting to see" @@ -74,4 +78,4 @@ SlowpokeWellB2F_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_GYM_GUY, 4, 5, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1 - person_event SPRITE_POKE_BALL, 5, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5ad28, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE + person_event SPRITE_POKE_BALL, 5, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 30b682850..db00dda58 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -1,3 +1,9 @@ +const_value set 2 + const SOULHOUSE_GRAMPS + const SOULHOUSE_TEACHER + const SOULHOUSE_LASS + const SOULHOUSE_GRANNY + SoulHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 7e0d0069a..e32946903 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const SPROUTTOWER1F_SAGE1 + const SPROUTTOWER1F_SAGE2 + const SPROUTTOWER1F_GRANNY + const SPROUTTOWER1F_TEACHER + const SPROUTTOWER1F_SAGE3 + const SPROUTTOWER1F_POKE_BALL + SproutTower1F_MapScriptHeader: .MapTriggers: db 0 @@ -21,15 +29,15 @@ TrainerSageChow: trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, 0, SageChowScript SageChowScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x184583 + waitbutton closetext - loadmovesprites end -ItemFragment_0x18451e: - db PARLYZ_HEAL, 1 +SproutTower1FParlyzHeal: + itemball PARLYZ_HEAL MapSproutTower1FSignpost1Script: jumptext UnknownText_0x1846d6 @@ -121,4 +129,4 @@ SproutTower1F_MapEventHeader: person_event SPRITE_GRANNY, 12, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x184504, -1 person_event SPRITE_TEACHER, 9, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x184507, -1 person_event SPRITE_SAGE, 5, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageChow, -1 - person_event SPRITE_POKE_BALL, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18451e, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL + person_event SPRITE_POKE_BALL, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index bdf50309b..621693f99 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const SPROUTTOWER2F_SAGE1 + const SPROUTTOWER2F_SAGE2 + const SPROUTTOWER2F_POKE_BALL + SproutTower2F_MapScriptHeader: .MapTriggers: db 0 @@ -9,29 +14,29 @@ TrainerSageNico: trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, 0, SageNicoScript SageNicoScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1847ff + waitbutton closetext - loadmovesprites end TrainerSageEdmond: trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, SageEdmondScript SageEdmondScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x18486f + waitbutton closetext - loadmovesprites end MapSproutTower2FSignpost0Script: jumptext UnknownText_0x1848c8 -ItemFragment_0x1847a7: - db X_ACCURACY, 1 +SproutTower2FXAccuracy: + itemball X_ACCURACY SageNicoSeenText: text "However hard we" @@ -101,4 +106,4 @@ SproutTower2F_MapEventHeader: db 3 person_event SPRITE_SAGE, 3, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageNico, -1 person_event SPRITE_SAGE, 14, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSageEdmond, -1 - person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1847a7, EVENT_SPROUT_TOWER2F_X_ACCURACY + person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index c8a1216a8..03c49ee0b 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -1,3 +1,12 @@ +const_value set 2 + const SPROUTTOWER3F_SAGE1 + const SPROUTTOWER3F_SAGE2 + const SPROUTTOWER3F_SAGE3 + const SPROUTTOWER3F_SAGE4 + const SPROUTTOWER3F_POKE_BALL1 + const SPROUTTOWER3F_POKE_BALL2 + const SPROUTTOWER3F_SILVER + SproutTower3F_MapScriptHeader: .MapTriggers: db 2 @@ -18,7 +27,7 @@ UnknownScript_0x184946: UnknownScript_0x184947: spriteface PLAYER, UP showemote EMOTE_SHOCK, PLAYER, 15 - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic playsound SFX_TACKLE playsound SFX_ELEVATOR earthquake 79 @@ -27,30 +36,30 @@ UnknownScript_0x184947: playsound SFX_ELEVATOR earthquake 79 applymovement PLAYER, MovementData_0x184a1d - applymovement $8, MovementData_0x184a22 - loadfont + applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a22 + opentext writetext UnknownText_0x184a27 + waitbutton closetext - loadmovesprites - showemote EMOTE_SHOCK, $8, 15 - spriteface $8, DOWN + showemote EMOTE_SHOCK, SPROUTTOWER3F_SILVER, 15 + spriteface SPROUTTOWER3F_SILVER, DOWN pause 15 - applymovement $8, MovementData_0x184a24 + applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a24 playmusic MUSIC_RIVAL_ENCOUNTER - loadfont + opentext writetext UnknownText_0x184aec + waitbutton closetext - loadmovesprites - spriteface $8, UP - loadfont + spriteface SPROUTTOWER3F_SILVER, UP + opentext writetext UnknownText_0x184bc8 pause 15 - loadmovesprites + closetext playsound SFX_WARP_TO special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes - disappear $8 - waitbutton + disappear SPROUTTOWER3F_SILVER + waitsfx special Special_FadeInQuickly dotrigger $1 special RestartMapMusic @@ -58,64 +67,64 @@ UnknownScript_0x184947: SageLiScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_HM05_FLASH iftrue UnknownScript_0x1849d1 writetext SageLiSeenText + waitbutton closetext - loadmovesprites winlosstext SageLiBeatenText, 0 loadtrainer SAGE, LI startbattle - returnafterbattle - loadfont + reloadmapafterbattle + opentext writetext UnknownText_0x184cc2 - keeptextopen + buttonsound verbosegiveitem HM_FLASH setevent EVENT_GOT_HM05_FLASH setevent EVENT_BEAT_SAGE_LI writetext UnknownText_0x184d13 + waitbutton closetext - loadmovesprites end UnknownScript_0x1849d1: writetext UnknownText_0x184d88 + waitbutton closetext - loadmovesprites end TrainerSageJin: trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, SageJinScript SageJinScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x184dfa + waitbutton closetext - loadmovesprites end TrainerSageTroy: trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, SageTroyScript SageTroyScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x184ea4 + waitbutton closetext - loadmovesprites end TrainerSageNeal: trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, SageNealScript SageNealScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x184f12 + waitbutton closetext - loadmovesprites end MapSproutTower3FSignpost3Script: @@ -124,11 +133,11 @@ MapSproutTower3FSignpost3Script: MapSproutTower3FSignpost5Script: jumptext UnknownText_0x184f61 -ItemFragment_0x184a19: - db POTION, 1 +SproutTower3FPotion: + itemball POTION -ItemFragment_0x184a1b: - db ESCAPE_ROPE, 1 +SproutTower3FEscapeRope: + itemball ESCAPE_ROPE MovementData_0x184a1d: step_up @@ -349,6 +358,6 @@ SproutTower3F_MapEventHeader: person_event SPRITE_SAGE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerSageTroy, -1 person_event SPRITE_SAGE, 2, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SageLiScript, -1 person_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSageNeal, -1 - person_event SPRITE_POKE_BALL, 14, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x184a19, EVENT_SPROUT_TOWER_3F_POTION - person_event SPRITE_POKE_BALL, 1, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x184a1b, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE + person_event SPRITE_POKE_BALL, 14, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION + person_event SPRITE_POKE_BALL, 1, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE person_event SPRITE_SILVER, 4, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index e9e68a97d..de9012ab0 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -1,22 +1,30 @@ +const_value set 2 + const TEAMROCKETBASEB1F_ROCKET1 + const TEAMROCKETBASEB1F_ROCKET2 + const TEAMROCKETBASEB1F_SCIENTIST + const TEAMROCKETBASEB1F_POKE_BALL1 + const TEAMROCKETBASEB1F_POKE_BALL2 + const TEAMROCKETBASEB1F_POKE_BALL3 + TeamRocketBaseB1F_MapScriptHeader: .MapTriggers: db 1 ; triggers - dw UnknownScript_0x6c65a, 0 + dw .Trigger0, 0 .MapCallbacks: db 1 ; callbacks - dbw 2, UnknownScript_0x6c65b + dbw 2, .Callback1 -UnknownScript_0x6c65a: +.Trigger0: end -UnknownScript_0x6c65b: - disappear $2 +.Callback1: + disappear TEAMROCKETBASEB1F_ROCKET1 return SecurityCamera1a: @@ -27,18 +35,18 @@ SecurityCamera1a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $13, $2 - appear $2 + moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $2 + appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT - applymovement $2, SecurityCameraMovement1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $13, $2 - appear $2 - applymovement $2, SecurityCameraMovement1 + moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $2 + appear TEAMROCKETBASEB1F_ROCKET1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_1 @@ -52,18 +60,18 @@ SecurityCamera1b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $13, $3 - appear $2 + moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $3 + appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT - applymovement $2, SecurityCameraMovement1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $13, $3 - appear $2 - applymovement $2, SecurityCameraMovement1 + moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $3 + appear TEAMROCKETBASEB1F_ROCKET1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_1 @@ -77,19 +85,19 @@ SecurityCamera2a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $4, $7 - appear $2 + moveperson TEAMROCKETBASEB1F_ROCKET1, $4, $7 + appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT - applymovement $2, SecurityCameraMovement2 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement2 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson $2, $c, $5 - appear $2 - applymovement $2, SecurityCameraMovement3 + moveperson TEAMROCKETBASEB1F_ROCKET1, $c, $5 + appear TEAMROCKETBASEB1F_ROCKET1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement3 scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_2 @@ -103,19 +111,19 @@ SecurityCamera2b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $4, $8 - appear $2 + moveperson TEAMROCKETBASEB1F_ROCKET1, $4, $8 + appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT - applymovement $2, SecurityCameraMovement4 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement4 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson $2, $c, $5 - appear $2 - applymovement $2, SecurityCameraMovement5 + moveperson TEAMROCKETBASEB1F_ROCKET1, $c, $5 + appear TEAMROCKETBASEB1F_ROCKET1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement5 scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_2 @@ -129,19 +137,19 @@ SecurityCamera3a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $13, $6 - appear $2 + moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $6 + appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT - applymovement $2, SecurityCameraMovement1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson $2, $19, $b - appear $2 - applymovement $2, SecurityCameraMovement6 + moveperson TEAMROCKETBASEB1F_ROCKET1, $19, $b + appear TEAMROCKETBASEB1F_ROCKET1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement6 scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_3 @@ -155,19 +163,19 @@ SecurityCamera3b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $13, $7 - appear $2 + moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $7 + appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT - applymovement $2, SecurityCameraMovement1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson $2, $19, $c - appear $2 - applymovement $2, SecurityCameraMovement7 + moveperson TEAMROCKETBASEB1F_ROCKET1, $19, $c + appear TEAMROCKETBASEB1F_ROCKET1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement7 scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_3 @@ -181,19 +189,19 @@ SecurityCamera4: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $11, $10 - appear $2 + moveperson TEAMROCKETBASEB1F_ROCKET1, $11, $10 + appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT - applymovement $2, SecurityCameraMovement1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson $2, $19, $b - appear $2 - applymovement $2, SecurityCameraMovement8 + moveperson TEAMROCKETBASEB1F_ROCKET1, $19, $b + appear TEAMROCKETBASEB1F_ROCKET1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement8 scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_4 @@ -207,19 +215,19 @@ SecurityCamera5: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $3, $10 - appear $2 + moveperson TEAMROCKETBASEB1F_ROCKET1, $3, $10 + appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT - applymovement $2, SecurityCameraMovement1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson $2, $e, $10 - appear $2 - applymovement $2, SecurityCameraMovement9 + moveperson TEAMROCKETBASEB1F_ROCKET1, $e, $10 + appear TEAMROCKETBASEB1F_ROCKET1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement9 scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_5 @@ -229,29 +237,29 @@ NoSecurityCamera: end TrainerCameraGrunt1: - loadfont + opentext writetext CameraGrunt1SeenText + waitbutton closetext - loadmovesprites winlosstext CameraGrunt1BeatenText, 0 - setlasttalked $2 + setlasttalked TEAMROCKETBASEB1F_ROCKET1 loadtrainer GRUNTM, 20 startbattle - disappear $2 - returnafterbattle + disappear TEAMROCKETBASEB1F_ROCKET1 + reloadmapafterbattle end TrainerCameraGrunt2: - loadfont + opentext writetext CameraGrunt2SeenText + waitbutton closetext - loadmovesprites winlosstext CameraGrunt2BeatenText, 0 - setlasttalked $2 + setlasttalked TEAMROCKETBASEB1F_ROCKET1 loadtrainer GRUNTM, 21 startbattle - disappear $2 - returnafterbattle + disappear TEAMROCKETBASEB1F_ROCKET1 + reloadmapafterbattle end PlaySecurityCameraSounds: @@ -272,7 +280,7 @@ ExplodingTrap1: checkevent EVENT_EXPLODING_TRAP_1 iftrue NoExplodingTrap scall KoffingExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_1 end @@ -280,7 +288,7 @@ ExplodingTrap2: checkevent EVENT_EXPLODING_TRAP_2 iftrue NoExplodingTrap scall VoltorbExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_2 end @@ -288,7 +296,7 @@ ExplodingTrap3: checkevent EVENT_EXPLODING_TRAP_3 iftrue NoExplodingTrap scall GeodudeExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_3 end @@ -296,7 +304,7 @@ ExplodingTrap4: checkevent EVENT_EXPLODING_TRAP_4 iftrue NoExplodingTrap scall VoltorbExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_4 end @@ -304,7 +312,7 @@ ExplodingTrap5: checkevent EVENT_EXPLODING_TRAP_5 iftrue NoExplodingTrap scall GeodudeExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_5 end @@ -312,7 +320,7 @@ ExplodingTrap6: checkevent EVENT_EXPLODING_TRAP_6 iftrue NoExplodingTrap scall KoffingExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_6 end @@ -320,7 +328,7 @@ ExplodingTrap7: checkevent EVENT_EXPLODING_TRAP_7 iftrue NoExplodingTrap scall VoltorbExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_7 end @@ -328,7 +336,7 @@ ExplodingTrap8: checkevent EVENT_EXPLODING_TRAP_8 iftrue NoExplodingTrap scall KoffingExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_8 end @@ -336,7 +344,7 @@ ExplodingTrap9: checkevent EVENT_EXPLODING_TRAP_9 iftrue NoExplodingTrap scall KoffingExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_9 end @@ -344,7 +352,7 @@ ExplodingTrap10: checkevent EVENT_EXPLODING_TRAP_10 iftrue NoExplodingTrap scall VoltorbExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_10 end @@ -352,7 +360,7 @@ ExplodingTrap11: checkevent EVENT_EXPLODING_TRAP_11 iftrue NoExplodingTrap scall GeodudeExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_11 end @@ -360,7 +368,7 @@ ExplodingTrap12: checkevent EVENT_EXPLODING_TRAP_12 iftrue NoExplodingTrap scall GeodudeExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_12 end @@ -368,7 +376,7 @@ ExplodingTrap13: checkevent EVENT_EXPLODING_TRAP_13 iftrue NoExplodingTrap scall GeodudeExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_13 end @@ -376,7 +384,7 @@ ExplodingTrap14: checkevent EVENT_EXPLODING_TRAP_14 iftrue NoExplodingTrap scall KoffingExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_14 end @@ -384,7 +392,7 @@ ExplodingTrap15: checkevent EVENT_EXPLODING_TRAP_15 iftrue NoExplodingTrap scall VoltorbExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_15 end @@ -392,7 +400,7 @@ ExplodingTrap16: checkevent EVENT_EXPLODING_TRAP_16 iftrue NoExplodingTrap scall KoffingExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_16 end @@ -400,7 +408,7 @@ ExplodingTrap17: checkevent EVENT_EXPLODING_TRAP_17 iftrue NoExplodingTrap scall VoltorbExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_17 end @@ -408,7 +416,7 @@ ExplodingTrap18: checkevent EVENT_EXPLODING_TRAP_18 iftrue NoExplodingTrap scall GeodudeExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_18 end @@ -416,7 +424,7 @@ ExplodingTrap19: checkevent EVENT_EXPLODING_TRAP_19 iftrue NoExplodingTrap scall GeodudeExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_19 end @@ -424,7 +432,7 @@ ExplodingTrap20: checkevent EVENT_EXPLODING_TRAP_20 iftrue NoExplodingTrap scall VoltorbExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_20 end @@ -432,7 +440,7 @@ ExplodingTrap21: checkevent EVENT_EXPLODING_TRAP_21 iftrue NoExplodingTrap scall KoffingExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_21 end @@ -440,7 +448,7 @@ ExplodingTrap22: checkevent EVENT_EXPLODING_TRAP_22 iftrue NoExplodingTrap scall VoltorbExplodingTrap - returnafterbattle + reloadmapafterbattle setevent EVENT_EXPLODING_TRAP_22 end @@ -448,9 +456,9 @@ VoltorbExplodingTrap: special FadeOutPalettes cry VOLTORB special FadeInPalettes - setlasttalked $ff + setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP - loadpokedata VOLTORB, 23 + loadwildmon VOLTORB, 23 startbattle end @@ -458,9 +466,9 @@ GeodudeExplodingTrap: special FadeOutPalettes cry GEODUDE special FadeInPalettes - setlasttalked $ff + setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP - loadpokedata GEODUDE, 21 + loadwildmon GEODUDE, 21 startbattle end @@ -468,9 +476,9 @@ KoffingExplodingTrap: special FadeOutPalettes cry KOFFING special FadeInPalettes - setlasttalked $ff + setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP - loadpokedata KOFFING, 21 + loadwildmon KOFFING, 21 startbattle end @@ -481,22 +489,22 @@ TrainerScientistJed: trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, 0, ScientistJedScript ScientistJedScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x6cc16 + waitbutton closetext - loadmovesprites end TrainerGruntM16: trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, 16, GruntM16SeenText, GruntM16BeatenText, 0, GruntM16Script GruntM16Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x6cd1b + waitbutton closetext - loadmovesprites end MapTeamRocketBaseB1FSignpost5Script: @@ -506,13 +514,13 @@ MapTeamRocketBaseB1FSignpost7Script: jumpstd teamrocketoath MapTeamRocketBaseB1FSignpost0Script: - loadfont + opentext checkevent EVENT_TURNED_OFF_SECURITY_CAMERAS iftrue UnknownScript_0x6cabe writetext UnknownText_0x6cdad playsound SFX_TALLY + waitbutton closetext - loadmovesprites setevent EVENT_TURNED_OFF_SECURITY_CAMERAS setevent EVENT_SECURITY_CAMERA_1 setevent EVENT_SECURITY_CAMERA_2 @@ -523,20 +531,20 @@ MapTeamRocketBaseB1FSignpost0Script: UnknownScript_0x6cabe: writetext UnknownText_0x6cdd0 + waitbutton closetext - loadmovesprites end -ItemFragment_0x6cac4: - db HYPER_POTION, 1 +TeamRocketBaseB1FHyperPotion: + itemball HYPER_POTION -ItemFragment_0x6cac6: - db NUGGET, 1 +TeamRocketBaseB1FNugget: + itemball NUGGET -ItemFragment_0x6cac8: - db GUARD_SPEC, 1 +TeamRocketBaseB1FGuardSpec: + itemball GUARD_SPEC -MapTeamRocketBaseB1FSignpostItem8: +TeamRocketBaseB1FHiddenRevive: dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE @@ -782,13 +790,13 @@ TeamRocketBaseB1F_MapEventHeader: signpost 5, 24, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script signpost 11, 20, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script signpost 11, 21, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script - signpost 11, 3, SIGNPOST_ITEM, MapTeamRocketBaseB1FSignpostItem8 + signpost 11, 3, SIGNPOST_ITEM, TeamRocketBaseB1FHiddenRevive .PersonEvents: db 6 person_event SPRITE_ROCKET, 0, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS person_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_SCIENTIST, 12, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_POKE_BALL, 6, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6cac4, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION - person_event SPRITE_POKE_BALL, 15, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6cac6, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET - person_event SPRITE_POKE_BALL, 12, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6cac8, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC + person_event SPRITE_POKE_BALL, 6, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION + person_event SPRITE_POKE_BALL, 15, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET + person_event SPRITE_POKE_BALL, 12, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 2a44c4652..3a675f92e 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -1,3 +1,19 @@ +const_value set 2 + const TEAMROCKETBASEB2F_ROCKET1 + const TEAMROCKETBASEB2F_ROCKET_GIRL + const TEAMROCKETBASEB2F_LANCE + const TEAMROCKETBASEB2F_DRAGON + const TEAMROCKETBASEB2F_VOLTORB1 + const TEAMROCKETBASEB2F_VOLTORB2 + const TEAMROCKETBASEB2F_VOLTORB3 + const TEAMROCKETBASEB2F_VOLTORB4 + const TEAMROCKETBASEB2F_VOLTORB5 + const TEAMROCKETBASEB2F_VOLTORB6 + const TEAMROCKETBASEB2F_ROCKET2 + const TEAMROCKETBASEB2F_ROCKET3 + const TEAMROCKETBASEB2F_ROCKET4 + const TEAMROCKETBASEB2F_POKE_BALL + TeamRocketBaseB2F_MapScriptHeader: .MapTriggers: db 4 @@ -37,109 +53,109 @@ UnknownScript_0x6cf90: return UnknownScript_0x6cf95: - moveperson $4, $9, $d + moveperson TEAMROCKETBASEB2F_LANCE, $9, $d jump UnknownScript_0x6cfac UnknownScript_0x6cf9c: - moveperson $3, $15, $10 - moveperson $2, $15, $10 - moveperson $5, $a, $d - moveperson $4, $a, $d + moveperson TEAMROCKETBASEB2F_ROCKET_GIRL, $15, $10 + moveperson TEAMROCKETBASEB2F_ROCKET1, $15, $10 + moveperson TEAMROCKETBASEB2F_DRAGON, $a, $d + moveperson TEAMROCKETBASEB2F_LANCE, $a, $d UnknownScript_0x6cfac: - appear $3 - appear $2 - loadfont + appear TEAMROCKETBASEB2F_ROCKET_GIRL + appear TEAMROCKETBASEB2F_ROCKET1 + opentext writetext UnknownText_0x6d2ad + waitbutton closetext - loadmovesprites spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 applymovement PLAYER, MovementData_0x6d21f playmusic MUSIC_ROCKET_ENCOUNTER - applymovement $3, MovementData_0x6d224 + applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d224 spriteface PLAYER, UP - applymovement $2, MovementData_0x6d22f - loadfont + applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d22f + opentext writetext UnknownText_0x6d2c3 + waitbutton closetext - loadmovesprites cry DRAGONITE - spriteface $3, LEFT + spriteface TEAMROCKETBASEB2F_ROCKET_GIRL, LEFT spriteface PLAYER, LEFT - appear $5 - applymovement $5, MovementData_0x6d236 - applymovement $3, MovementData_0x6d23b - applymovement $2, MovementData_0x6d24c - appear $4 - applymovement $4, MovementData_0x6d244 - loadfont + appear TEAMROCKETBASEB2F_DRAGON + applymovement TEAMROCKETBASEB2F_DRAGON, MovementData_0x6d236 + applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d23b + applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d24c + appear TEAMROCKETBASEB2F_LANCE + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d244 + opentext writetext UnknownText_0x6d38c + waitbutton closetext - loadmovesprites spriteface PLAYER, RIGHT - applymovement $3, MovementData_0x6d241 - loadfont + applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d241 + opentext writetext UnknownText_0x6d3bd + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x6d24a - applymovement $3, MovementData_0x6d248 + applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d24a + applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d248 winlosstext UnknownText_0x6d45c, 0 - setlasttalked $3 + setlasttalked TEAMROCKETBASEB2F_ROCKET_GIRL loadtrainer EXECUTIVEF, 2 startbattle - disappear $5 + disappear TEAMROCKETBASEB2F_DRAGON setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE setevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEF_2 - loadfont + opentext writetext UnknownText_0x6d4c6 + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes - disappear $2 - disappear $3 - disappear $c - disappear $d - disappear $e + disappear TEAMROCKETBASEB2F_ROCKET1 + disappear TEAMROCKETBASEB2F_ROCKET_GIRL + disappear TEAMROCKETBASEB2F_ROCKET2 + disappear TEAMROCKETBASEB2F_ROCKET3 + disappear TEAMROCKETBASEB2F_ROCKET4 pause 15 special Special_FadeInQuickly dotrigger $2 clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE - spriteface $4, DOWN - loadfont + spriteface TEAMROCKETBASEB2F_LANCE, DOWN + opentext writetext UnknownText_0x6d5d8 + waitbutton closetext - loadmovesprites - applymovement $4, MovementData_0x6d250 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d250 spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x6d64e + waitbutton closetext - loadmovesprites - follow $4, PLAYER - applymovement $4, MovementData_0x6d254 + follow TEAMROCKETBASEB2F_LANCE, PLAYER + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d254 stopfollow - applymovement $4, MovementData_0x6d258 - loadfont + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d258 + opentext writetext UnknownText_0x6d6cf + waitbutton closetext - loadmovesprites - applymovement $4, MovementData_0x6d267 - disappear $4 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d267 + disappear TEAMROCKETBASEB2F_LANCE UnknownScript_0x6d075: applymovement PLAYER, MovementData_0x6d271 end UnknownScript_0x6d07a: - loadfont + opentext writetext UnknownText_0x6d7ea + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x6d278 end @@ -149,146 +165,146 @@ UnknownScript_0x6d085: UnknownScript_0x6d08b: spriteface PLAYER, RIGHT - spriteface $4, LEFT + spriteface TEAMROCKETBASEB2F_LANCE, LEFT UnknownScript_0x6d091: - loadfont + opentext writetext UnknownText_0x6da97 + waitbutton closetext - loadmovesprites special FadeOutPalettes special Mobile_HealParty playsound SFX_FULL_HEAL special HealParty special FadeInPalettes - loadfont + opentext writetext UnknownText_0x6daf7 + waitbutton closetext - loadmovesprites dotrigger $1 setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE checkcode VAR_FACING if_equal RIGHT, UnknownScript_0x6d0be - applymovement $4, MovementData_0x6d212 - disappear $4 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d212 + disappear TEAMROCKETBASEB2F_LANCE end UnknownScript_0x6d0be: - applymovement $4, MovementData_0x6d219 - disappear $4 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d219 + disappear TEAMROCKETBASEB2F_LANCE end TrainerGruntM17: trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, 17, GruntM17SeenText, GruntM17BeatenText, 0, GruntM17Script GruntM17Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x6db88 + waitbutton closetext - loadmovesprites end TrainerGruntM18: trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, 18, GruntM18SeenText, GruntM18BeatenText, 0, GruntM18Script GruntM18Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x6dc1a + waitbutton closetext - loadmovesprites end TrainerGruntM19: trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, 19, GruntM19SeenText, GruntM19BeatenText, 0, GruntM19Script GruntM19Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x6dcd1 + waitbutton closetext - loadmovesprites end VoltorbScript_0x6d101: cry ELECTRODE - loadpokedata ELECTRODE, 23 + loadwildmon ELECTRODE, 23 startbattle iftrue UnknownScript_0x6d182 - disappear $6 - disappear $9 + disappear TEAMROCKETBASEB2F_VOLTORB1 + disappear TEAMROCKETBASEB2F_VOLTORB4 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 iffalse UnknownScript_0x6d182 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 iffalse UnknownScript_0x6d182 - returnafterbattle + reloadmapafterbattle special PlayMapMusic applymovement PLAYER, MovementData_0x6d28c jump UnknownScript_0x6d184 VoltorbScript_0x6d12c: cry ELECTRODE - loadpokedata ELECTRODE, 23 + loadwildmon ELECTRODE, 23 startbattle iftrue UnknownScript_0x6d182 - disappear $7 - disappear $a + disappear TEAMROCKETBASEB2F_VOLTORB2 + disappear TEAMROCKETBASEB2F_VOLTORB5 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 iffalse UnknownScript_0x6d182 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 iffalse UnknownScript_0x6d182 - returnafterbattle + reloadmapafterbattle special PlayMapMusic applymovement PLAYER, MovementData_0x6d299 jump UnknownScript_0x6d184 VoltorbScript_0x6d157: cry ELECTRODE - loadpokedata ELECTRODE, 23 + loadwildmon ELECTRODE, 23 startbattle iftrue UnknownScript_0x6d182 - disappear $8 - disappear $b + disappear TEAMROCKETBASEB2F_VOLTORB3 + disappear TEAMROCKETBASEB2F_VOLTORB6 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 iffalse UnknownScript_0x6d182 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 iffalse UnknownScript_0x6d182 - returnafterbattle + reloadmapafterbattle special PlayMapMusic applymovement PLAYER, MovementData_0x6d2a4 jump UnknownScript_0x6d184 UnknownScript_0x6d182: - returnafterbattle + reloadmapafterbattle end UnknownScript_0x6d184: - moveperson $4, $12, $6 - appear $4 - applymovement $4, MovementData_0x6d27a + moveperson TEAMROCKETBASEB2F_LANCE, $12, $6 + appear TEAMROCKETBASEB2F_LANCE + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a spriteface PLAYER, RIGHT - loadfont + opentext writetext UnknownText_0x6d809 - keeptextopen + buttonsound verbosegiveitem HM_WHIRLPOOL setevent EVENT_GOT_HM06_WHIRLPOOL writetext UnknownText_0x6d8f8 + waitbutton closetext - loadmovesprites - spriteface $4, DOWN - loadfont + spriteface TEAMROCKETBASEB2F_LANCE, DOWN + opentext writetext UnknownText_0x6d994 + waitbutton closetext - loadmovesprites spriteface PLAYER, DOWN - applymovement $4, MovementData_0x6d283 - disappear $4 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d283 + disappear TEAMROCKETBASEB2F_LANCE setevent EVENT_CLEARED_ROCKET_HIDEOUT clearflag ENGINE_ROCKET_SIGNAL_ON_CH20 setevent EVENT_ROUTE_43_GATE_ROCKETS @@ -309,44 +325,44 @@ MapTeamRocketBaseB2FSignpostPtr1: MapTeamRocketBaseB2FSignpost1Script: - loadfont + opentext checkevent EVENT_LEARNED_HAIL_GIOVANNI iftrue UnknownScript_0x6d1e8 writetext UnknownText_0x6dd39 + waitbutton closetext - loadmovesprites end UnknownScript_0x6d1e8: writetext UnknownText_0x6dd6b - closetext + waitbutton playsound SFX_ENTER_DOOR changeblock $e, $c, $7 reloadmappart - loadmovesprites + closetext setevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER - waitbutton + waitsfx end MapTeamRocketBaseB2FSignpost21Script: - loadfont + opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x6d207 writetext UnknownText_0x6dda7 + waitbutton closetext - loadmovesprites end UnknownScript_0x6d207: writetext UnknownText_0x6de03 + waitbutton closetext - loadmovesprites end -ItemFragment_0x6d20d: - db TM_THIEF, 1 +TeamRocketBaseB2FTMThief: + itemball TM_THIEF -MapTeamRocketBaseB2FSignpostItem22: +TeamRocketBaseB2FHiddenFullHeal: dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL @@ -948,7 +964,7 @@ TeamRocketBaseB2F_MapEventHeader: signpost 6, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script signpost 7, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script signpost 8, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 7, 26, SIGNPOST_ITEM, MapTeamRocketBaseB2FSignpostItem22 + signpost 7, 26, SIGNPOST_ITEM, TeamRocketBaseB2FHiddenFullHeal .PersonEvents: db 14 @@ -965,4 +981,4 @@ TeamRocketBaseB2F_MapEventHeader: person_event SPRITE_ROCKET, 13, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_ROCKET, 1, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_ROCKET, 14, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_POKE_BALL, 10, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6d20d, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF + person_event SPRITE_POKE_BALL, 10, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 76cd16b73..a55e2c125 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -1,12 +1,28 @@ +const_value set 2 + const TEAMROCKETBASEB3F_LANCE + const TEAMROCKETBASEB3F_ROCKET1 + const TEAMROCKETBASEB3F_MOLTRES + const TEAMROCKETBASEB3F_ROCKET_GIRL + const TEAMROCKETBASEB3F_ROCKET2 + const TEAMROCKETBASEB3F_SCIENTIST1 + const TEAMROCKETBASEB3F_SCIENTIST2 + const TEAMROCKETBASEB3F_ROCKET3 + const TEAMROCKETBASEB3F_SILVER + const TEAMROCKETBASEB3F_POKE_BALL1 + const TEAMROCKETBASEB3F_POKE_BALL2 + const TEAMROCKETBASEB3F_POKE_BALL3 + const TEAMROCKETBASEB3F_POKE_BALL4 + const TEAMROCKETBASEB3F_POKE_BALL5 + TeamRocketBaseB3F_MapScriptHeader: .MapTriggers: db 4 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 dw .Trigger2, 0 dw .Trigger3, 0 - dw .Trigger4, 0 .MapCallbacks: db 1 @@ -15,17 +31,17 @@ TeamRocketBaseB3F_MapScriptHeader: dbw 1, .CheckGiovanniDoor -.Trigger1: +.Trigger0: priorityjump LanceScript_0x6dffc end -.Trigger2: +.Trigger1: end -.Trigger3: +.Trigger2: end -.Trigger4: +.Trigger3: end .CheckGiovanniDoor: @@ -40,34 +56,34 @@ TeamRocketBaseB3F_MapScriptHeader: LanceScript_0x6dffc: spriteface PLAYER, LEFT pause 5 - spriteface $4, RIGHT + spriteface TEAMROCKETBASEB3F_MOLTRES, RIGHT pause 20 - applymovement $2, MovementData_0x6e12a - loadfont + applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12a + opentext writetext UnknownText_0x6e179 + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x6e12c - disappear $2 + applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c + disappear TEAMROCKETBASEB3F_LANCE dotrigger $1 end UnknownScript_0x6e019: spriteface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_RotatePalettesRightMusic - appear $a - applymovement $a, MovementData_0x6e164 + special Special_FadeOutMusic + appear TEAMROCKETBASEB3F_SILVER + applymovement TEAMROCKETBASEB3F_SILVER, MovementData_0x6e164 spriteface PLAYER, LEFT playmusic MUSIC_RIVAL_ENCOUNTER - loadfont + opentext writetext UnknownText_0x6e267 + waitbutton closetext - loadmovesprites playsound SFX_TACKLE applymovement PLAYER, MovementData_0x6e175 - applymovement $a, MovementData_0x6e16d - disappear $a + applymovement TEAMROCKETBASEB3F_SILVER, MovementData_0x6e16d + disappear TEAMROCKETBASEB3F_SILVER dotrigger $2 special RestartMapMusic end @@ -83,36 +99,36 @@ UnknownScript_0x6e052: applymovement PLAYER, MovementData_0x6e13a UnknownScript_0x6e056: pause 30 - showemote EMOTE_SHOCK, $3, 15 + showemote EMOTE_SHOCK, TEAMROCKETBASEB3F_ROCKET1, 15 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface $3, DOWN - loadfont + spriteface TEAMROCKETBASEB3F_ROCKET1, DOWN + opentext writetext UnknownText_0x6e400 + waitbutton closetext - loadmovesprites - applymovement $3, MovementData_0x6e142 + applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e142 winlosstext UnknownText_0x6e511, 0 - setlasttalked $3 + setlasttalked TEAMROCKETBASEB3F_ROCKET1 loadtrainer EXECUTIVEM, 4 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEM_4 - loadfont + opentext writetext UnknownText_0x6e548 + waitbutton closetext - loadmovesprites - applymovement $3, MovementData_0x6e144 + applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e144 playsound SFX_TACKLE - applymovement $3, MovementData_0x6e147 - disappear $3 + applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147 + disappear TEAMROCKETBASEB3F_ROCKET1 dotrigger $3 end MoltresScript_0x6e091: - loadfont + opentext writetext UnknownText_0x6e585 + waitbutton closetext - loadmovesprites setevent EVENT_LEARNED_HAIL_GIOVANNI end @@ -120,11 +136,11 @@ TrainerGruntF5: trainer EVENT_BEAT_ROCKET_GRUNTF_5, GRUNTF, 5, GruntF5SeenText, GruntF5BeatenText, 0, GruntF5Script GruntF5Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x6e611 + waitbutton closetext - loadmovesprites setevent EVENT_LEARNED_SLOWPOKETAIL end @@ -132,11 +148,11 @@ TrainerGruntM28: trainer EVENT_BEAT_ROCKET_GRUNTM_28, GRUNTM, 28, GruntM28SeenText, GruntM28BeatenText, 0, GruntM28Script GruntM28Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x6e737 + waitbutton closetext - loadmovesprites setevent EVENT_LEARNED_RATICATE_TAIL end @@ -144,22 +160,22 @@ TrainerScientistRoss: trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, ScientistRossScript ScientistRossScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x6e822 + waitbutton closetext - loadmovesprites end TrainerScientistMitch: trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, ScientistMitchScript ScientistMitchScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x6e90a + waitbutton closetext - loadmovesprites end BossDoor: @@ -167,7 +183,7 @@ BossDoor: dw .Script .Script - loadfont + opentext checkevent EVENT_LEARNED_SLOWPOKETAIL iffalse .NeedsPassword checkevent EVENT_LEARNED_RATICATE_TAIL @@ -176,38 +192,38 @@ BossDoor: .NeedsPassword writetext UnknownText_0x6e970 + waitbutton closetext - loadmovesprites end .OpenSesame writetext UnknownText_0x6e9a3 - closetext + waitbutton playsound SFX_ENTER_DOOR changeblock $a, $8, $7 reloadmappart - loadmovesprites + closetext setevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE - waitbutton + waitsfx end MapTeamRocketBaseB3FSignpost9Script: jumpstd teamrocketoath -ItemFragment_0x6e120: - db PROTEIN, 1 +TeamRocketBaseB3FProtein: + itemball PROTEIN -ItemFragment_0x6e122: - db X_SPECIAL, 1 +TeamRocketBaseB3FXSpecial: + itemball X_SPECIAL -ItemFragment_0x6e124: - db FULL_HEAL, 1 +TeamRocketBaseB3FFullHeal: + itemball FULL_HEAL -ItemFragment_0x6e126: - db ICE_HEAL, 1 +TeamRocketBaseB3FIceHeal: + itemball ICE_HEAL -ItemFragment_0x6e128: - db ULTRA_BALL, 1 +TeamRocketBaseB3FUltraBall: + itemball ULTRA_BALL MovementData_0x6e12a: step_right @@ -596,8 +612,8 @@ TeamRocketBaseB3F_MapEventHeader: person_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_ROCKET, 14, 24, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x6e048, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_SILVER, 5, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE - person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6e120, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN - person_event SPRITE_POKE_BALL, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6e122, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL - person_event SPRITE_POKE_BALL, 9, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6e124, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL - person_event SPRITE_POKE_BALL, 2, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6e126, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL - person_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x6e128, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL + person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN + person_event SPRITE_POKE_BALL, 12, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL + person_event SPRITE_POKE_BALL, 9, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL + person_event SPRITE_POKE_BALL, 2, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL + person_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 3d9237d63..e543c352f 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -1,10 +1,14 @@ +const_value set 2 + const TIMECAPSULE_CHRIS1 + const TIMECAPSULE_CHRIS2 + TimeCapsule_MapScriptHeader: .MapTriggers: db 2 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 - dw .Trigger2, 0 .MapCallbacks: db 1 @@ -13,23 +17,23 @@ TimeCapsule_MapScriptHeader: dbw 2, TimeCapsule_SetWhichChris -.Trigger1: +.Trigger0: priorityjump TimeCapsule_Initialize end -.Trigger2: +.Trigger1: end TimeCapsule_SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 - disappear $3 - appear $2 + disappear TIMECAPSULE_CHRIS2 + appear TIMECAPSULE_CHRIS1 return .Chris2: - disappear $2 - appear $3 + disappear TIMECAPSULE_CHRIS1 + appear TIMECAPSULE_CHRIS2 return TimeCapsule_Initialize: @@ -43,10 +47,10 @@ MapTimeCapsuleSignpost1Script: end ChrisScript_0x19351a: - loadfont + opentext writetext UnknownText_0x193521 + waitbutton closetext - loadmovesprites end UnknownText_0x193521: diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 5ac0f1665..b0164dc88 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -1,3 +1,15 @@ +const_value set 2 + const TINTOWER1F_SUICUNE + const TINTOWER1F_RAIKOU + const TINTOWER1F_ENTEI + const TINTOWER1F_SUPER_NERD + const TINTOWER1F_SAGE1 + const TINTOWER1F_SAGE2 + const TINTOWER1F_SAGE3 + const TINTOWER1F_SAGE4 + const TINTOWER1F_SAGE5 + const TINTOWER1F_SAGE6 + TinTower1F_MapScriptHeader: .MapTriggers: db 2 @@ -34,38 +46,38 @@ UnknownScript_0x18502f: UnknownScript_0x185047: checkevent EVENT_FOUGHT_HO_OH iffalse UnknownScript_0x18504f - appear $5 + appear TINTOWER1F_SUPER_NERD UnknownScript_0x18504f: return UnknownScript_0x185050: checkevent EVENT_FOUGHT_SUICUNE iftrue UnknownScript_0x185077 - appear $2 + appear TINTOWER1F_SUICUNE writebyte RAIKOU special SpecialMonCheck iftrue UnknownScript_0x185065 - appear $3 + appear TINTOWER1F_RAIKOU jump UnknownScript_0x185067 UnknownScript_0x185065: - disappear $3 + disappear TINTOWER1F_RAIKOU UnknownScript_0x185067: writebyte ENTEI special SpecialMonCheck iftrue UnknownScript_0x185074 - appear $4 + appear TINTOWER1F_ENTEI jump UnknownScript_0x185076 UnknownScript_0x185074: - disappear $4 + disappear TINTOWER1F_ENTEI UnknownScript_0x185076: return UnknownScript_0x185077: - disappear $2 - disappear $3 - disappear $4 + disappear TINTOWER1F_SUICUNE + disappear TINTOWER1F_RAIKOU + disappear TINTOWER1F_ENTEI clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 return @@ -83,40 +95,40 @@ UnknownScript_0x18508f: writebyte RAIKOU special SpecialMonCheck iftrue UnknownScript_0x1850b6 - applymovement $3, MovementData_0x1851d0 + applymovement TINTOWER1F_RAIKOU, MovementData_0x1851d0 spriteface PLAYER, LEFT cry RAIKOU pause 10 playsound SFX_WARP_FROM - applymovement $3, MovementData_0x1851d4 - disappear $3 + applymovement TINTOWER1F_RAIKOU, MovementData_0x1851d4 + disappear TINTOWER1F_RAIKOU playsound SFX_EXIT_BUILDING - waitbutton + waitsfx UnknownScript_0x1850b6: writebyte ENTEI special SpecialMonCheck iftrue UnknownScript_0x1850d7 - applymovement $4, MovementData_0x1851da + applymovement TINTOWER1F_ENTEI, MovementData_0x1851da spriteface PLAYER, RIGHT cry ENTEI pause 10 playsound SFX_WARP_FROM - applymovement $4, MovementData_0x1851de - disappear $4 + applymovement TINTOWER1F_ENTEI, MovementData_0x1851de + disappear TINTOWER1F_ENTEI playsound SFX_EXIT_BUILDING - waitbutton + waitsfx UnknownScript_0x1850d7: spriteface PLAYER, UP pause 10 applymovement PLAYER, MovementData_0x1851e8 - applymovement $2, MovementData_0x1851e4 + applymovement TINTOWER1F_SUICUNE, MovementData_0x1851e4 cry SUICUNE pause 20 - loadpokedata SUICUNE, 40 + loadwildmon SUICUNE, 40 writecode VAR_BATTLETYPE, BATTLETYPE_SUICUNE startbattle - reloadmapmusic - disappear $2 + dontrestartmapmusic + disappear TINTOWER1F_SUICUNE setevent EVENT_FOUGHT_SUICUNE setevent EVENT_SAW_SUICUNE_ON_ROUTE_42 domaptrigger ROUTE_42, $0 @@ -126,39 +138,39 @@ UnknownScript_0x1850d7: domaptrigger CIANWOOD_CITY, $0 dotrigger $1 clearevent EVENT_SET_WHEN_FOUGHT_HO_OH - returnafterbattle + reloadmapafterbattle pause 20 spriteface PLAYER, DOWN playmusic MUSIC_MYSTICALMAN_ENCOUNTER playsound SFX_ENTER_DOOR - moveperson $5, $a, $f - appear $5 - applymovement $5, MovementData_0x1851ec + moveperson TINTOWER1F_SUPER_NERD, $a, $f + appear TINTOWER1F_SUPER_NERD + applymovement TINTOWER1F_SUPER_NERD, MovementData_0x1851ec playsound SFX_ENTER_DOOR - moveperson $6, $9, $f - appear $6 - applymovement $6, MovementData_0x1851f5 + moveperson TINTOWER1F_SAGE1, $9, $f + appear TINTOWER1F_SAGE1 + applymovement TINTOWER1F_SAGE1, MovementData_0x1851f5 playsound SFX_ENTER_DOOR - moveperson $7, $9, $f - appear $7 - applymovement $7, MovementData_0x1851fb + moveperson TINTOWER1F_SAGE2, $9, $f + appear TINTOWER1F_SAGE2 + applymovement TINTOWER1F_SAGE2, MovementData_0x1851fb playsound SFX_ENTER_DOOR - moveperson $8, $9, $f - appear $8 - applymovement $8, MovementData_0x1851fe - moveperson $6, $7, $d - moveperson $7, $9, $d - moveperson $8, $b, $d + moveperson TINTOWER1F_SAGE3, $9, $f + appear TINTOWER1F_SAGE3 + applymovement TINTOWER1F_SAGE3, MovementData_0x1851fe + moveperson TINTOWER1F_SAGE1, $7, $d + moveperson TINTOWER1F_SAGE2, $9, $d + moveperson TINTOWER1F_SAGE3, $b, $d spriteface PLAYER, RIGHT - loadfont + opentext writetext UnknownText_0x185203 + waitbutton closetext - loadmovesprites - applymovement $5, MovementData_0x1851f1 + applymovement TINTOWER1F_SUPER_NERD, MovementData_0x1851f1 playsound SFX_EXIT_BUILDING - disappear $5 - waitbutton - special Special_RotatePalettesRightMusic + disappear TINTOWER1F_SUPER_NERD + waitsfx + special Special_FadeOutMusic pause 20 playmapmusic end @@ -182,34 +194,34 @@ UnknownScript_0x185185: SageScript_0x185188: faceplayer - loadfont + opentext checkevent EVENT_FOUGHT_HO_OH iftrue UnknownScript_0x1851b6 checkevent EVENT_GOT_RAINBOW_WING iftrue UnknownScript_0x1851b0 writetext UnknownText_0x185629 - keeptextopen + buttonsound verbosegiveitem RAINBOW_WING - loadmovesprites + closetext refreshscreen $0 earthquake 72 - waitbutton + waitsfx playsound SFX_STRENGTH changeblock $a, $2, $20 reloadmappart setevent EVENT_GOT_RAINBOW_WING - loadmovesprites - loadfont + closetext + opentext UnknownScript_0x1851b0: writetext UnknownText_0x18564a + waitbutton closetext - loadmovesprites end UnknownScript_0x1851b6: writetext UnknownText_0x185803 + waitbutton closetext - loadmovesprites end SageScript_0x1851bc: diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index 95c9724ea..c73a1eb4e 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -1,3 +1,4 @@ + TinTower2F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 78f520a64..197859e64 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -1,3 +1,6 @@ +const_value set 2 + const TINTOWER3F_POKE_BALL + TinTower3F_MapScriptHeader: .MapTriggers: db 0 @@ -5,8 +8,8 @@ TinTower3F_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x185a37: - db FULL_HEAL, 1 +TinTower3FFullHeal: + itemball FULL_HEAL TinTower3F_MapEventHeader: ; filler @@ -25,4 +28,4 @@ TinTower3F_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 14, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185a37, EVENT_TIN_TOWER_3F_FULL_HEAL + person_event SPRITE_POKE_BALL, 14, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 9d4f1bb2c..44b683423 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const TINTOWER4F_POKE_BALL1 + const TINTOWER4F_POKE_BALL2 + const TINTOWER4F_POKE_BALL3 + TinTower4F_MapScriptHeader: .MapTriggers: db 0 @@ -5,16 +10,16 @@ TinTower4F_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x185a58: - db ULTRA_BALL, 1 +TinTower4FUltraBall: + itemball ULTRA_BALL -ItemFragment_0x185a5a: - db PP_UP, 1 +TinTower4FPPUp: + itemball PP_UP -ItemFragment_0x185a5c: - db ESCAPE_ROPE, 1 +TinTower4FEscapeRope: + itemball ESCAPE_ROPE -MapTinTower4FSignpostItem0: +TinTower4FHiddenMaxPotion: dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION @@ -34,10 +39,10 @@ TinTower4F_MapEventHeader: .Signposts: db 1 - signpost 6, 11, SIGNPOST_ITEM, MapTinTower4FSignpostItem0 + signpost 6, 11, SIGNPOST_ITEM, TinTower4FHiddenMaxPotion .PersonEvents: db 3 - person_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185a58, EVENT_TIN_TOWER_4F_ULTRA_BALL - person_event SPRITE_POKE_BALL, 14, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185a5a, EVENT_TIN_TOWER_4F_PP_UP - person_event SPRITE_POKE_BALL, 12, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185a5c, EVENT_TIN_TOWER_4F_ESCAPE_ROPE + person_event SPRITE_POKE_BALL, 10, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL + person_event SPRITE_POKE_BALL, 14, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP + person_event SPRITE_POKE_BALL, 12, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index f946986e8..a8e668284 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -1,3 +1,6 @@ +const_value set 2 + const TINTOWER5F_POKE_BALL + TinTower5F_MapScriptHeader: .MapTriggers: db 0 @@ -5,14 +8,14 @@ TinTower5F_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x185aa9: - db RARE_CANDY, 1 +TinTower5FRareCandy: + itemball RARE_CANDY -MapTinTower5FSignpostItem0: +TinTower5FHiddenFullRestore: dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE -MapTinTower5FSignpostItem1: +TinTower5FHiddenCarbos: dwb EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS @@ -32,9 +35,9 @@ TinTower5F_MapEventHeader: .Signposts: db 2 - signpost 14, 16, SIGNPOST_ITEM, MapTinTower5FSignpostItem0 - signpost 15, 3, SIGNPOST_ITEM, MapTinTower5FSignpostItem1 + signpost 14, 16, SIGNPOST_ITEM, TinTower5FHiddenFullRestore + signpost 15, 3, SIGNPOST_ITEM, TinTower5FHiddenCarbos .PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185aa9, EVENT_TIN_TOWER_5F_RARE_CANDY + person_event SPRITE_POKE_BALL, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 9063a82dd..d95d20429 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -1,3 +1,6 @@ +const_value set 2 + const TINTOWER6F_POKE_BALL + TinTower6F_MapScriptHeader: .MapTriggers: db 0 @@ -5,8 +8,8 @@ TinTower6F_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x185ae4: - db MAX_POTION, 1 +TinTower6FMaxPotion: + itemball MAX_POTION TinTower6F_MapEventHeader: ; filler @@ -25,4 +28,4 @@ TinTower6F_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 8, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185ae4, EVENT_TIN_TOWER_6F_MAX_POTION + person_event SPRITE_POKE_BALL, 8, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 0398ba0c3..2baba56cd 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -1,3 +1,6 @@ +const_value set 2 + const TINTOWER7F_POKE_BALL + TinTower7F_MapScriptHeader: .MapTriggers: db 0 @@ -5,8 +8,8 @@ TinTower7F_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x185b05: - db MAX_REVIVE, 1 +TinTower7FMaxRevive: + itemball MAX_REVIVE TinTower7F_MapEventHeader: ; filler @@ -28,4 +31,4 @@ TinTower7F_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 1, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185b05, EVENT_TIN_TOWER_7F_MAX_REVIVE + person_event SPRITE_POKE_BALL, 1, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index d89317a82..5156e92d1 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const TINTOWER8F_POKE_BALL1 + const TINTOWER8F_POKE_BALL2 + const TINTOWER8F_POKE_BALL3 + TinTower8F_MapScriptHeader: .MapTriggers: db 0 @@ -5,14 +10,14 @@ TinTower8F_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x185b35: - db NUGGET, 1 +TinTower8FNugget: + itemball NUGGET -ItemFragment_0x185b37: - db MAX_ELIXER, 1 +TinTower8FMaxElixer: + itemball MAX_ELIXER -ItemFragment_0x185b39: - db FULL_RESTORE, 1 +TinTower8FFullRestore: + itemball FULL_RESTORE TinTower8F_MapEventHeader: ; filler @@ -35,6 +40,6 @@ TinTower8F_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185b35, EVENT_TIN_TOWER_8F_NUGGET - person_event SPRITE_POKE_BALL, 6, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185b37, EVENT_TIN_TOWER_8F_MAX_ELIXER - person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185b39, EVENT_TIN_TOWER_8F_FULL_RESTORE + person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET + person_event SPRITE_POKE_BALL, 6, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER + person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 8e129a15b..728a94147 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -1,3 +1,6 @@ +const_value set 2 + const TINTOWER9F_POKE_BALL + TinTower9F_MapScriptHeader: .MapTriggers: db 0 @@ -5,8 +8,8 @@ TinTower9F_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x185b88: - db HP_UP, 1 +TinTower9FHPUp: + itemball HP_UP UnknownText_0x185b8a: text "HO-OH: Shaoooh!" @@ -38,4 +41,4 @@ TinTower9F_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 1, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x185b88, EVENT_TIN_TOWER_9F_HP_UP + person_event SPRITE_POKE_BALL, 1, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 09c6ef5e3..61698aeae 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -1,3 +1,6 @@ +const_value set 2 + const TINTOWERROOF_HO_OH + TinTowerRoof_MapScriptHeader: .MapTriggers: db 0 @@ -17,26 +20,26 @@ UnknownScript_0x77230: jump UnknownScript_0x77241 UnknownScript_0x7723e: - appear $2 + appear TINTOWERROOF_HO_OH return UnknownScript_0x77241: - disappear $2 + disappear TINTOWERROOF_HO_OH return HoOhScript_0x77244: faceplayer - loadfont + opentext writetext UnknownText_0x77260 cry HO_OH pause 15 - loadmovesprites + closetext setevent EVENT_FOUGHT_HO_OH writecode VAR_BATTLETYPE, BATTLETYPE_FORCEITEM - loadpokedata HO_OH, 60 + loadwildmon HO_OH, 60 startbattle - disappear $2 - returnafterbattle + disappear TINTOWERROOF_HO_OH + reloadmapafterbattle setevent EVENT_SET_WHEN_FOUGHT_HO_OH end diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index c14dba7b9..0360c8d08 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -1,3 +1,6 @@ +const_value set 2 + const TOHJOFALLS_POKE_BALL + TohjoFalls_MapScriptHeader: .MapTriggers: db 0 @@ -5,8 +8,8 @@ TohjoFalls_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x18db02: - db MOON_STONE, 1 +TohjoFallsMoonStone: + itemball MOON_STONE TohjoFalls_MapEventHeader: ; filler @@ -25,4 +28,4 @@ TohjoFalls_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18db02, EVENT_TOHJO_FALLS_MOON_STONE + person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index def2de6ec..3abad85e7 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -1,10 +1,14 @@ +const_value set 2 + const TRADECENTER_CHRIS1 + const TRADECENTER_CHRIS2 + TradeCenter_MapScriptHeader: .MapTriggers: db 2 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 - dw .Trigger2, 0 .MapCallbacks: db 1 @@ -13,23 +17,23 @@ TradeCenter_MapScriptHeader: dbw 2, TradeCenter_SetWhichChris -.Trigger1: +.Trigger0: priorityjump TradeCenter_Initialize end -.Trigger2: +.Trigger1: end TradeCenter_SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 - disappear $3 - appear $2 + disappear TRADECENTER_CHRIS2 + appear TRADECENTER_CHRIS1 return .Chris2: - disappear $2 - appear $3 + disappear TRADECENTER_CHRIS1 + appear TRADECENTER_CHRIS2 return TradeCenter_Initialize: @@ -43,10 +47,10 @@ MapTradeCenterSignpost1Script: end ChrisScript_0x19340b: - loadfont + opentext writetext .FriendReadyText + waitbutton closetext - loadmovesprites end .FriendReadyText: diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index cbd68d69d..d196d9a47 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const TRAINERHOUSE1F_RECEPTIONIST + const TRAINERHOUSE1F_COOLTRAINER_M + const TRAINERHOUSE1F_COOLTRAINER_F + const TRAINERHOUSE1F_YOUNGSTER + const TRAINERHOUSE1F_GENTLEMAN + TrainerHouse1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index acb57b158..bca44441c 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -1,78 +1,82 @@ +const_value set 2 + const TRAINERHOUSEB1F_RECEPTIONIST + const TRAINERHOUSEB1F_CHRIS + TrainerHouseB1F_MapScriptHeader: .MapTriggers: db 1 ; triggers - dw UnknownScript_0x9b38a, 0 + dw Trigger0, 0 .MapCallbacks: db 0 -UnknownScript_0x9b38a: +Trigger0: end -UnknownScript_0x9b38b: +TrainerHouseReceptionistScript: spriteface PLAYER, UP - loadfont + opentext checkflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY - iftrue UnknownScript_0x9b3f7 - writetext UnknownText_0x9b420 - keeptextopen + iftrue .FoughtTooManyTimes + writetext TrainerHouseB1FIntroText + buttonsound special SpecialTrainerHouse - iffalse UnknownScript_0x9b3a6 + iffalse .GetCal3Name trainertotext CAL, CAL2, $0 - jump UnknownScript_0x9b3aa + jump .GotName -UnknownScript_0x9b3a6: +.GetCal3Name: trainertotext CAL, CAL3, $0 -UnknownScript_0x9b3aa: - writetext UnknownText_0x9b46a - keeptextopen - writetext UnknownText_0x9b487 +.GotName: + writetext TrainerHouseB1FYourOpponentIsText + buttonsound + writetext TrainerHouseB1FAskWantToBattleText yesorno - iffalse UnknownScript_0x9b3ed + iffalse .Declined setflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY - writetext UnknownText_0x9b4a2 + writetext TrainerHouseB1FGoRightInText + waitbutton closetext - loadmovesprites - applymovement PLAYER, MovementData_0x9b401 - loadfont - writetext UnknownText_0x9b587 + applymovement PLAYER, Movement_EnterTrainerHouseBattleRoom + opentext + writetext TrainerHouseB1FCalBeforeText + waitbutton closetext - loadmovesprites special SpecialTrainerHouse - iffalse UnknownScript_0x9b3dc - winlosstext UnknownText_0x9b578, 0 - setlasttalked $3 + iffalse .NoSpecialBattle + winlosstext TrainerHouseB1FCalBeatenText, 0 + setlasttalked TRAINERHOUSEB1F_CHRIS loadtrainer CAL, CAL2 startbattle - returnafterbattle - iffalse UnknownScript_0x9b3e8 -UnknownScript_0x9b3dc: - winlosstext UnknownText_0x9b578, 0 - setlasttalked $3 + reloadmapafterbattle + iffalse .End +.NoSpecialBattle: + winlosstext TrainerHouseB1FCalBeatenText, 0 + setlasttalked TRAINERHOUSEB1F_CHRIS loadtrainer CAL, CAL3 startbattle - returnafterbattle -UnknownScript_0x9b3e8: - applymovement PLAYER, MovementData_0x9b40f + reloadmapafterbattle +.End: + applymovement PLAYER, Movement_ExitTrainerHouseBattleRoom end -UnknownScript_0x9b3ed: - writetext UnknownText_0x9b4d6 +.Declined: + writetext TrainerHouseB1FPleaseComeAgainText + waitbutton closetext - loadmovesprites - applymovement PLAYER, MovementData_0x9b41d + applymovement PLAYER, Movement_TrainerHouseTurnBack end -UnknownScript_0x9b3f7: - writetext UnknownText_0x9b51d +.FoughtTooManyTimes: + writetext TrainerHouseB1FSecondChallengeDeniedText + waitbutton closetext - loadmovesprites - applymovement PLAYER, MovementData_0x9b41d + applymovement PLAYER, Movement_TrainerHouseTurnBack end -MovementData_0x9b401: +Movement_EnterTrainerHouseBattleRoom: step_left step_left step_left @@ -88,7 +92,7 @@ MovementData_0x9b401: turn_head_right step_end -MovementData_0x9b40f: +Movement_ExitTrainerHouseBattleRoom: step_up step_up step_up @@ -104,12 +108,12 @@ MovementData_0x9b40f: step_right step_end -MovementData_0x9b41d: +Movement_TrainerHouseTurnBack: step_right turn_head_left step_end -UnknownText_0x9b420: +TrainerHouseB1FIntroText: text "Hi. Welcome to our" line "TRAINING HALL." @@ -118,18 +122,18 @@ UnknownText_0x9b420: cont "day." done -UnknownText_0x9b46a: +TrainerHouseB1FYourOpponentIsText: text_from_ram StringBuffer3 text " is your" line "opponent today." done -UnknownText_0x9b487: +TrainerHouseB1FAskWantToBattleText: text "Would you like to" line "battle?" done -UnknownText_0x9b4a2: +TrainerHouseB1FGoRightInText: text "Please go right" line "through." @@ -137,7 +141,7 @@ UnknownText_0x9b4a2: line "right away." done -UnknownText_0x9b4d6: +TrainerHouseB1FPleaseComeAgainText: text "Sorry. Only those" line "trainers who will" @@ -145,7 +149,7 @@ UnknownText_0x9b4d6: line "allowed to go in." done -UnknownText_0x9b51d: +TrainerHouseB1FSecondChallengeDeniedText: text "I'm sorry." line "This would be your" @@ -156,12 +160,12 @@ UnknownText_0x9b51d: line "a day." done -UnknownText_0x9b578: +TrainerHouseB1FCalBeatenText: text "I lost…" line "Darn…" done -UnknownText_0x9b587: +TrainerHouseB1FCalBeforeText: text "I traveled out" line "here just so I" cont "could battle you." @@ -177,7 +181,7 @@ TrainerHouseB1F_MapEventHeader: .XYTriggers: db 1 - xy_trigger 0, $3, $7, $0, UnknownScript_0x9b38b, $0, $0 + xy_trigger 0, $3, $7, $0, TrainerHouseReceptionistScript, $0, $0 .Signposts: db 0 diff --git a/maps/Underground.asm b/maps/Underground.asm index d021507f7..905ab6fcd 100644 --- a/maps/Underground.asm +++ b/maps/Underground.asm @@ -1,3 +1,4 @@ + Underground_MapScriptHeader: .MapTriggers: db 0 @@ -5,11 +6,11 @@ Underground_MapScriptHeader: .MapCallbacks: db 0 -MapUndergroundSignpostItem0: +UndergroundHiddenFullRestore: dwb EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE, FULL_RESTORE -MapUndergroundSignpostItem1: +UndergroundHiddenXSpecial: dwb EVENT_UNDERGROUND_HIDDEN_X_SPECIAL, X_SPECIAL @@ -27,8 +28,8 @@ Underground_MapEventHeader: .Signposts: db 2 - signpost 9, 3, SIGNPOST_ITEM, MapUndergroundSignpostItem0 - signpost 19, 1, SIGNPOST_ITEM, MapUndergroundSignpostItem1 + signpost 9, 3, SIGNPOST_ITEM, UndergroundHiddenFullRestore + signpost 19, 1, SIGNPOST_ITEM, UndergroundHiddenXSpecial .PersonEvents: db 0 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index f9cd1222f..20a2a338d 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -1,610 +1,655 @@ +UNDERGROUND_DOOR_CLOSED1 EQU $2a +UNDERGROUND_DOOR_CLOSED2 EQU $3e +UNDERGROUND_DOOR_CLOSED3 EQU $3f +UNDERGROUND_DOOR_OPEN1 EQU $2d +UNDERGROUND_DOOR_OPEN2 EQU $3d + +ugdoor: macro +\1_YCOORD EQU \2 +\1_XCOORD EQU \3 +endm + + ugdoor UGDOOR_1, $10, $06 + ugdoor UGDOOR_2, $0a, $06 + ugdoor UGDOOR_3, $02, $06 + ugdoor UGDOOR_4, $02, $0a + ugdoor UGDOOR_5, $0a, $0a + ugdoor UGDOOR_6, $10, $0a + ugdoor UGDOOR_7, $0c, $06 + ugdoor UGDOOR_8, $0c, $08 + ugdoor UGDOOR_9, $06, $06 + ugdoor UGDOOR_10, $06, $08 + ugdoor UGDOOR_11, $0c, $0a + ugdoor UGDOOR_12, $0c, $0c + ugdoor UGDOOR_13, $06, $0a + ugdoor UGDOOR_14, $06, $0c + ugdoor UGDOOR_15, $12, $0a + ugdoor UGDOOR_16, $12, $0c + +doorstate: macro + changeblock UGDOOR_\1_YCOORD, UGDOOR_\1_XCOORD, UNDERGROUND_DOOR_\2 +endm + +const_value set 2 + const UNDERGROUNDPATHSWITCHROOMENTRANCES_PHARMACIST1 + const UNDERGROUNDPATHSWITCHROOMENTRANCES_PHARMACIST2 + const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET1 + const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET2 + const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET3 + const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET_GIRL + const UNDERGROUNDPATHSWITCHROOMENTRANCES_TEACHER + const UNDERGROUNDPATHSWITCHROOMENTRANCES_SUPER_NERD + const UNDERGROUNDPATHSWITCHROOMENTRANCES_POKE_BALL1 + const UNDERGROUNDPATHSWITCHROOMENTRANCES_POKE_BALL2 + const UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER + UndergroundPathSwitchRoomEntrances_MapScriptHeader: .MapTriggers: db 2 ; triggers - dw UnknownScript_0x7c9f5, 0 - dw UnknownScript_0x7c9f6, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 .MapCallbacks: db 1 ; callbacks - dbw 1, UnknownScript_0x7c9f7 + dbw 1, .UpdateDoorPositions -UnknownScript_0x7c9f5: +.Trigger0: end -UnknownScript_0x7c9f6: +.Trigger1: end -UnknownScript_0x7c9f7: +.UpdateDoorPositions: checkevent EVENT_SWITCH_4 - iffalse UnknownScript_0x7ca01 - changeblock $10, $6, $2d -UnknownScript_0x7ca01: + iffalse .false4 + doorstate 1, OPEN1 +.false4: checkevent EVENT_SWITCH_5 - iffalse UnknownScript_0x7ca0b - changeblock $a, $6, $2d -UnknownScript_0x7ca0b: + iffalse .false5 + doorstate 2, OPEN1 +.false5: checkevent EVENT_SWITCH_6 - iffalse UnknownScript_0x7ca15 - changeblock $2, $6, $2d -UnknownScript_0x7ca15: + iffalse .false6 + doorstate 3, OPEN1 +.false6: checkevent EVENT_SWITCH_7 - iffalse UnknownScript_0x7ca1f - changeblock $2, $a, $2d -UnknownScript_0x7ca1f: + iffalse .false7 + doorstate 4, OPEN1 +.false7: checkevent EVENT_SWITCH_8 - iffalse UnknownScript_0x7ca29 - changeblock $a, $a, $2d -UnknownScript_0x7ca29: + iffalse .false8 + doorstate 5, OPEN1 +.false8: checkevent EVENT_SWITCH_9 - iffalse UnknownScript_0x7ca33 - changeblock $10, $a, $2d -UnknownScript_0x7ca33: + iffalse .false9 + doorstate 6, OPEN1 +.false9: checkevent EVENT_SWITCH_10 - iffalse UnknownScript_0x7ca41 - changeblock $c, $6, $2a - changeblock $c, $8, $2d -UnknownScript_0x7ca41: + iffalse .false10 + doorstate 7, CLOSED1 + doorstate 8, OPEN1 +.false10: checkevent EVENT_SWITCH_11 - iffalse UnknownScript_0x7ca4f - changeblock $6, $6, $2a - changeblock $6, $8, $2d -UnknownScript_0x7ca4f: + iffalse .false11 + doorstate 9, CLOSED1 + doorstate 10, OPEN1 +.false11: checkevent EVENT_SWITCH_12 - iffalse UnknownScript_0x7ca5d - changeblock $c, $a, $2a - changeblock $c, $c, $2d -UnknownScript_0x7ca5d: + iffalse .false12 + doorstate 11, CLOSED1 + doorstate 12, OPEN1 +.false12: checkevent EVENT_SWITCH_13 - iffalse UnknownScript_0x7ca6b - changeblock $6, $a, $2a - changeblock $6, $c, $2d -UnknownScript_0x7ca6b: + iffalse .false13 + doorstate 13, CLOSED1 + doorstate 14, OPEN1 +.false13: checkevent EVENT_SWITCH_14 - iffalse UnknownScript_0x7ca79 - changeblock $12, $a, $2a - changeblock $12, $c, $2d -UnknownScript_0x7ca79: + iffalse .false14 + doorstate 15, CLOSED1 + doorstate 16, OPEN1 +.false14: return SuperNerdScript_0x7ca7a: - jumptextfaceplayer UnknownText_0x7d176 + jumptextfaceplayer UndergroundPathSwitchRoomEntrances_SuperNerdText TeacherScript_0x7ca7d: - jumptextfaceplayer UnknownText_0x7d1d0 + jumptextfaceplayer UndergroundPathSwitchRoomEntrances_TeacherText -UnknownScript_0x7ca80: +UndergroundSilverTrigger1: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic pause 15 playsound SFX_EXIT_BUILDING - appear $c - waitbutton - applymovement $c, MovementData_0x7ce87 + appear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER + waitsfx + applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement1 spriteface PLAYER, RIGHT - scall UnknownScript_0x7cad4 - applymovement $c, MovementData_0x7ce92 + scall UndergroundSilverBattleScript + applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1 playsound SFX_EXIT_BUILDING - disappear $c - dotrigger $1 - waitbutton + disappear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER + dotrigger 1 + waitsfx playmapmusic end -UnknownScript_0x7caaa: +UndergroundSilverTrigger2: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic pause 15 playsound SFX_EXIT_BUILDING - appear $c - waitbutton - applymovement $c, MovementData_0x7ce8c + appear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER + waitsfx + applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement2 spriteface PLAYER, RIGHT - scall UnknownScript_0x7cad4 - applymovement $c, MovementData_0x7ce97 + scall UndergroundSilverBattleScript + applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2 playsound SFX_EXIT_BUILDING - disappear $c - dotrigger $1 - waitbutton + disappear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER + dotrigger 1 + waitsfx playmapmusic end -UnknownScript_0x7cad4: +UndergroundSilverBattleScript: checkevent EVENT_RIVAL_BURNED_TOWER - iftrue UnknownScript_0x7cae1 + iftrue .Continue setevent EVENT_RIVAL_BURNED_TOWER - domaptrigger BURNED_TOWER_1F, $1 -UnknownScript_0x7cae1: + domaptrigger BURNED_TOWER_1F, 1 +.Continue: playmusic MUSIC_RIVAL_ENCOUNTER - loadfont - writetext UnknownText_0x7ce9d + opentext + writetext UndergroundSilverBeforeText + waitbutton closetext - loadmovesprites setevent EVENT_RIVAL_UNDERGROUND_PATH checkevent EVENT_GOT_TOTODILE_FROM_ELM - iftrue UnknownScript_0x7cb09 + iftrue .Totodile checkevent EVENT_GOT_CHIKORITA_FROM_ELM - iftrue UnknownScript_0x7cb19 - winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102 - setlasttalked $c + iftrue .Chikorita + winlosstext UndergroundSilverWinText, UndergroundSilverLossText + setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER loadtrainer RIVAL1, RIVAL1_12 startbattle - reloadmapmusic - returnafterbattle - jump UnknownScript_0x7cb29 + dontrestartmapmusic + reloadmapafterbattle + jump .FinishRivalBattle -UnknownScript_0x7cb09: - winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102 - setlasttalked $c +.Totodile: + winlosstext UndergroundSilverWinText, UndergroundSilverLossText + setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER loadtrainer RIVAL1, RIVAL1_10 startbattle - reloadmapmusic - returnafterbattle - jump UnknownScript_0x7cb29 + dontrestartmapmusic + reloadmapafterbattle + jump .FinishRivalBattle -UnknownScript_0x7cb19: - winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102 - setlasttalked $c +.Chikorita: + winlosstext UndergroundSilverWinText, UndergroundSilverLossText + setlasttalked UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER loadtrainer RIVAL1, RIVAL1_11 startbattle - reloadmapmusic - returnafterbattle - jump UnknownScript_0x7cb29 + dontrestartmapmusic + reloadmapafterbattle + jump .FinishRivalBattle -UnknownScript_0x7cb29: +.FinishRivalBattle: playmusic MUSIC_RIVAL_AFTER - loadfont - writetext UnknownText_0x7cfc2 + opentext + writetext UndergroundSilverAfterText + waitbutton closetext - loadmovesprites end TrainerGruntM11: trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, 11, GruntM11SeenText, GruntM11BeatenText, 0, GruntM11Script GruntM11Script: - talkaftercancel - loadfont - writetext UnknownText_0x7d290 + end_if_just_battled + opentext + writetext GruntM11AfterText + waitbutton closetext - loadmovesprites end TrainerGruntM25: trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, 25, GruntM25SeenText, GruntM25BeatenText, 0, GruntM25Script GruntM25Script: - talkaftercancel - loadfont - writetext UnknownText_0x7d347 + end_if_just_battled + opentext + writetext GruntM25AfterText + waitbutton closetext - loadmovesprites end TrainerBurglarDuncan: trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, BurglarDuncanScript BurglarDuncanScript: - talkaftercancel - loadfont - writetext UnknownText_0x7d3cf + end_if_just_battled + opentext + writetext BurglarDuncanAfterText + waitbutton closetext - loadmovesprites end TrainerBurglarEddie: trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, BurglarEddieScript BurglarEddieScript: - talkaftercancel - loadfont - writetext UnknownText_0x7d45b + end_if_just_battled + opentext + writetext BurglarEddieAfterText + waitbutton closetext - loadmovesprites end TrainerGruntM13: trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, 13, GruntM13SeenText, GruntM13BeatenText, 0, GruntM13Script GruntM13Script: - talkaftercancel - loadfont - writetext UnknownText_0x7d51f + end_if_just_battled + opentext + writetext GruntM13AfterText + waitbutton closetext - loadmovesprites end TrainerGruntF3: trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, 3, GruntF3SeenText, GruntF3BeatenText, 0, GruntF3Script GruntF3Script: - talkaftercancel - loadfont - writetext UnknownText_0x7d5e6 + end_if_just_battled + opentext + writetext GruntF3AfterText + waitbutton closetext - loadmovesprites end -MapUndergroundPathSwitchRoomEntrancesSignpost0Script: - loadfont - writetext UnknownText_0x7d554 - keeptextopen +Switch1Script: + opentext + writetext SwitchRoomText_Switch1 + buttonsound checkevent EVENT_SWITCH_1 - iftrue UnknownScript_0x7cbcb - writetext UnknownText_0x7d617 + iftrue .On + writetext SwitchRoomText_OffTurnOn yesorno - iffalse UnknownScript_0x7cc8b + iffalse UndergroundPathSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions - addvar $1 + addvar 1 copyvartobyte UndergroundSwitchPositions setevent EVENT_SWITCH_1 - jump UnknownScript_0x7cc8d + jump UndergroundPathSwitchRoomEntrances_UpdateDoors -UnknownScript_0x7cbcb: - writetext UnknownText_0x7d62d +.On: + writetext SwitchRoomText_OnTurnOff yesorno - iffalse UnknownScript_0x7cc8b + iffalse UndergroundPathSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions addvar -1 copyvartobyte UndergroundSwitchPositions clearevent EVENT_SWITCH_1 - jump UnknownScript_0x7cc8d + jump UndergroundPathSwitchRoomEntrances_UpdateDoors -MapUndergroundPathSwitchRoomEntrancesSignpost1Script: - loadfont - writetext UnknownText_0x7d643 - keeptextopen +Switch2Script: + opentext + writetext SwitchRoomText_Switch2 + buttonsound checkevent EVENT_SWITCH_2 - iftrue UnknownScript_0x7cc00 - writetext UnknownText_0x7d617 + iftrue .On + writetext SwitchRoomText_OffTurnOn yesorno - iffalse UnknownScript_0x7cc8b + iffalse UndergroundPathSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions - addvar $2 + addvar 2 copyvartobyte UndergroundSwitchPositions setevent EVENT_SWITCH_2 - jump UnknownScript_0x7cc8d + jump UndergroundPathSwitchRoomEntrances_UpdateDoors -UnknownScript_0x7cc00: - writetext UnknownText_0x7d62d +.On: + writetext SwitchRoomText_OnTurnOff yesorno - iffalse UnknownScript_0x7cc8b + iffalse UndergroundPathSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions addvar -2 copyvartobyte UndergroundSwitchPositions clearevent EVENT_SWITCH_2 - jump UnknownScript_0x7cc8d + jump UndergroundPathSwitchRoomEntrances_UpdateDoors -MapUndergroundPathSwitchRoomEntrancesSignpost2Script: - loadfont - writetext UnknownText_0x7d65a - keeptextopen +Switch3Script: + opentext + writetext SwitchRoomText_Switch3 + buttonsound checkevent EVENT_SWITCH_3 - iftrue UnknownScript_0x7cc35 - writetext UnknownText_0x7d617 + iftrue .On + writetext SwitchRoomText_OffTurnOn yesorno - iffalse UnknownScript_0x7cc8b + iffalse UndergroundPathSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions - addvar $3 + addvar 3 copyvartobyte UndergroundSwitchPositions setevent EVENT_SWITCH_3 - jump UnknownScript_0x7cc8d + jump UndergroundPathSwitchRoomEntrances_UpdateDoors -UnknownScript_0x7cc35: - writetext UnknownText_0x7d62d +.On: + writetext SwitchRoomText_OnTurnOff yesorno - iffalse UnknownScript_0x7cc8b + iffalse UndergroundPathSwitchRoomEntrances_DontToggle copybytetovar UndergroundSwitchPositions addvar -3 copyvartobyte UndergroundSwitchPositions clearevent EVENT_SWITCH_3 - jump UnknownScript_0x7cc8d + jump UndergroundPathSwitchRoomEntrances_UpdateDoors -MapUndergroundPathSwitchRoomEntrancesSignpost3Script: - loadfont - writetext UnknownText_0x7d671 - keeptextopen +EmergencySwitchScript: + opentext + writetext SwitchRoomText_Emergency + buttonsound checkevent EVENT_EMERGENCY_SWITCH - iftrue UnknownScript_0x7cc70 - writetext UnknownText_0x7d617 + iftrue .On + writetext SwitchRoomText_OffTurnOn yesorno - iffalse UnknownScript_0x7cc8b - writebyte $7 + iffalse UndergroundPathSwitchRoomEntrances_DontToggle + writebyte 7 copyvartobyte UndergroundSwitchPositions setevent EVENT_EMERGENCY_SWITCH setevent EVENT_SWITCH_1 setevent EVENT_SWITCH_2 setevent EVENT_SWITCH_3 - jump UnknownScript_0x7cc8d + jump UndergroundPathSwitchRoomEntrances_UpdateDoors -UnknownScript_0x7cc70: - writetext UnknownText_0x7d62d +.On: + writetext SwitchRoomText_OnTurnOff yesorno - iffalse UnknownScript_0x7cc8b - writebyte $0 + iffalse UndergroundPathSwitchRoomEntrances_DontToggle + writebyte 0 copyvartobyte UndergroundSwitchPositions clearevent EVENT_EMERGENCY_SWITCH clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_2 clearevent EVENT_SWITCH_3 - jump UnknownScript_0x7cc8d + jump UndergroundPathSwitchRoomEntrances_UpdateDoors -UnknownScript_0x7cc8b: - loadmovesprites +UndergroundPathSwitchRoomEntrances_DontToggle: + closetext end -UnknownScript_0x7cc8d: +UndergroundPathSwitchRoomEntrances_UpdateDoors: copybytetovar UndergroundSwitchPositions - if_equal $0, UnknownScript_0x7ccb0 - if_equal $1, UnknownScript_0x7ccd7 - if_equal $2, UnknownScript_0x7ccf2 - if_equal $3, UnknownScript_0x7cd0d - if_equal $4, UnknownScript_0x7cd28 - if_equal $5, UnknownScript_0x7cd43 - if_equal $6, UnknownScript_0x7cd5e - if_equal $7, UnknownScript_0x7cd79 -UnknownScript_0x7ccb0: + if_equal 0, .Position0 + if_equal 1, .Position1 + if_equal 2, .Position2 + if_equal 3, .Position3 + if_equal 4, .Position4 + if_equal 5, .Position5 + if_equal 6, .Position6 + if_equal 7, .EmergencyPosition +.Position0: playsound SFX_ENTER_DOOR - scall UnknownScript_0x7ce11 - scall UnknownScript_0x7ce19 - scall UnknownScript_0x7ce21 - scall UnknownScript_0x7ce29 - scall UnknownScript_0x7ce31 - scall UnknownScript_0x7ce39 - scall UnknownScript_0x7ce41 - scall UnknownScript_0x7ce4d - scall UnknownScript_0x7ce59 - scall UnknownScript_0x7ce65 - scall UnknownScript_0x7ce71 + scall .Clear4 + scall .Clear5 + scall .Clear6 + scall .Clear7 + scall .Clear8 + scall .Clear9 + scall .Clear10 + scall .Clear11 + scall .Clear12 + scall .Clear13 + scall .Clear14 reloadmappart - loadmovesprites + closetext end -UnknownScript_0x7ccd7: +.Position1: playsound SFX_ENTER_DOOR - scall UnknownScript_0x7cda5 - scall UnknownScript_0x7cdd5 - scall UnknownScript_0x7cdf9 - scall UnknownScript_0x7ce39 - scall UnknownScript_0x7ce4d - scall UnknownScript_0x7ce59 - scall UnknownScript_0x7ce71 + scall .Set4 + scall .Set10 + scall .Set13 + scall .Clear9 + scall .Clear11 + scall .Clear12 + scall .Clear14 reloadmappart - loadmovesprites + closetext end -UnknownScript_0x7ccf2: +.Position2: playsound SFX_ENTER_DOOR - scall UnknownScript_0x7cdad - scall UnknownScript_0x7cde1 - scall UnknownScript_0x7cded - scall UnknownScript_0x7ce31 - scall UnknownScript_0x7ce41 - scall UnknownScript_0x7ce65 - scall UnknownScript_0x7ce71 + scall .Set5 + scall .Set11 + scall .Set12 + scall .Clear8 + scall .Clear10 + scall .Clear13 + scall .Clear14 reloadmappart - loadmovesprites + closetext end -UnknownScript_0x7cd0d: +.Position3: playsound SFX_ENTER_DOOR - scall UnknownScript_0x7cdb5 - scall UnknownScript_0x7cdd5 - scall UnknownScript_0x7cdf9 - scall UnknownScript_0x7ce29 - scall UnknownScript_0x7ce4d - scall UnknownScript_0x7ce59 - scall UnknownScript_0x7ce71 + scall .Set6 + scall .Set10 + scall .Set13 + scall .Clear7 + scall .Clear11 + scall .Clear12 + scall .Clear14 reloadmappart - loadmovesprites + closetext end -UnknownScript_0x7cd28: +.Position4: playsound SFX_ENTER_DOOR - scall UnknownScript_0x7cdbd - scall UnknownScript_0x7cde1 - scall UnknownScript_0x7cded - scall UnknownScript_0x7ce21 - scall UnknownScript_0x7ce41 - scall UnknownScript_0x7ce65 - scall UnknownScript_0x7ce71 + scall .Set7 + scall .Set11 + scall .Set12 + scall .Clear6 + scall .Clear10 + scall .Clear13 + scall .Clear14 reloadmappart - loadmovesprites + closetext end -UnknownScript_0x7cd43: +.Position5: playsound SFX_ENTER_DOOR - scall UnknownScript_0x7cdc5 - scall UnknownScript_0x7cdd5 - scall UnknownScript_0x7cdf9 - scall UnknownScript_0x7ce19 - scall UnknownScript_0x7ce4d - scall UnknownScript_0x7ce59 - scall UnknownScript_0x7ce71 + scall .Set8 + scall .Set10 + scall .Set13 + scall .Clear5 + scall .Clear11 + scall .Clear12 + scall .Clear14 reloadmappart - loadmovesprites + closetext end -UnknownScript_0x7cd5e: +.Position6: playsound SFX_ENTER_DOOR - scall UnknownScript_0x7cdcd - scall UnknownScript_0x7cde1 - scall UnknownScript_0x7cded - scall UnknownScript_0x7ce05 - scall UnknownScript_0x7ce11 - scall UnknownScript_0x7ce41 - scall UnknownScript_0x7ce65 + scall .Set9 + scall .Set11 + scall .Set12 + scall .Set14 + scall .Clear4 + scall .Clear10 + scall .Clear13 reloadmappart - loadmovesprites + closetext end -UnknownScript_0x7cd79: +.EmergencyPosition: playsound SFX_ENTER_DOOR - scall UnknownScript_0x7ce11 - scall UnknownScript_0x7ce19 - scall UnknownScript_0x7cdb5 - scall UnknownScript_0x7ce29 - scall UnknownScript_0x7cdc5 - scall UnknownScript_0x7cdcd - scall UnknownScript_0x7ce41 - scall UnknownScript_0x7cde1 - scall UnknownScript_0x7cded - scall UnknownScript_0x7ce65 - scall UnknownScript_0x7ce05 + scall .Clear4 + scall .Clear5 + scall .Set6 + scall .Clear7 + scall .Set8 + scall .Set9 + scall .Clear10 + scall .Set11 + scall .Set12 + scall .Clear13 + scall .Set14 reloadmappart - loadmovesprites - writebyte $6 + closetext + writebyte 6 copyvartobyte UndergroundSwitchPositions end -UnknownScript_0x7cda5: - changeblock $10, $6, $2d +.Set4: + doorstate 1, OPEN1 setevent EVENT_SWITCH_4 end -UnknownScript_0x7cdad: - changeblock $a, $6, $2d +.Set5: + doorstate 2, OPEN1 setevent EVENT_SWITCH_5 end -UnknownScript_0x7cdb5: - changeblock $2, $6, $2d +.Set6: + doorstate 3, OPEN1 setevent EVENT_SWITCH_6 end -UnknownScript_0x7cdbd: - changeblock $2, $a, $2d +.Set7: + doorstate 4, OPEN1 setevent EVENT_SWITCH_7 end -UnknownScript_0x7cdc5: - changeblock $a, $a, $2d +.Set8: + doorstate 5, OPEN1 setevent EVENT_SWITCH_8 end -UnknownScript_0x7cdcd: - changeblock $10, $a, $2d +.Set9: + doorstate 6, OPEN1 setevent EVENT_SWITCH_9 end -UnknownScript_0x7cdd5: - changeblock $c, $6, $2a - changeblock $c, $8, $2d +.Set10: + doorstate 7, CLOSED1 + doorstate 8, OPEN1 setevent EVENT_SWITCH_10 end -UnknownScript_0x7cde1: - changeblock $6, $6, $2a - changeblock $6, $8, $2d +.Set11: + doorstate 9, CLOSED1 + doorstate 10, OPEN1 setevent EVENT_SWITCH_11 end -UnknownScript_0x7cded: - changeblock $c, $a, $2a - changeblock $c, $c, $2d +.Set12: + doorstate 11, CLOSED1 + doorstate 12, OPEN1 setevent EVENT_SWITCH_12 end -UnknownScript_0x7cdf9: - changeblock $6, $a, $2a - changeblock $6, $c, $2d +.Set13: + doorstate 13, CLOSED1 + doorstate 14, OPEN1 setevent EVENT_SWITCH_13 end -UnknownScript_0x7ce05: - changeblock $12, $a, $2a - changeblock $12, $c, $2d +.Set14: + doorstate 15, CLOSED1 + doorstate 16, OPEN1 setevent EVENT_SWITCH_14 end -UnknownScript_0x7ce11: - changeblock $10, $6, $3e +.Clear4: + doorstate 1, CLOSED2 clearevent EVENT_SWITCH_4 end -UnknownScript_0x7ce19: - changeblock $a, $6, $3e +.Clear5: + doorstate 2, CLOSED2 clearevent EVENT_SWITCH_5 end -UnknownScript_0x7ce21: - changeblock $2, $6, $3e +.Clear6: + doorstate 3, CLOSED2 clearevent EVENT_SWITCH_6 end -UnknownScript_0x7ce29: - changeblock $2, $a, $3e +.Clear7: + doorstate 4, CLOSED2 clearevent EVENT_SWITCH_7 end -UnknownScript_0x7ce31: - changeblock $a, $a, $3e +.Clear8: + doorstate 5, CLOSED2 clearevent EVENT_SWITCH_8 end -UnknownScript_0x7ce39: - changeblock $10, $a, $3e +.Clear9: + doorstate 6, CLOSED2 clearevent EVENT_SWITCH_9 end -UnknownScript_0x7ce41: - changeblock $c, $6, $3f - changeblock $c, $8, $3d +.Clear10: + doorstate 7, CLOSED3 + doorstate 8, OPEN2 clearevent EVENT_SWITCH_10 end -UnknownScript_0x7ce4d: - changeblock $6, $6, $3f - changeblock $6, $8, $3d +.Clear11: + doorstate 9, CLOSED3 + doorstate 10, OPEN2 clearevent EVENT_SWITCH_11 end -UnknownScript_0x7ce59: - changeblock $c, $a, $3f - changeblock $c, $c, $3d +.Clear12: + doorstate 11, CLOSED3 + doorstate 12, OPEN2 clearevent EVENT_SWITCH_12 end -UnknownScript_0x7ce65: - changeblock $6, $a, $3f - changeblock $6, $c, $3d +.Clear13: + doorstate 13, CLOSED3 + doorstate 14, OPEN2 clearevent EVENT_SWITCH_13 end -UnknownScript_0x7ce71: - changeblock $12, $a, $3f - changeblock $12, $c, $3d +.Clear14: + doorstate 15, CLOSED3 + doorstate 16, OPEN2 clearevent EVENT_SWITCH_14 end -ItemFragment_0x7ce7d: - db SMOKE_BALL, 1 +UndergroundPathSwitchRoomEntrancesSmokeBall: + itemball SMOKE_BALL -ItemFragment_0x7ce7f: - db FULL_HEAL, 1 +UndergroundPathSwitchRoomEntrancesFullHeal: + itemball FULL_HEAL -MapUndergroundPathSwitchRoomEntrancesSignpostItem4: +UndergroundPathSwitchRoomEntrancesHiddenMaxPotion: dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION -MapUndergroundPathSwitchRoomEntrancesSignpostItem5: +UndergroundPathSwitchRoomEntrancesHiddenRevive: dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE -MovementData_0x7ce87: +UndergroundSilverApproachMovement1: step_down step_left step_left step_left step_end -MovementData_0x7ce8c: +UndergroundSilverApproachMovement2: step_down step_down step_left @@ -612,14 +657,14 @@ MovementData_0x7ce8c: step_left step_end -MovementData_0x7ce92: +UndergroundSilverRetreatMovement1: step_right step_right step_right step_up step_end -MovementData_0x7ce97: +UndergroundSilverRetreatMovement2: step_right step_right step_right @@ -627,7 +672,7 @@ MovementData_0x7ce97: step_up step_end -UnknownText_0x7ce9d: +UndergroundSilverBeforeText: text "Hold it!" para "I saw you, so I" @@ -650,7 +695,7 @@ UnknownText_0x7ce9d: line "debts!" done -UnknownText_0x7cf5d: +UndergroundSilverWinText: text "…Why…" line "Why do I lose?" @@ -663,7 +708,7 @@ UnknownText_0x7cf5d: para "So why do I lose?" done -UnknownText_0x7cfc2: +UndergroundSilverAfterText: text "…I don't under-" line "stand…" @@ -699,7 +744,7 @@ UnknownText_0x7cfc2: line "#MON trainer!" done -UnknownText_0x7d102: +UndergroundSilverLossText: text "Humph. This is my" line "real power, wimp." @@ -711,7 +756,7 @@ UnknownText_0x7d102: cont "under my heels." done -UnknownText_0x7d176: +UndergroundPathSwitchRoomEntrances_SuperNerdText: text "I was challenged" line "to a battle down-" cont "stairs." @@ -721,7 +766,7 @@ UnknownText_0x7d176: cont "better be careful." done -UnknownText_0x7d1d0: +UndergroundPathSwitchRoomEntrances_TeacherText: text "There are some" line "shops downstairs…" @@ -745,7 +790,7 @@ GruntM11BeatenText: line "by indecision!" done -UnknownText_0x7d290: +GruntM11AfterText: text "I'm confused too…" line "The switch on the" @@ -769,7 +814,7 @@ GruntM25BeatenText: line "I blew it." done -UnknownText_0x7d347: +GruntM25AfterText: text "All right. A hint!" para "Change the order" @@ -789,7 +834,7 @@ BurglarDuncanBeatenText: text "Mercy!" done -UnknownText_0x7d3cf: +BurglarDuncanAfterText: text "Steal and sell!" line "That's basic in" cont "crime, kid!" @@ -808,7 +853,7 @@ BurglarEddieBeatenText: text "Over the top!" done -UnknownText_0x7d45b: +BurglarEddieAfterText: text "UNDERGROUND WARE-" line "HOUSE?" @@ -833,13 +878,13 @@ GruntM13BeatenText: line "you're cool, huh?" done -UnknownText_0x7d51f: +GruntM13AfterText: text "You must have ice" line "in your veins to" cont "dis TEAM ROCKET." done -UnknownText_0x7d554: +SwitchRoomText_Switch1: text "It's labeled" line "SWITCH 1." done @@ -860,33 +905,33 @@ GruntF3BeatenText: text "How could you?" done -UnknownText_0x7d5e6: +GruntF3AfterText: text "Go wherever you'd" line "like! Get lost!" cont "See if I care!" done -UnknownText_0x7d617: +SwitchRoomText_OffTurnOn: text "It's OFF." line "Turn it ON?" done -UnknownText_0x7d62d: +SwitchRoomText_OnTurnOff: text "It's ON." line "Turn it OFF?" done -UnknownText_0x7d643: +SwitchRoomText_Switch2: text "It's labeled" line "SWITCH 2." done -UnknownText_0x7d65a: +SwitchRoomText_Switch3: text "It's labeled" line "SWITCH 3." done -UnknownText_0x7d671: +SwitchRoomText_Emergency: text "It's labeled" line "EMERGENCY." done @@ -909,17 +954,17 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $4, $13, $0, UnknownScript_0x7ca80, $0, $0 - xy_trigger 0, $5, $13, $0, UnknownScript_0x7caaa, $0, $0 + xy_trigger 0, $4, $13, $0, UndergroundSilverTrigger1, $0, 0 + xy_trigger 0, $5, $13, $0, UndergroundSilverTrigger2, $0, 0 .Signposts: db 6 - signpost 1, 16, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost0Script - signpost 1, 10, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost1Script - signpost 1, 2, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost2Script - signpost 11, 20, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost3Script - signpost 9, 8, SIGNPOST_ITEM, MapUndergroundPathSwitchRoomEntrancesSignpostItem4 - signpost 8, 1, SIGNPOST_ITEM, MapUndergroundPathSwitchRoomEntrancesSignpostItem5 + signpost 1, 16, SIGNPOST_READ, Switch1Script + signpost 1, 10, SIGNPOST_READ, Switch2Script + signpost 1, 2, SIGNPOST_READ, Switch3Script + signpost 11, 20, SIGNPOST_READ, EmergencySwitchScript + signpost 9, 8, SIGNPOST_ITEM, UndergroundPathSwitchRoomEntrancesHiddenMaxPotion + signpost 8, 1, SIGNPOST_ITEM, UndergroundPathSwitchRoomEntrancesHiddenRevive .PersonEvents: db 11 @@ -931,6 +976,6 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: person_event SPRITE_ROCKET_GIRL, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_TEACHER, 27, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1 person_event SPRITE_SUPER_NERD, 27, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1 - person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7ce7d, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL - person_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7ce7f, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL + person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundPathSwitchRoomEntrancesSmokeBall, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL + person_event SPRITE_POKE_BALL, 9, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundPathSwitchRoomEntrancesFullHeal, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL person_event SPRITE_SILVER, 3, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_UNDERGROUND_PATH diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 1f04c7d82..84db4ed32 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -1,3 +1,12 @@ +const_value set 2 + const UNDERGROUNDWAREHOUSE_ROCKET1 + const UNDERGROUNDWAREHOUSE_ROCKET2 + const UNDERGROUNDWAREHOUSE_ROCKET3 + const UNDERGROUNDWAREHOUSE_GENTLEMAN + const UNDERGROUNDWAREHOUSE_POKE_BALL1 + const UNDERGROUNDWAREHOUSE_POKE_BALL2 + const UNDERGROUNDWAREHOUSE_POKE_BALL3 + UndergroundWarehouse_MapScriptHeader: .MapTriggers: db 0 @@ -33,63 +42,63 @@ TrainerGruntM24: trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, 24, GruntM24SeenText, GruntM24BeatenText, 0, GruntM24Script GruntM24Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7da48 + waitbutton closetext - loadmovesprites end TrainerGruntM14: trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, 14, GruntM14SeenText, GruntM14BeatenText, 0, GruntM14Script GruntM14Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7db01 + waitbutton closetext - loadmovesprites end TrainerGruntM15: trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, 15, GruntM15SeenText, GruntM15BeatenText, 0, GruntM15Script GruntM15Script: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7db8e + waitbutton closetext - loadmovesprites end GentlemanScript_0x7d9bf: faceplayer - loadfont + opentext checkevent EVENT_RECEIVED_CARD_KEY iftrue UnknownScript_0x7d9de writetext UnknownText_0x7dbc6 - keeptextopen + buttonsound verbosegiveitem CARD_KEY setevent EVENT_RECEIVED_CARD_KEY setevent EVENT_WAREHOUSE_LAYOUT_1 clearevent EVENT_WAREHOUSE_LAYOUT_2 clearevent EVENT_WAREHOUSE_LAYOUT_3 writetext UnknownText_0x7dc5b - keeptextopen + buttonsound UnknownScript_0x7d9de: writetext UnknownText_0x7dc8d + waitbutton closetext - loadmovesprites end -ItemFragment_0x7d9e4: - db MAX_ETHER, 1 +UndergroundWarehouseMaxEther: + itemball MAX_ETHER -ItemFragment_0x7d9e6: - db TM_SLEEP_TALK, 1 +UndergroundWarehouseTMSleepTalk: + itemball TM_SLEEP_TALK -ItemFragment_0x7d9e8: - db ULTRA_BALL, 1 +UndergroundWarehouseUltraBall: + itemball ULTRA_BALL GruntM24SeenText: text "How did you get" @@ -226,6 +235,6 @@ UndergroundWarehouse_MapEventHeader: person_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 3, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_GENTLEMAN, 8, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d9e4, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER - person_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d9e6, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK - person_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d9e8, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL + person_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundWarehouseMaxEther, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER + person_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundWarehouseTMSleepTalk, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK + person_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundWarehouseUltraBall, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index cf9b6ed88..01875f6ae 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -1,3 +1,14 @@ +const_value set 2 + const UNIONCAVE1F_POKEFAN_M1 + const UNIONCAVE1F_SUPER_NERD + const UNIONCAVE1F_POKEFAN_M2 + const UNIONCAVE1F_FISHER1 + const UNIONCAVE1F_FISHER2 + const UNIONCAVE1F_POKE_BALL1 + const UNIONCAVE1F_POKE_BALL2 + const UNIONCAVE1F_POKE_BALL3 + const UNIONCAVE1F_POKE_BALL4 + UnionCave1F_MapScriptHeader: .MapTriggers: db 0 @@ -9,68 +20,68 @@ TrainerPokemaniacLarry: trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, PokemaniacLarryScript PokemaniacLarryScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x59d31 + waitbutton closetext - loadmovesprites end TrainerHikerRussell: trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, HikerRussellScript HikerRussellScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x59c6c + waitbutton closetext - loadmovesprites end TrainerHikerDaniel: trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, HikerDanielScript HikerDanielScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x59dc9 + waitbutton closetext - loadmovesprites end TrainerFirebreatherBill: trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, FirebreatherBillScript FirebreatherBillScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x59e6f + waitbutton closetext - loadmovesprites end TrainerFirebreatherRay: trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, FirebreatherRayScript FirebreatherRayScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x59efc + waitbutton closetext - loadmovesprites end -ItemFragment_0x59c00: - db GREAT_BALL, 1 +UnionCave1FGreatBall: + itemball GREAT_BALL -ItemFragment_0x59c02: - db X_ATTACK, 1 +UnionCave1FXAttack: + itemball X_ATTACK -ItemFragment_0x59c04: - db POTION, 1 +UnionCave1FPotion: + itemball POTION -ItemFragment_0x59c06: - db AWAKENING, 1 +UnionCave1FAwakening: + itemball AWAKENING UnknownScript_0x59c08: jumptext UnknownText_0x59f29 @@ -212,7 +223,7 @@ UnionCave1F_MapEventHeader: person_event SPRITE_POKEFAN_M, 8, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerHikerRussell, -1 person_event SPRITE_FISHER, 27, 15, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerFirebreatherRay, -1 person_event SPRITE_FISHER, 19, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerFirebreatherBill, -1 - person_event SPRITE_POKE_BALL, 21, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59c00, EVENT_UNION_CAVE_1F_GREAT_BALL - person_event SPRITE_POKE_BALL, 2, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59c02, EVENT_UNION_CAVE_1F_X_ATTACK - person_event SPRITE_POKE_BALL, 17, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59c04, EVENT_UNION_CAVE_1F_POTION - person_event SPRITE_POKE_BALL, 33, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x59c06, EVENT_UNION_CAVE_1F_AWAKENING + person_event SPRITE_POKE_BALL, 21, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL + person_event SPRITE_POKE_BALL, 2, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK + person_event SPRITE_POKE_BALL, 17, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION + person_event SPRITE_POKE_BALL, 33, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index d8cbad843..26295aab0 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -1,3 +1,12 @@ +const_value set 2 + const UNIONCAVEB1F_POKEFAN_M1 + const UNIONCAVEB1F_POKEFAN_M2 + const UNIONCAVEB1F_SUPER_NERD1 + const UNIONCAVEB1F_SUPER_NERD2 + const UNIONCAVEB1F_POKE_BALL1 + const UNIONCAVEB1F_BOULDER + const UNIONCAVEB1F_POKE_BALL2 + UnionCaveB1F_MapScriptHeader: .MapTriggers: db 0 @@ -9,51 +18,51 @@ TrainerPokemaniacAndrew: trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, PokemaniacAndrewScript PokemaniacAndrewScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5a181 + waitbutton closetext - loadmovesprites end TrainerPokemaniacCalvin: trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, PokemaniacCalvinScript PokemaniacCalvinScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5a230 + waitbutton closetext - loadmovesprites end TrainerHikerPhillip: trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, HikerPhillipScript HikerPhillipScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5a073 + waitbutton closetext - loadmovesprites end TrainerHikerLeonard: trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, HikerLeonardScript HikerLeonardScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5a0fb + waitbutton closetext - loadmovesprites end -ItemFragment_0x5a016: - db TM_SWIFT, 1 +UnionCaveB1FTMSwift: + itemball TM_SWIFT -ItemFragment_0x5a018: - db X_DEFEND, 1 +UnionCaveB1FXDefend: + itemball X_DEFEND UnionCaveB1FBoulder: jumpstd strengthboulder @@ -167,6 +176,6 @@ UnionCaveB1F_MapEventHeader: person_event SPRITE_POKEFAN_M, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerLeonard, -1 person_event SPRITE_SUPER_NERD, 32, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1 person_event SPRITE_SUPER_NERD, 30, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacCalvin, -1 - person_event SPRITE_POKE_BALL, 16, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5a016, EVENT_UNION_CAVE_B1F_TM_SWIFT + person_event SPRITE_POKE_BALL, 16, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT person_event SPRITE_BOULDER, 10, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1 - person_event SPRITE_POKE_BALL, 23, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5a018, EVENT_UNION_CAVE_B1F_X_DEFEND + person_event SPRITE_POKE_BALL, 23, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB1FXDefend, EVENT_UNION_CAVE_B1F_X_DEFEND diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index a0e1c24e3..0425c1d67 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const UNIONCAVEB2F_ROCKER + const UNIONCAVEB2F_COOLTRAINER_F1 + const UNIONCAVEB2F_COOLTRAINER_F2 + const UNIONCAVEB2F_POKE_BALL1 + const UNIONCAVEB2F_POKE_BALL2 + const UNIONCAVEB2F_SURF + UnionCaveB2F_MapScriptHeader: .MapTriggers: db 0 @@ -15,61 +23,61 @@ UnknownScript_0x5a30d: checkcode VAR_WEEKDAY if_equal FRIDAY, UnknownScript_0x5a31c UnknownScript_0x5a319: - disappear $7 + disappear UNIONCAVEB2F_SURF return UnknownScript_0x5a31c: - appear $7 + appear UNIONCAVEB2F_SURF return SurfScript_0x5a31f: faceplayer cry LAPRAS - loadpokedata LAPRAS, 20 + loadwildmon LAPRAS, 20 startbattle - disappear $7 + disappear UNIONCAVEB2F_SURF setflag ENGINE_UNION_CAVE_LAPRAS - returnafterbattle + reloadmapafterbattle end TrainerCooltrainermNick: trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, CooltrainermNickScript CooltrainermNickScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5a3f0 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfGwen: trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, CooltrainerfGwenScript CooltrainerfGwenScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5a488 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfEmma: trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, CooltrainerfEmmaScript CooltrainerfEmmaScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x5a52b + waitbutton closetext - loadmovesprites end -ItemFragment_0x5a36a: - db ELIXER, 1 +UnionCaveB2FElixer: + itemball ELIXER -ItemFragment_0x5a36c: - db HYPER_POTION, 1 +UnionCaveB2FHyperPotion: + itemball HYPER_POTION CooltrainermNickSeenText: text "There are two" @@ -155,6 +163,6 @@ UnionCaveB2F_MapEventHeader: person_event SPRITE_ROCKER, 19, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermNick, -1 person_event SPRITE_COOLTRAINER_F, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 person_event SPRITE_COOLTRAINER_F, 30, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 - person_event SPRITE_POKE_BALL, 2, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5a36a, EVENT_UNION_CAVE_B2F_ELIXER - person_event SPRITE_POKE_BALL, 19, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x5a36c, EVENT_UNION_CAVE_B2F_HYPER_POTION + person_event SPRITE_POKE_BALL, 2, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER + person_event SPRITE_POKE_BALL, 19, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION person_event SPRITE_SURF, 31, 11, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SurfScript_0x5a31f, EVENT_UNION_CAVE_B2F_LAPRAS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 426cc8249..90b18c6b7 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -1,3 +1,11 @@ +const_value set 2 + const VERMILIONCITY_TEACHER + const VERMILIONCITY_GRAMPS + const VERMILIONCITY_MACHOP + const VERMILIONCITY_SUPER_NERD + const VERMILIONCITY_BIG_SNORLAX + const VERMILIONCITY_POKEFAN_M + VermilionCity_MapScriptHeader: .MapTriggers: db 0 @@ -19,46 +27,46 @@ GrampsScript_0x1aa986: jumptextfaceplayer UnknownText_0x1aaa6f VermilionMachop: - loadfont + opentext writetext UnknownText_0x1aaaca cry MACHOP + waitbutton closetext - loadmovesprites earthquake 30 - loadfont + opentext writetext UnknownText_0x1aaae2 + waitbutton closetext - loadmovesprites end SuperNerdScript_0x1aa99b: jumptextfaceplayer UnknownText_0x1aab1a VermilionSnorlax: - loadfont + opentext special SpecialSnorlaxAwake iftrue UnknownScript_0x1aa9ab writetext UnknownText_0x1aab64 + waitbutton closetext - loadmovesprites end UnknownScript_0x1aa9ab: writetext UnknownText_0x1aab84 pause 15 cry SNORLAX - loadmovesprites + closetext writecode VAR_BATTLETYPE, BATTLETYPE_FORCEITEM - loadpokedata SNORLAX, 50 + loadwildmon SNORLAX, 50 startbattle - disappear $6 + disappear VERMILIONCITY_BIG_SNORLAX setevent EVENT_FOUGHT_SNORLAX - returnafterbattle + reloadmapafterbattle end VermilionGymBadgeGuy: faceplayer - loadfont + opentext checkevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY iftrue .AlreadyGotItem checkcode VAR_BADGES @@ -66,33 +74,33 @@ VermilionGymBadgeGuy: if_greater_than 13, .MostBadges if_greater_than 9, .SomeBadges writetext UnknownText_0x1aabc8 + waitbutton closetext - loadmovesprites end .SomeBadges writetext UnknownText_0x1aac2b + waitbutton closetext - loadmovesprites end .MostBadges writetext UnknownText_0x1aac88 + waitbutton closetext - loadmovesprites end .AllBadges writetext UnknownText_0x1aacf3 - keeptextopen + buttonsound verbosegiveitem HP_UP iffalse .Done setevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY .AlreadyGotItem writetext UnknownText_0x1aad4a - closetext + waitbutton .Done - loadmovesprites + closetext end VermilionCitySign: @@ -116,7 +124,7 @@ VermilionCityPokeCenterSign: VermilionCityMartSign: jumpstd martsign -MapVermilionCitySignpostItem7: +VermilionCityHiddenFullHeal: dwb EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL UnknownText_0x1aaa15: @@ -290,7 +298,7 @@ VermilionCity_MapEventHeader: signpost 15, 27, SIGNPOST_READ, VermilionCityPortSign signpost 5, 10, SIGNPOST_READ, VermilionCityPokeCenterSign signpost 13, 22, SIGNPOST_READ, VermilionCityMartSign - signpost 19, 12, SIGNPOST_ITEM, MapVermilionCitySignpostItem7 + signpost 19, 12, SIGNPOST_ITEM, VermilionCityHiddenFullHeal .PersonEvents: db 6 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 17c51ff47..209986a0f 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -1,3 +1,10 @@ +const_value set 2 + const VERMILIONGYM_SURGE + const VERMILIONGYM_GENTLEMAN + const VERMILIONGYM_ROCKER + const VERMILIONGYM_SUPER_NERD + const VERMILIONGYM_GYM_GUY + VermilionGym_MapScriptHeader: .MapTriggers: db 0 @@ -7,83 +14,83 @@ VermilionGym_MapScriptHeader: SurgeScript_0x1920a5: faceplayer - loadfont + opentext checkflag ENGINE_THUNDERBADGE iftrue .FightDone writetext UnknownText_0x192142 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x192238, 0 loadtrainer LT_SURGE, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_LTSURGE setevent EVENT_BEAT_GENTLEMAN_GREGORY setevent EVENT_BEAT_GUITARIST_VINCENT setevent EVENT_BEAT_JUGGLER_HORTON - loadfont + opentext writetext UnknownText_0x192277 playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_THUNDERBADGE writetext UnknownText_0x192291 + waitbutton closetext - loadmovesprites end .FightDone writetext UnknownText_0x192303 + waitbutton closetext - loadmovesprites end TrainerGentlemanGregory: trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, GentlemanGregoryScript GentlemanGregoryScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1923b0 + waitbutton closetext - loadmovesprites end TrainerGuitaristVincent: trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, GuitaristVincentScript GuitaristVincentScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x19244b + waitbutton closetext - loadmovesprites end TrainerJugglerHorton: trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, JugglerHortonScript JugglerHortonScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x1924d6 + waitbutton closetext - loadmovesprites end VermilionGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_LTSURGE iftrue .VermilionGymGuyWinScript writetext VermilionGymGuyText + waitbutton closetext - loadmovesprites end .VermilionGymGuyWinScript writetext VermilionGymGuyWinText + waitbutton closetext - loadmovesprites end MapVermilionGymSignpost14Script: diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index 96e683728..1f1f42e66 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const VERMILIONHOUSEDIGLETTSCAVESPEECHHOUSE_GENTLEMAN + VermilionHouseDiglettsCaveSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index fc784e562..3571d066f 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const VERMILIONHOUSEFISHINGSPEECHHOUSE_FISHING_GURU + VermilionHouseFishingSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index b9b86a019..c07f6ca28 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const VERMILIONMAGNETTRAINSPEECHHOUSE_POKEFAN_F + const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER + VermilionMagnetTrainSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index b1f33863e..7da93f1e2 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const VERMILIONMART_CLERK + const VERMILIONMART_SUPER_NERD + const VERMILIONMART_BUENA + VermilionMart_MapScriptHeader: .MapTriggers: db 0 @@ -6,9 +11,9 @@ VermilionMart_MapScriptHeader: db 0 ClerkScript_0x191f7e: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_VERMILION - loadmovesprites + closetext end SuperNerdScript_0x191f85: diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index 300f70722..f3cc2d248 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const VERMILIONPOKECENTER1F_NURSE + const VERMILIONPOKECENTER1F_FISHING_GURU + const VERMILIONPOKECENTER1F_SAILOR + const VERMILIONPOKECENTER1F_BUG_CATCHER + VermilionPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -10,18 +16,18 @@ NurseScript_0x191603: FishingGuruScript_0x191606: faceplayer - loadfont + opentext checkevent EVENT_FOUGHT_SNORLAX iftrue UnknownScript_0x191614 writetext UnknownText_0x191620 + waitbutton closetext - loadmovesprites end UnknownScript_0x191614: writetext UnknownText_0x191698 + waitbutton closetext - loadmovesprites end SailorScript_0x19161a: diff --git a/maps/VermilionPokeCenter2FBeta.asm b/maps/VermilionPokeCenter2FBeta.asm index 3d8ad1efc..23d9a4408 100644 --- a/maps/VermilionPokeCenter2FBeta.asm +++ b/maps/VermilionPokeCenter2FBeta.asm @@ -1,3 +1,4 @@ + VermilionPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index c9cb32207..2e31531ce 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -1,10 +1,15 @@ +const_value set 2 + const VERMILIONPORT_SAILOR1 + const VERMILIONPORT_SAILOR2 + const VERMILIONPORT_SUPER_NERD + VermilionPort_MapScriptHeader: .MapTriggers: db 2 ; triggers + dw .Trigger0, 0 dw .Trigger1, 0 - dw .Trigger2, 0 .MapCallbacks: db 1 @@ -12,10 +17,10 @@ VermilionPort_MapScriptHeader: ; callbacks dbw 5, .FlyPoint -.Trigger1 +.Trigger0 end -.Trigger2 +.Trigger1 priorityjump UnknownScript_0x74da6 end @@ -25,7 +30,7 @@ VermilionPort_MapScriptHeader: UnknownScript_0x74da6: applymovement PLAYER, MovementData_0x74ef3 - appear $2 + appear VERMILIONPORT_SAILOR1 dotrigger $0 setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN @@ -38,21 +43,21 @@ UnknownScript_0x74da6: SailorScript_0x74dc4: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e1a writetext UnknownText_0x74f06 + waitbutton closetext - loadmovesprites - spriteface $2, DOWN + spriteface VERMILIONPORT_SAILOR1, DOWN pause 10 playsound SFX_EXIT_BUILDING - disappear $2 - waitbutton + disappear VERMILIONPORT_SAILOR1 + waitsfx applymovement PLAYER, MovementData_0x74ef1 playsound SFX_EXIT_BUILDING special FadeOutPalettes - waitbutton + waitsfx setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND clearevent EVENT_BEAT_POKEMANIAC_ETHAN @@ -66,25 +71,25 @@ SailorScript_0x74dc4: clearevent EVENT_BEAT_SCHOOLBOY_NATE clearevent EVENT_BEAT_SCHOOLBOY_RICKY setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE - appear $2 + appear VERMILIONPORT_SAILOR1 domaptrigger FAST_SHIP_1F, $1 warp FAST_SHIP_1F, $19, $1 end UnknownScript_0x74e1a: writetext UnknownText_0x74f31 + waitbutton closetext - loadmovesprites end UnknownScript_0x74e20: - spriteface $3, RIGHT + spriteface VERMILIONPORT_SAILOR2, RIGHT checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e86 checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue UnknownScript_0x74e86 spriteface PLAYER, LEFT - loadfont + opentext checkcode VAR_WEEKDAY if_equal MONDAY, UnknownScript_0x74e72 if_equal TUESDAY, UnknownScript_0x74e72 @@ -95,34 +100,34 @@ UnknownScript_0x74e20: yesorno iffalse UnknownScript_0x74e8d writetext UnknownText_0x74f8b - keeptextopen + buttonsound checkitem S_S_TICKET iffalse UnknownScript_0x74e68 writetext UnknownText_0x74fc2 + waitbutton closetext - loadmovesprites setevent EVENT_RECEIVED_BALLS_FROM_KURT applymovement PLAYER, MovementData_0x74ef8 jump SailorScript_0x74dc4 UnknownScript_0x74e68: writetext UnknownText_0x74ff2 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x74ef5 end UnknownScript_0x74e72: writetext UnknownText_0x75059 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x74ef5 end UnknownScript_0x74e7c: writetext UnknownText_0x75080 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x74ef5 end @@ -131,20 +136,20 @@ UnknownScript_0x74e86: UnknownScript_0x74e87: writetext UnknownText_0x74fa7 + waitbutton closetext - loadmovesprites end UnknownScript_0x74e8d: writetext UnknownText_0x74fa7 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x74ef5 end SailorScript_0x74e97: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e1a checkcode VAR_WEEKDAY @@ -157,43 +162,43 @@ SailorScript_0x74e97: yesorno iffalse UnknownScript_0x74e87 writetext UnknownText_0x74f8b - keeptextopen + buttonsound checkitem S_S_TICKET iffalse UnknownScript_0x74ed4 writetext UnknownText_0x74fc2 + waitbutton closetext - loadmovesprites setevent EVENT_RECEIVED_BALLS_FROM_KURT applymovement PLAYER, MovementData_0x74efe jump SailorScript_0x74dc4 UnknownScript_0x74ed4: writetext UnknownText_0x74ff2 + waitbutton closetext - loadmovesprites end UnknownScript_0x74eda: writetext UnknownText_0x75059 + waitbutton closetext - loadmovesprites end UnknownScript_0x74ee0: writetext UnknownText_0x75080 + waitbutton closetext - loadmovesprites end SuperNerdScript_0x74ee6: faceplayer - loadfont + opentext writetext UnknownText_0x750a6 + waitbutton closetext - loadmovesprites end -MapVermilionPortSignpostItem0: +VermilionPortHiddenIron: dwb EVENT_VERMILION_PORT_HIDDEN_IRON, IRON @@ -313,7 +318,7 @@ VermilionPort_MapEventHeader: .Signposts: db 1 - signpost 13, 16, SIGNPOST_ITEM, MapVermilionPortSignpostItem0 + signpost 13, 16, SIGNPOST_ITEM, VermilionPortHiddenIron .PersonEvents: db 3 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 29b61c72e..8acb74505 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -1,3 +1,6 @@ +const_value set 2 + const VERMILIONPORTPASSAGE_TEACHER + VermilionPortPassage_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 25f58022e..1e4b4ab72 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -1,3 +1,11 @@ +const_value set 2 + const VICTORYROAD_SILVER + const VICTORYROAD_POKE_BALL1 + const VICTORYROAD_POKE_BALL2 + const VICTORYROAD_POKE_BALL3 + const VICTORYROAD_POKE_BALL4 + const VICTORYROAD_POKE_BALL5 + VictoryRoad_MapScriptHeader: .MapTriggers: db 2 @@ -16,16 +24,16 @@ UnknownScript_0x74491: end UnknownScript_0x74492: - moveperson $2, $12, $b + moveperson VICTORYROAD_SILVER, $12, $b spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic pause 15 - appear $2 - applymovement $2, MovementData_0x74539 + appear VICTORYROAD_SILVER + applymovement VICTORYROAD_SILVER, MovementData_0x74539 scall UnknownScript_0x744d4 - applymovement $2, MovementData_0x7454c - disappear $2 + applymovement VICTORYROAD_SILVER, MovementData_0x7454c + disappear VICTORYROAD_SILVER dotrigger $1 playmapmusic end @@ -33,13 +41,13 @@ UnknownScript_0x74492: UnknownScript_0x744b5: spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_RotatePalettesRightMusic + special Special_FadeOutMusic pause 15 - appear $2 - applymovement $2, MovementData_0x74542 + appear VICTORYROAD_SILVER + applymovement VICTORYROAD_SILVER, MovementData_0x74542 scall UnknownScript_0x744d4 - applymovement $2, MovementData_0x74555 - disappear $2 + applymovement VICTORYROAD_SILVER, MovementData_0x74555 + disappear VICTORYROAD_SILVER dotrigger $1 playmapmusic end @@ -47,69 +55,69 @@ UnknownScript_0x744b5: UnknownScript_0x744d4: spriteface PLAYER, DOWN playmusic MUSIC_RIVAL_ENCOUNTER - loadfont + opentext writetext UnknownText_0x7455f + waitbutton closetext - loadmovesprites setevent EVENT_RIVAL_VICTORY_ROAD checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x744ff checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x7450f winlosstext UnknownText_0x7463d, UnknownText_0x747aa - setlasttalked $2 + setlasttalked VICTORYROAD_SILVER loadtrainer RIVAL1, RIVAL1_15 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump UnknownScript_0x7451f UnknownScript_0x744ff: winlosstext UnknownText_0x7463d, UnknownText_0x747aa - setlasttalked $2 + setlasttalked VICTORYROAD_SILVER loadtrainer RIVAL1, RIVAL1_13 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump UnknownScript_0x7451f UnknownScript_0x7450f: winlosstext UnknownText_0x7463d, UnknownText_0x747aa - setlasttalked $2 + setlasttalked VICTORYROAD_SILVER loadtrainer RIVAL1, RIVAL1_14 startbattle - reloadmapmusic - returnafterbattle + dontrestartmapmusic + reloadmapafterbattle jump UnknownScript_0x7451f UnknownScript_0x7451f: playmusic MUSIC_RIVAL_AFTER - loadfont + opentext writetext UnknownText_0x746ce + waitbutton closetext - loadmovesprites end -ItemFragment_0x74529: - db TM_EARTHQUAKE, 1 +VictoryRoadTMEarthquake: + itemball TM_EARTHQUAKE -ItemFragment_0x7452b: - db MAX_REVIVE, 1 +VictoryRoadMaxRevive: + itemball MAX_REVIVE -ItemFragment_0x7452d: - db FULL_RESTORE, 1 +VictoryRoadFullRestore: + itemball FULL_RESTORE -ItemFragment_0x7452f: - db FULL_HEAL, 1 +VictoryRoadFullHeal: + itemball FULL_HEAL -ItemFragment_0x74531: - db HP_UP, 1 +VictoryRoadHPUp: + itemball HP_UP -MapVictoryRoadSignpostItem0: +VictoryRoadHiddenMaxPotion: dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION -MapVictoryRoadSignpostItem1: +VictoryRoadHiddenFullHeal: dwb EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL @@ -258,14 +266,14 @@ VictoryRoad_MapEventHeader: .Signposts: db 2 - signpost 29, 3, SIGNPOST_ITEM, MapVictoryRoadSignpostItem0 - signpost 65, 3, SIGNPOST_ITEM, MapVictoryRoadSignpostItem1 + signpost 29, 3, SIGNPOST_ITEM, VictoryRoadHiddenMaxPotion + signpost 65, 3, SIGNPOST_ITEM, VictoryRoadHiddenFullHeal .PersonEvents: db 6 person_event SPRITE_SILVER, 13, 18, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD - person_event SPRITE_POKE_BALL, 28, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x74529, EVENT_VICTORY_ROAD_TM_EARTHQUAKE - person_event SPRITE_POKE_BALL, 48, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7452b, EVENT_VICTORY_ROAD_MAX_REVIVE - person_event SPRITE_POKE_BALL, 29, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7452d, EVENT_VICTORY_ROAD_FULL_RESTORE - person_event SPRITE_POKE_BALL, 48, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7452f, EVENT_VICTORY_ROAD_FULL_HEAL - person_event SPRITE_POKE_BALL, 38, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x74531, EVENT_VICTORY_ROAD_HP_UP + person_event SPRITE_POKE_BALL, 28, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE + person_event SPRITE_POKE_BALL, 48, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE + person_event SPRITE_POKE_BALL, 29, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE + person_event SPRITE_POKE_BALL, 48, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL + person_event SPRITE_POKE_BALL, 38, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index aca132bd1..8195ac971 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -1,3 +1,8 @@ +const_value set 2 + const VICTORYROADGATE_OFFICER + const VICTORYROADGATE_BLACK_BELT1 + const VICTORYROADGATE_BLACK_BELT2 + VictoryRoadGate_MapScriptHeader: .MapTriggers: db 2 @@ -22,21 +27,21 @@ UnknownScript_0x9b9fd: OfficerScript_0x9ba03: faceplayer UnknownScript_0x9ba04: - loadfont + opentext writetext UnknownText_0x9ba29 - keeptextopen + buttonsound checkcode VAR_BADGES if_greater_than 7, UnknownScript_0x9ba19 writetext UnknownText_0x9ba5f + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x9ba27 end UnknownScript_0x9ba19: writetext UnknownText_0x9bab4 + waitbutton closetext - loadmovesprites dotrigger $1 end diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 248e3e564..c142602ba 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -1,3 +1,13 @@ +const_value set 2 + const VIOLETCITY_FISHER + const VIOLETCITY_LASS + const VIOLETCITY_SUPER_NERD + const VIOLETCITY_GRAMPS + const VIOLETCITY_YOUNGSTER + const VIOLETCITY_FRUIT_TREE + const VIOLETCITY_POKE_BALL1 + const VIOLETCITY_POKE_BALL2 + VioletCity_MapScriptHeader: .MapTriggers: db 0 @@ -12,55 +22,55 @@ VioletCity_MapScriptHeader: setflag ENGINE_FLYPOINT_VIOLET return -FisherScript_0x1a83bb: - applymovement $2, MovementData_0x1a8465 +VioletCityEarlScript: + applymovement VIOLETCITY_FISHER, VioletCitySpinningEarl_MovementData faceplayer - loadfont - writetext UnknownText_0x1a8473 + opentext + 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 - loadmovesprites end -UnknownScript_0x1a83d1: - writetext UnknownText_0x1a84cb +.FollowEarl: + writetext Text_FollowEarl + waitbutton closetext - loadmovesprites playmusic MUSIC_SHOW_ME_AROUND - follow $2, PLAYER - applymovement $2, MovementData_0x1a842a + follow VIOLETCITY_FISHER, PLAYER + applymovement VIOLETCITY_FISHER, VioletCityFollowEarl_MovementData spriteface PLAYER, UP - applymovement $2, MovementData_0x1a8465 + applymovement VIOLETCITY_FISHER, VioletCitySpinningEarl_MovementData stopfollow special RestartMapMusic - loadfont - writetext UnknownText_0x1a84f9 + opentext + writetext Text_HereTeacherIAm + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x1a8465 - applymovement $2, MovementData_0x1a8463 + applymovement VIOLETCITY_FISHER, VioletCitySpinningEarl_MovementData + applymovement VIOLETCITY_FISHER, VioletCityFinishFollowEarl_MovementData playsound SFX_ENTER_DOOR - disappear $2 + disappear VIOLETCITY_FISHER clearevent EVENT_EARLS_ACADEMY_EARL - waitbutton + 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 @@ -80,19 +90,19 @@ VioletCityPokeCenterSign: VioletCityMartSign: jumpstd martsign -ItemFragment_0x1a8421: - db PP_UP, 1 +VioletCityPPUp: + itemball PP_UP -ItemFragment_0x1a8423: - db RARE_CANDY, 1 +VioletCityRareCandy: + itemball RARE_CANDY -FruitTreeScript_0x1a8425: +VioletCityFruitTreeScript: fruittree FRUITTREE_VIOLET_CITY -MapVioletCitySignpostItem6: +VioletCityHiddenHyperPotion: dwb EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION -MovementData_0x1a842a: +VioletCityFollowEarl_MovementData: big_step_down big_step_down turn_head_down @@ -151,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 @@ -171,7 +181,7 @@ MovementData_0x1a8465: turn_head_down step_end -UnknownText_0x1a8473: +Text_EarlAsksIfYouBeatFalkner: text "Hello!" line "You are trainer?" @@ -179,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." @@ -208,7 +218,7 @@ UnknownText_0x1a8529: line "ghosts." done -UnknownText_0x1a8593: +VioletCitySuperNerdText: text "Hey, you're a" line "#MON trainer?" @@ -219,7 +229,7 @@ UnknownText_0x1a8593: line "for prime time!" done -UnknownText_0x1a85ef: +VioletCityGrampsText: text "FALKNER, from the" line "VIOLET #MON" @@ -233,7 +243,7 @@ UnknownText_0x1a85ef: line "job with it." done -UnknownText_0x1a8665: +VioletCityYoungsterText: text "I saw a wiggly" line "tree up ahead!" @@ -293,19 +303,19 @@ 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 - signpost 14, 37, SIGNPOST_ITEM, MapVioletCitySignpostItem6 + signpost 14, 37, SIGNPOST_ITEM, VioletCityHiddenHyperPotion .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_POKE_BALL, 1, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a8421, EVENT_VIOLET_CITY_PP_UP - person_event SPRITE_POKE_BALL, 5, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1a8423, EVENT_VIOLET_CITY_RARE_CANDY + 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 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 7b9d36025..28c1dd218 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -1,3 +1,9 @@ +const_value set 2 + const VIOLETGYM_FALKNER + const VIOLETGYM_YOUNGSTER1 + const VIOLETGYM_YOUNGSTER2 + const VIOLETGYM_GYM_GUY + VioletGym_MapScriptHeader: .MapTriggers: db 0 @@ -7,21 +13,21 @@ VioletGym_MapScriptHeader: FalknerScript_0x683c2: faceplayer - loadfont + opentext checkevent EVENT_BEAT_FALKNER iftrue .FightDone writetext UnknownText_0x68473 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x6854a, 0 loadtrainer FALKNER, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_FALKNER - loadfont + opentext writetext UnknownText_0x685af playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_ZEPHYRBADGE checkcode VAR_BADGES scall VioletGymTriggerRockets @@ -33,20 +39,20 @@ FalknerScript_0x683c2: domaptrigger ELMS_LAB, $2 specialphonecall SPECIALCALL_ASSISTANT writetext UnknownText_0x685c8 - keeptextopen + buttonsound verbosegiveitem TM_MUD_SLAP iffalse .NoRoomForMudSlap setevent EVENT_GOT_TM31_MUD_SLAP writetext UnknownText_0x68648 + waitbutton closetext - loadmovesprites end .SpeechAfterTM: writetext UnknownText_0x68735 - closetext + waitbutton .NoRoomForMudSlap: - loadmovesprites + closetext end VioletGymTriggerRockets: @@ -64,38 +70,38 @@ TrainerBird_keeperRod: trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, 0, Bird_keeperRodScript Bird_keeperRodScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x68837 + waitbutton closetext - loadmovesprites end TrainerBird_keeperAbe: trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, 0, Bird_keeperAbeScript Bird_keeperAbeScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x688c7 + waitbutton closetext - loadmovesprites end VioletGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_FALKNER iftrue .VioletGymGuyWinScript writetext VioletGymGuyText + waitbutton closetext - loadmovesprites end .VioletGymGuyWinScript writetext VioletGymGuyWinText + waitbutton closetext - loadmovesprites end VioletGymStatue: diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index f338b7086..0513be044 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const VIOLETMART_CLERK + const VIOLETMART_GRANNY + const VIOLETMART_COOLTRAINER_M + VioletMart_MapScriptHeader: .MapTriggers: db 0 @@ -6,9 +11,9 @@ VioletMart_MapScriptHeader: db 0 ClerkScript_0x68295: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_VIOLET - loadmovesprites + closetext end GrannyScript_0x6829c: diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 28ed77051..7717c7136 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -1,3 +1,8 @@ +const_value set 2 + const VIOLETNICKNAMESPEECHHOUSE_TEACHER + const VIOLETNICKNAMESPEECHHOUSE_LASS + const VIOLETNICKNAMESPEECHHOUSE_BIRD + VioletNicknameSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -13,11 +18,11 @@ LassScript_0x693ec: BirdScript_0x693ef: faceplayer - loadfont + opentext writetext UnknownText_0x6947c cry PIDGEY + waitbutton closetext - loadmovesprites end UnknownText_0x693fa: diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm index bbdf8639b..eabab4e7d 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletOnixTradeHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const VIOLETONIXTRADEHOUSE_POKEFAN_M + const VIOLETONIXTRADEHOUSE_YOUNGSTER + VioletOnixTradeHouse_MapScriptHeader: .MapTriggers: db 0 @@ -10,10 +14,10 @@ PokefanMScript_0x6998d: YoungsterScript_0x69990: faceplayer - loadfont + opentext trade $1 + waitbutton closetext - loadmovesprites end UnknownText_0x69997: diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index 94d56df43..15d7fb0b1 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const VIOLETPOKECENTER1F_NURSE + const VIOLETPOKECENTER1F_GAMEBOY_KID + const VIOLETPOKECENTER1F_GENTLEMAN + const VIOLETPOKECENTER1F_YOUNGSTER + const VIOLETPOKECENTER1F_SCIENTIST + VioletPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -5,71 +12,71 @@ VioletPokeCenter1F_MapScriptHeader: .MapCallbacks: db 0 -NurseScript_0x694c9: +VioletPokeCenterNurse: jumpstd pokecenternurse -ScientistScript_0x694cc: +VioletPokeCenter1F_ElmsAideScript: faceplayer - loadfont + opentext checkevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE - iftrue UnknownScript_0x6953a + iftrue .SecondTimeAsking writetext UnknownText_0x69555 -UnknownScript_0x694d7: +.AskTakeEgg: yesorno - iffalse UnknownScript_0x69531 + iffalse .RefusedEgg checkcode VAR_PARTYCOUNT - if_equal $6, UnknownScript_0x6952b + if_equal PARTY_LENGTH, .PartyFull giveegg TOGEPI, 5 stringtotext .eggname, $1 - scall UnknownScript_0x69527 + scall .AideGivesEgg setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE clearevent EVENT_ELMS_AIDE_IN_LAB clearevent EVENT_TOGEPI_HATCHED domaptrigger ROUTE_32, $1 writetext UnknownText_0x695c5 + waitbutton closetext - loadmovesprites checkcode VAR_FACING - if_equal $1, .UnknownScript_0x69511 + if_equal UP, .AideWalksAroundPlayer spriteface PLAYER, DOWN - applymovement $6, MovementData_0x69549 + applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksStraightOutOfPokecenter playsound SFX_EXIT_BUILDING - disappear $6 - waitbutton + disappear VIOLETPOKECENTER1F_SCIENTIST + waitsfx end -.UnknownScript_0x69511 - applymovement $6, MovementData_0x6954e +.AideWalksAroundPlayer + applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksLeftToExitPokecenter spriteface PLAYER, DOWN - applymovement $6, MovementData_0x69551 + applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideFinishesLeavingPokecenter playsound SFX_EXIT_BUILDING - disappear $6 - waitbutton + disappear VIOLETPOKECENTER1F_SCIENTIST + waitsfx end .eggname db "EGG@" -UnknownScript_0x69527: +.AideGivesEgg: jumpstd receivetogepiegg end -UnknownScript_0x6952b: +.PartyFull: writetext UnknownText_0x69693 + waitbutton closetext - loadmovesprites end -UnknownScript_0x69531: +.RefusedEgg: writetext UnknownText_0x696f2 + waitbutton closetext - loadmovesprites setevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE end -UnknownScript_0x6953a: +.SecondTimeAsking: writetext UnknownText_0x69712 - jump UnknownScript_0x694d7 + jump .AskTakeEgg GameboyKidScript_0x69540: jumptextfaceplayer UnknownText_0x69809 @@ -80,19 +87,19 @@ GentlemanScript_0x69543: YoungsterScript_0x69546: jumptextfaceplayer UnknownText_0x698b8 -MovementData_0x69549: +MovementData_AideWalksStraightOutOfPokecenter: step_down step_down step_down step_down step_end -MovementData_0x6954e: +MovementData_AideWalksLeftToExitPokecenter: step_left step_down step_end -MovementData_0x69551: +MovementData_AideFinishesLeavingPokecenter: step_down step_down step_down @@ -226,8 +233,8 @@ VioletPokeCenter1F_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x694c9, -1 + person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletPokeCenterNurse, -1 person_event SPRITE_GAMEBOY_KID, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x69540, -1 person_event SPRITE_GENTLEMAN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x69543, -1 person_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x69546, -1 - person_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x694cc, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER + person_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, VioletPokeCenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 83743b017..7d725a3aa 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -1,3 +1,9 @@ +const_value set 2 + const VIRIDIANCITY_GRAMPS1 + const VIRIDIANCITY_GRAMPS2 + const VIRIDIANCITY_FISHER + const VIRIDIANCITY_YOUNGSTER + ViridianCity_MapScriptHeader: .MapTriggers: db 0 @@ -14,52 +20,52 @@ ViridianCity_MapScriptHeader: GrampsScript_0x1a9a4c: faceplayer - loadfont + opentext writetext UnknownText_0x1a9aa5 yesorno iffalse UnknownScript_0x1a9a5b writetext UnknownText_0x1a9b6f + waitbutton closetext - loadmovesprites end UnknownScript_0x1a9a5b: writetext UnknownText_0x1a9bb7 + waitbutton closetext - loadmovesprites end GrampsScript_0x1a9a61: faceplayer - loadfont + opentext checkevent EVENT_BLUE_IN_CINNABAR iftrue .BlueReturned writetext UnknownText_0x1a9c11 + waitbutton closetext - loadmovesprites end .BlueReturned writetext UnknownText_0x1a9c7e + waitbutton closetext - loadmovesprites end FisherScript_0x1a9a75: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM42_DREAM_EATER iftrue UnknownScript_0x1a9a8a writetext UnknownText_0x1a9cc4 - keeptextopen + buttonsound verbosegiveitem TM_DREAM_EATER iffalse UnknownScript_0x1a9a8e setevent EVENT_GOT_TM42_DREAM_EATER UnknownScript_0x1a9a8a: writetext UnknownText_0x1a9d86 - closetext + waitbutton UnknownScript_0x1a9a8e: - loadmovesprites + closetext end YoungsterScript_0x1a9a90: diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 54dd617e8..b277f34b0 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -1,3 +1,7 @@ +const_value set 2 + const VIRIDIANGYM_BLUE + const VIRIDIANGYM_GYM_GUY + ViridianGym_MapScriptHeader: .MapTriggers: db 0 @@ -7,47 +11,47 @@ ViridianGym_MapScriptHeader: BlueScript_0x9aa26: faceplayer - loadfont + opentext checkflag ENGINE_EARTHBADGE iftrue .FightDone writetext UnknownText_0x9aa7b + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x9abae, 0 loadtrainer BLUE, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_BLUE - loadfont + opentext writetext UnknownText_0x9ac0f playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_EARTHBADGE writetext UnknownText_0x9ac27 + waitbutton closetext - loadmovesprites end .FightDone writetext UnknownText_0x9acab + waitbutton closetext - loadmovesprites end ViridianGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_BLUE iftrue .ViridianGymGuyWinScript writetext ViridianGymGuyText + waitbutton closetext - loadmovesprites end .ViridianGymGuyWinScript writetext ViridianGymGuyWinText + waitbutton closetext - loadmovesprites end ViridianGymStatue: diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 0a3eb2356..25764b0a5 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const VIRIDIANMART_CLERK + const VIRIDIANMART_LASS + const VIRIDIANMART_COOLTRAINER_M + ViridianMart_MapScriptHeader: .MapTriggers: db 0 @@ -6,9 +11,9 @@ ViridianMart_MapScriptHeader: db 0 ClerkScript_0x9b5e7: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_VIRIDIAN - loadmovesprites + closetext end LassScript_0x9b5ee: diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index efdc8df83..42447d2fa 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -1,3 +1,9 @@ +const_value set 2 + const VIRIDIANNICKNAMESPEECHHOUSE_POKEFAN_M + const VIRIDIANNICKNAMESPEECHHOUSE_LASS + const VIRIDIANNICKNAMESPEECHHOUSE_MOLTRES + const VIRIDIANNICKNAMESPEECHHOUSE_GROWLITHE + ViridianNicknameSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -12,19 +18,19 @@ LassScript_0x9ae3d: jumptextfaceplayer UnknownText_0x9aecb MoltresScript_0x9ae40: - loadfont + opentext writetext UnknownText_0x9aefe cry SPEAROW + waitbutton closetext - loadmovesprites end GrowlitheScript_0x9ae4a: - loadfont + opentext writetext UnknownText_0x9af10 cry RATTATA + waitbutton closetext - loadmovesprites end UnknownText_0x9ae54: diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index 7669ab8d9..c8eccee2c 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const VIRIDIANPOKECENTER1F_NURSE + const VIRIDIANPOKECENTER1F_COOLTRAINER_M + const VIRIDIANPOKECENTER1F_COOLTRAINER_F + const VIRIDIANPOKECENTER1F_BUG_CATCHER + ViridianPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -10,18 +16,18 @@ NurseScript_0x9b690: CooltrainerMScript_0x9b693: faceplayer - loadfont + opentext checkevent EVENT_BLUE_IN_CINNABAR iftrue .BlueReturned writetext UnknownText_0x9b6ad + waitbutton closetext - loadmovesprites end .BlueReturned writetext UnknownText_0x9b6f5 + waitbutton closetext - loadmovesprites end CooltrainerFScript_0x9b6a7: diff --git a/maps/ViridianPokeCenter2FBeta.asm b/maps/ViridianPokeCenter2FBeta.asm index c545a50bc..be9def165 100644 --- a/maps/ViridianPokeCenter2FBeta.asm +++ b/maps/ViridianPokeCenter2FBeta.asm @@ -1,3 +1,4 @@ + ViridianPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 2ef14fcc0..78523ae8e 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -1,3 +1,14 @@ +const_value set 2 + const WAREHOUSEENTRANCE_SUPER_NERD1 + const WAREHOUSEENTRANCE_SUPER_NERD2 + const WAREHOUSEENTRANCE_SUPER_NERD3 + const WAREHOUSEENTRANCE_SUPER_NERD4 + const WAREHOUSEENTRANCE_POKE_BALL + const WAREHOUSEENTRANCE_GRAMPS + const WAREHOUSEENTRANCE_SUPER_NERD5 + const WAREHOUSEENTRANCE_SUPER_NERD6 + const WAREHOUSEENTRANCE_GRANNY + WarehouseEntrance_MapScriptHeader: .MapTriggers: db 0 @@ -52,104 +63,104 @@ WarehouseEntrance_MapScriptHeader: if_equal SATURDAY, .Saturday .Sunday: - disappear $7 - disappear $8 - appear $9 - appear $a + disappear WAREHOUSEENTRANCE_GRAMPS + disappear WAREHOUSEENTRANCE_SUPER_NERD5 + appear WAREHOUSEENTRANCE_SUPER_NERD6 + appear WAREHOUSEENTRANCE_GRANNY return .Monday: - disappear $7 + disappear WAREHOUSEENTRANCE_GRAMPS checkmorn iffalse .NotMondayMorning - appear $7 + appear WAREHOUSEENTRANCE_GRAMPS .NotMondayMorning: - disappear $8 - disappear $9 - disappear $a + disappear WAREHOUSEENTRANCE_SUPER_NERD5 + disappear WAREHOUSEENTRANCE_SUPER_NERD6 + disappear WAREHOUSEENTRANCE_GRANNY return .Tuesday: - disappear $7 - appear $8 - disappear $9 - disappear $a + disappear WAREHOUSEENTRANCE_GRAMPS + appear WAREHOUSEENTRANCE_SUPER_NERD5 + disappear WAREHOUSEENTRANCE_SUPER_NERD6 + disappear WAREHOUSEENTRANCE_GRANNY return .Wednesday: - disappear $7 - disappear $8 - appear $9 - disappear $a + disappear WAREHOUSEENTRANCE_GRAMPS + disappear WAREHOUSEENTRANCE_SUPER_NERD5 + appear WAREHOUSEENTRANCE_SUPER_NERD6 + disappear WAREHOUSEENTRANCE_GRANNY return .Thursday: - disappear $7 - appear $8 - disappear $9 - disappear $a + disappear WAREHOUSEENTRANCE_GRAMPS + appear WAREHOUSEENTRANCE_SUPER_NERD5 + disappear WAREHOUSEENTRANCE_SUPER_NERD6 + disappear WAREHOUSEENTRANCE_GRANNY return .Friday: - disappear $7 - disappear $8 - appear $9 - disappear $a + disappear WAREHOUSEENTRANCE_GRAMPS + disappear WAREHOUSEENTRANCE_SUPER_NERD5 + appear WAREHOUSEENTRANCE_SUPER_NERD6 + disappear WAREHOUSEENTRANCE_GRANNY return .Saturday: - disappear $7 - appear $8 - disappear $9 - appear $a + disappear WAREHOUSEENTRANCE_GRAMPS + appear WAREHOUSEENTRANCE_SUPER_NERD5 + disappear WAREHOUSEENTRANCE_SUPER_NERD6 + appear WAREHOUSEENTRANCE_GRANNY return TrainerSupernerdEric: trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, SupernerdEricScript SupernerdEricScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7c36c + waitbutton closetext - loadmovesprites end TrainerSupernerdTeru: trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, SupernerdTeruScript SupernerdTeruScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7c410 + waitbutton closetext - loadmovesprites end TrainerPokemaniacIssac: trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, PokemaniacIssacScript PokemaniacIssacScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7c498 + waitbutton closetext - loadmovesprites end TrainerPokemaniacDonald: trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, PokemaniacDonaldScript PokemaniacDonaldScript: - talkaftercancel - loadfont + end_if_just_battled + opentext writetext UnknownText_0x7c52f + waitbutton closetext - loadmovesprites end GrannyScript_0x7c132: - loadfont + opentext checkcode VAR_WEEKDAY if_equal SUNDAY, .Open if_equal SATURDAY, .Open @@ -157,11 +168,11 @@ GrannyScript_0x7c132: .Open: pokemart MARTTYPE_BITTER, MART_UNDERGROUND - loadmovesprites + closetext end GrampsScript_0x7c146: - loadfont + opentext checkflag ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED iftrue WarehouseEntranceScript_ShopClosed checkcode VAR_WEEKDAY @@ -172,11 +183,11 @@ GrampsScript_0x7c146: checkmorn iffalse WarehouseEntranceScript_ShopClosed pokemart MARTTYPE_BARGAIN, 0 - loadmovesprites + closetext end OlderHaircutBrotherScript: - loadfont + opentext checkcode VAR_WEEKDAY if_equal TUESDAY, .DoHaircut if_equal THURSDAY, .DoHaircut @@ -186,14 +197,14 @@ OlderHaircutBrotherScript: .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut - special PlaceMoneyTopRightOW + special PlaceMoneyTopRight writetext UnknownText_0x7c5f9 yesorno iffalse .Refused checkmoney $0, 500 if_equal $2, .NotEnoughMoney writetext UnknownText_0x7c69a - keeptextopen + buttonsound special Special_YoungerHaircutBrother if_equal $0, .Refused if_equal $1, .Refused @@ -222,18 +233,18 @@ OlderHaircutBrotherScript: .then: takemoney $0, 500 - special PlaceMoneyTopRightOW + special PlaceMoneyTopRight writetext UnknownText_0x7c6b8 + waitbutton closetext - loadmovesprites special FadeOutPalettes playmusic MUSIC_HEAL pause 60 special FadeInPalettes special RestartMapMusic - loadfont + opentext writetext UnknownText_0x7c6d8 - closetext + waitbutton checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x7c2bb checkevent EVENT_RECEIVED_BALLS_FROM_KURT @@ -242,24 +253,24 @@ OlderHaircutBrotherScript: .Refused: writetext UnknownText_0x7c6ea + waitbutton closetext - loadmovesprites end .NotEnoughMoney: writetext UnknownText_0x7c709 + waitbutton closetext - loadmovesprites end .AlreadyGotHaircut: writetext UnknownText_0x7c72b + waitbutton closetext - loadmovesprites end YoungerHaircutBrotherScript: - loadfont + opentext checkcode VAR_WEEKDAY if_equal SUNDAY, .DoHaircut if_equal WEDNESDAY, .DoHaircut @@ -269,14 +280,14 @@ YoungerHaircutBrotherScript: .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut - special PlaceMoneyTopRightOW + special PlaceMoneyTopRight writetext UnknownText_0x7c75c yesorno iffalse .Refused checkmoney $0, 300 if_equal $2, .NotEnoughMoney writetext UnknownText_0x7c7f1 - keeptextopen + buttonsound special Special_OlderHaircutBrother if_equal $0, .Refused if_equal $1, .Refused @@ -305,18 +316,18 @@ YoungerHaircutBrotherScript: .then: takemoney $0, 300 - special PlaceMoneyTopRightOW + special PlaceMoneyTopRight writetext UnknownText_0x7c80e + waitbutton closetext - loadmovesprites special FadeOutPalettes playmusic MUSIC_HEAL pause 60 special FadeInPalettes special RestartMapMusic - loadfont + opentext writetext UnknownText_0x7c82a - closetext + waitbutton checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x7c2bb checkevent EVENT_RECEIVED_BALLS_FROM_KURT @@ -325,92 +336,92 @@ YoungerHaircutBrotherScript: .Refused: writetext UnknownText_0x7c842 + waitbutton closetext - loadmovesprites end .NotEnoughMoney: writetext UnknownText_0x7c85b + waitbutton closetext - loadmovesprites end .AlreadyGotHaircut: writetext UnknownText_0x7c87b + waitbutton closetext - loadmovesprites end UnknownScript_0x7c2bb: writetext HaircutBrosText_SlightlyHappier special PlayCurMonCry + waitbutton closetext - loadmovesprites end UnknownScript_0x7c2c4: writetext HaircutBrosText_Happier special PlayCurMonCry + waitbutton closetext - loadmovesprites end UnknownScript_0x7c2cd: writetext HaircutBrosText_MuchHappier special PlayCurMonCry + waitbutton closetext - loadmovesprites end BasementDoorScript:: - loadfont + opentext checkevent EVENT_USED_BASEMENT_KEY iftrue .Open checkitem BASEMENT_KEY iftrue .Unlock writetext UnknownText_0x7c5b0 + waitbutton closetext - loadmovesprites end .Unlock: playsound SFX_TRANSACTION writetext UnknownText_0x7c5d6 + waitbutton closetext - loadmovesprites changeblock $12, $6, $2e reloadmappart - loadmovesprites + closetext setevent EVENT_USED_BASEMENT_KEY end .Open: writetext UnknownText_0x7c5c3 + waitbutton closetext - loadmovesprites end WarehouseEntranceScript_ShopClosed: writetext UnknownText_0x7c904 + waitbutton closetext - loadmovesprites end -ItemFragment_0x7c306: - db COIN_CASE, 1 +WarehouseEntranceCoinCase: + itemball COIN_CASE MapWarehouseEntranceSignpost1Script: jumptext UnknownText_0x7c91a -MapWarehouseEntranceSignpostItem2: +WarehouseEntranceHiddenParlyzHeal: dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL -MapWarehouseEntranceSignpostItem3: +WarehouseEntranceHiddenSuperPotion: dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_SUPER_POTION, SUPER_POTION -MapWarehouseEntranceSignpostItem4: +WarehouseEntranceHiddenAntidote: dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_ANTIDOTE, ANTIDOTE @@ -663,9 +674,9 @@ WarehouseEntrance_MapEventHeader: db 5 signpost 6, 18, SIGNPOST_READ, BasementDoorScript signpost 6, 19, SIGNPOST_READ, MapWarehouseEntranceSignpost1Script - signpost 13, 6, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem2 - signpost 18, 4, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem3 - signpost 8, 17, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem4 + signpost 13, 6, SIGNPOST_ITEM, WarehouseEntranceHiddenParlyzHeal + signpost 18, 4, SIGNPOST_ITEM, WarehouseEntranceHiddenSuperPotion + signpost 8, 17, SIGNPOST_ITEM, WarehouseEntranceHiddenAntidote .PersonEvents: db 9 @@ -673,7 +684,7 @@ WarehouseEntrance_MapEventHeader: person_event SPRITE_SUPER_NERD, 9, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdTeru, -1 person_event SPRITE_SUPER_NERD, 27, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1 person_event SPRITE_SUPER_NERD, 6, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1 - person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7c306, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE + person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WarehouseEntranceCoinCase, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE person_event SPRITE_GRAMPS, 11, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_WAREHOUSE_ENTRANCE_GRAMPS person_event SPRITE_SUPER_NERD, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER person_event SPRITE_SUPER_NERD, 15, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index e1de0b780..e425c80ca 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const WHIRLISLANDB1F_POKE_BALL1 + const WHIRLISLANDB1F_POKE_BALL2 + const WHIRLISLANDB1F_POKE_BALL3 + const WHIRLISLANDB1F_POKE_BALL4 + const WHIRLISLANDB1F_POKE_BALL5 + const WHIRLISLANDB1F_BOULDER + WhirlIslandB1F_MapScriptHeader: .MapTriggers: db 0 @@ -5,33 +13,33 @@ WhirlIslandB1F_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x18c410: - db FULL_RESTORE, 1 +WhirlIslandB1FFullRestore: + itemball FULL_RESTORE -ItemFragment_0x18c412: - db CARBOS, 1 +WhirlIslandB1FCarbos: + itemball CARBOS -ItemFragment_0x18c414: - db CALCIUM, 1 +WhirlIslandB1FCalcium: + itemball CALCIUM -ItemFragment_0x18c416: - db NUGGET, 1 +WhirlIslandB1FNugget: + itemball NUGGET -ItemFragment_0x18c418: - db ESCAPE_ROPE, 1 +WhirlIslandB1FEscapeRope: + itemball ESCAPE_ROPE WhirlIslandB1FBoulder: jumpstd strengthboulder -MapWhirlIslandB1FSignpostItem0: +WhirlIslandB1FHiddenRareCandy: dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY -MapWhirlIslandB1FSignpostItem1: +WhirlIslandB1FHiddenUltraBall: dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL -MapWhirlIslandB1FSignpostItem2: +WhirlIslandB1FHiddenFullRestore: dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE @@ -56,15 +64,15 @@ WhirlIslandB1F_MapEventHeader: .Signposts: db 3 - signpost 4, 30, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem0 - signpost 18, 36, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem1 - signpost 23, 2, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem2 + signpost 4, 30, SIGNPOST_ITEM, WhirlIslandB1FHiddenRareCandy + signpost 18, 36, SIGNPOST_ITEM, WhirlIslandB1FHiddenUltraBall + signpost 23, 2, SIGNPOST_ITEM, WhirlIslandB1FHiddenFullRestore .PersonEvents: db 6 - person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c410, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE - person_event SPRITE_POKE_BALL, 18, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c412, EVENT_WHIRL_ISLAND_B1F_CARBOS - person_event SPRITE_POKE_BALL, 23, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c414, EVENT_WHIRL_ISLAND_B1F_CALCIUM - person_event SPRITE_POKE_BALL, 8, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c416, EVENT_WHIRL_ISLAND_B1F_NUGGET - person_event SPRITE_POKE_BALL, 26, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c418, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE + person_event SPRITE_POKE_BALL, 13, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE + person_event SPRITE_POKE_BALL, 18, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS + person_event SPRITE_POKE_BALL, 23, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM + person_event SPRITE_POKE_BALL, 8, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET + person_event SPRITE_POKE_BALL, 26, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE person_event SPRITE_BOULDER, 26, 23, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index 7d8d4311b..0ff3a9e78 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const WHIRLISLANDB2F_POKE_BALL1 + const WHIRLISLANDB2F_POKE_BALL2 + const WHIRLISLANDB2F_POKE_BALL3 + WhirlIslandB2F_MapScriptHeader: .MapTriggers: db 0 @@ -5,14 +10,14 @@ WhirlIslandB2F_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x18c4b8: - db FULL_RESTORE, 1 +WhirlIslandB2FFullRestore: + itemball FULL_RESTORE -ItemFragment_0x18c4ba: - db MAX_REVIVE, 1 +WhirlIslandB2FMaxRevive: + itemball MAX_REVIVE -ItemFragment_0x18c4bc: - db MAX_ELIXER, 1 +WhirlIslandB2FMaxElixer: + itemball MAX_ELIXER WhirlIslandB2F_MapEventHeader: ; filler @@ -33,6 +38,6 @@ WhirlIslandB2F_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_POKE_BALL, 11, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c4b8, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE - person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c4ba, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE - person_event SPRITE_POKE_BALL, 12, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c4bc, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER + person_event SPRITE_POKE_BALL, 11, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE + person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE + person_event SPRITE_POKE_BALL, 12, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 3b2b6f0e7..8b0aaea9a 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -1,3 +1,4 @@ + WhirlIslandCave_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 6a1f215a1..be55b8345 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -1,3 +1,6 @@ +const_value set 2 + const WHIRLISLANDLUGIACHAMBER_LUGIA + WhirlIslandLugiaChamber_MapScriptHeader: .MapTriggers: db 0 @@ -17,26 +20,26 @@ UnknownScript_0x18c504: jump UnknownScript_0x18c515 UnknownScript_0x18c512: - appear $2 + appear WHIRLISLANDLUGIACHAMBER_LUGIA return UnknownScript_0x18c515: - disappear $2 + disappear WHIRLISLANDLUGIACHAMBER_LUGIA return LugiaScript_0x18c518: faceplayer - loadfont + opentext writetext UnknownText_0x18c531 cry LUGIA pause 15 - loadmovesprites + closetext setevent EVENT_FOUGHT_LUGIA writecode VAR_BATTLETYPE, BATTLETYPE_FORCEITEM - loadpokedata LUGIA, 60 + loadwildmon LUGIA, 60 startbattle - disappear $2 - returnafterbattle + disappear WHIRLISLANDLUGIACHAMBER_LUGIA + reloadmapafterbattle end UnknownText_0x18c531: diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index e8992db89..9da9eaeaf 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -1,3 +1,6 @@ +const_value set 2 + const WHIRLISLANDNE_POKE_BALL + WhirlIslandNE_MapScriptHeader: .MapTriggers: db 0 @@ -5,8 +8,8 @@ WhirlIslandNE_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x18c396: - db ULTRA_BALL, 1 +WhirlIslandNEUltraBall: + itemball ULTRA_BALL WhirlIslandNE_MapEventHeader: ; filler @@ -26,4 +29,4 @@ WhirlIslandNE_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 11, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c396, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL + person_event SPRITE_POKE_BALL, 11, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index 60eafae8e..e7d8525fc 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -1,3 +1,4 @@ + WhirlIslandNW_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index 32cad9594..921b57312 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -1,3 +1,4 @@ + WhirlIslandSE_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 8cc34dc17..1902ecbfd 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -1,3 +1,6 @@ +const_value set 2 + const WHIRLISLANDSW_POKE_BALL + WhirlIslandSW_MapScriptHeader: .MapTriggers: db 0 @@ -5,8 +8,8 @@ WhirlIslandSW_MapScriptHeader: .MapCallbacks: db 0 -ItemFragment_0x18c3bc: - db ULTRA_BALL, 1 +WhirlIslandSWUltraBall: + itemball ULTRA_BALL WhirlIslandSW_MapEventHeader: ; filler @@ -28,4 +31,4 @@ WhirlIslandSW_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x18c3bc, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL + person_event SPRITE_POKE_BALL, 2, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index a3288fec8..1ff5d3c40 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -1,3 +1,6 @@ +const_value set 2 + const WILLSROOM_WILL + WillsRoom_MapScriptHeader: .MapTriggers: db 2 @@ -38,41 +41,41 @@ UnknownScript_0x1804e0: earthquake 80 changeblock $4, $e, $2a reloadmappart - loadmovesprites + closetext dotrigger $1 setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED - waitbutton + waitsfx end WillScript_0x1804f8: faceplayer - loadfont + opentext checkevent EVENT_BEAT_ELITE_4_WILL iftrue UnknownScript_0x180526 writetext UnknownText_0x180531 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x18062c, 0 loadtrainer WILL, 1 startbattle - returnafterbattle + reloadmapafterbattle setevent EVENT_BEAT_ELITE_4_WILL - loadfont + opentext writetext UnknownText_0x180644 + waitbutton closetext - loadmovesprites playsound SFX_ENTER_DOOR changeblock $4, $2, $16 reloadmappart - loadmovesprites + closetext setevent EVENT_WILLS_ROOM_EXIT_OPEN - waitbutton + waitsfx end UnknownScript_0x180526: writetext UnknownText_0x180644 + waitbutton closetext - loadmovesprites end MovementData_0x18052c: diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 01a098a7f..b906acc31 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -1,3 +1,11 @@ +const_value set 2 + const WISETRIOSROOM_SAGE1 + const WISETRIOSROOM_SAGE2 + const WISETRIOSROOM_SAGE3 + const WISETRIOSROOM_SAGE4 + const WISETRIOSROOM_SAGE5 + const WISETRIOSROOM_SAGE6 + WiseTriosRoom_MapScriptHeader: .MapTriggers: db 2 @@ -50,39 +58,39 @@ SageScript_0x985a0: jumptextfaceplayer UnknownText_0x987af UnknownScript_0x985a3: - spriteface $4, UP + spriteface WISETRIOSROOM_SAGE3, UP spriteface PLAYER, DOWN - showemote EMOTE_SHOCK, $4, 20 - follow PLAYER, $4 + showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE3, 20 + follow PLAYER, WISETRIOSROOM_SAGE3 applymovement PLAYER, MovementData_0x98622 stopfollow spriteface PLAYER, RIGHT - loadfont + opentext writetext UnknownText_0x98712 + waitbutton closetext - loadmovesprites - applymovement $4, MovementData_0x98625 - spriteface $4, LEFT + applymovement WISETRIOSROOM_SAGE3, MovementData_0x98625 + spriteface WISETRIOSROOM_SAGE3, LEFT end TrainerSageGaku: trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, 0, SageGakuScript SageGakuScript: - loadfont + opentext writetext UnknownText_0x98938 + waitbutton closetext - loadmovesprites end TrainerSageMasa: trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, 0, SageMasaScript SageMasaScript: - loadfont + opentext writetext UnknownText_0x98a35 + waitbutton closetext - loadmovesprites end TrainerSageKoji: @@ -92,24 +100,24 @@ SageKojiScript: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x9861b pause 10 - showemote EMOTE_SHOCK, $7, 20 - loadfont + showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE6, 20 + opentext writetext UnknownText_0x98c6c - keeptextopen + buttonsound writetext UnknownText_0x98cac + waitbutton closetext - loadmovesprites - applymovement $7, MovementData_0x98628 - spriteface $7, UP + applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628 + spriteface WISETRIOSROOM_SAGE6, UP setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER dotrigger $1 end UnknownScript_0x9861b: - loadfont + opentext writetext UnknownText_0x98db5 + waitbutton closetext - loadmovesprites end MovementData_0x98622: |