diff options
Diffstat (limited to 'maps')
400 files changed, 10218 insertions, 12935 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 3675392fc..f8cd6d4b7 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const AZALEAGYM_BUGSY const AZALEAGYM_BUG_CATCHER1 const AZALEAGYM_BUG_CATCHER2 @@ -8,11 +8,9 @@ const_value set 2 const AZALEAGYM_GYM_GUY AzaleaGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks AzaleaGymBugsyScript: faceplayer @@ -59,8 +57,8 @@ AzaleaGymBugsyScript: end AzaleaGymActivateRockets: - if_equal 7, .RadioTowerRockets - if_equal 6, .GoldenrodRockets + ifequal 7, .RadioTowerRockets + ifequal 6, .GoldenrodRockets end .GoldenrodRockets: @@ -70,10 +68,10 @@ AzaleaGymActivateRockets: jumpstd radiotowerrockets TrainerTwinsAmyandmay1: - trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript + trainer TWINS, AMYANDMAY1, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript .AfterScript: - end_if_just_battled + endifjustbattled opentext writetext TwinsAmyandmay1AfterBattleText waitbutton @@ -81,10 +79,10 @@ TrainerTwinsAmyandmay1: end TrainerTwinsAmyandmay2: - trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript + trainer TWINS, AMYANDMAY2, EVENT_BEAT_TWINS_AMY_AND_MAY, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript .AfterScript: - end_if_just_battled + endifjustbattled opentext writetext TwinsAmyandmay2AfterBattleText waitbutton @@ -92,10 +90,10 @@ TrainerTwinsAmyandmay2: end TrainerBugCatcherBenny: - trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, BugCatcherBennySeenText, BugCatcherBennyBeatenText, 0, .AfterScript + trainer BUG_CATCHER, BUG_CATCHER_BENNY, EVENT_BEAT_BUG_CATCHER_BENNY, BugCatcherBennySeenText, BugCatcherBennyBeatenText, 0, .AfterScript .AfterScript: - end_if_just_battled + endifjustbattled opentext writetext BugCatcherBennyAfterBattleText waitbutton @@ -103,10 +101,10 @@ TrainerBugCatcherBenny: end TrainerBugCatcherAl: - trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, BugCatcherAlSeenText, BugCatcherAlBeatenText, 0, .AfterScript + trainer BUG_CATCHER, AL, EVENT_BEAT_BUG_CATCHER_AL, BugCatcherAlSeenText, BugCatcherAlBeatenText, 0, .AfterScript .AfterScript: - end_if_just_battled + endifjustbattled opentext writetext BugCatcherAlAfterBattleText waitbutton @@ -114,10 +112,10 @@ TrainerBugCatcherAl: end TrainerBugCatcherJosh: - trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, BugCatcherJoshSeenText, BugCatcherJoshBeatenText, 0, .AfterScript + trainer BUG_CATCHER, JOSH, EVENT_BEAT_BUG_CATCHER_JOSH, BugCatcherJoshSeenText, BugCatcherJoshBeatenText, 0, .AfterScript .AfterScript: - end_if_just_battled + endifjustbattled opentext writetext BugCatcherJoshAfterBattleText waitbutton @@ -362,28 +360,23 @@ AzaleaGymGuyWinText: done AzaleaGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 15, 5, AZALEA_TOWN - warp_def 5, 15, 5, AZALEA_TOWN - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 13, BGEVENT_READ, AzaleaGymStatue - bg_event 6, 13, BGEVENT_READ, AzaleaGymStatue - -.ObjectEvents: - db 7 - object_event 5, 7, SPRITE_BUGSY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1 - object_event 5, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1 - object_event 8, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1 - object_event 0, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherJosh, -1 - object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1 - object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1 - object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 15, AZALEA_TOWN, 5 + warp_event 5, 15, AZALEA_TOWN, 5 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 13, BGEVENT_READ, AzaleaGymStatue + bg_event 6, 13, BGEVENT_READ, AzaleaGymStatue + + db 7 ; object events + object_event 5, 7, SPRITE_BUGSY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1 + object_event 5, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1 + object_event 8, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1 + object_event 0, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherJosh, -1 + object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1 + object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1 + object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 8ecf94d92..c98ff31ac 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const AZALEAMART_CLERK const AZALEAMART_COOLTRAINER_M const AZALEAMART_BUG_CATCHER AzaleaMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks AzaleaMartClerkScript: opentext @@ -46,22 +44,17 @@ AzaleaMartBugCatcherText: done AzaleaMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, AZALEA_TOWN - warp_def 3, 7, 3, AZALEA_TOWN + db 2 ; warp events + warp_event 2, 7, AZALEA_TOWN, 3 + warp_event 3, 7, AZALEA_TOWN, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1 - object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1 - object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1 + object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1 + object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1 diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index 6e65c2c01..85725aeba 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -1,16 +1,14 @@ -const_value set 2 + const_def 2 ; object constants const AZALEAPOKECENTER1F_NURSE const AZALEAPOKECENTER1F_GENTLEMAN const AZALEAPOKECENTER1F_FISHING_GURU const AZALEAPOKECENTER1F_POKEFAN_F AzaleaPokecenter1F_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -77,24 +75,19 @@ AzaleaPokecenter1FPokefanFText: done AzaleaPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 1, AZALEA_TOWN - warp_def 4, 7, 1, AZALEA_TOWN - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1 - object_event 9, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1 - object_event 6, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1 - object_event 1, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, AZALEA_TOWN, 1 + warp_event 4, 7, AZALEA_TOWN, 1 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1 + object_event 9, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1 + object_event 6, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1 + object_event 1, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 16889aa51..cbfe8b425 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const AZALEATOWN_AZALEA_ROCKET1 const AZALEATOWN_GRAMPS const AZALEATOWN_TEACHER @@ -13,14 +13,12 @@ const_value set 2 const AZALEATOWN_KURT_OUTSIDE AzaleaTown_MapScripts: -.SceneScripts: - db 3 - scene_script .DummyScene0 - scene_script .DummyScene1 - scene_script .DummyScene2 - -.MapCallbacks: - db 1 + db 3 ; scene scripts + scene_script .DummyScene0 ; SCENE_AZALEATOWN_NOTHING + scene_script .DummyScene1 ; SCENE_AZALEATOWN_RIVAL_BATTLE + scene_script .DummyScene2 ; SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL + + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .Flypoint .DummyScene0: @@ -38,23 +36,23 @@ AzaleaTown_MapScripts: AzaleaTownRivalBattleScene1: moveobject AZALEATOWN_SILVER, 11, 11 - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear AZALEATOWN_SILVER applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1 - spriteface PLAYER, DOWN + objectface PLAYER, DOWN jump AzaleaTownRivalBattleScript AzaleaTownRivalBattleScene2: - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear AZALEATOWN_SILVER applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement2 - spriteface PLAYER, UP + objectface PLAYER, UP AzaleaTownRivalBattleScript: playmusic MUSIC_RIVAL_ENCOUNTER opentext @@ -98,11 +96,11 @@ AzaleaTownRivalBattleScript: writetext AzaleaTownRivalAfterText waitbutton closetext - spriteface PLAYER, LEFT + objectface PLAYER, LEFT applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement playsound SFX_EXIT_BUILDING disappear AZALEATOWN_SILVER - setscene 0 + setscene SCENE_AZALEATOWN_NOTHING waitsfx playmapmusic end @@ -160,17 +158,17 @@ AzaleaTownCelebiScene: opentext writetext AzaleaTownKurtText1 buttonsound - spriteface AZALEATOWN_KURT_OUTSIDE, RIGHT + objectface AZALEATOWN_KURT_OUTSIDE, RIGHT writetext AzaleaTownKurtText2 buttonsound writetext AzaleaTownKurtText3 waitbutton verbosegiveitem GS_BALL - spriteface AZALEATOWN_KURT_OUTSIDE, LEFT - setflag ENGINE_HAVE_EXAMINED_GS_BALL + objectface AZALEATOWN_KURT_OUTSIDE, LEFT + setflag ENGINE_FOREST_IS_RESTLESS clearevent EVENT_ILEX_FOREST_LASS setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS - setscene 0 + setscene SCENE_AZALEATOWN_NOTHING closetext end @@ -179,7 +177,7 @@ AzaleaTownKurtScript: opentext writetext AzaleaTownKurtText3 waitbutton - spriteface AZALEATOWN_KURT_OUTSIDE, LEFT + objectface AZALEATOWN_KURT_OUTSIDE, LEFT closetext end @@ -211,7 +209,7 @@ WhiteApricornTree: fruittree FRUITTREE_AZALEA_TOWN AzaleaTownHiddenFullHeal: - hiddenitem EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL AzaleaTownRivalBattleApproachMovement1: step LEFT @@ -456,49 +454,44 @@ AzaleaTownIlexForestSignText: done AzaleaTown_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 8 - warp_def 15, 9, 1, AZALEA_POKECENTER_1F - warp_def 21, 13, 1, CHARCOAL_KILN - warp_def 21, 5, 2, AZALEA_MART - warp_def 9, 5, 1, KURTS_HOUSE - warp_def 10, 15, 1, AZALEA_GYM - warp_def 31, 7, 1, SLOWPOKE_WELL_B1F - warp_def 2, 10, 3, ILEX_FOREST_AZALEA_GATE - warp_def 2, 11, 4, ILEX_FOREST_AZALEA_GATE - -.CoordEvents: - db 3 - coord_event 5, 10, 1, AzaleaTownRivalBattleScene1 - coord_event 5, 11, 1, AzaleaTownRivalBattleScene2 - coord_event 9, 6, 2, AzaleaTownCelebiScene - -.BGEvents: - db 9 - bg_event 19, 9, BGEVENT_READ, AzaleaTownSign - bg_event 10, 9, BGEVENT_READ, KurtsHouseSign + db 0, 0 ; filler + + db 8 ; warp events + warp_event 15, 9, AZALEA_POKECENTER_1F, 1 + warp_event 21, 13, CHARCOAL_KILN, 1 + warp_event 21, 5, AZALEA_MART, 2 + warp_event 9, 5, KURTS_HOUSE, 1 + warp_event 10, 15, AZALEA_GYM, 1 + warp_event 31, 7, SLOWPOKE_WELL_B1F, 1 + warp_event 2, 10, ILEX_FOREST_AZALEA_GATE, 3 + warp_event 2, 11, ILEX_FOREST_AZALEA_GATE, 4 + + db 3 ; coord events + coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1 + coord_event 5, 11, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene2 + coord_event 9, 6, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL, AzaleaTownCelebiScene + + db 9 ; bg events + bg_event 19, 9, BGEVENT_READ, AzaleaTownSign + bg_event 10, 9, BGEVENT_READ, KurtsHouseSign bg_event 14, 15, BGEVENT_READ, AzaleaGymSign - bg_event 29, 7, BGEVENT_READ, SlowpokeWellSign + bg_event 29, 7, BGEVENT_READ, SlowpokeWellSign bg_event 19, 13, BGEVENT_READ, CharcoalKilnSign - bg_event 16, 9, BGEVENT_READ, AzaleaTownPokecenterSign - bg_event 22, 5, BGEVENT_READ, AzaleaTownMartSign - bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign - bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal - -.ObjectEvents: - db 12 - object_event 31, 9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET - object_event 21, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 + bg_event 16, 9, BGEVENT_READ, AzaleaTownPokecenterSign + bg_event 22, 5, BGEVENT_READ, AzaleaTownMartSign + bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign + bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal + + db 12 ; object events + object_event 31, 9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET + object_event 21, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 object_event 15, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1 - object_event 7, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1 - object_event 8, 17, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - object_event 18, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - object_event 29, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - object_event 15, 15, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - object_event 8, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1 + object_event 7, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1 + object_event 8, 17, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event 18, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event 29, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event 15, 15, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event 8, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1 object_event 11, 10, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN object_event 10, 16, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS - object_event 6, 5, SPRITE_KURT_OUTSIDE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT + object_event 6, 5, SPRITE_KURT_OUTSIDE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 910d27a69..ef2d5a7f8 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const BATTLETOWER1F_RECEPTIONIST const BATTLETOWER1F_YOUNGSTER const BATTLETOWER1F_COOLTRAINER_F @@ -6,24 +6,22 @@ const_value set 2 const BATTLETOWER1F_GRANNY BattleTower1F_MapScripts: -.SceneScripts: - db 2 - scene_script .Scene0 - scene_script .Scene1 + db 2 ; scene scripts + scene_script .Scene0 ; SCENE_DEFAULT + scene_script .Scene1 ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .Scene0: writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS - special Special_BattleTowerAction + special BattleTowerAction iffalse .SkipEverything writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState - special Special_BattleTowerAction - if_equal $0, .SkipEverything - if_equal $2, .priorityjump1 - if_equal $3, .SkipEverything - if_equal $4, .SkipEverything + special BattleTowerAction + ifequal $0, .SkipEverything + ifequal $2, .priorityjump1 + ifequal $3, .SkipEverything + ifequal $4, .SkipEverything opentext writetext Text_WeveBeenWaitingForYou waitbutton @@ -34,11 +32,11 @@ BattleTower1F_MapScripts: .priorityjump1 priorityjump BattleTower_LeftWithoutSaving writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_06 - special Special_BattleTowerAction + special BattleTowerAction .SkipEverything: - setscene 1 + setscene SCENE_FINISHED .Scene1: end @@ -55,63 +53,63 @@ UnknownScript_0x9e3e0: ReceptionistScript_0x9e3e2: writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState - special Special_BattleTowerAction - if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm + special BattleTowerAction + ifequal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm opentext writetext Text_BattleTowerWelcomesYou buttonsound writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags] - special Special_BattleTowerAction - if_not_equal $0, Script_Menu_ChallengeExplanationCancel + special BattleTowerAction + ifnotequal $0, Script_Menu_ChallengeExplanationCancel jump Script_BattleTowerIntroductionYesNo Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc writetext Text_WantToGoIntoABattleRoom writebyte TRUE - special Special_Menu_ChallengeExplanationCancel - if_equal 1, Script_ChooseChallenge - if_equal 2, Script_BattleTowerExplanation + special Menu_ChallengeExplanationCancel + ifequal 1, Script_ChooseChallenge + ifequal 2, Script_BattleTowerExplanation jump Script_BattleTowerHopeToServeYouAgain Script_ChooseChallenge: ; 0x9e40f writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM - special Special_BattleTowerAction - special Special_CheckForBattleTowerRules - if_not_equal FALSE, Script_WaitButton + special BattleTowerAction + special CheckForBattleTowerRules + ifnotequal FALSE, Script_WaitButton writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel - setscene 0 - special Special_TryQuickSave + setscene SCENE_DEFAULT + special TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - setscene 1 + setscene SCENE_FINISHED writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags] - special Special_BattleTowerAction - special Special_BattleTowerRoomMenu - if_equal $a, Script_Menu_ChallengeExplanationCancel - if_not_equal $0, Script_MobileError + special BattleTowerAction + special BattleTowerRoomMenu + ifequal $a, Script_Menu_ChallengeExplanationCancel + ifnotequal $0, Script_MobileError writebyte BATTLETOWERACTION_11 - special Special_BattleTowerAction + special BattleTowerAction writetext Text_RightThisWayToYourBattleRoom waitbutton closetext writebyte BATTLETOWERACTION_CHOOSEREWARD - special Special_BattleTowerAction + special BattleTowerAction jump Script_WalkToBattleTowerElevator Script_ResumeBattleTowerChallenge: closetext writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group - special Special_BattleTowerAction + special BattleTowerAction Script_WalkToBattleTowerElevator: musicfadeout MUSIC_NONE, 8 - setmapscene BATTLE_TOWER_BATTLE_ROOM, 0 - setmapscene BATTLE_TOWER_ELEVATOR, 0 - setmapscene BATTLE_TOWER_HALLWAY, 0 + setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_DEFAULT + setmapscene BATTLE_TOWER_ELEVATOR, SCENE_DEFAULT + setmapscene BATTLE_TOWER_HALLWAY, SCENE_DEFAULT follow BATTLETOWER1F_RECEPTIONIST, PLAYER applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator writebyte BATTLETOWERACTION_0A - special Special_BattleTowerAction + special BattleTowerAction warpsound disappear BATTLETOWER1F_RECEPTIONIST stopfollow @@ -121,15 +119,15 @@ Script_WalkToBattleTowerElevator: Script_GivePlayerHisPrize: ; 0x9e47a writebyte BATTLETOWERACTION_1C - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_GIVEREWARD - special Special_BattleTowerAction - if_equal POTION, Script_YourPackIsStuffedFull + special BattleTowerAction + ifequal POTION, Script_YourPackIsStuffedFull itemtotext USE_SCRIPT_VAR, MEM_BUFFER_1 giveitem ITEM_FROM_MEM, 5 writetext Text_PlayerGotFive writebyte BATTLETOWERACTION_1D - special Special_BattleTowerAction + special BattleTowerAction closetext end @@ -147,7 +145,7 @@ Script_BattleTowerExplanation: ; 0x9e4a5 writetext Text_BattleTowerIntroduction_2 Script_BattleTowerSkipExplanation: writebyte BATTLETOWERACTION_SET_EXPLANATION_READ - special Special_BattleTowerAction + special BattleTowerAction jump Script_Menu_ChallengeExplanationCancel Script_BattleTowerHopeToServeYouAgain: @@ -157,7 +155,7 @@ Script_BattleTowerHopeToServeYouAgain: end UnreferencedScript_0x9e4b6: - special Special_BattleTowerMobileError + special BattleTowerMobileError closetext end @@ -170,33 +168,33 @@ UnreferencedScript_0x9e4be: writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel - special Special_TryQuickSave + special TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel writebyte BATTLETOWERACTION_SET_EXPLANATION_READ - special Special_BattleTowerAction - special Special_Function1700ba - if_equal $a, Script_Menu_ChallengeExplanationCancel - if_not_equal $0, Script_MobileError + special BattleTowerAction + special Function1700ba + ifequal $a, Script_Menu_ChallengeExplanationCancel + ifnotequal $0, Script_MobileError writetext Text_ReceivedAListOfLeadersOnTheHonorRoll - spriteface BATTLETOWER1F_RECEPTIONIST, LEFT + objectface BATTLETOWER1F_RECEPTIONIST, LEFT writetext Text_PleaseConfirmOnThisMonitor waitbutton - spriteface BATTLETOWER1F_RECEPTIONIST, DOWN + objectface BATTLETOWER1F_RECEPTIONIST, DOWN closetext end UnreferencedScript_0x9e4ea: writebyte BATTLETOWERACTION_LEVEL_CHECK - special Special_BattleTowerAction - if_not_equal $0, Script_APkmnLevelExceeds + special BattleTowerAction + ifnotequal $0, Script_APkmnLevelExceeds writebyte BATTLETOWERACTION_UBERS_CHECK - special Special_BattleTowerAction - if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70 - special Special_CheckForBattleTowerRules - if_not_equal FALSE, Script_WaitButton + special BattleTowerAction + ifnotequal $0, Script_MayNotEnterABattleRoomUnderL70 + special CheckForBattleTowerRules + ifnotequal FALSE, Script_WaitButton writebyte BATTLETOWERACTION_05 - special Special_BattleTowerAction - if_equal $0, .zero + special BattleTowerAction + ifequal $0, .zero writetext Text_CantBeRegistered_PreviousRecordDeleted jump continue @@ -208,14 +206,14 @@ continue: writetext Text_SaveBeforeReentry yesorno iffalse Script_Menu_ChallengeExplanationCancel - setscene 0 - special Special_TryQuickSave + setscene SCENE_DEFAULT + special TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - setscene 1 + setscene SCENE_FINISHED writebyte BATTLETOWERACTION_06 - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_12 - special Special_BattleTowerAction + special BattleTowerAction writetext Text_RightThisWayToYourBattleRoom waitbutton jump Script_ResumeBattleTowerChallenge @@ -236,7 +234,7 @@ Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549 jump Script_Menu_ChallengeExplanationCancel Script_MobileError: - special Special_BattleTowerMobileError + special BattleTowerMobileError closetext end @@ -252,7 +250,7 @@ YoungsterScript_0x9e55d: writetext Text_BattleTowerYoungster waitbutton closetext - spriteface BATTLETOWER1F_YOUNGSTER, RIGHT + objectface BATTLETOWER1F_YOUNGSTER, RIGHT end CooltrainerFScript_0x9e568: @@ -794,26 +792,21 @@ Text_BattleTowerBugCatcher: ; 0x9f35b done BattleTower1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 7, 9, 3, BATTLE_TOWER_OUTSIDE - warp_def 8, 9, 4, BATTLE_TOWER_OUTSIDE - warp_def 7, 0, 1, BATTLE_TOWER_ELEVATOR - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 6, 6, BGEVENT_READ, MapBattleTower1FSignpost0Script - -.ObjectEvents: - db 5 - object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1 - object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1 - object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1 - object_event 1, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1 - object_event 14, 3, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 7, 9, BATTLE_TOWER_OUTSIDE, 3 + warp_event 8, 9, BATTLE_TOWER_OUTSIDE, 4 + warp_event 7, 0, BATTLE_TOWER_ELEVATOR, 1 + + db 0 ; coord events + + db 1 ; bg events + bg_event 6, 6, BGEVENT_READ, MapBattleTower1FSignpost0Script + + db 5 ; object events + object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1 + object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1 + object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1 + object_event 1, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1 + object_event 14, 3, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index dd8e08e0f..d4dc279ac 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -1,20 +1,18 @@ -const_value set 2 + const_def 2 ; object constants const BATTLETOWERBATTLEROOM_YOUNGSTER const BATTLETOWERBATTLEROOM_RECEPTIONIST BattleTowerBattleRoom_MapScripts: -.SceneScripts: - db 2 - scene_script .EnterBattleRoom - scene_script .DummyScene + db 2 ; scene scripts + scene_script .EnterBattleRoom ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .EnterBattleRoom: ; 0x9f419 disappear BATTLETOWERBATTLEROOM_YOUNGSTER priorityjump Script_BattleRoom - setscene 1 + setscene SCENE_FINISHED .DummyScene: end @@ -23,7 +21,7 @@ Script_BattleRoom: ; 0x9f421 ; beat all 7 opponents in a row Script_BattleRoomLoop: ; 0x9f425 writebyte BATTLETOWERBATTLEROOM_YOUNGSTER - special Special_LoadOpponentTrainerAndPokemonWithOTSprite + special LoadOpponentTrainerAndPokemonWithOTSprite appear BATTLETOWERBATTLEROOM_YOUNGSTER warpsound waitsfx @@ -32,12 +30,12 @@ Script_BattleRoomLoop: ; 0x9f425 battletowertext BATTLETOWERTEXT_INTRO buttonsound closetext - special Special_BattleTowerBattle ; calls predef startbattle - special Special_FadeOutPalettes + special BattleTowerBattle ; calls predef startbattle + special FadeOutPalettes reloadmap - if_not_equal $0, Script_FailedBattleTowerChallenge + ifnotequal $0, Script_FailedBattleTowerChallenge copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64 - if_equal BATTLETOWER_STREAK_LENGTH, Script_BeatenAllTrainers + ifequal BATTLETOWER_STREAK_LENGTH, Script_BeatenAllTrainers applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksOut warpsound disappear BATTLETOWERBATTLEROOM_YOUNGSTER @@ -48,10 +46,10 @@ Script_BattleRoomLoop: ; 0x9f425 waitbutton closetext playmusic MUSIC_HEAL - special Special_FadeOutPalettes - special Special_LoadMapPalettes + special FadeOutPalettes + special LoadMapPalettes pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic opentext writetext Text_NextUpOpponentNo @@ -68,35 +66,35 @@ Script_DontBattleNextOpponent: ; 0x9f483 yesorno iffalse Script_DontSaveAndEndTheSession writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave - special Special_BattleTowerAction + special BattleTowerAction playsound SFX_SAVE waitsfx - special Special_FadeOutPalettes + special FadeOutPalettes special Reset Script_DontSaveAndEndTheSession: ; 0x9f4a3 writetext Text_CancelYourBattleRoomChallenge yesorno iffalse Script_ContinueAndBattleNextOpponent writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_06 - special Special_BattleTowerAction + special BattleTowerAction closetext - special Special_FadeOutPalettes + special FadeOutPalettes warpfacing UP, BATTLE_TOWER_1F, 7, 7 opentext jump Script_BattleTowerHopeToServeYouAgain Script_FailedBattleTowerChallenge: pause 60 - special Special_BattleTowerFade + special BattleTowerFade warpfacing UP, BATTLE_TOWER_1F, 7, 7 writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction opentext writetext Text_ThanksForVisiting waitbutton @@ -105,7 +103,7 @@ Script_FailedBattleTowerChallenge: Script_BeatenAllTrainers: ; 0x9f4d9 pause 60 - special Special_BattleTowerFade + special BattleTowerFade warpfacing UP, BATTLE_TOWER_1F, 7, 7 Script_BeatenAllTrainers2: opentext @@ -114,7 +112,7 @@ Script_BeatenAllTrainers2: UnreferencedScript_0x9f4eb: writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction opentext writetext Text_TooMuchTimeElapsedNoRegister waitbutton @@ -123,9 +121,9 @@ UnreferencedScript_0x9f4eb: UnreferencedScript_0x9f4f7: writebyte BATTLETOWERACTION_CHALLENGECANCELED - special Special_BattleTowerAction + special BattleTowerAction writebyte BATTLETOWERACTION_06 - special Special_BattleTowerAction + special BattleTowerAction opentext writetext Text_ThanksForVisiting writetext Text_WeHopeToServeYouAgain @@ -139,21 +137,16 @@ Text_ReturnedAfterSave_Mobile: done BattleTowerBattleRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 7, 4, BATTLE_TOWER_HALLWAY - warp_def 4, 7, 4, BATTLE_TOWER_HALLWAY + db 2 ; warp events + warp_event 3, 7, BATTLE_TOWER_HALLWAY, 4 + warp_event 4, 7, BATTLE_TOWER_HALLWAY, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 - object_event 4, 0, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER - object_event 1, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 + db 2 ; object events + object_event 4, 0, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER + object_event 1, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index f9f32dfae..f2b3621ba 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -1,19 +1,16 @@ -const_value set 2 + const_def 2 ; object constants const BATTLETOWERELEVATOR_RECEPTIONIST BattleTowerElevator_MapScripts: -.SceneScripts: - db 2 - scene_script .Scene0 - scene_script .Scene1 + db 2 ; scene scripts + scene_script .Scene0 ; SCENE_DEFAULT + scene_script .Scene1 ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .Scene0: priorityjump .RideElevator - setscene 1 - + setscene SCENE_FINISHED .Scene1: end @@ -22,7 +19,7 @@ BattleTowerElevator_MapScripts: applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn writebyte BATTLETOWERACTION_0A - special Special_BattleTowerAction + special BattleTowerAction playsound SFX_ELEVATOR earthquake 60 waitsfx @@ -45,20 +42,15 @@ MovementData_BattleTowerElevatorPlayerWalksIn: step_end BattleTowerElevator_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 1, 3, 1, BATTLE_TOWER_HALLWAY - warp_def 2, 3, 1, BATTLE_TOWER_HALLWAY + db 2 ; warp events + warp_event 1, 3, BATTLE_TOWER_HALLWAY, 1 + warp_event 2, 3, BATTLE_TOWER_HALLWAY, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 1, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 + db 1 ; object events + object_event 1, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 80075fee2..7b41b7e9a 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -1,18 +1,16 @@ -const_value set 2 + const_def 2 ; object constants const BATTLETOWERHALLWAY_RECEPTIONIST BattleTowerHallway_MapScripts: -.SceneScripts: - db 2 - scene_script .Scene0 - scene_script .Scene1 + db 2 ; scene scripts + scene_script .Scene0 ; SCENE_DEFAULT + scene_script .Scene1 ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .Scene0: priorityjump .ChooseBattleRoom - setscene 1 + setscene SCENE_FINISHED .Scene1: end @@ -38,14 +36,14 @@ BattleTowerHallway_MapScripts: ; at least it should look like that ; because all warps lead to the same room .WalkToChosenBattleRoom: ; 0x9f5dc - if_equal 3, .L30L40 - if_equal 4, .L30L40 - if_equal 5, .L50L60 - if_equal 6, .L50L60 - if_equal 7, .L70L80 - if_equal 8, .L70L80 - if_equal 9, .L90L100 - if_equal 10, .L90L100 + ifequal 3, .L30L40 + ifequal 4, .L30L40 + ifequal 5, .L50L60 + ifequal 6, .L50L60 + ifequal 7, .L70L80 + ifequal 8, .L70L80 + ifequal 9, .L90L100 + ifequal 10, .L90L100 applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo1020Room jump .EnterBattleRoom @@ -77,24 +75,19 @@ BattleTowerHallway_MapScripts: end BattleTowerHallway_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 11, 1, 1, BATTLE_TOWER_ELEVATOR - warp_def 5, 0, 1, BATTLE_TOWER_BATTLE_ROOM - warp_def 7, 0, 1, BATTLE_TOWER_BATTLE_ROOM - warp_def 9, 0, 1, BATTLE_TOWER_BATTLE_ROOM - warp_def 13, 0, 1, BATTLE_TOWER_BATTLE_ROOM - warp_def 15, 0, 1, BATTLE_TOWER_BATTLE_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 11, 1, BATTLE_TOWER_ELEVATOR, 1 + warp_event 5, 0, BATTLE_TOWER_BATTLE_ROOM, 1 + warp_event 7, 0, BATTLE_TOWER_BATTLE_ROOM, 1 + warp_event 9, 0, BATTLE_TOWER_BATTLE_ROOM, 1 + warp_event 13, 0, BATTLE_TOWER_BATTLE_ROOM, 1 + warp_event 15, 0, BATTLE_TOWER_BATTLE_ROOM, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 1 ; object events + object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index a61717fd0..6f3e6674c 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER const BATTLETOWEROUTSIDE_BUENA const BATTLETOWEROUTSIDE_SAILOR const BATTLETOWEROUTSIDE_LASS BattleTowerOutside_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_TILES, .Callback1 callback MAPCALLBACK_OBJECTS, .Callback2 @@ -127,26 +125,21 @@ BattleTowerOutsideText_DoorsOpen: done BattleTowerOutside_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 8, 21, 3, ROUTE_40_BATTLE_TOWER_GATE - warp_def 9, 21, 4, ROUTE_40_BATTLE_TOWER_GATE - warp_def 8, 9, 1, BATTLE_TOWER_1F - warp_def 9, 9, 2, BATTLE_TOWER_1F + db 4 ; warp events + warp_event 8, 21, ROUTE_40_BATTLE_TOWER_GATE, 3 + warp_event 9, 21, ROUTE_40_BATTLE_TOWER_GATE, 4 + warp_event 8, 9, BATTLE_TOWER_1F, 1 + warp_event 9, 9, BATTLE_TOWER_1F, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 10, 10, BGEVENT_READ, MapBattleTowerOutsideSignpost0Script -.ObjectEvents: - db 4 - object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 + db 4 ; object events + object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 object_event 13, 11, SPRITE_BUENA, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1 object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR object_event 12, 24, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm new file mode 100644 index 000000000..e669586e0 --- /dev/null +++ b/maps/BillsBrothersHouse.asm @@ -0,0 +1,41 @@ + const_def 2 ; object constants + const BILLSBROTHERSHOUSE_POKEFAN_F + const BILLSBROTHERSHOUSE_YOUNGSTER + +BillsBrothersHouse_MapScripts: + db 0 ; scene scripts + + db 0 ; callbacks + +BillsBrotherScript: + jumptextfaceplayer BillsBrotherText + +BillsBrothersHouseYoungsterScript: + jumptextfaceplayer BillsBrothersHouseYoungsterText + +BillsBrotherText: + text "My grandpa is at " + line "my brother BILL's" + cont "on CERULEAN CAPE." + done + +BillsBrothersHouseYoungsterText: + text "I saw these weird," + line "slow #MON on" + cont "CYCLING ROAD." + done + +BillsBrothersHouse_MapEvents: + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, FUCHSIA_CITY, 4 + warp_event 3, 7, FUCHSIA_CITY, 4 + + db 0 ; coord events + + db 0 ; bg events + + db 2 ; object events + object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsBrotherScript, -1 + object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsBrothersHouseYoungsterScript, -1 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/BillsFamilysHouse.asm index 33c8dbd17..baf09246d 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -1,16 +1,14 @@ -const_value set 2 - const GOLDENRODBILLSHOUSE_BILL - const GOLDENRODBILLSHOUSE_POKEFAN_F - const GOLDENRODBILLSHOUSE_TWIN + const_def 2 ; object constants + const BILLSFAMILYSHOUSE_BILL + const BILLSFAMILYSHOUSE_POKEFAN_F + const BILLSFAMILYSHOUSE_TWIN -GoldenrodBillsHouse_MapScripts: -.SceneScripts: - db 0 +BillsFamilysHouse_MapScripts: + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks -BillsHouseBill: +BillScript: faceplayer opentext checkevent EVENT_GOT_EEVEE @@ -22,7 +20,7 @@ BillsHouseBill: buttonsound waitsfx checkcode VAR_PARTYCOUNT - if_equal PARTY_LENGTH, UnknownScript_0x54c13 + ifequal PARTY_LENGTH, UnknownScript_0x54c13 writetext UnknownText_0x54dae playsound SFX_CAUGHT_MON waitsfx @@ -51,7 +49,7 @@ UnknownScript_0x54c1f: closetext end -BillsMom: +BillsMomScript: faceplayer opentext checkevent EVENT_MET_BILL @@ -67,15 +65,15 @@ UnknownScript_0x54c33: closetext end -BillsSister: +BillsSisterScript: faceplayer opentext checkcellnum PHONE_BILL iftrue UnknownScript_0x54c58 writetext UnknownText_0x54f9e askforphonenumber PHONE_BILL - if_equal PHONE_CONTACTS_FULL, UnknownScript_0x54c64 - if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x54c5e + ifequal PHONE_CONTACTS_FULL, UnknownScript_0x54c64 + ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x54c5e waitsfx addcellnum PHONE_BILL writetext UnknownText_0x54fd9 @@ -242,26 +240,21 @@ UnknownText_0x55069: line "system." done -GoldenrodBillsHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 4, GOLDENROD_CITY - warp_def 3, 7, 4, GOLDENROD_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 0, 1, BGEVENT_READ, BillsHouseBookshelf2 - bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1 - bg_event 7, 1, BGEVENT_READ, BillsHouseRadio - -.ObjectEvents: - db 3 - object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsHouseBill, EVENT_MET_BILL - object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMom, -1 - object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSister, -1 +BillsFamilysHouse_MapEvents: + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, GOLDENROD_CITY, 4 + warp_event 3, 7, GOLDENROD_CITY, 4 + + db 0 ; coord events + + db 3 ; bg events + bg_event 0, 1, BGEVENT_READ, BillsHouseBookshelf2 + bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1 + bg_event 7, 1, BGEVENT_READ, BillsHouseRadio + + db 3 ; object events + object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillScript, EVENT_MET_BILL + object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMomScript, -1 + object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSisterScript, -1 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index e21facaab..ff83b7979 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -1,17 +1,15 @@ -const_value set 2 + const_def 2 ; object constants const BILLSHOUSE_GRAMPS BillsHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks BillsGrandpa: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue .JustShowedSomething checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA iftrue .GotThunderstone @@ -37,9 +35,9 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo - if_not_equal LICKITUNG, .WrongPokemon + ifnotequal LICKITUNG, .WrongPokemon scall .CorrectPokemon setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA jump .ShowedLickitung @@ -51,9 +49,9 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo - if_not_equal ODDISH, .WrongPokemon + ifnotequal ODDISH, .WrongPokemon scall .CorrectPokemon setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA jump .ShowedOddish @@ -65,9 +63,9 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo - if_not_equal STARYU, .WrongPokemon + ifnotequal STARYU, .WrongPokemon scall .CorrectPokemon setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA jump .ShowedStaryu @@ -81,9 +79,9 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo - if_not_equal GROWLITHE, .WrongPokemon + ifnotequal GROWLITHE, .WrongPokemon scall .CorrectPokemon setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA jump .ShowedGrowlitheVulpix @@ -95,9 +93,9 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo - if_not_equal VULPIX, .WrongPokemon + ifnotequal VULPIX, .WrongPokemon scall .CorrectPokemon setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA jump .ShowedGrowlitheVulpix @@ -109,9 +107,9 @@ BillsGrandpa: yesorno iffalse .SaidNo scall .ExcitedToSee - special Special_BillsGrandfather + special BillsGrandfather iffalse .SaidNo - if_not_equal PICHU, .WrongPokemon + ifnotequal PICHU, .WrongPokemon scall .CorrectPokemon setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA jump .ShowedPichu @@ -123,7 +121,7 @@ BillsGrandpa: verbosegiveitem EVERSTONE iffalse .BagFull setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 closetext end @@ -134,7 +132,7 @@ BillsGrandpa: verbosegiveitem LEAF_STONE iffalse .BagFull setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 closetext end @@ -145,7 +143,7 @@ BillsGrandpa: verbosegiveitem WATER_STONE iffalse .BagFull setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 closetext end @@ -156,7 +154,7 @@ BillsGrandpa: verbosegiveitem FIRE_STONE iffalse .BagFull setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 closetext end @@ -354,20 +352,15 @@ BillsGrandpaPichuText: done BillsHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, ROUTE_25 - warp_def 3, 7, 1, ROUTE_25 + db 2 ; warp events + warp_event 2, 7, ROUTE_25, 1 + warp_event 3, 7, ROUTE_25, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1 + db 1 ; object events + object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 396599703..538f325c6 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const BLACKTHORNCITY_SUPER_NERD1 const BLACKTHORNCITY_SUPER_NERD2 const BLACKTHORNCITY_GRAMPS1 @@ -10,11 +10,9 @@ const_value set 2 const BLACKTHORNCITY_COOLTRAINER_F2 BlackthornCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_OBJECTS, .Santos @@ -24,7 +22,7 @@ BlackthornCity_MapScripts: .Santos: checkcode VAR_WEEKDAY - if_equal SATURDAY, .SantosAppears + ifequal SATURDAY, .SantosAppears disappear BLACKTHORNCITY_SANTOS return @@ -93,7 +91,7 @@ SantosScript: checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS iftrue .Saturday checkcode VAR_WEEKDAY - if_not_equal SATURDAY, .NotSaturday + ifnotequal SATURDAY, .NotSaturday checkevent EVENT_MET_SANTOS_OF_SATURDAY iftrue .MetSantos writetext MeetSantosText @@ -313,41 +311,36 @@ BlackthornCityTrainerTipsText: done BlackthornCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 8 - warp_def 18, 11, 1, BLACKTHORN_GYM_1F - warp_def 13, 21, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE - warp_def 29, 23, 1, BLACKTHORN_EMYS_HOUSE - warp_def 15, 29, 2, BLACKTHORN_MART - warp_def 21, 29, 1, BLACKTHORN_POKECENTER_1F - warp_def 9, 31, 1, MOVE_DELETERS_HOUSE - warp_def 36, 9, 2, ICE_PATH_1F - warp_def 20, 1, 1, DRAGONS_DEN_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 7 + db 0, 0 ; filler + + db 8 ; warp events + warp_event 18, 11, BLACKTHORN_GYM_1F, 1 + warp_event 13, 21, BLACKTHORN_DRAGON_SPEECH_HOUSE, 1 + warp_event 29, 23, BLACKTHORN_EMYS_HOUSE, 1 + warp_event 15, 29, BLACKTHORN_MART, 2 + warp_event 21, 29, BLACKTHORN_POKECENTER_1F, 1 + warp_event 9, 31, MOVE_DELETERS_HOUSE, 1 + warp_event 36, 9, ICE_PATH_1F, 2 + warp_event 20, 1, DRAGONS_DEN_1F, 1 + + db 0 ; coord events + + db 7 ; bg events bg_event 34, 24, BGEVENT_READ, BlackthornCitySign bg_event 17, 13, BGEVENT_READ, BlackthornGymSign - bg_event 7, 31, BGEVENT_READ, MoveDeletersHouseSign - bg_event 21, 3, BGEVENT_READ, DragonDensSign - bg_event 5, 25, BGEVENT_READ, BlackthornCityTrainerTips + bg_event 7, 31, BGEVENT_READ, MoveDeletersHouseSign + bg_event 21, 3, BGEVENT_READ, DragonDensSign + bg_event 5, 25, BGEVENT_READ, BlackthornCityTrainerTips bg_event 16, 29, BGEVENT_READ, BlackthornCityMartSign bg_event 22, 29, BGEVENT_READ, BlackthornCityPokecenterSign -.ObjectEvents: - db 9 + db 9 ; object events object_event 18, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM object_event 19, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM - object_event 20, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN - object_event 21, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN + object_event 20, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN + object_event 21, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN object_event 24, 31, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1 - object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1 + object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1 object_event 13, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1 object_event 22, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY object_event 35, 19, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 74621532f..8b4575611 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY const BLACKTHORNDRAGONSPEECHHOUSE_EKANS BlackthornDragonSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks BlackthornDragonSpeechHouseGrannyScript: jumptextfaceplayer BlackthornDragonSpeechHouseGrannyText @@ -48,21 +46,16 @@ BlackthornDragonSpeechHouseDratiniText: done BlackthornDragonSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, BLACKTHORN_CITY - warp_def 3, 7, 2, BLACKTHORN_CITY + db 2 ; warp events + warp_event 2, 7, BLACKTHORN_CITY, 2 + warp_event 3, 7, BLACKTHORN_CITY, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1 - object_event 5, 5, SPRITE_EKANS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1 + db 2 ; object events + object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1 + object_event 5, 5, SPRITE_EKANS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1 diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index d8277c74f..01fffb4de 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -1,17 +1,15 @@ -const_value set 2 + const_def 2 ; object constants const BLACKTHORNEMYSHOUSE_EMY BlackthornEmysHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Emy: faceplayer opentext - trade NPCTRADE_EMY + trade NPC_TRADE_EMY waitbutton closetext end @@ -20,22 +18,17 @@ EmysHouseBookshelf: jumpstd magazinebookshelf BlackthornEmysHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, BLACKTHORN_CITY - warp_def 3, 7, 3, BLACKTHORN_CITY + db 2 ; warp events + warp_event 2, 7, BLACKTHORN_CITY, 3 + warp_event 3, 7, BLACKTHORN_CITY, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, EmysHouseBookshelf - bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, EmysHouseBookshelf + bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1 + db 1 ; object events + object_event 2, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 25de39246..4627e807b 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const BLACKTHORNGYM1F_CLAIR const BLACKTHORNGYM1F_COOLTRAINER_M1 const BLACKTHORNGYM1F_COOLTRAINER_M2 @@ -6,11 +6,9 @@ const_value set 2 const BLACKTHORNGYM1F_GYM_GUY BlackthornGym1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .Boulders .Boulders: @@ -93,10 +91,10 @@ BlackthornGymClairScript: end TrainerCooltrainermPaul: - trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, .Script + trainer COOLTRAINERM, PAUL, EVENT_BEAT_COOLTRAINERM_PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainermPaulAfterBattleText waitbutton @@ -104,10 +102,10 @@ TrainerCooltrainermPaul: end TrainerCooltrainermMike: - trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, .Script + trainer COOLTRAINERM, MIKE, EVENT_BEAT_COOLTRAINERM_MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainermMikeAfterBattleText waitbutton @@ -115,10 +113,10 @@ TrainerCooltrainermMike: end TrainerCooltrainerfLola: - trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, .Script + trainer COOLTRAINERF, LOLA, EVENT_BEAT_COOLTRAINERF_LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainerfLolaAfterBattleText waitbutton @@ -387,31 +385,26 @@ BlackthornGymGuyWinText: done BlackthornGym1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 7 - warp_def 4, 17, 1, BLACKTHORN_CITY - warp_def 5, 17, 1, BLACKTHORN_CITY - warp_def 1, 7, 1, BLACKTHORN_GYM_2F - warp_def 7, 9, 2, BLACKTHORN_GYM_2F - warp_def 2, 6, 3, BLACKTHORN_GYM_2F - warp_def 7, 7, 4, BLACKTHORN_GYM_2F - warp_def 7, 6, 5, BLACKTHORN_GYM_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 15, BGEVENT_READ, BlackthornGymStatue - bg_event 6, 15, BGEVENT_READ, BlackthornGymStatue - -.ObjectEvents: - db 5 - object_event 5, 3, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1 - object_event 6, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1 - object_event 1, 14, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1 - object_event 9, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1 - object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1 + db 0, 0 ; filler + + db 7 ; warp events + warp_event 4, 17, BLACKTHORN_CITY, 1 + warp_event 5, 17, BLACKTHORN_CITY, 1 + warp_event 1, 7, BLACKTHORN_GYM_2F, 1 + warp_event 7, 9, BLACKTHORN_GYM_2F, 2 + warp_event 2, 6, BLACKTHORN_GYM_2F, 3 + warp_event 7, 7, BLACKTHORN_GYM_2F, 4 + warp_event 7, 6, BLACKTHORN_GYM_2F, 5 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 15, BGEVENT_READ, BlackthornGymStatue + bg_event 6, 15, BGEVENT_READ, BlackthornGymStatue + + db 5 ; object events + object_event 5, 3, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1 + object_event 6, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1 + object_event 1, 14, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1 + object_event 9, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1 + object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 7d08bcebb..195e937e3 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const BLACKTHORNGYM2F_COOLTRAINER_M const BLACKTHORNGYM2F_COOLTRAINER_F const BLACKTHORNGYM2F_BOULDER1 @@ -9,11 +9,9 @@ const_value set 2 const BLACKTHORNGYM2F_BOULDER6 BlackthornGym2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable .SetUpStoneTable: @@ -59,10 +57,10 @@ BlackthornGymBoulder: jumpstd strengthboulder TrainerCooltrainermCody: - trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script + trainer COOLTRAINERM, CODY, EVENT_BEAT_COOLTRAINERM_CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainermCodyAfterBattleText waitbutton @@ -70,10 +68,10 @@ TrainerCooltrainermCody: end TrainerCooltrainerfFran: - trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, .Script + trainer COOLTRAINERF, FRAN, EVENT_BEAT_COOLTRAINERF_FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainerfFranAfterBattleText waitbutton @@ -126,30 +124,25 @@ BlackthornGym2FBoulderFellText: done BlackthornGym2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 1, 7, 3, BLACKTHORN_GYM_1F - warp_def 7, 9, 4, BLACKTHORN_GYM_1F - warp_def 2, 5, 5, BLACKTHORN_GYM_1F ; hole - warp_def 8, 7, 6, BLACKTHORN_GYM_1F ; hole - warp_def 8, 3, 7, BLACKTHORN_GYM_1F ; hole - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 8 - object_event 4, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1 - object_event 4, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1 - object_event 8, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 - object_event 2, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 - object_event 6, 16, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 - object_event 3, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 - object_event 6, 1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 - object_event 8, 14, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 1, 7, BLACKTHORN_GYM_1F, 3 + warp_event 7, 9, BLACKTHORN_GYM_1F, 4 + warp_event 2, 5, BLACKTHORN_GYM_1F, 5 ; hole + warp_event 8, 7, BLACKTHORN_GYM_1F, 6 ; hole + warp_event 8, 3, BLACKTHORN_GYM_1F, 7 ; hole + + db 0 ; coord events + + db 0 ; bg events + + db 8 ; object events + object_event 4, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1 + object_event 4, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1 + object_event 8, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 + object_event 2, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 + object_event 6, 16, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 + object_event 3, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 + object_event 6, 1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 + object_event 8, 14, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 4b4b74324..c7a61af05 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const BLACKTHORNMART_CLERK const BLACKTHORNMART_COOLTRAINER_M const BLACKTHORNMART_BLACK_BELT BlackthornMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks BlackthornMartClerkScript: opentext @@ -47,22 +45,17 @@ BlackthornMartBlackBeltText: done BlackthornMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, BLACKTHORN_CITY - warp_def 3, 7, 4, BLACKTHORN_CITY + db 2 ; warp events + warp_event 2, 7, BLACKTHORN_CITY, 4 + warp_event 3, 7, BLACKTHORN_CITY, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1 - object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1 - object_event 5, 2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1 + object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1 + object_event 5, 2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1 diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index 45c925561..a6e44a881 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const BLACKTHORNPOKECENTER1F_NURSE const BLACKTHORNPOKECENTER1F_GENTLEMAN const BLACKTHORNPOKECENTER1F_TWIN const BLACKTHORNPOKECENTER1F_COOLTRAINER_M BlackthornPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks BlackthornPokecenter1FNurseScript: jumpstd pokecenternurse @@ -50,24 +48,19 @@ BlackthornPokecenter1FTwinText: done BlackthornPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 5, BLACKTHORN_CITY - warp_def 4, 7, 5, BLACKTHORN_CITY - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1 - object_event 5, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1 - object_event 1, 4, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1 - object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, BLACKTHORN_CITY, 5 + warp_event 4, 7, BLACKTHORN_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1 + object_event 5, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1 + object_event 1, 4, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1 + object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index bb8603fbf..e402d0c9a 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -1,46 +1,44 @@ -const_value set 2 + const_def 2 ; object constants const BLUESHOUSE_DAISY BluesHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks DaisyScript: faceplayer opentext checkcode VAR_HOUR - if_equal 15, .ThreePM + ifequal 15, .ThreePM writetext DaisyHelloText waitbutton closetext end .ThreePM: - checkflag ENGINE_TEA_IN_BLUES_HOUSE + checkflag ENGINE_DAISYS_GROOMING iftrue .AlreadyGroomedMon writetext DaisyOfferGroomingText yesorno iffalse .Refused writetext DaisyWhichMonText waitbutton - special Special_DaisyMassage - if_equal $0, .Refused - if_equal $1, .CantGroomEgg - setflag ENGINE_TEA_IN_BLUES_HOUSE + special DaisysGrooming + ifequal $0, .Refused + ifequal $1, .CantGroomEgg + setflag ENGINE_DAISYS_GROOMING writetext DaisyAlrightText waitbutton closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic opentext writetext GroomedMonLooksContentText - special Special_PlayCurMonCry + special PlayCurMonCry buttonsound writetext DaisyAllDoneText waitbutton @@ -145,20 +143,15 @@ DaisyCantGroomEggText: done BluesHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, PALLET_TOWN - warp_def 3, 7, 2, PALLET_TOWN + db 2 ; warp events + warp_event 2, 7, PALLET_TOWN, 2 + warp_event 3, 7, PALLET_TOWN, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_DAISY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1 + db 1 ; object events + object_event 2, 3, SPRITE_DAISY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 9ddbb5664..5e7c4e247 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const BRUNOSROOM_BRUNO BrunosRoom_MapScripts: -.SceneScripts: - db 2 - scene_script .LockDoor - scene_script .DummyScene + db 2 ; scene scripts + scene_script .LockDoor ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .BrunosRoomDoors .LockDoor: @@ -37,7 +35,7 @@ BrunosRoom_MapScripts: changeblock 4, 14, $2a ; wall reloadmappart closetext - setscene 1 + setscene SCENE_FINISHED setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -125,22 +123,17 @@ BrunoScript_BrunoDefeatText: done BrunosRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 17, 3, KOGAS_ROOM - warp_def 5, 17, 4, KOGAS_ROOM - warp_def 4, 2, 1, KARENS_ROOM - warp_def 5, 2, 2, KARENS_ROOM + db 4 ; warp events + warp_event 4, 17, KOGAS_ROOM, 3 + warp_event 5, 17, KOGAS_ROOM, 4 + warp_event 4, 2, KARENS_ROOM, 1 + warp_event 5, 2, KARENS_ROOM, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 5, 7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1 + db 1 ; object events + object_event 5, 7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index f8e5ef52f..b0df5c97f 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const BURNEDTOWER1F_ROCK const BURNEDTOWER1F_EUSINE const BURNEDTOWER1F_SILVER @@ -6,14 +6,12 @@ const_value set 2 const BURNEDTOWER1F_POKE_BALL BurnedTower1F_MapScripts: -.SceneScripts: - db 3 - scene_script .EusineScene - scene_script .DummyScene1 - scene_script .DummyScene2 - -.MapCallbacks: - db 1 + db 3 ; scene scripts + scene_script .EusineScene ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_BURNEDTOWER1F_RIVAL_BATTLE + scene_script .DummyScene2 ; SCENE_BURNEDTOWER1F_NOTHING + + db 1 ; callbacks callback MAPCALLBACK_TILES, .HoleAndLadder .EusineScene: @@ -38,7 +36,7 @@ BurnedTower1F_MapScripts: return .MeetEusine: - spriteface BURNEDTOWER1F_EUSINE, DOWN + objectface BURNEDTOWER1F_EUSINE, DOWN showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15 applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement opentext @@ -46,14 +44,14 @@ BurnedTower1F_MapScripts: waitbutton closetext moveobject BURNEDTOWER1F_EUSINE, 9, 14 - setscene 1 + setscene SCENE_BURNEDTOWER1F_RIVAL_BATTLE end BurnedTowerRivalBattleScript: showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 - spriteface BURNEDTOWER1F_SILVER, RIGHT + objectface BURNEDTOWER1F_SILVER, RIGHT pause 15 applymovement PLAYER, BurnedTowerMovement_PlayerWalksToSilver applymovement BURNEDTOWER1F_SILVER, BurnedTowerMovement_SilverWalksToPlayer @@ -98,9 +96,9 @@ BurnedTowerRivalBattleScript: writetext BurnedTowerSilver_AfterText1 waitbutton closetext - setscene 2 + setscene SCENE_BURNEDTOWER1F_NOTHING setevent EVENT_RIVAL_BURNED_TOWER - special Special_FadeOutMusic + special FadeOutMusic pause 15 earthquake 50 showemote EMOTE_SHOCK, PLAYER, 15 @@ -131,10 +129,10 @@ BurnedTower1FRock: jumpstd smashrock BurnedTower1FHiddenEther: - hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER + hiddenitem ETHER, EVENT_BURNED_TOWER_1F_HIDDEN_ETHER BurnedTower1FHiddenUltraBall: - hiddenitem EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem ULTRA_BALL, EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL BurnedTower1FHPUp: itemball HP_UP @@ -278,39 +276,34 @@ BurnedTower1FMortyText: done BurnedTower1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 14 - warp_def 9, 15, 13, ECRUTEAK_CITY - warp_def 10, 15, 13, ECRUTEAK_CITY - warp_def 10, 9, 1, BURNED_TOWER_B1F - warp_def 5, 5, 1, BURNED_TOWER_B1F - warp_def 5, 6, 1, BURNED_TOWER_B1F - warp_def 4, 6, 1, BURNED_TOWER_B1F - warp_def 15, 4, 2, BURNED_TOWER_B1F - warp_def 15, 5, 2, BURNED_TOWER_B1F - warp_def 10, 7, 3, BURNED_TOWER_B1F - warp_def 5, 14, 4, BURNED_TOWER_B1F - warp_def 4, 14, 4, BURNED_TOWER_B1F - warp_def 14, 14, 5, BURNED_TOWER_B1F - warp_def 15, 14, 5, BURNED_TOWER_B1F - warp_def 7, 15, 6, BURNED_TOWER_B1F - -.CoordEvents: - db 1 - coord_event 11, 9, 1, BurnedTowerRivalBattleScript - -.BGEvents: - db 2 - bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther + db 0, 0 ; filler + + db 14 ; warp events + warp_event 9, 15, ECRUTEAK_CITY, 13 + warp_event 10, 15, ECRUTEAK_CITY, 13 + warp_event 10, 9, BURNED_TOWER_B1F, 1 + warp_event 5, 5, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S + warp_event 5, 6, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S + warp_event 4, 6, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S + warp_event 15, 4, BURNED_TOWER_B1F, 2 ; inaccessible, left over from G/S + warp_event 15, 5, BURNED_TOWER_B1F, 2 ; inaccessible, left over from G/S + warp_event 10, 7, BURNED_TOWER_B1F, 3 ; inaccessible, left over from G/S + warp_event 5, 14, BURNED_TOWER_B1F, 4 ; inaccessible, left over from G/S + warp_event 4, 14, BURNED_TOWER_B1F, 4 ; inaccessible, left over from G/S + warp_event 14, 14, BURNED_TOWER_B1F, 5 ; inaccessible, left over from G/S + warp_event 15, 14, BURNED_TOWER_B1F, 5 ; inaccessible, left over from G/S + warp_event 7, 15, BURNED_TOWER_B1F, 6 ; inaccessible, left over from G/S + + db 1 ; coord events + coord_event 11, 9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript + + db 2 ; bg events + bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther bg_event 13, 11, BGEVENT_ITEM, BurnedTower1FHiddenUltraBall -.ObjectEvents: - db 5 - object_event 15, 4, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1 + db 5 ; object events + object_event 15, 4, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1 object_event 12, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE - object_event 8, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER + object_event 8, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER object_event 14, 14, SPRITE_MORTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY - object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP + object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 3ad1d60f4..17c3bc1e3 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const BURNEDTOWERB1F_BOULDER const BURNEDTOWERB1F_RAIKOU1 const BURNEDTOWERB1F_ENTEI1 @@ -10,13 +10,11 @@ const_value set 2 const BURNEDTOWERB1F_EUSINE BurnedTowerB1F_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .LadderCallback .DummyScene0: @@ -36,56 +34,56 @@ ReleaseTheBeasts: playmusic MUSIC_NONE pause 30 appear BURNEDTOWERB1F_RAIKOU1 - spriteface PLAYER, UP + objectface PLAYER, UP pause 5 disappear BURNEDTOWERB1F_RAIKOU2 pause 15 cry RAIKOU appear BURNEDTOWERB1F_ENTEI1 - spriteface PLAYER, UP + objectface PLAYER, UP pause 5 disappear BURNEDTOWERB1F_ENTEI2 pause 15 cry ENTEI appear BURNEDTOWERB1F_SUICUNE1 - spriteface PLAYER, UP + objectface PLAYER, UP pause 5 disappear BURNEDTOWERB1F_SUICUNE2 pause 15 cry SUICUNE pause 15 playsound SFX_WARP_FROM - spriteface PLAYER, LEFT + objectface PLAYER, LEFT applymovement BURNEDTOWERB1F_RAIKOU1, BurnedTowerRaikouMovement disappear BURNEDTOWERB1F_RAIKOU1 waitsfx playsound SFX_WARP_FROM - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT applymovement BURNEDTOWERB1F_ENTEI1, BurnedTowerEnteiMovement disappear BURNEDTOWERB1F_ENTEI1 waitsfx pause 15 playsound SFX_WARP_FROM - spriteface PLAYER, UP + objectface PLAYER, UP applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement1 playsound SFX_WARP_FROM - spriteface PLAYER, DOWN + objectface PLAYER, DOWN applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement2 - spriteface PLAYER, UP + objectface PLAYER, UP pause 20 cry SUICUNE pause 30 playsound SFX_WARP_FROM applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement3 - spriteface PLAYER, DOWN + objectface PLAYER, DOWN disappear BURNEDTOWERB1F_SUICUNE1 waitsfx special RestartMapMusic - setscene 1 + setscene SCENE_FINISHED setevent EVENT_RELEASED_THE_BEASTS - special Special_InitRoamMons - setmapscene ECRUTEAK_GYM, 1 - setmapscene CIANWOOD_CITY, 1 + special InitRoamMons + setmapscene ECRUTEAK_GYM, SCENE_FINISHED + setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY setevent EVENT_ECRUTEAK_GYM_GRAMPS clearevent EVENT_ECRUTEAK_CITY_GRAMPS @@ -96,7 +94,7 @@ ReleaseTheBeasts: changeblock 6, 14, $1b ; ladder reloadmappart closetext - setscene 1 + setscene SCENE_FINISHED end BurnedTowerB1FEusine: @@ -106,7 +104,7 @@ BurnedTowerB1FEusine: waitbutton closetext checkcode VAR_FACING - if_equal UP, .Movement + ifequal UP, .Movement applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1 jump UnknownScript_0x18622a @@ -236,33 +234,28 @@ BurnedTowerB1FEusineText: done BurnedTowerB1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 10, 9, 3, BURNED_TOWER_1F - warp_def 17, 7, 7, BURNED_TOWER_1F - warp_def 10, 8, 9, BURNED_TOWER_1F - warp_def 3, 13, 10, BURNED_TOWER_1F - warp_def 17, 14, 12, BURNED_TOWER_1F - warp_def 7, 15, 14, BURNED_TOWER_1F - -.CoordEvents: - db 1 - coord_event 10, 6, 0, ReleaseTheBeasts - -.BGEvents: - db 0 - -.ObjectEvents: - db 9 - object_event 17, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1 - object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 - object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 - object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 - object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - object_event 16, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE + db 0, 0 ; filler + + db 6 ; warp events + warp_event 10, 9, BURNED_TOWER_1F, 3 + warp_event 17, 7, BURNED_TOWER_1F, 7 + warp_event 10, 8, BURNED_TOWER_1F, 9 + warp_event 3, 13, BURNED_TOWER_1F, 10 + warp_event 17, 14, BURNED_TOWER_1F, 12 + warp_event 7, 15, BURNED_TOWER_1F, 14 + + db 1 ; coord events + coord_event 10, 6, SCENE_DEFAULT, ReleaseTheBeasts + + db 0 ; bg events + + db 9 ; object events + object_event 17, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1 + object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + object_event 16, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE object_event 10, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 09a8db2f2..e2485619b 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CELADONCAFE_SUPER_NERD const CELADONCAFE_FISHER1 const CELADONCAFE_FISHER2 @@ -6,11 +6,9 @@ const_value set 2 const CELADONCAFE_TEACHER CeladonCafe_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonCafeChef: faceplayer @@ -30,7 +28,7 @@ CeladonCafeFisher1: writetext Fisher1Text_Concentration waitbutton closetext - spriteface CELADONCAFE_FISHER1, LEFT + objectface CELADONCAFE_FISHER1, LEFT end CeladonCafeFisher2: @@ -43,7 +41,7 @@ CeladonCafeFisher2: writetext Fisher2Text_Quantity waitbutton closetext - spriteface CELADONCAFE_FISHER2, RIGHT + objectface CELADONCAFE_FISHER2, RIGHT end CeladonCafeFisher3: @@ -56,7 +54,7 @@ CeladonCafeFisher3: writetext Fisher3Text_GoldenrodIsBest waitbutton closetext - spriteface CELADONCAFE_FISHER3, RIGHT + objectface CELADONCAFE_FISHER3, RIGHT end CeladonCafeTeacher: @@ -71,7 +69,7 @@ CeladonCafeTeacher: writetext TeacherText_NoCoinCase waitbutton closetext - spriteface CELADONCAFE_TEACHER, LEFT + objectface CELADONCAFE_TEACHER, LEFT end .HasCoinCase: @@ -79,12 +77,12 @@ CeladonCafeTeacher: writetext TeacherText_KeepEating waitbutton closetext - spriteface CELADONCAFE_TEACHER, RIGHT + objectface CELADONCAFE_TEACHER, RIGHT opentext writetext TeacherText_MoreChef waitbutton closetext - spriteface CELADONCAFE_TEACHER, LEFT + objectface CELADONCAFE_TEACHER, LEFT end EatathonContestPoster: @@ -208,26 +206,21 @@ NoRoomForLeftoversText: done CeladonCafe_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 6, 7, 9, CELADON_CITY - warp_def 7, 7, 9, CELADON_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 5, 0, BGEVENT_READ, EatathonContestPoster - bg_event 7, 1, BGEVENT_READ, CeladonCafeTrashcan - -.ObjectEvents: - db 5 - object_event 9, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1 - object_event 4, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1 - object_event 1, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1 - object_event 1, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher3, -1 - object_event 4, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeTeacher, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 6, 7, CELADON_CITY, 9 + warp_event 7, 7, CELADON_CITY, 9 + + db 0 ; coord events + + db 2 ; bg events + bg_event 5, 0, BGEVENT_READ, EatathonContestPoster + bg_event 7, 1, BGEVENT_READ, CeladonCafeTrashcan + + db 5 ; object events + object_event 9, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1 + object_event 4, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1 + object_event 1, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1 + object_event 1, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher3, -1 + object_event 4, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeTeacher, -1 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 8075a5343..16409b219 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CELADONCITY_FISHER const CELADONCITY_POLIWAG const CELADONCITY_TEACHER1 @@ -10,11 +10,9 @@ const_value set 2 const CELADONCITY_LASS CeladonCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -75,7 +73,7 @@ CeladonCityPokecenterSign: jumpstd pokecentersign CeladonCityHiddenPpUp: - hiddenitem EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP + hiddenitem PP_UP, EVENT_CELADON_CITY_HIDDEN_PP_UP CeladonCityFisherText: text "This POLIWRATH is" @@ -235,43 +233,38 @@ CeladonCityTrainerTipsText: done CeladonCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 4, 9, 1, CELADON_DEPT_STORE_1F - warp_def 16, 9, 1, CELADON_MANSION_1F - warp_def 16, 3, 3, CELADON_MANSION_1F - warp_def 17, 3, 3, CELADON_MANSION_1F - warp_def 29, 9, 1, CELADON_POKECENTER_1F - warp_def 18, 19, 1, CELADON_GAME_CORNER - warp_def 23, 19, 1, CELADON_GAME_CORNER_PRIZE_ROOM - warp_def 10, 29, 1, CELADON_GYM - warp_def 25, 29, 1, CELADON_CAFE - -.CoordEvents: - db 0 - -.BGEvents: - db 8 + db 0, 0 ; filler + + db 9 ; warp events + warp_event 4, 9, CELADON_DEPT_STORE_1F, 1 + warp_event 16, 9, CELADON_MANSION_1F, 1 + warp_event 16, 3, CELADON_MANSION_1F, 3 + warp_event 17, 3, CELADON_MANSION_1F, 3 + warp_event 29, 9, CELADON_POKECENTER_1F, 1 + warp_event 18, 19, CELADON_GAME_CORNER, 1 + warp_event 23, 19, CELADON_GAME_CORNER_PRIZE_ROOM, 1 + warp_event 10, 29, CELADON_GYM, 1 + warp_event 25, 29, CELADON_CAFE, 1 + + db 0 ; coord events + + db 8 ; bg events bg_event 23, 21, BGEVENT_READ, CeladonCitySign bg_event 11, 31, BGEVENT_READ, CeladonGymSign - bg_event 6, 9, BGEVENT_READ, CeladonCityDeptStoreSign - bg_event 13, 9, BGEVENT_READ, CeladonCityMansionSign + bg_event 6, 9, BGEVENT_READ, CeladonCityDeptStoreSign + bg_event 13, 9, BGEVENT_READ, CeladonCityMansionSign bg_event 19, 21, BGEVENT_READ, CeladonCityGameCornerSign bg_event 29, 21, BGEVENT_READ, CeladonCityTrainerTips - bg_event 30, 9, BGEVENT_READ, CeladonCityPokecenterSign + bg_event 30, 9, BGEVENT_READ, CeladonCityPokecenterSign bg_event 37, 21, BGEVENT_ITEM, CeladonCityHiddenPpUp -.ObjectEvents: - db 9 + db 9 ; object events object_event 26, 11, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityFisherScript, -1 object_event 27, 11, SPRITE_POLIWAG, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1 object_event 20, 24, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1 object_event 14, 16, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps1Script, -1 - object_event 8, 31, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1 + object_event 8, 31, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1 object_event 18, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster1Script, -1 object_event 24, 33, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster2Script, -1 - object_event 6, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1 - object_event 7, 22, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassScript, -1 + object_event 6, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1 + object_event 7, 22, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassScript, -1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 7f838179d..ba347458a 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const CELADONDEPTSTORE1F_RECEPTIONIST const CELADONDEPTSTORE1F_GENTLEMAN const CELADONDEPTSTORE1F_TEACHER CeladonDeptStore1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonDeptStore1FReceptionistScript: jumptextfaceplayer CeladonDeptStore1FReceptionistText @@ -74,26 +72,21 @@ CeladonDeptStore1FDirectoryText: done CeladonDeptStore1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 7, 7, 1, CELADON_CITY - warp_def 8, 7, 1, CELADON_CITY - warp_def 15, 0, 2, CELADON_DEPT_STORE_2F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 14, 0, BGEVENT_READ, CeladonDeptStore1FDirectory - bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton - -.ObjectEvents: - db 3 - object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1 - object_event 11, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1 - object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 7, 7, CELADON_CITY, 1 + warp_event 8, 7, CELADON_CITY, 1 + warp_event 15, 0, CELADON_DEPT_STORE_2F, 2 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 14, 0, BGEVENT_READ, CeladonDeptStore1FDirectory + bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton + + db 3 ; object events + object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1 + object_event 11, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1 + object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index eb9bb8dbc..39b452fe7 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const CELADONDEPTSTORE2F_CLERK1 const CELADONDEPTSTORE2F_CLERK2 const CELADONDEPTSTORE2F_POKEFAN_M const CELADONDEPTSTORE2F_YOUNGSTER CeladonDeptStore2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x70bad: faceplayer @@ -69,26 +67,21 @@ CeladonDeptStore2FDirectoryText: done CeladonDeptStore2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 12, 0, 1, CELADON_DEPT_STORE_3F - warp_def 15, 0, 3, CELADON_DEPT_STORE_1F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 14, 0, BGEVENT_READ, CeladonDeptStore2FDirectory - bg_event 3, 0, BGEVENT_READ, CeladonDeptStore2FElevatorButton - -.ObjectEvents: - db 4 - object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1 - object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1 - object_event 5, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1 - object_event 6, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 12, 0, CELADON_DEPT_STORE_3F, 1 + warp_event 15, 0, CELADON_DEPT_STORE_1F, 3 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 14, 0, BGEVENT_READ, CeladonDeptStore2FDirectory + bg_event 3, 0, BGEVENT_READ, CeladonDeptStore2FElevatorButton + + db 4 ; object events + object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1 + object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1 + object_event 5, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1 + object_event 6, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 01cd14f57..eafcc6382 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CELADONDEPTSTORE3F_CLERK const CELADONDEPTSTORE3F_YOUNGSTER const CELADONDEPTSTORE3F_GAMEBOY_KID1 @@ -6,11 +6,9 @@ const_value set 2 const CELADONDEPTSTORE3F_SUPER_NERD CeladonDeptStore3F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x70d29: faceplayer @@ -28,7 +26,7 @@ CeladonDeptStore3FGameboyKid1Script: writetext CeladonDeptStore3FGameboyKid1Text waitbutton closetext - spriteface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN + objectface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN end CeladonDeptStore3FGameboyKid2Script: @@ -37,7 +35,7 @@ CeladonDeptStore3FGameboyKid2Script: writetext CeladonDeptStore3FGameboyKid2Text waitbutton closetext - spriteface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN + objectface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN end CeladonDeptStore3FSuperNerdScript: @@ -95,27 +93,22 @@ CeladonDeptStore3FDirectoryText: done CeladonDeptStore3F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 12, 0, 1, CELADON_DEPT_STORE_2F - warp_def 15, 0, 2, CELADON_DEPT_STORE_4F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 14, 0, BGEVENT_READ, CeladonDeptStore3FDirectory - bg_event 3, 0, BGEVENT_READ, CeladonDeptStore3FElevatorButton - -.ObjectEvents: - db 5 - object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1 - object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1 - object_event 9, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1 - object_event 10, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1 - object_event 13, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 12, 0, CELADON_DEPT_STORE_2F, 1 + warp_event 15, 0, CELADON_DEPT_STORE_4F, 2 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 14, 0, BGEVENT_READ, CeladonDeptStore3FDirectory + bg_event 3, 0, BGEVENT_READ, CeladonDeptStore3FElevatorButton + + db 5 ; object events + object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1 + object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1 + object_event 9, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1 + object_event 10, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1 + object_event 13, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index e3869c990..f619e49d8 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const CELADONDEPTSTORE4F_CLERK const CELADONDEPTSTORE4F_SUPER_NERD const CELADONDEPTSTORE4F_YOUNGSTER CeladonDeptStore4F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x70f0d: faceplayer @@ -51,25 +49,20 @@ CeladonDeptStore4FDirectoryText: done CeladonDeptStore4F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 12, 0, 1, CELADON_DEPT_STORE_5F - warp_def 15, 0, 2, CELADON_DEPT_STORE_3F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 14, 0, BGEVENT_READ, CeladonDeptStore4FDirectory - bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton - -.ObjectEvents: - db 3 - object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1 - object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1 - object_event 8, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 12, 0, CELADON_DEPT_STORE_5F, 1 + warp_event 15, 0, CELADON_DEPT_STORE_3F, 2 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 14, 0, BGEVENT_READ, CeladonDeptStore4FDirectory + bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton + + db 3 ; object events + object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1 + object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1 + object_event 8, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index a14e8c7be..c276e1dad 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CELADONDEPTSTORE5F_CLERK1 const CELADONDEPTSTORE5F_CLERK2 const CELADONDEPTSTORE5F_GENTLEMAN @@ -6,11 +6,9 @@ const_value set 2 const CELADONDEPTSTORE5F_TEACHER CeladonDeptStore5F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x71004: faceplayer @@ -72,27 +70,22 @@ CeladonDeptStore5FDirectoryText: done CeladonDeptStore5F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 12, 0, 1, CELADON_DEPT_STORE_4F - warp_def 15, 0, 1, CELADON_DEPT_STORE_6F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 14, 0, BGEVENT_READ, CeladonDeptStore5FDirectory - bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton - -.ObjectEvents: - db 5 - object_event 7, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1 - object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1 - object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1 - object_event 3, 4, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1 - object_event 1, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 12, 0, CELADON_DEPT_STORE_4F, 1 + warp_event 15, 0, CELADON_DEPT_STORE_6F, 1 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 14, 0, BGEVENT_READ, CeladonDeptStore5FDirectory + bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton + + db 5 ; object events + object_event 7, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1 + object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1 + object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1 + object_event 3, 4, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1 + object_event 1, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 9a8c0bde8..243c8d11a 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const CELADONDEPTSTORE6F_SUPER_NERD const CELADONDEPTSTORE6F_YOUNGSTER CeladonDeptStore6F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .HideRooftopStairs .HideRooftopStairs: @@ -24,19 +22,19 @@ CeladonDeptStore6FVendingMachine: opentext writetext CeladonVendingText .Start: - special Special_PlaceMoneyTopRight - loadmenudata .MenuData + special PlaceMoneyTopRight + loadmenuheader .MenuHeader verticalmenu closewindow - if_equal 1, .FreshWater - if_equal 2, .SodaPop - if_equal 3, .Lemonade + ifequal 1, .FreshWater + ifequal 2, .SodaPop + ifequal 3, .Lemonade closetext end .FreshWater: checkmoney YOUR_MONEY, 200 - if_equal HAVE_LESS, .NotEnoughMoney + ifequal HAVE_LESS, .NotEnoughMoney giveitem FRESH_WATER iffalse .NotEnoughSpace takemoney YOUR_MONEY, 200 @@ -45,7 +43,7 @@ CeladonDeptStore6FVendingMachine: .SodaPop: checkmoney YOUR_MONEY, 300 - if_equal HAVE_LESS, .NotEnoughMoney + ifequal HAVE_LESS, .NotEnoughMoney giveitem SODA_POP iffalse .NotEnoughSpace takemoney YOUR_MONEY, 300 @@ -54,7 +52,7 @@ CeladonDeptStore6FVendingMachine: .Lemonade: checkmoney YOUR_MONEY, 350 - if_equal HAVE_LESS, .NotEnoughMoney + ifequal HAVE_LESS, .NotEnoughMoney giveitem LEMONADE iffalse .NotEnoughSpace takemoney YOUR_MONEY, 350 @@ -79,13 +77,13 @@ CeladonDeptStore6FVendingMachine: waitbutton jump .Start -.MenuData: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "FRESH WATER ¥200@" @@ -146,27 +144,22 @@ CeladonDeptStore6FDirectoryText: done CeladonDeptStore6F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 15, 0, 2, CELADON_DEPT_STORE_5F - warp_def 2, 0, 1, CELADON_DEPT_STORE_ELEVATOR - -.CoordEvents: - db 0 - -.BGEvents: - db 6 - bg_event 14, 0, BGEVENT_READ, CeladonDeptStore6FDirectory - bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton - bg_event 8, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine - bg_event 9, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine - bg_event 10, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine - bg_event 11, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine - -.ObjectEvents: - db 2 - object_event 9, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1 - object_event 12, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 15, 0, CELADON_DEPT_STORE_5F, 2 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 + + db 0 ; coord events + + db 6 ; bg events + bg_event 14, 0, BGEVENT_READ, CeladonDeptStore6FDirectory + bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton + bg_event 8, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine + bg_event 9, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine + bg_event 10, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine + bg_event 11, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine + + db 2 ; object events + object_event 9, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1 + object_event 12, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1 diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index b5045880b..d89efe8ee 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -1,9 +1,7 @@ CeladonDeptStoreElevator_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonDeptStoreElevatorScript: opentext @@ -28,20 +26,15 @@ CeladonDeptStoreElevatorData: db -1 ; end CeladonDeptStoreElevator_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 1, 3, -1, CELADON_DEPT_STORE_1F - warp_def 2, 3, -1, CELADON_DEPT_STORE_1F + db 2 ; warp events + warp_event 1, 3, CELADON_DEPT_STORE_1F, -1 + warp_event 2, 3, CELADON_DEPT_STORE_1F, -1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 3, 0, BGEVENT_READ, CeladonDeptStoreElevatorScript + db 1 ; bg events + bg_event 3, 0, BGEVENT_READ, CeladonDeptStoreElevatorScript -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 5d3382f53..5bbcb42ef 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CELADONGAMECORNER_CLERK const CELADONGAMECORNER_RECEPTIONIST const CELADONGAMECORNER_POKEFAN_M @@ -10,11 +10,9 @@ const_value set 2 const CELADONGAMECORNER_GRAMPS CeladonGameCorner_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonGameCornerClerkScript: jumpstd gamecornercoinvendor @@ -28,7 +26,7 @@ CeladonGameCornerPokefanMScript: writetext CeladonGameCornerPokefanMText waitbutton closetext - spriteface CELADONGAMECORNER_POKEFAN_M, LEFT + objectface CELADONGAMECORNER_POKEFAN_M, LEFT end CeladonGameCornerTeacherScript: @@ -37,7 +35,7 @@ CeladonGameCornerTeacherScript: writetext CeladonGameCornerTeacherText waitbutton closetext - spriteface CELADONGAMECORNER_TEACHER, RIGHT + objectface CELADONGAMECORNER_TEACHER, RIGHT end CeladonGameCornerFishingGuruScript: @@ -46,7 +44,7 @@ CeladonGameCornerFishingGuruScript: writetext CeladonGameCornerFishingGuruText waitbutton closetext - spriteface CELADONGAMECORNER_FISHING_GURU, RIGHT + objectface CELADONGAMECORNER_FISHING_GURU, RIGHT end CeladonGameCornerFisherScript: @@ -59,7 +57,7 @@ CeladonGameCornerFisherScript: checkitem COIN_CASE iffalse .NoCoinCase checkcoins MAX_COINS - 1 - if_equal HAVE_MORE, .FullCoinCase + ifequal HAVE_MORE, .FullCoinCase stringtotext .coinname, MEM_BUFFER_1 scall .GiveCoins givecoins 18 @@ -68,7 +66,7 @@ CeladonGameCornerFisherScript: writetext CeladonGameCornerFisherText2 waitbutton closetext - spriteface LAST_TALKED, LEFT + objectface LAST_TALKED, LEFT end .GiveCoins: @@ -82,14 +80,14 @@ CeladonGameCornerFisherScript: writetext CeladonGameCornerFisherNoCoinCaseText waitbutton closetext - spriteface LAST_TALKED, LEFT + objectface LAST_TALKED, LEFT end .FullCoinCase: writetext CeladonGameCornerFisherFullCoinCaseText waitbutton closetext - spriteface LAST_TALKED, LEFT + objectface LAST_TALKED, LEFT end CeladonGymGuyScript: @@ -101,7 +99,7 @@ CeladonGameCornerGrampsScript: writetext CeladonGameCornerGrampsText waitbutton closetext - spriteface CELADONGAMECORNER_GRAMPS, LEFT + objectface CELADONGAMECORNER_GRAMPS, LEFT end CeladonGameCornerPoster1Script: @@ -112,23 +110,23 @@ CeladonGameCornerPoster2Script: CeladonGameCornerLuckySlotMachineScript: random 6 - if_equal 0, CeladonGameCornerSlotMachineScript + ifequal 0, CeladonGameCornerSlotMachineScript refreshscreen writebyte FALSE - special Special_SlotMachine + special SlotMachine closetext end CeladonGameCornerSlotMachineScript: refreshscreen writebyte TRUE - special Special_SlotMachine + special SlotMachine closetext end CeladonGameCornerCardFlipScript: refreshscreen - special Special_CardFlip + special CardFlip closetext end @@ -139,7 +137,7 @@ MapCeladonGameCornerSignpost9Script: opentext writetext UnknownText_0x72567 waitbutton - special Special_CardFlip + special CardFlip closetext end @@ -282,66 +280,61 @@ UnknownText_0x72567: done CeladonGameCorner_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 14, 13, 6, CELADON_CITY - warp_def 15, 13, 6, CELADON_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 38 - bg_event 1, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 1, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 1, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 1, 9, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 1, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 1, 11, BGEVENT_LEFT, CeladonGameCornerCardFlipScript - bg_event 6, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 6, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 6, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 6, 9, BGEVENT_READ, MapCeladonGameCornerSignpost9Script - bg_event 6, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 6, 11, BGEVENT_RIGHT, CeladonGameCornerCardFlipScript - bg_event 7, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 7, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 7, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 7, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 7, 10, BGEVENT_READ, CeladonGameCornerSlotMachineScript - bg_event 7, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript - bg_event 12, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 12, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 12, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 12, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + db 0, 0 ; filler + + db 2 ; warp events + warp_event 14, 13, CELADON_CITY, 6 + warp_event 15, 13, CELADON_CITY, 6 + + db 0 ; coord events + + db 38 ; bg events + bg_event 1, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 1, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 1, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 1, 9, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 1, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 1, 11, BGEVENT_LEFT, CeladonGameCornerCardFlipScript + bg_event 6, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 6, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 6, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 6, 9, BGEVENT_READ, MapCeladonGameCornerSignpost9Script + bg_event 6, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 6, 11, BGEVENT_RIGHT, CeladonGameCornerCardFlipScript + bg_event 7, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 10, BGEVENT_READ, CeladonGameCornerSlotMachineScript + bg_event 7, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript + bg_event 12, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 12, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 12, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 12, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 12, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 12, 11, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript - bg_event 13, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 13, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 13, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 13, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 13, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 13, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 13, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 13, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 13, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 13, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript - bg_event 18, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 18, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 18, 8, BGEVENT_READ, CeladonGameCornerLighterScript - bg_event 18, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 18, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 18, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 18, 8, BGEVENT_READ, CeladonGameCornerLighterScript + bg_event 18, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 18, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 18, 11, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript - bg_event 15, 0, BGEVENT_READ, CeladonGameCornerPoster1Script - bg_event 9, 0, BGEVENT_READ, CeladonGameCornerPoster2Script + bg_event 15, 0, BGEVENT_READ, CeladonGameCornerPoster1Script + bg_event 9, 0, BGEVENT_READ, CeladonGameCornerPoster2Script -.ObjectEvents: - db 9 - object_event 5, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1 - object_event 3, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1 + db 9 ; object events + object_event 5, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1 + object_event 3, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1 object_event 14, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1 - object_event 17, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1 - object_event 11, 7, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1 - object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 - object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 - object_event 11, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 - object_event 2, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1 + object_event 17, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1 + object_event 11, 7, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1 + object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 + object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 + object_event 11, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 + object_event 2, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 6d55f57d8..0141f21f3 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const CELADONGAMECORNERPRIZEROOM_GENTLEMAN const CELADONGAMECORNERPRIZEROOM_PHARMACIST CeladonGameCornerPrizeRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonGameCornerPrizeRoomGentlemanScript: jumptextfaceplayer CeladonGameCornerPrizeRoomGentlemanText @@ -24,18 +22,18 @@ CeladonGameCornerPrizeRoomTMVendor: iffalse CeladonPrizeRoom_NoCoinCase writetext CeladonPrizeRoom_AskWhichPrizeText CeladonPrizeRoom_tmcounterloop: - special Special_DisplayCoinCaseBalance - loadmenudata CeladonPrizeRoom_TMMenuDataHeader + special DisplayCoinCaseBalance + loadmenuheader CeladonPrizeRoom_TMMenuHeader verticalmenu closewindow - if_equal 1, .doubleteam - if_equal 2, .psychic - if_equal 3, .hyperbeam + ifequal 1, .doubleteam + ifequal 2, .psychic + ifequal 3, .hyperbeam jump CeladonPrizeRoom_cancel .doubleteam checkcoins 1500 - if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins + ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins itemtotext TM_DOUBLE_TEAM, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel @@ -46,7 +44,7 @@ CeladonPrizeRoom_tmcounterloop: .psychic checkcoins 3500 - if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins + ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins itemtotext TM_PSYCHIC_M, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel @@ -57,7 +55,7 @@ CeladonPrizeRoom_tmcounterloop: .hyperbeam checkcoins 7500 - if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins + ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins itemtotext TM_HYPER_BEAM, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel @@ -102,13 +100,13 @@ CeladonPrizeRoom_NoCoinCase: closetext end -CeladonPrizeRoom_TMMenuDataHeader: +CeladonPrizeRoom_TMMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 15, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "TM32 1500@" @@ -125,20 +123,20 @@ CeladonGameCornerPrizeRoomPokemonVendor: iffalse CeladonPrizeRoom_NoCoinCase .loop writetext CeladonPrizeRoom_AskWhichPrizeText - special Special_DisplayCoinCaseBalance - loadmenudata .MenuDataHeader + special DisplayCoinCaseBalance + loadmenuheader .MenuHeader verticalmenu closewindow - if_equal 1, .pikachu - if_equal 2, .porygon - if_equal 3, .larvitar + ifequal 1, .pikachu + ifequal 2, .porygon + ifequal 3, .larvitar jump CeladonPrizeRoom_cancel .pikachu checkcoins 2222 - if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins + ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins checkcode VAR_PARTYCOUNT - if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom + ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom pokenamemem PIKACHU, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel @@ -147,16 +145,16 @@ CeladonGameCornerPrizeRoomPokemonVendor: writetext CeladonPrizeRoom_HereYouGoText waitbutton writebyte PIKACHU - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke PIKACHU, 25 takecoins 2222 jump .loop .porygon checkcoins 5555 - if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins + ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins checkcode VAR_PARTYCOUNT - if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom + ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom pokenamemem PORYGON, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel @@ -165,16 +163,16 @@ CeladonGameCornerPrizeRoomPokemonVendor: writetext CeladonPrizeRoom_HereYouGoText waitbutton writebyte PORYGON - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke PORYGON, 15 takecoins 5555 jump .loop .larvitar checkcoins 8888 - if_equal HAVE_LESS, CeladonPrizeRoom_notenoughcoins + ifequal HAVE_LESS, CeladonPrizeRoom_notenoughcoins checkcode VAR_PARTYCOUNT - if_equal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom + ifequal PARTY_LENGTH, CeladonPrizeRoom_notenoughroom pokenamemem LARVITAR, MEM_BUFFER_0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel @@ -183,18 +181,18 @@ CeladonGameCornerPrizeRoomPokemonVendor: writetext CeladonPrizeRoom_HereYouGoText waitbutton writebyte LARVITAR - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke LARVITAR, 40 takecoins 8888 jump .loop -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 17, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "PIKACHU 2222@" @@ -264,23 +262,18 @@ CeladonPrizeRoom_NoCoinCaseText: done CeladonGameCornerPrizeRoom_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 5, 7, CELADON_CITY - warp_def 3, 5, 7, CELADON_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 2, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor - bg_event 4, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor - -.ObjectEvents: - db 2 - object_event 0, 2, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1 - object_event 4, 4, SPRITE_PHARMACIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 5, CELADON_CITY, 7 + warp_event 3, 5, CELADON_CITY, 7 + + db 0 ; coord events + + db 2 ; bg events + bg_event 2, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor + bg_event 4, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor + + db 2 ; object events + object_event 0, 2, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1 + object_event 4, 4, SPRITE_PHARMACIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 53f09324a..246b30a39 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CELADONGYM_ERIKA const CELADONGYM_LASS1 const CELADONGYM_LASS2 @@ -7,11 +7,9 @@ const_value set 2 const CELADONGYM_TWIN2 CeladonGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ErikaScript_0x72a6a: faceplayer @@ -50,10 +48,10 @@ UnknownScript_0x72aae: end TrainerLassMichelle: - trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script + trainer LASS, MICHELLE, EVENT_BEAT_LASS_MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext LassMichelleAfterBattleText waitbutton @@ -61,10 +59,10 @@ TrainerLassMichelle: end TrainerPicnickerTanya: - trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script + trainer PICNICKER, TANYA, EVENT_BEAT_PICNICKER_TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PicnickerTanyaAfterBattleText waitbutton @@ -72,10 +70,10 @@ TrainerPicnickerTanya: end TrainerBeautyJulia: - trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script + trainer BEAUTY, JULIA, EVENT_BEAT_BEAUTY_JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BeautyJuliaAfterBattleText waitbutton @@ -83,10 +81,10 @@ TrainerBeautyJulia: end TrainerTwinsJoandzoe1: - trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script + trainer TWINS, JOANDZOE1, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext TwinsJoandzoe1AfterBattleText waitbutton @@ -94,10 +92,10 @@ TrainerTwinsJoandzoe1: end TrainerTwinsJoandzoe2: - trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script + trainer TWINS, JOANDZOE2, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext TwinsJoandzoe2AfterBattleText waitbutton @@ -268,27 +266,22 @@ TwinsJoandzoe2AfterBattleText: done CeladonGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 17, 8, CELADON_CITY - warp_def 5, 17, 8, CELADON_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 15, BGEVENT_READ, CeladonGymStatue - bg_event 6, 15, BGEVENT_READ, CeladonGymStatue - -.ObjectEvents: - db 6 - object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1 - object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1 - object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 - object_event 3, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1 - object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1 - object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 17, CELADON_CITY, 8 + warp_event 5, 17, CELADON_CITY, 8 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 15, BGEVENT_READ, CeladonGymStatue + bg_event 6, 15, BGEVENT_READ, CeladonGymStatue + + db 6 ; object events + object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1 + object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1 + object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 + object_event 3, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1 + object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1 + object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 4f6e0f94d..2e856fd79 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const CELADONMANSION1F_GRANNY const CELADONMANSION1F_GROWLITHE1 const CELADONMANSION1F_CLEFAIRY const CELADONMANSION1F_GROWLITHE2 CeladonMansion1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonMansionManager: jumptextfaceplayer CeladonMansionManagerText @@ -75,29 +73,24 @@ CeladonMansionManagersSuiteSignText: done CeladonMansion1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 6, 9, 2, CELADON_CITY - warp_def 7, 9, 2, CELADON_CITY - warp_def 3, 0, 3, CELADON_CITY - warp_def 0, 0, 1, CELADON_MANSION_2F - warp_def 7, 0, 4, CELADON_MANSION_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign - bg_event 0, 3, BGEVENT_READ, CeladonMansion1fBookshelf - bg_event 2, 3, BGEVENT_READ, CeladonMansion1fBookshelf - -.ObjectEvents: - db 4 - object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1 - object_event 2, 6, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1 - object_event 3, 4, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1 - object_event 4, 4, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 6, 9, CELADON_CITY, 2 + warp_event 7, 9, CELADON_CITY, 2 + warp_event 3, 0, CELADON_CITY, 3 + warp_event 0, 0, CELADON_MANSION_2F, 1 + warp_event 7, 0, CELADON_MANSION_2F, 4 + + db 0 ; coord events + + db 3 ; bg events + bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign + bg_event 0, 3, BGEVENT_READ, CeladonMansion1fBookshelf + bg_event 2, 3, BGEVENT_READ, CeladonMansion1fBookshelf + + db 4 ; object events + object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1 + object_event 2, 6, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1 + object_event 3, 4, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1 + object_event 4, 4, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1 diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index e463c5b07..f230404de 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -1,9 +1,7 @@ CeladonMansion2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonMansion2FComputer: jumptext CeladonMansion2FComputerText @@ -50,24 +48,19 @@ CeladonMansion2FSignText: done CeladonMansion2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 0, 0, 4, CELADON_MANSION_1F - warp_def 1, 0, 2, CELADON_MANSION_3F - warp_def 6, 0, 3, CELADON_MANSION_3F - warp_def 7, 0, 5, CELADON_MANSION_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 0, 3, BGEVENT_READ, CeladonMansion2FComputer - bg_event 5, 8, BGEVENT_UP, CeladonMansion2FSign - bg_event 2, 3, BGEVENT_READ, CeladonMansion2FBookshelf - -.ObjectEvents: - db 0 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 0, 0, CELADON_MANSION_1F, 4 + warp_event 1, 0, CELADON_MANSION_3F, 2 + warp_event 6, 0, CELADON_MANSION_3F, 3 + warp_event 7, 0, CELADON_MANSION_1F, 5 + + db 0 ; coord events + + db 3 ; bg events + bg_event 0, 3, BGEVENT_READ, CeladonMansion2FComputer + bg_event 5, 8, BGEVENT_UP, CeladonMansion2FSign + bg_event 2, 3, BGEVENT_READ, CeladonMansion2FBookshelf + + db 0 ; object events diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index bb6bb2f3f..a2f187409 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -1,22 +1,20 @@ -const_value set 2 + const_def 2 ; object constants const CELADONMANSION3F_COOLTRAINER_M const CELADONMANSION3F_GYM_GUY const CELADONMANSION3F_SUPER_NERD const CELADONMANSION3F_FISHER CeladonMansion3F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CooltrainerMScript_0x71670: faceplayer opentext writetext UnknownText_0x716ce checkcode VAR_DEXCAUGHT - if_greater_than NUM_POKEMON - 2 - 1, UnknownScript_0x7167e ; ignore Mew and Celebi + ifgreater NUM_POKEMON - 2 - 1, UnknownScript_0x7167e ; ignore Mew and Celebi waitbutton closetext end @@ -28,7 +26,7 @@ UnknownScript_0x7167e: waitsfx writetext UnknownText_0x71760 buttonsound - special Special_Diploma + special Diploma writetext UnknownText_0x71763 waitbutton closetext @@ -49,7 +47,7 @@ UnknownScript_0x716a4: writetext UnknownText_0x717d8 yesorno iffalse UnknownScript_0x716b0 - special Special_PrintDiploma + special PrintDiploma closetext end @@ -190,29 +188,24 @@ UnknownText_0x71996: done CeladonMansion3F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 0, 0, 1, CELADON_MANSION_ROOF - warp_def 1, 0, 2, CELADON_MANSION_2F - warp_def 6, 0, 3, CELADON_MANSION_2F - warp_def 7, 0, 2, CELADON_MANSION_ROOF - -.CoordEvents: - db 0 - -.BGEvents: - db 4 - bg_event 5, 8, BGEVENT_UP, MapCeladonMansion3FSignpost0Script - bg_event 4, 3, BGEVENT_UP, MapCeladonMansion3FSignpost1Script - bg_event 1, 6, BGEVENT_UP, MapCeladonMansion3FSignpost2Script - bg_event 1, 3, BGEVENT_UP, MapCeladonMansion3FSignpost3Script - -.ObjectEvents: - db 4 - object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1 - object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1 - object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1 - object_event 0, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 0, 0, CELADON_MANSION_ROOF, 1 + warp_event 1, 0, CELADON_MANSION_2F, 2 + warp_event 6, 0, CELADON_MANSION_2F, 3 + warp_event 7, 0, CELADON_MANSION_ROOF, 2 + + db 0 ; coord events + + db 4 ; bg events + bg_event 5, 8, BGEVENT_UP, MapCeladonMansion3FSignpost0Script + bg_event 4, 3, BGEVENT_UP, MapCeladonMansion3FSignpost1Script + bg_event 1, 6, BGEVENT_UP, MapCeladonMansion3FSignpost2Script + bg_event 1, 3, BGEVENT_UP, MapCeladonMansion3FSignpost3Script + + db 4 ; object events + object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1 + object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1 + object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1 + object_event 0, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index d3a3c7623..7c040bdad 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const CELADONMANSIONROOF_FISHER CeladonMansionRoof_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonMansionRoofFisherScript: jumptextfaceplayer CeladonMansionRoofFisherText @@ -34,22 +32,17 @@ UnknownText_0x71aa1: done CeladonMansionRoof_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 1, 1, 1, CELADON_MANSION_3F - warp_def 6, 1, 4, CELADON_MANSION_3F - warp_def 2, 5, 1, CELADON_MANSION_ROOF_HOUSE + db 3 ; warp events + warp_event 1, 1, CELADON_MANSION_3F, 1 + warp_event 6, 1, CELADON_MANSION_3F, 4 + warp_event 2, 5, CELADON_MANSION_ROOF_HOUSE, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 6, 1, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script + db 1 ; bg events + bg_event 6, 1, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script -.ObjectEvents: - db 1 - object_event 7, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1 + db 1 ; object events + object_event 7, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index f49d12535..61157e619 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const CELADONMANSIONROOFHOUSE_PHARMACIST CeladonMansionRoofHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PharmacistScript_0x71afd: faceplayer @@ -15,7 +13,7 @@ PharmacistScript_0x71afd: iftrue UnknownScript_0x71b21 writetext UnknownText_0x71b27 buttonsound - checknite + checktime NITE iftrue UnknownScript_0x71b14 writetext UnknownText_0x71b4a waitbutton @@ -117,20 +115,15 @@ UnknownText_0x71db3: done CeladonMansionRoofHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, CELADON_MANSION_ROOF - warp_def 3, 7, 3, CELADON_MANSION_ROOF + db 2 ; warp events + warp_event 2, 7, CELADON_MANSION_ROOF, 3 + warp_event 3, 7, CELADON_MANSION_ROOF, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1 + db 1 ; object events + object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1 diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index cfe31f624..0fbe53d52 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CELADONPOKECENTER1F_NURSE const CELADONPOKECENTER1F_GENTLEMAN const CELADONPOKECENTER1F_PHARMACIST @@ -6,11 +6,9 @@ const_value set 2 const CELADONPOKECENTER1F_EUSINE CeladonPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x71e22: jumpstd pokecenternurse @@ -30,9 +28,9 @@ CeladonEusine: writetext CeladonEusineText1 buttonsound writebyte SUICUNE - special Special_MonCheck + special MonCheck iffalse .NoSuicune - special Special_BeastsCheck + special BeastsCheck iftrue .HoOh writetext NoBeastsText waitbutton @@ -45,7 +43,7 @@ CeladonEusine: waitbutton closetext checkcode VAR_FACING - if_equal UP, .Location1 + ifequal UP, .Location1 applymovement CELADONPOKECENTER1F_EUSINE, .Movement1 jump .Continue @@ -146,25 +144,20 @@ NoBeastsText: done CeladonPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 5, CELADON_CITY - warp_def 4, 7, 5, CELADON_CITY - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 5 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1 - object_event 1, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1 - object_event 0, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1 - object_event 8, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1 - object_event 4, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, CELADON_CITY, 5 + warp_event 4, 7, CELADON_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 5 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1 + object_event 1, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1 + object_event 0, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1 + object_event 8, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1 + object_event 4, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm index 06212496b..aec478102 100644 --- a/maps/CeladonPokecenter2FBeta.asm +++ b/maps/CeladonPokecenter2FBeta.asm @@ -1,23 +1,16 @@ CeladonPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, CELADON_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, CELADON_POKECENTER_1F, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 9980a4487..34727e077 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CERULEANCITY_COOLTRAINER_M const CERULEANCITY_SUPER_NERD const CERULEANCITY_SLOWPOKE @@ -7,11 +7,9 @@ const_value set 2 const CERULEANCITY_YOUNGSTER CeruleanCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -51,7 +49,7 @@ CeruleanCityCooltrainerFScript: writetext CeruleanCityCooltrainerFText1 waitbutton closetext - spriteface CERULEANCITY_COOLTRAINER_F, LEFT + objectface CERULEANCITY_COOLTRAINER_F, LEFT opentext writetext CeruleanCityCooltrainerFText2 waitbutton @@ -115,7 +113,7 @@ CeruleanCityYoungsterScript: playsound SFX_TRANSACTION waitsfx showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15 - spriteface CERULEANCITY_YOUNGSTER, LEFT + objectface CERULEANCITY_YOUNGSTER, LEFT opentext writetext CeruleanCityYoungsterText2 waitbutton @@ -147,7 +145,7 @@ CeruleanCityMartSign: jumpstd martsign CeruleanCityHiddenBerserkGene: - hiddenitem EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE + hiddenitem BERSERK_GENE, EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY CeruleanCityCooltrainerMText1: text "KANTO's POWER" @@ -276,38 +274,33 @@ CeruleanLockedDoorText: done CeruleanCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 7, 15, 1, CERULEAN_GYM_BADGE_SPEECH_HOUSE - warp_def 28, 17, 1, CERULEAN_POLICE_STATION - warp_def 13, 19, 1, CERULEAN_TRADE_SPEECH_HOUSE - warp_def 19, 21, 1, CERULEAN_POKECENTER_1F - warp_def 30, 23, 1, CERULEAN_GYM - warp_def 25, 29, 2, CERULEAN_MART - -.CoordEvents: - db 0 - -.BGEvents: - db 9 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 7, 15, CERULEAN_GYM_BADGE_SPEECH_HOUSE, 1 + warp_event 28, 17, CERULEAN_POLICE_STATION, 1 + warp_event 13, 19, CERULEAN_TRADE_SPEECH_HOUSE, 1 + warp_event 19, 21, CERULEAN_POKECENTER_1F, 1 + warp_event 30, 23, CERULEAN_GYM, 1 + warp_event 25, 29, CERULEAN_MART, 2 + + db 0 ; coord events + + db 9 ; bg events bg_event 23, 23, BGEVENT_READ, CeruleanCitySign bg_event 27, 25, BGEVENT_READ, CeruleanGymSign bg_event 11, 29, BGEVENT_READ, CeruleanBikeShopSign bg_event 25, 17, BGEVENT_READ, CeruleanPoliceSign - bg_event 23, 7, BGEVENT_READ, CeruleanCapeSign + bg_event 23, 7, BGEVENT_READ, CeruleanCapeSign bg_event 14, 29, BGEVENT_READ, CeruleanLockedDoor bg_event 20, 21, BGEVENT_READ, CeruleanCityPokecenterSign bg_event 26, 29, BGEVENT_READ, CeruleanCityMartSign - bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene + bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene -.ObjectEvents: - db 6 + db 6 ; object events object_event 15, 23, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1 object_event 23, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1 - object_event 20, 24, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1 + object_event 20, 24, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1 object_event 21, 24, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerFScript, -1 object_event 30, 26, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityFisherScript, -1 - object_event 6, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1 + object_event 6, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index b1076ded5..a7e81fea5 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CERULEANGYM_ROCKET const CERULEANGYM_MISTY const CERULEANGYM_SWIMMER_GIRL1 @@ -7,13 +7,11 @@ const_value set 2 const CERULEANGYM_GYM_GUY CeruleanGym_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .GruntRunsOut + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_CERULEANGYM_NOTHING + scene_script .GruntRunsOut ; SCENE_CERULEANGYM_GRUNT_RUNS_OUT -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -48,13 +46,13 @@ CeruleanGym_MapScripts: setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM clearevent EVENT_ROUTE_24_ROCKET clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND - setscene 0 - setmapscene ROUTE_25, 1 - setmapscene POWER_PLANT, 0 + setscene SCENE_CERULEANGYM_NOTHING + setmapscene ROUTE_25, SCENE_ROUTE25_MISTYS_DATE + setmapscene POWER_PLANT, SCENE_POWERPLANT_NOTHING waitsfx special RestartMapMusic pause 15 - spriteface PLAYER, DOWN + objectface PLAYER, DOWN pause 15 end @@ -86,10 +84,10 @@ MistyScript_0x188432: end TrainerSwimmerfDiana: - trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script + trainer SWIMMERF, DIANA, EVENT_BEAT_SWIMMERF_DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfDianaAfterBattleText waitbutton @@ -97,10 +95,10 @@ TrainerSwimmerfDiana: end TrainerSwimmerfBriana: - trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script + trainer SWIMMERF, BRIANA, EVENT_BEAT_SWIMMERF_BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfBrianaAfterBattleText waitbutton @@ -108,10 +106,10 @@ TrainerSwimmerfBriana: end TrainerSwimmermParker: - trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script + trainer SWIMMERM, PARKER, EVENT_BEAT_SWIMMERM_PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermParkerAfterBattleText waitbutton @@ -135,7 +133,7 @@ CeruleanGymGuyScript: end CeruleanGymHiddenMachinePart: - hiddenitem EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART + hiddenitem MACHINE_PART, EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM CeruleanGymStatue1: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM @@ -363,28 +361,23 @@ CeruleanGymGuyWinText: done CeruleanGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 15, 5, CERULEAN_CITY - warp_def 5, 15, 5, CERULEAN_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 3, 8, BGEVENT_ITEM, CeruleanGymHiddenMachinePart - bg_event 2, 13, BGEVENT_READ, CeruleanGymStatue1 - bg_event 6, 13, BGEVENT_READ, CeruleanGymStatue2 - -.ObjectEvents: - db 6 - object_event 4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET - object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM - object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM - object_event 1, 9, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM - object_event 8, 9, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM - object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 15, CERULEAN_CITY, 5 + warp_event 5, 15, CERULEAN_CITY, 5 + + db 0 ; coord events + + db 3 ; bg events + bg_event 3, 8, BGEVENT_ITEM, CeruleanGymHiddenMachinePart + bg_event 2, 13, BGEVENT_READ, CeruleanGymStatue1 + bg_event 6, 13, BGEVENT_READ, CeruleanGymStatue2 + + db 6 ; object events + object_event 4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET + object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event 1, 9, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event 8, 9, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 82d9db826..6d94bae06 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M CeruleanGymBadgeSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeruleanGymBadgeSpeechHousePokefanMScript: jumptextfaceplayer CeruleanGymBadgeSpeechHousePokefanMText @@ -17,20 +15,15 @@ CeruleanGymBadgeSpeechHousePokefanMText: done CeruleanGymBadgeSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, CERULEAN_CITY - warp_def 3, 7, 1, CERULEAN_CITY + db 2 ; warp events + warp_event 2, 7, CERULEAN_CITY, 1 + warp_event 3, 7, CERULEAN_CITY, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1 + db 1 ; object events + object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index c89621b6a..6fd5c9b87 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const CERULEANMART_CLERK const CERULEANMART_COOLTRAINER_M const CERULEANMART_COOLTRAINER_F CeruleanMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeruleanMart_Clerk: opentext @@ -46,22 +44,17 @@ CeruleanMart_CooltrainerFText: done CeruleanMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 6, CERULEAN_CITY - warp_def 3, 7, 6, CERULEAN_CITY + db 2 ; warp events + warp_event 2, 7, CERULEAN_CITY, 6 + warp_event 3, 7, CERULEAN_CITY, 6 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1 - object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1 - object_event 7, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1 + object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1 + object_event 7, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1 diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 2efd5f743..d8cfde177 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -1,20 +1,18 @@ -const_value set 2 + const_def 2 ; object constants const CERULEANPOKECENTER1F_NURSE const CERULEANPOKECENTER1F_SUPER_NERD const CERULEANPOKECENTER1F_GYM_GUY CeruleanPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x18820f: jumpstd pokecenternurse SuperNerdScript_0x188212: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x188221 @@ -63,23 +61,18 @@ CeruleanPokecenter1FGymGuyText: done CeruleanPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 4, CERULEAN_CITY - warp_def 4, 7, 4, CERULEAN_CITY - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1 - object_event 8, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1 - object_event 1, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, CERULEAN_CITY, 4 + warp_event 4, 7, CERULEAN_CITY, 4 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 3 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1 + object_event 8, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1 + object_event 1, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1 diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm index 467377caa..135d49d36 100644 --- a/maps/CeruleanPokecenter2FBeta.asm +++ b/maps/CeruleanPokecenter2FBeta.asm @@ -1,23 +1,16 @@ CeruleanPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeruleanPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 1, CERULEAN_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, CERULEAN_POKECENTER_1F, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index ca77bf0cd..1c97dc0e5 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const CERULEANPOLICESTATION_FISHING_GURU const CERULEANPOLICESTATION_POKEFAN_F const CERULEANPOLICESTATION_DIGLETT CeruleanPoliceStation_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeruleanPoliceStationFishingGuruScript: jumptextfaceplayer CeruleanPoliceStationFishingGuruText @@ -44,22 +42,17 @@ CeruleanDiglettText: done CeruleanPoliceStation_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, CERULEAN_CITY - warp_def 3, 7, 2, CERULEAN_CITY + db 2 ; warp events + warp_event 2, 7, CERULEAN_CITY, 2 + warp_event 3, 7, CERULEAN_CITY, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 5, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1 - object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1 - object_event 3, 5, SPRITE_DIGLETT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1 + db 3 ; object events + object_event 5, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1 + object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1 + object_event 3, 5, SPRITE_DIGLETT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 8fdd470ae..3181409f4 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const CERULEANTRADESPEECHHOUSE_GRANNY const CERULEANTRADESPEECHHOUSE_GRAMPS const CERULEANTRADESPEECHHOUSE_RHYDON const CERULEANTRADESPEECHHOUSE_ZUBAT CeruleanTradeSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeruleanTradeSpeechHouseGrannyScript: jumptextfaceplayer CeruleanTradeSpeechHouseGrannyText @@ -54,23 +52,18 @@ UnknownText_0x1881b5: done CeruleanTradeSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, CERULEAN_CITY - warp_def 3, 7, 3, CERULEAN_CITY + db 2 ; warp events + warp_event 2, 7, CERULEAN_CITY, 3 + warp_event 3, 7, CERULEAN_CITY, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 - object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1 - object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1 - object_event 5, 2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1 - object_event 5, 6, SPRITE_ZUBAT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ZubatScript_0x188143, -1 + db 4 ; object events + object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1 + object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1 + object_event 5, 2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1 + object_event 5, 6, SPRITE_ZUBAT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ZubatScript_0x188143, -1 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 3eaa2464b..dda289377 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const CHARCOALKILN_BLACK_BELT const CHARCOALKILN_YOUNGSTER const CHARCOALKILN_MOLTRES CharcoalKiln_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CharcoalKilnBoss: faceplayer @@ -149,25 +147,20 @@ FarfetchdText: done CharcoalKiln_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 2, AZALEA_TOWN - warp_def 3, 7, 2, AZALEA_TOWN - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 0, 1, BGEVENT_READ, CharcoalKilnBookshelf - bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf - bg_event 7, 1, BGEVENT_READ, CharcoalKilnRadio - -.ObjectEvents: - db 3 - object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS - object_event 5, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE - object_event 5, 6, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, AZALEA_TOWN, 2 + warp_event 3, 7, AZALEA_TOWN, 2 + + db 0 ; coord events + + db 3 ; bg events + bg_event 0, 1, BGEVENT_READ, CharcoalKilnBookshelf + bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf + bg_event 7, 1, BGEVENT_READ, CharcoalKilnRadio + + db 3 ; object events + object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS + object_event 5, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE + object_event 5, 6, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index ac3db17b6..3fc6df5b8 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CHERRYGROVECITY_GRAMPS const CHERRYGROVECITY_SILVER const CHERRYGROVECITY_TEACHER @@ -6,13 +6,11 @@ const_value set 2 const CHERRYGROVECITY_FISHER CherrygroveCity_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_CHERRYGROVECITY_NOTHING + scene_script .DummyScene1 ; SCENE_CHERRYGROVECITY_MEET_RIVAL -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -44,28 +42,28 @@ CherrygroveCityGuideGent: waitbutton closetext applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement2 - spriteface PLAYER, UP + objectface PLAYER, UP opentext writetext GuideGentMartText waitbutton closetext applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement3 - spriteface PLAYER, UP + objectface PLAYER, UP opentext writetext GuideGentRoute30Text waitbutton closetext applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement4 - spriteface PLAYER, LEFT + objectface PLAYER, LEFT opentext writetext GuideGentSeaText waitbutton closetext applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement5 - spriteface PLAYER, UP + objectface PLAYER, UP pause 60 - spriteface CHERRYGROVECITY_GRAMPS, LEFT - spriteface PLAYER, RIGHT + objectface CHERRYGROVECITY_GRAMPS, LEFT + objectface PLAYER, RIGHT opentext writetext GuideGentGiftText buttonsound @@ -79,7 +77,7 @@ CherrygroveCityGuideGent: closetext stopfollow special RestartMapMusic - spriteface PLAYER, UP + objectface PLAYER, UP applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement6 playsound SFX_ENTER_DOOR disappear CHERRYGROVECITY_GRAMPS @@ -103,13 +101,13 @@ CherrygroveCityGuideGent: CherrygroveSilverSceneSouth: moveobject CHERRYGROVECITY_SILVER, 39, 7 CherrygroveSilverSceneNorth: - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear CHERRYGROVECITY_SILVER applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalWalksToYou - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT playmusic MUSIC_RIVAL_ENCOUNTER opentext writetext UnknownText_0x19c4e2 @@ -168,10 +166,10 @@ CherrygroveSilverSceneNorth: .FinishRival: playsound SFX_TACKLE applymovement PLAYER, CherrygroveCity_RivalPushesYouOutOfTheWay - spriteface PLAYER, LEFT + objectface PLAYER, LEFT applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft disappear CHERRYGROVECITY_SILVER - setscene 0 + setscene SCENE_CHERRYGROVECITY_NOTHING special HealParty playmapmusic end @@ -547,33 +545,28 @@ GuideGentsHouseSignText: done CherrygroveCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 23, 3, 2, CHERRYGROVE_MART - warp_def 29, 3, 1, CHERRYGROVE_POKECENTER_1F - warp_def 17, 7, 1, CHERRYGROVE_GYM_SPEECH_HOUSE - warp_def 25, 9, 1, GUIDE_GENTS_HOUSE - warp_def 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE - -.CoordEvents: - db 2 - coord_event 33, 6, 1, CherrygroveSilverSceneNorth - coord_event 33, 7, 1, CherrygroveSilverSceneSouth - -.BGEvents: - db 4 - bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign - bg_event 23, 9, BGEVENT_READ, GuideGentsHouseSign - bg_event 24, 3, BGEVENT_READ, CherrygroveCityMartSign - bg_event 30, 3, BGEVENT_READ, CherrygroveCityPokecenterSign - -.ObjectEvents: - db 5 - object_event 32, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE - object_event 39, 6, SPRITE_SILVER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY + db 0, 0 ; filler + + db 5 ; warp events + warp_event 23, 3, CHERRYGROVE_MART, 2 + warp_event 29, 3, CHERRYGROVE_POKECENTER_1F, 1 + warp_event 17, 7, CHERRYGROVE_GYM_SPEECH_HOUSE, 1 + warp_event 25, 9, GUIDE_GENTS_HOUSE, 1 + warp_event 31, 11, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 1 + + db 2 ; coord events + coord_event 33, 6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneNorth + coord_event 33, 7, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneSouth + + db 4 ; bg events + bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign + bg_event 23, 9, BGEVENT_READ, GuideGentsHouseSign + bg_event 24, 3, BGEVENT_READ, CherrygroveCityMartSign + bg_event 30, 3, BGEVENT_READ, CherrygroveCityPokecenterSign + + db 5 ; object events + object_event 32, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE + object_event 39, 6, SPRITE_SILVER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY object_event 27, 12, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1 - object_event 23, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1 - object_event 7, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MysticWaterGuy, -1 + object_event 23, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1 + object_event 7, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MysticWaterGuy, -1 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index c79941cb2..f2f1f69b8 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER CherrygroveEvolutionSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks YoungsterScript_0x196cb2: opentext @@ -42,23 +40,18 @@ UnknownText_0x196cfc: done CherrygroveEvolutionSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 5, CHERRYGROVE_CITY - warp_def 3, 7, 5, CHERRYGROVE_CITY + db 2 ; warp events + warp_event 2, 7, CHERRYGROVE_CITY, 5 + warp_event 3, 7, CHERRYGROVE_CITY, 5 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf -.ObjectEvents: - db 2 - object_event 3, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1 - object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1 + db 2 ; object events + object_event 3, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1 + object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 2709ed1c0..95aa6c91a 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER CherrygroveGymSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CherrygroveGymSpeechHousePokefanMScript: jumptextfaceplayer CherrygroveGymSpeechHousePokefanMText @@ -45,23 +43,18 @@ CherrygroveGymSpeechHouseBugCatcherText: done CherrygroveGymSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 3, CHERRYGROVE_CITY - warp_def 3, 7, 3, CHERRYGROVE_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf - -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1 - object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, CHERRYGROVE_CITY, 3 + warp_event 3, 7, CHERRYGROVE_CITY, 3 + + db 0 ; coord events + + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf + + db 2 ; object events + object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1 + object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 7a4b6dc0b..94177e6c8 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const CHERRYGROVEMART_CLERK const CHERRYGROVEMART_COOLTRAINER_M const CHERRYGROVEMART_YOUNGSTER CherrygroveMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x19680a: opentext @@ -72,22 +70,17 @@ CherrygroveMartYoungsterText: done CherrygroveMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, CHERRYGROVE_CITY - warp_def 3, 7, 1, CHERRYGROVE_CITY + db 2 ; warp events + warp_event 2, 7, CHERRYGROVE_CITY, 1 + warp_event 3, 7, CHERRYGROVE_CITY, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1 - object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1 - object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1 + object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1 + object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1 diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index 202d87e50..979f79361 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const CHERRYGROVEPOKECENTER1F_NURSE const CHERRYGROVEPOKECENTER1F_FISHER const CHERRYGROVEPOKECENTER1F_GENTLEMAN const CHERRYGROVEPOKECENTER1F_TEACHER CherrygrovePokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x19696d: jumpstd pokecenternurse @@ -69,24 +67,19 @@ UnknownText_0x196a46: done CherrygrovePokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 2, CHERRYGROVE_CITY - warp_def 4, 7, 2, CHERRYGROVE_CITY - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19696d, -1 - object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1 - object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1 - object_event 1, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x196976, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, CHERRYGROVE_CITY, 2 + warp_event 4, 7, CHERRYGROVE_CITY, 2 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19696d, -1 + object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1 + object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1 + object_event 1, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x196976, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index f05b7aeb3..38b6982e2 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CIANWOODCITY_STANDING_YOUNGSTER const CIANWOODCITY_POKEFAN_M const CIANWOODCITY_LASS @@ -13,13 +13,11 @@ const_value set 2 const CIANWOODCITY_SUICUNE CianwoodCity_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_CIANWOODCITY_NOTHING + scene_script .DummyScene1 ; SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune .DummyScene0: @@ -38,20 +36,20 @@ CianwoodCity_MapScripts: return CianwoodCitySuicuneAndEusine: - spriteface PLAYER, UP + objectface PLAYER, UP showemote EMOTE_SHOCK, PLAYER, 15 pause 15 playsound SFX_WARP_FROM applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00da - spriteface PLAYER, DOWN + objectface PLAYER, DOWN pause 15 playsound SFX_WARP_FROM applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0 disappear CIANWOODCITY_SUICUNE pause 10 - setscene 0 + setscene SCENE_CIANWOODCITY_NOTHING clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42 - setmapscene ROUTE_42, 1 + setmapscene ROUTE_42, SCENE_ROUTE42_SUICUNE checkevent EVENT_FOUGHT_EUSINE iftrue .Done setevent EVENT_FOUGHT_EUSINE @@ -76,7 +74,7 @@ CianwoodCitySuicuneAndEusine: applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00ec disappear CIANWOODCITY_EUSINE pause 20 - special Special_FadeOutMusic + special FadeOutMusic playmapmusic pause 10 .Done: @@ -145,10 +143,10 @@ CianwoodCityRock: jumpstd smashrock CianwoodCityHiddenRevive: - hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_CIANWOOD_CITY_HIDDEN_REVIVE CianwoodCityHiddenMaxEther: - hiddenitem EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem MAX_ETHER, EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER MovementData_0x1a00da: set_sliding @@ -381,45 +379,40 @@ CianwoodPokeSeerSignText: done CianwoodCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 7 - warp_def 17, 41, 1, MANIAS_HOUSE - warp_def 8, 43, 1, CIANWOOD_GYM - warp_def 23, 43, 1, CIANWOOD_POKECENTER_1F - warp_def 15, 47, 1, CIANWOOD_PHARMACY - warp_def 9, 31, 1, CIANWOOD_PHOTO_STUDIO - warp_def 15, 37, 1, CIANWOOD_LUGIA_SPEECH_HOUSE - warp_def 5, 17, 1, POKE_SEERS_HOUSE - -.CoordEvents: - db 1 - coord_event 11, 16, 1, CianwoodCitySuicuneAndEusine - -.BGEvents: - db 8 + db 0, 0 ; filler + + db 7 ; warp events + warp_event 17, 41, MANIAS_HOUSE, 1 + warp_event 8, 43, CIANWOOD_GYM, 1 + warp_event 23, 43, CIANWOOD_POKECENTER_1F, 1 + warp_event 15, 47, CIANWOOD_PHARMACY, 1 + warp_event 9, 31, CIANWOOD_PHOTO_STUDIO, 1 + warp_event 15, 37, CIANWOOD_LUGIA_SPEECH_HOUSE, 1 + warp_event 5, 17, POKE_SEERS_HOUSE, 1 + + db 1 ; coord events + coord_event 11, 16, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE, CianwoodCitySuicuneAndEusine + + db 8 ; bg events bg_event 20, 34, BGEVENT_READ, CianwoodCitySign - bg_event 7, 45, BGEVENT_READ, CianwoodGymSign + bg_event 7, 45, BGEVENT_READ, CianwoodGymSign bg_event 24, 43, BGEVENT_READ, CianwoodPokecenterSign bg_event 19, 47, BGEVENT_READ, CianwoodPharmacySign - bg_event 8, 32, BGEVENT_READ, CianwoodPhotoStudioSign - bg_event 8, 24, BGEVENT_READ, CianwoodPokeSeerSign - bg_event 4, 19, BGEVENT_ITEM, CianwoodCityHiddenRevive - bg_event 5, 29, BGEVENT_ITEM, CianwoodCityHiddenMaxEther + bg_event 8, 32, BGEVENT_READ, CianwoodPhotoStudioSign + bg_event 8, 24, BGEVENT_READ, CianwoodPokeSeerSign + bg_event 4, 19, BGEVENT_ITEM, CianwoodCityHiddenRevive + bg_event 5, 29, BGEVENT_ITEM, CianwoodCityHiddenMaxEther -.ObjectEvents: - db 12 + db 12 ; object events object_event 21, 37, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodCityYoungster, -1 object_event 17, 33, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1 object_event 14, 42, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityLass, -1 - object_event 8, 16, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 - object_event 9, 17, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 - object_event 4, 25, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 - object_event 5, 29, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event 8, 16, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event 9, 17, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event 4, 25, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event 5, 29, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 object_event 10, 27, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 - object_event 4, 19, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event 4, 19, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 object_event 10, 46, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityChucksWife, -1 object_event 11, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE - object_event 10, 14, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY + object_event 10, 14, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 1ca8a0a5e..4e76b7385 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const CIANWOODGYM_CHUCK const CIANWOODGYM_BLACK_BELT1 const CIANWOODGYM_BLACK_BELT2 @@ -10,11 +10,9 @@ const_value set 2 const CIANWOODGYM_BOULDER4 CianwoodGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ChuckScript_0x9d60f: faceplayer @@ -24,7 +22,7 @@ ChuckScript_0x9d60f: writetext ChuckIntroText1 waitbutton closetext - spriteface CIANWOODGYM_CHUCK, RIGHT + objectface CIANWOODGYM_CHUCK, RIGHT opentext writetext ChuckIntroText2 waitbutton @@ -76,8 +74,8 @@ ChuckScript_0x9d60f: end CianwoodGymActivateRockets: - if_equal 7, .RadioTowerRockets - if_equal 6, .GoldenrodRockets + ifequal 7, .RadioTowerRockets + ifequal 6, .GoldenrodRockets end .GoldenrodRockets: @@ -87,10 +85,10 @@ CianwoodGymActivateRockets: jumpstd radiotowerrockets TrainerBlackbeltYoshi: - trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script + trainer BLACKBELT_T, YOSHI, EVENT_BEAT_BLACKBELT_YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BlackbeltYoshiAfterText waitbutton @@ -98,10 +96,10 @@ TrainerBlackbeltYoshi: end TrainerBlackbeltLao: - trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, .Script + trainer BLACKBELT_T, LAO, EVENT_BEAT_BLACKBELT_LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BlackbeltLaoAfterText waitbutton @@ -109,10 +107,10 @@ TrainerBlackbeltLao: end TrainerBlackbeltNob: - trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, .Script + trainer BLACKBELT_T, NOB, EVENT_BEAT_BLACKBELT_NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BlackbeltNobAfterText waitbutton @@ -120,10 +118,10 @@ TrainerBlackbeltNob: end TrainerBlackbeltLung: - trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, .Script + trainer BLACKBELT_T, LUNG, EVENT_BEAT_BLACKBELT_LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BlackbeltLungAfterText waitbutton @@ -306,30 +304,25 @@ BlackbeltLungAfterText: done CianwoodGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 17, 2, CIANWOOD_CITY - warp_def 5, 17, 2, CIANWOOD_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 15, BGEVENT_READ, CianwoodGymStatue - bg_event 6, 15, BGEVENT_READ, CianwoodGymStatue - -.ObjectEvents: - db 9 - object_event 4, 1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1 - object_event 2, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1 - object_event 7, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1 - object_event 3, 9, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltNob, -1 - object_event 5, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBlackbeltLung, -1 - object_event 5, 1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 - object_event 3, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 - object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 - object_event 5, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 17, CIANWOOD_CITY, 2 + warp_event 5, 17, CIANWOOD_CITY, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 15, BGEVENT_READ, CianwoodGymStatue + bg_event 6, 15, BGEVENT_READ, CianwoodGymStatue + + db 9 ; object events + object_event 4, 1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1 + object_event 2, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1 + object_event 7, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1 + object_event 3, 9, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltNob, -1 + object_event 5, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBlackbeltLung, -1 + object_event 5, 1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 + object_event 3, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 + object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 + object_event 5, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 4b3099eec..8eb9bffaf 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const CIANWOODLUGIASPEECHHOUSE_TEACHER const CIANWOODLUGIASPEECHHOUSE_LASS const CIANWOODLUGIASPEECHHOUSE_TWIN CianwoodLugiaSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CianwoodLugiaSpeechHouseTeacherScript: jumptextfaceplayer CianwoodLugiaSpeechHouseTeacherText @@ -62,24 +60,19 @@ CianwoodLugiaSpeechHouseTwinText: done CianwoodLugiaSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 6, CIANWOOD_CITY - warp_def 3, 7, 6, CIANWOOD_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf - -.ObjectEvents: - db 3 - object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1 - object_event 6, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1 - object_event 0, 2, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, CIANWOOD_CITY, 6 + warp_event 3, 7, CIANWOOD_CITY, 6 + + db 0 ; coord events + + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf + + db 3 ; object events + object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1 + object_event 6, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1 + object_event 0, 2, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 696a16610..ef00ba49d 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const CIANWOODPHARMACY_PHARMACIST CianwoodPharmacy_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -73,22 +71,17 @@ PharmacistDescribeSecretpotionText: done CianwoodPharmacy_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, CIANWOOD_CITY - warp_def 3, 7, 4, CIANWOOD_CITY + db 2 ; warp events + warp_event 2, 7, CIANWOOD_CITY, 4 + warp_event 3, 7, CIANWOOD_CITY, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, CianwoodPharmacyBookshelf - bg_event 1, 1, BGEVENT_READ, CianwoodPharmacyBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, CianwoodPharmacyBookshelf + bg_event 1, 1, BGEVENT_READ, CianwoodPharmacyBookshelf -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1 + db 1 ; object events + object_event 2, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1 diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index bbf2eb3d9..7c8bfcbbb 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const CIANWOODPHOTOSTUDIO_FISHING_GURU CianwoodPhotoStudio_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FishingGuruScript_0x9e0e0: faceplayer @@ -16,7 +14,7 @@ FishingGuruScript_0x9e0e0: iffalse UnknownScript_0x9e0f3 writetext UnknownText_0x9e142 waitbutton - special Special_PhotoStudio + special PhotoStudio waitbutton closetext end @@ -49,20 +47,15 @@ UnknownText_0x9e156: done CianwoodPhotoStudio_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 5, CIANWOOD_CITY - warp_def 3, 7, 5, CIANWOOD_CITY + db 2 ; warp events + warp_event 2, 7, CIANWOOD_CITY, 5 + warp_event 3, 7, CIANWOOD_CITY, 5 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1 + db 1 ; object events + object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1 diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index 0f97e011b..52a7e8a7b 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const CIANWOODPOKECENTER1F_NURSE const CIANWOODPOKECENTER1F_LASS const CIANWOODPOKECENTER1F_GYM_GUY const CIANWOODPOKECENTER1F_SUPER_NERD CianwoodPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x9dbcf: jumpstd pokecenternurse @@ -132,24 +130,19 @@ CianwoodPokecenter1FSuperNerdText: done CianwoodPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 3, CIANWOOD_CITY - warp_def 4, 7, 3, CIANWOOD_CITY - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1 - object_event 1, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1 - object_event 5, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1 - object_event 8, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, CIANWOOD_CITY, 3 + warp_event 4, 7, CIANWOOD_CITY, 3 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1 + object_event 1, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1 + object_event 5, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1 + object_event 8, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index ed4765d18..54656768b 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const CINNABARISLAND_BLUE CinnabarIsland_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -35,7 +33,7 @@ CinnabarIslandPokecenterSign: jumpstd pokecentersign CinnabarIslandHiddenRareCandy: - hiddenitem EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY CinnabarIslandBlueTeleport: teleport_from @@ -128,23 +126,18 @@ CinnabarIslandSignText: done CinnabarIsland_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 11, 11, 1, CINNABAR_POKECENTER_1F + db 1 ; warp events + warp_event 11, 11, CINNABAR_POKECENTER_1F, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 4 + db 4 ; bg events bg_event 12, 11, BGEVENT_READ, CinnabarIslandPokecenterSign - bg_event 9, 11, BGEVENT_READ, CinnabarIslandGymSign - bg_event 7, 7, BGEVENT_READ, CinnabarIslandSign - bg_event 9, 1, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy + bg_event 9, 11, BGEVENT_READ, CinnabarIslandGymSign + bg_event 7, 7, BGEVENT_READ, CinnabarIslandSign + bg_event 9, 1, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy -.ObjectEvents: - db 1 - object_event 9, 6, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR + db 1 ; object events + object_event 9, 6, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index 17fe1b97c..16cfb0c51 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const CINNABARPOKECENTER1F_NURSE const CINNABARPOKECENTER1F_COOLTRAINER_F const CINNABARPOKECENTER1F_FISHER CinnabarPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x1ab32c: jumpstd pokecenternurse @@ -35,23 +33,18 @@ CinnabarPokecenter1FFisherText: done CinnabarPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 1, CINNABAR_ISLAND - warp_def 4, 7, 1, CINNABAR_ISLAND - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1 - object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1 - object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, CINNABAR_ISLAND, 1 + warp_event 4, 7, CINNABAR_ISLAND, 1 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 3 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1 + object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1 + object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1 diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm index f2621c43c..cf100a4a8 100644 --- a/maps/CinnabarPokecenter2FBeta.asm +++ b/maps/CinnabarPokecenter2FBeta.asm @@ -1,23 +1,16 @@ CinnabarPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CinnabarPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, CINNABAR_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, CINNABAR_POKECENTER_1F, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 6f8538bac..edaa5e0ad 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -1,16 +1,14 @@ -const_value set 2 + const_def 2 ; object constants const COLOSSEUM_CHRIS1 const COLOSSEUM_CHRIS2 Colosseum_MapScripts: -.SceneScripts: - db 3 - scene_script .InitializeColosseum - scene_script .DummyScene1 - scene_script .DummyScene2 - -.MapCallbacks: - db 2 + db 3 ; scene scripts + scene_script .InitializeColosseum ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED + scene_script .DummyScene2 ; unused + + db 2 ; callbacks callback MAPCALLBACK_OBJECTS, .SetWhichChris callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F @@ -25,7 +23,7 @@ Colosseum_MapScripts: end .SetWhichChris: - special Special_CableClubCheckWhichChris + special CableClubCheckWhichChris iffalse .Chris2 disappear COLOSSEUM_CHRIS2 appear COLOSSEUM_CHRIS1 @@ -37,16 +35,16 @@ Colosseum_MapScripts: return .PreparePokecenter2F: - setmapscene POKECENTER_2F, 2 + setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM return .InitializeAndPreparePokecenter2F: - setscene 1 - setmapscene POKECENTER_2F, 2 + setscene SCENE_FINISHED + setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM end MapColosseumSignpost1Script: - special Special_Colosseum + special Colosseum newloadmap MAPSETUP_LINKRETURN end @@ -63,23 +61,18 @@ ChrisScript_0x193499: done Colosseum_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 7, 3, POKECENTER_2F - warp_def 5, 7, 3, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script - bg_event 5, 4, BGEVENT_LEFT, MapColosseumSignpost1Script - -.ObjectEvents: - db 2 - object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS - object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 7, POKECENTER_2F, 3 + warp_event 5, 7, POKECENTER_2F, 3 + + db 0 ; coord events + + db 2 ; bg events + bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script + bg_event 5, 4, BGEVENT_LEFT, MapColosseumSignpost1Script + + db 2 ; object events + object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 695329ded..7bc264807 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const COPYCATSHOUSE1F_POKEFAN_M const COPYCATSHOUSE1F_POKEFAN_F const COPYCATSHOUSE1F_CLEFAIRY CopycatsHouse1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CopycatsHouse1FPokefanMScript: jumptextfaceplayer CopycatsHouse1FPokefanMText @@ -73,23 +71,18 @@ UnknownText_0x18ae4b: done CopycatsHouse1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 2, 7, 8, SAFFRON_CITY - warp_def 3, 7, 8, SAFFRON_CITY - warp_def 2, 0, 1, COPYCATS_HOUSE_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 - object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1 - object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1 - object_event 6, 6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 2, 7, SAFFRON_CITY, 8 + warp_event 3, 7, SAFFRON_CITY, 8 + warp_event 2, 0, COPYCATS_HOUSE_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 3 ; object events + object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1 + object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1 + object_event 6, 6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 74f6af110..9d0bbfe65 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const COPYCATSHOUSE2F_COPYCAT1 ; if player is male const COPYCATSHOUSE2F_DODRIO const COPYCATSHOUSE2F_FAIRYDOLL ; lost item @@ -7,11 +7,9 @@ const_value set 2 const COPYCATSHOUSE2F_COPYCAT2 ; if player is female CopycatsHouse2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .Callback .Callback: @@ -46,7 +44,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Default_Merge_1: - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX checkevent EVENT_RETURNED_MACHINE_PART iftrue .TalkAboutLostItem opentext @@ -70,7 +68,7 @@ Copycat: .Default_Merge_3a: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext CopycatText_QuickMimicking waitbutton @@ -99,7 +97,7 @@ Copycat: .Default_Merge_3b: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext CopycatText_Worried waitbutton @@ -142,7 +140,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .GotPass_Merge_1: - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext checkflag ENGINE_PLAYER_IS_FEMALE iftrue .GotPass_Female_2 @@ -164,7 +162,7 @@ Copycat: .GotPass_Merge_3: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext CopycatText_ItsAScream waitbutton @@ -361,26 +359,21 @@ CopycatsHouse2FDollText: done CopycatsHouse2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def 3, 0, 3, COPYCATS_HOUSE_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, CopycatsHouse2FBookshelf - bg_event 1, 1, BGEVENT_READ, CopycatsHouse2FBookshelf - -.ObjectEvents: - db 6 - object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1 - object_event 6, 4, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1 - object_event 6, 1, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL - object_event 2, 1, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 - object_event 7, 1, SPRITE_BIRD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 - object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2 + db 0, 0 ; filler + + db 1 ; warp events + warp_event 3, 0, COPYCATS_HOUSE_1F, 3 + + db 0 ; coord events + + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, CopycatsHouse2FBookshelf + bg_event 1, 1, BGEVENT_READ, CopycatsHouse2FBookshelf + + db 6 ; object events + object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1 + object_event 6, 4, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1 + object_event 6, 1, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL + object_event 2, 1, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 + object_event 7, 1, SPRITE_BIRD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 + object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index bb698becd..1e700ba7d 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const DANCETHEATRE_KIMONO_GIRL1 const DANCETHEATRE_KIMONO_GIRL2 const DANCETHEATRE_KIMONO_GIRL3 @@ -10,17 +10,15 @@ const_value set 2 const DANCETHEATRE_GRANNY DanceTheatre_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerKimonoGirlNaoko2: - trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script + trainer KIMONO_GIRL, NAOKO2, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext KimonoGirlNaoko2AfterBattleText waitbutton @@ -28,10 +26,10 @@ TrainerKimonoGirlNaoko2: end TrainerKimonoGirlSayo: - trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, KimonoGirlSayoSeenText, KimonoGirlSayoBeatenText, 0, .Script + trainer KIMONO_GIRL, SAYO, EVENT_BEAT_KIMONO_GIRL_SAYO, KimonoGirlSayoSeenText, KimonoGirlSayoBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext KimonoGirlSayoAfterBattleText waitbutton @@ -39,10 +37,10 @@ TrainerKimonoGirlSayo: end TrainerKimonoGirlZuki: - trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, KimonoGirlZukiSeenText, KimonoGirlZukiBeatenText, 0, .Script + trainer KIMONO_GIRL, ZUKI, EVENT_BEAT_KIMONO_GIRL_ZUKI, KimonoGirlZukiSeenText, KimonoGirlZukiBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext KimonoGirlZukiAfterBattleText waitbutton @@ -50,10 +48,10 @@ TrainerKimonoGirlZuki: end TrainerKimonoGirlKuni: - trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, KimonoGirlKuniSeenText, KimonoGirlKuniBeatenText, 0, .Script + trainer KIMONO_GIRL, KUNI, EVENT_BEAT_KIMONO_GIRL_KUNI, KimonoGirlKuniSeenText, KimonoGirlKuniBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext KimonoGirlKuniAfterBattleText waitbutton @@ -61,10 +59,10 @@ TrainerKimonoGirlKuni: end TrainerKimonoGirlMiki: - trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, KimonoGirlMikiSeenText, KimonoGirlMikiBeatenText, 0, .Script + trainer KIMONO_GIRL, MIKI, EVENT_BEAT_KIMONO_GIRL_MIKI, KimonoGirlMikiSeenText, KimonoGirlMikiBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext KimonoGirlMikiAfterBattleText waitbutton @@ -338,30 +336,25 @@ FancyPanelText: done DanceTheatre_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 5, 13, 8, ECRUTEAK_CITY - warp_def 6, 13, 8, ECRUTEAK_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 5, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script - bg_event 6, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script - -.ObjectEvents: - db 9 - object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1 - object_event 2, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1 - object_event 6, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1 - object_event 9, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlKuni, -1 - object_event 11, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlMiki, -1 - object_event 7, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterSurfGuy, -1 - object_event 6, 8, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, DanceTheaterRhydon, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 5, 13, ECRUTEAK_CITY, 8 + warp_event 6, 13, ECRUTEAK_CITY, 8 + + db 0 ; coord events + + db 2 ; bg events + bg_event 5, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script + bg_event 6, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script + + db 9 ; object events + object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1 + object_event 2, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1 + object_event 6, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1 + object_event 9, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlKuni, -1 + object_event 11, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlMiki, -1 + object_event 7, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterSurfGuy, -1 + object_event 6, 8, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, DanceTheaterRhydon, -1 object_event 10, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DanceTheatreCooltrainerMScript, -1 - object_event 3, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1 + object_event 3, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 63ea46aa3..84daa17de 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const DARKCAVEBLACKTHORNENTRANCE_PHARMACIST const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1 const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2 DarkCaveBlackthornEntrance_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks DarkCaveBlackthornEntrancePharmacistScript: faceplayer @@ -62,22 +60,17 @@ DarkCaveBlackthornEntrancePharmacistText2: done DarkCaveBlackthornEntrance_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 23, 3, 1, ROUTE_45 - warp_def 3, 25, 2, DARK_CAVE_VIOLET_ENTRANCE + db 2 ; warp events + warp_event 23, 3, ROUTE_45, 1 + warp_event 3, 25, DARK_CAVE_VIOLET_ENTRANCE, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 7, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1 - object_event 21, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE - object_event 7, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE + db 3 ; object events + object_event 7, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1 + object_event 21, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE + object_event 7, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 3eed4f41c..10bbfb607 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const DARKCAVEVIOLETENTRANCE_POKE_BALL1 const DARKCAVEVIOLETENTRANCE_ROCK1 const DARKCAVEVIOLETENTRANCE_ROCK2 @@ -9,11 +9,9 @@ const_value set 2 const DARKCAVEVIOLETENTRANCE_POKE_BALL4 DarkCaveVioletEntrance_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks DarkCaveVioletEntrancePotion: itemball POTION @@ -31,32 +29,27 @@ DarkCaveVioletEntranceRock: jumpstd smashrock DarkCaveVioletEntranceHiddenElixer: - hiddenitem EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER + hiddenitem ELIXER, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER DarkCaveVioletEntrance_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 15, 3, ROUTE_31 - warp_def 17, 1, 2, DARK_CAVE_BLACKTHORN_ENTRANCE - warp_def 35, 33, 3, ROUTE_46 + db 3 ; warp events + warp_event 3, 15, ROUTE_31, 3 + warp_event 17, 1, DARK_CAVE_BLACKTHORN_ENTRANCE, 2 + warp_event 35, 33, ROUTE_46, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 26, 3, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer + db 1 ; bg events + bg_event 26, 3, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer -.ObjectEvents: - db 8 - object_event 6, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION + db 8 ; object events + object_event 6, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION object_event 16, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 - object_event 27, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 - object_event 7, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 + object_event 27, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 + object_event 7, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 object_event 36, 31, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 - object_event 36, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL - object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION - object_event 30, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT + object_event 36, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL + object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION + object_event 30, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 93461c3a8..7d085ede3 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const DAYCARE_GRAMPS const DAYCARE_GRANNY DayCare_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: @@ -31,8 +29,8 @@ DayCareManScript_Inside: buttonsound closetext checkcode VAR_PARTYCOUNT - if_equal PARTY_LENGTH, .PartyFull - special Special_GiveOddEgg + ifequal PARTY_LENGTH, .PartyFull + special GiveOddEgg opentext writetext DayCareText_GotOddEgg playsound SFX_KEY_ITEM @@ -51,7 +49,7 @@ DayCareManScript_Inside: end .AlreadyHaveOddEgg: - special Special_DayCareMan + special DayCareMan waitbutton closetext end @@ -61,7 +59,7 @@ DayCareLadyScript: opentext checkflag ENGINE_DAY_CARE_MAN_HAS_EGG iftrue .HusbandWasLookingForYou - special Special_DayCareLady + special DayCareLady waitbutton closetext end @@ -156,25 +154,20 @@ DayCareText_PartyFull: done DayCare_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 0, 5, 3, ROUTE_34 - warp_def 0, 6, 4, ROUTE_34 - warp_def 2, 7, 5, ROUTE_34 - warp_def 3, 7, 5, ROUTE_34 - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, DayCareBookshelf - bg_event 1, 1, BGEVENT_READ, DayCareBookshelf - -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE - object_event 5, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 0, 5, ROUTE_34, 3 + warp_event 0, 6, ROUTE_34, 4 + warp_event 2, 7, ROUTE_34, 5 + warp_event 3, 7, ROUTE_34, 5 + + db 0 ; coord events + + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, DayCareBookshelf + bg_event 1, 1, BGEVENT_READ, DayCareBookshelf + + db 2 ; object events + object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE + object_event 5, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1 diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm index e958d81f2..403e2f165 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/DayOfWeekSiblingsHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 - const ROUTE26DAYOFWEEKSIBLINGSHOUSE_POKEDEX + const_def 2 ; object constants + const DAYOFWEEKSIBLINGSHOUSE_POKEDEX -Route26DayofWeekSiblingsHouse_MapScripts: -.SceneScripts: - db 0 +DayOfWeekSiblingsHouse_MapScripts: + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PokedexScript_0x7b1e4: opentext @@ -70,21 +68,16 @@ UnknownText_0x7b2b9: line "ROUTE 37" done -Route26DayofWeekSiblingsHouse_MapEvents: - ; filler - db 0, 0 +DayOfWeekSiblingsHouse_MapEvents: + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, ROUTE_26 - warp_def 3, 7, 3, ROUTE_26 + db 2 ; warp events + warp_event 2, 7, ROUTE_26, 3 + warp_event 3, 7, ROUTE_26, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1 + db 1 ; object events + object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index b7ff38465..8475c1411 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -1,18 +1,16 @@ -const_value set 2 + const_def 2 ; object constants const DIGLETTSCAVE_POKEFAN_M DiglettsCave_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks DiglettsCavePokefanMScript: jumptextfaceplayer DiglettsCavePokefanMText DiglettsCaveHiddenMaxRevive: - hiddenitem EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE + hiddenitem MAX_REVIVE, EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE DiglettsCavePokefanMText: text "A bunch of DIGLETT" @@ -23,25 +21,20 @@ DiglettsCavePokefanMText: done DiglettsCave_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 3, 33, 10, VERMILION_CITY - warp_def 5, 31, 5, DIGLETTS_CAVE - warp_def 15, 5, 5, ROUTE_2 - warp_def 17, 3, 6, DIGLETTS_CAVE - warp_def 17, 33, 2, DIGLETTS_CAVE - warp_def 3, 3, 4, DIGLETTS_CAVE - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 6, 11, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive - -.ObjectEvents: - db 1 - object_event 3, 31, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 3, 33, VERMILION_CITY, 10 + warp_event 5, 31, DIGLETTS_CAVE, 5 + warp_event 15, 5, ROUTE_2, 5 + warp_event 17, 3, DIGLETTS_CAVE, 6 + warp_event 17, 33, DIGLETTS_CAVE, 2 + warp_event 3, 3, DIGLETTS_CAVE, 4 + + db 0 ; coord events + + db 1 ; bg events + bg_event 6, 11, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive + + db 1 ; object events + object_event 3, 31, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 8be52840d..ccff4b538 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -1,17 +1,15 @@ -const_value set 2 + const_def 2 ; object constants const DRAGONSHRINE_ELDER1 const DRAGONSHRINE_ELDER2 const DRAGONSHRINE_ELDER3 const DRAGONSHRINE_CLAIR DragonShrine_MapScripts: -.SceneScripts: - db 2 - scene_script .DragonShrineTest - scene_script .DummyScene + db 2 ; scene scripts + scene_script .DragonShrineTest ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .DragonShrineTest: priorityjump .DragonShrineTestScript @@ -27,93 +25,93 @@ DragonShrine_MapScripts: writetext DragonShrineElderGreetingText buttonsound .Question1: - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 writetext DragonShrineQuestion1Text buttonsound - loadmenudata DragonShrineQuestion1_MenuDataHeader + loadmenuheader DragonShrineQuestion1_MenuHeader verticalmenu closewindow - if_equal 1, .RightAnswer - if_equal 2, .WrongAnswer - if_equal 3, .RightAnswer + ifequal 1, .RightAnswer + ifequal 2, .WrongAnswer + ifequal 3, .RightAnswer end .Question2: - setevent EVENT_DRAGON_SHRINE_QUESTION_2 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 writetext DragonShrineQuestion2Text buttonsound - loadmenudata DragonShrineQuestion2_MenuDataHeader + loadmenuheader DragonShrineQuestion2_MenuHeader verticalmenu closewindow - if_equal 1, .RightAnswer - if_equal 2, .RightAnswer - if_equal 3, .WrongAnswer + ifequal 1, .RightAnswer + ifequal 2, .RightAnswer + ifequal 3, .WrongAnswer .Question3: - setevent EVENT_DRAGON_SHRINE_QUESTION_3 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4 writetext DragonShrineQuestion3Text buttonsound - loadmenudata DragonShrineQuestion3_MenuDataHeader + loadmenuheader DragonShrineQuestion3_MenuHeader verticalmenu closewindow - if_equal 1, .WrongAnswer - if_equal 2, .RightAnswer - if_equal 3, .RightAnswer + ifequal 1, .WrongAnswer + ifequal 2, .RightAnswer + ifequal 3, .RightAnswer .Question4: - setevent EVENT_DRAGON_SHRINE_QUESTION_4 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5 writetext DragonShrineQuestion4Text buttonsound - loadmenudata DragonShrineQuestion4_MenuDataHeader + loadmenuheader DragonShrineQuestion4_MenuHeader verticalmenu closewindow - if_equal 1, .RightAnswer - if_equal 2, .WrongAnswer - if_equal 3, .RightAnswer + ifequal 1, .RightAnswer + ifequal 2, .WrongAnswer + ifequal 3, .RightAnswer .Question5: - setevent EVENT_DRAGON_SHRINE_QUESTION_5 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6 writetext DragonShrineQuestion5Text buttonsound - loadmenudata DragonShrineQuestion5_MenuDataHeader + loadmenuheader DragonShrineQuestion5_MenuHeader verticalmenu closewindow - if_equal 1, .WrongAnswer - if_equal 2, .RightAnswer - if_equal 3, .WrongAnswer + ifequal 1, .WrongAnswer + ifequal 2, .RightAnswer + ifequal 3, .WrongAnswer .RightAnswer: - checkevent EVENT_DRAGON_SHRINE_QUESTION_5 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6 iftrue .PassedTheTest writetext DragonShrineRightAnswerText buttonsound - checkevent EVENT_DRAGON_SHRINE_QUESTION_4 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5 iftrue .Question5 - checkevent EVENT_DRAGON_SHRINE_QUESTION_3 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4 iftrue .Question4 - checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 iftrue .Question3 - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .Question2 .WrongAnswer: closetext - spriteface DRAGONSHRINE_ELDER1, LEFT + objectface DRAGONSHRINE_ELDER1, LEFT opentext writetext DragonShrineWrongAnswerText1 waitbutton closetext - spriteface DRAGONSHRINE_ELDER1, DOWN + objectface DRAGONSHRINE_ELDER1, DOWN opentext writetext DragonShrineWrongAnswerText2 waitbutton closetext setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG opentext - checkevent EVENT_DRAGON_SHRINE_QUESTION_5 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6 iftrue .Question5 - checkevent EVENT_DRAGON_SHRINE_QUESTION_4 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5 iftrue .Question4 - checkevent EVENT_DRAGON_SHRINE_QUESTION_3 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4 iftrue .Question3 - checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 iftrue .Question2 - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .Question1 .PassedTheTest: writetext DragonShrinePassedTestText @@ -124,17 +122,17 @@ DragonShrine_MapScripts: playmusic MUSIC_CLAIR appear DRAGONSHRINE_CLAIR waitsfx - spriteface PLAYER, DOWN + objectface PLAYER, DOWN pause 30 applymovement DRAGONSHRINE_CLAIR, DragonShrineClairWalkInMovement - spriteface DRAGONSHRINE_CLAIR, RIGHT - spriteface PLAYER, LEFT - spriteface DRAGONSHRINE_ELDER1, LEFT + objectface DRAGONSHRINE_CLAIR, RIGHT + objectface PLAYER, LEFT + objectface DRAGONSHRINE_ELDER1, LEFT opentext writetext DragonShrineClairYouPassedText waitbutton closetext - special Special_FadeOutMusic + special FadeOutMusic applymovement DRAGONSHRINE_CLAIR, DragonShrineClairBigStepLeftMovement opentext writetext DragonShrineClairThatCantBeText @@ -146,7 +144,7 @@ DragonShrine_MapScripts: waitbutton closetext applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkToClairMovement - spriteface DRAGONSHRINE_CLAIR, UP + objectface DRAGONSHRINE_CLAIR, UP opentext writetext DragonShrineMustIInformLanceText waitbutton @@ -165,17 +163,17 @@ DragonShrine_MapScripts: waitsfx special RestartMapMusic specialphonecall SPECIALCALL_MASTERBALL - setscene 1 - setmapscene DRAGONS_DEN_B1F, 1 + setscene SCENE_FINISHED + setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM writetext DragonShrinePlayerReceivedRisingBadgeText buttonsound writetext DragonShrineRisingBadgeExplanationText waitbutton closetext applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2ce - spriteface DRAGONSHRINE_CLAIR, UP + objectface DRAGONSHRINE_CLAIR, UP applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1 - spriteface PLAYER, UP + objectface PLAYER, UP opentext writetext DragonShrineElderScoldsClairText waitbutton @@ -188,15 +186,15 @@ DragonShrine_MapScripts: playsound SFX_ENTER_DOOR disappear DRAGONSHRINE_CLAIR waitsfx - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 end DragonShrineElder1Script: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue .DontGiveDratiniYet - checkevent EVENT_JUST_RECEIVED_DRATINI + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7 iftrue .ReceivedDratini checkevent EVENT_GOT_DRATINI iffalse .GiveDratini @@ -211,15 +209,15 @@ DragonShrineElder1Script: writetext DragonShrineTakeThisDratiniText waitbutton checkcode VAR_PARTYCOUNT - if_equal 6, .PartyFull + ifequal PARTY_LENGTH, .PartyFull writetext DragonShrinePlayerReceivedDratiniText playsound SFX_CAUGHT_MON waitsfx givepoke DRATINI, 15 checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG - special Special_Dratini + special GiveDratini setevent EVENT_GOT_DRATINI - setevent EVENT_JUST_RECEIVED_DRATINI + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7 writetext DragonShrineSymbolicDragonText waitbutton closetext @@ -265,65 +263,65 @@ DragonShrineElder3Script: closetext end -DragonShrineQuestion1_MenuDataHeader: +DragonShrineQuestion1_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Pal@" db "Underling@" db "Friend@" -DragonShrineQuestion2_MenuDataHeader: +DragonShrineQuestion2_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 9, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Strategy@" db "Raising@" db "Cheating@" -DragonShrineQuestion3_MenuDataHeader: +DragonShrineQuestion3_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 5, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Weak person@" db "Tough person@" db "Anybody@" -DragonShrineQuestion4_MenuDataHeader: +DragonShrineQuestion4_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Love@" db "Violence@" db "Knowledge@" -DragonShrineQuestion5_MenuDataHeader: +DragonShrineQuestion5_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 12, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Tough@" @@ -658,23 +656,18 @@ DragonShrineSpeechlessText: done DragonShrine_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 9, 2, DRAGONS_DEN_B1F - warp_def 5, 9, 2, DRAGONS_DEN_B1F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_GAVE_KURT_APRICORNS - object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_GAVE_KURT_APRICORNS - object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_GAVE_KURT_APRICORNS - object_event 4, 8, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 9, DRAGONS_DEN_B1F, 2 + warp_event 5, 9, DRAGONS_DEN_B1F, 2 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 4, 8, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index 0ff616c59..2fbc62dfe 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -1,26 +1,19 @@ DragonsDen1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks DragonsDen1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 3, 5, 8, BLACKTHORN_CITY - warp_def 3, 3, 4, DRAGONS_DEN_1F - warp_def 5, 15, 1, DRAGONS_DEN_B1F - warp_def 5, 13, 2, DRAGONS_DEN_1F + db 4 ; warp events + warp_event 3, 5, BLACKTHORN_CITY, 8 + warp_event 3, 3, DRAGONS_DEN_1F, 4 + warp_event 5, 15, DRAGONS_DEN_B1F, 1 + warp_event 5, 13, DRAGONS_DEN_1F, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 172619fb6..2404cebe1 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const DRAGONSDENB1F_POKE_BALL1 const DRAGONSDENB1F_CLAIR const DRAGONSDENB1F_SILVER @@ -10,13 +10,11 @@ const_value set 2 const DRAGONSDENB1F_POKE_BALL3 DragonsDenB1F_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DRAGONSDENB1F_NOTHING + scene_script .DummyScene1 ; SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .CheckSilver .DummyScene0: @@ -33,8 +31,8 @@ DragonsDenB1F_MapScripts: .CheckDay: checkcode VAR_WEEKDAY - if_equal TUESDAY, .AppearSilver - if_equal THURSDAY, .AppearSilver + ifequal TUESDAY, .AppearSilver + ifequal THURSDAY, .AppearSilver disappear DRAGONSDENB1F_SILVER return @@ -49,7 +47,7 @@ DragonsDenB1F_ClairScene: pause 30 closetext showemote EMOTE_SHOCK, PLAYER, 15 - spriteface PLAYER, LEFT + objectface PLAYER, LEFT playmusic MUSIC_CLAIR applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksToYou opentext @@ -76,18 +74,18 @@ DragonsDenB1F_ClairScene: closetext .FinishClair: applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksAway - special Special_FadeOutMusic + special FadeOutMusic pause 30 special RestartMapMusic disappear DRAGONSDENB1F_CLAIR - setscene 0 + setscene SCENE_DRAGONSDENB1F_NOTHING end TrainerCooltrainermDarin: - trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, .Script + trainer COOLTRAINERM, DARIN, EVENT_BEAT_COOLTRAINERM_DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainermDarinAfterBattleText waitbutton @@ -95,10 +93,10 @@ TrainerCooltrainermDarin: end TrainerCooltrainerfCara: - trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, .Script + trainer COOLTRAINERF, CARA, EVENT_BEAT_COOLTRAINERF_CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainerfCaraAfterBattleText waitbutton @@ -106,10 +104,10 @@ TrainerCooltrainerfCara: end TrainerTwinsLeaandpia1: - trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, .Script + trainer TWINS, LEAANDPIA1, EVENT_BEAT_TWINS_LEA_AND_PIA, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext TwinsLeaandpia1AfterBattleText waitbutton @@ -117,10 +115,10 @@ TrainerTwinsLeaandpia1: end TrainerTwinsLeaandpia2: - trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, .Script + trainer TWINS, LEAANDPIA1, EVENT_BEAT_TWINS_LEA_AND_PIA, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext TwinsLeaandpia2AfterBattleText waitbutton @@ -157,12 +155,12 @@ SilverScript_0x18c97e: playmusic MUSIC_RIVAL_ENCOUNTER faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue .SilverTalkAgain writetext SilverText_Training1 waitbutton closetext - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 special RestartMapMusic end @@ -183,13 +181,13 @@ DragonsDenB1FMaxElixer: itemball MAX_ELIXER DragonsDenB1FHiddenRevive: - hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE DragonsDenB1FHiddenMaxPotion: - hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION DragonsDenB1FHiddenMaxElixer: - hiddenitem EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER + hiddenitem MAX_ELIXER, EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER MovementDragonsDen_ClairWalksToYou: slow_step RIGHT @@ -407,33 +405,28 @@ Text_NoRoomForDragonFang: done DragonsDenB1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 20, 3, 3, DRAGONS_DEN_1F - warp_def 19, 29, 1, DRAGON_SHRINE + db 2 ; warp events + warp_event 20, 3, DRAGONS_DEN_1F, 3 + warp_event 19, 29, DRAGON_SHRINE, 1 -.CoordEvents: - db 1 - coord_event 19, 30, 1, DragonsDenB1F_ClairScene + db 1 ; coord events + coord_event 19, 30, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM, DragonsDenB1F_ClairScene -.BGEvents: - db 4 + db 4 ; bg events bg_event 18, 24, BGEVENT_READ, MapDragonsDenB1FSignpost0Script bg_event 33, 29, BGEVENT_ITEM, DragonsDenB1FHiddenRevive bg_event 21, 17, BGEVENT_ITEM, DragonsDenB1FHiddenMaxPotion bg_event 31, 15, BGEVENT_ITEM, DragonsDenB1FHiddenMaxElixer -.ObjectEvents: - db 9 - object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG + db 9 ; object events + object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG object_event 14, 30, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR object_event 20, 23, SPRITE_SILVER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN - object_event 20, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1 - object_event 8, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1 - object_event 4, 17, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1 - object_event 4, 18, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1 - object_event 30, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM - object_event 5, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER + object_event 20, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1 + object_event 8, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1 + object_event 4, 17, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1 + object_event 4, 18, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1 + object_event 30, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM + object_event 5, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 1936858dd..9fa76633d 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const EARLSPOKEMONACADEMY_EARL const EARLSPOKEMONACADEMY_YOUNGSTER1 const EARLSPOKEMONACADEMY_GAMEBOY_KID1 @@ -7,11 +7,9 @@ const_value set 2 const EARLSPOKEMONACADEMY_POKEDEX EarlsPokemonAcademy_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks AcademyEarl: applymovement EARLSPOKEMONACADEMY_EARL, MovementData_0x68b2d @@ -47,7 +45,7 @@ EarlsPokemonAcademyGameboyKid1Script: writetext EarlsPokemonAcademyGameboyKid1Text waitbutton closetext - spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN + objectface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN end EarlsPokemonAcademyGameboyKid2Script: @@ -56,7 +54,7 @@ EarlsPokemonAcademyGameboyKid2Script: writetext EarlsPokemonAcademyGameboyKid2Text waitbutton closetext - spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN + objectface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN end EarlsPokemonAcademyYoungster2Script: @@ -66,14 +64,14 @@ AcademyBlackboard: opentext writetext AcademyBlackboardText .Loop: - loadmenudata .BlackboardMenuData + loadmenuheader .BlackboardMenuHeader _2dmenu closewindow - if_equal 1, .Poison - if_equal 2, .Paralysis - if_equal 3, .Sleep - if_equal 4, .Burn - if_equal 5, .Freeze + ifequal 1, .Poison + ifequal 2, .Paralysis + ifequal 3, .Sleep + ifequal 4, .Burn + ifequal 5, .Freeze closetext end @@ -102,13 +100,13 @@ AcademyBlackboard: waitbutton jump .Loop -.BlackboardMenuData: +.BlackboardMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 11, 8 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags dn 3, 2 ; rows, columns db 5 ; spacing @@ -412,29 +410,24 @@ AcademyStickerMachineText: done EarlsPokemonAcademy_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 3, 15, 3, VIOLET_CITY - warp_def 4, 15, 3, VIOLET_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 4 - bg_event 0, 1, BGEVENT_READ, AcademyBookshelf - bg_event 1, 1, BGEVENT_READ, AcademyBookshelf - bg_event 3, 0, BGEVENT_READ, AcademyBlackboard - bg_event 4, 0, BGEVENT_READ, AcademyBlackboard - -.ObjectEvents: - db 6 - object_event 4, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL - object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1 - object_event 3, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1 - object_event 4, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1 - object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1 - object_event 2, 4, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AcademyNotebook, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 3, 15, VIOLET_CITY, 3 + warp_event 4, 15, VIOLET_CITY, 3 + + db 0 ; coord events + + db 4 ; bg events + bg_event 0, 1, BGEVENT_READ, AcademyBookshelf + bg_event 1, 1, BGEVENT_READ, AcademyBookshelf + bg_event 3, 0, BGEVENT_READ, AcademyBlackboard + bg_event 4, 0, BGEVENT_READ, AcademyBlackboard + + db 6 ; object events + object_event 4, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL + object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1 + object_event 3, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1 + object_event 4, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1 + object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1 + object_event 2, 4, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AcademyNotebook, -1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 5e3dada98..c8bb4af5f 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ECRUTEAKCITY_GRAMPS1 const ECRUTEAKCITY_GRAMPS2 const ECRUTEAKCITY_LASS1 @@ -8,11 +8,9 @@ const_value set 2 const ECRUTEAKCITY_GRAMPS3 EcruteakCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -88,7 +86,7 @@ EcruteakCityMartSign: jumpstd martsign EcruteakCityHiddenHyperPotion: - hiddenitem EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION UnusedMissingDaughterText: ; This text is neither used nor referenced in the final game. @@ -260,47 +258,42 @@ BurnedTowerSignText: done EcruteakCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 15 - warp_def 35, 26, 1, ROUTE_42_ECRUTEAK_GATE - warp_def 35, 27, 2, ROUTE_42_ECRUTEAK_GATE - warp_def 18, 11, 1, ECRUTEAK_HOUSE - warp_def 20, 2, 1, WISE_TRIOS_ROOM - warp_def 20, 3, 2, WISE_TRIOS_ROOM - warp_def 23, 27, 1, ECRUTEAK_POKECENTER_1F - warp_def 5, 21, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE - warp_def 23, 21, 1, DANCE_THEATRE - warp_def 29, 21, 2, ECRUTEAK_MART - warp_def 6, 27, 1, ECRUTEAK_GYM - warp_def 13, 27, 1, ECRUTEAK_ITEMFINDER_HOUSE - warp_def 37, 7, 1, TIN_TOWER_1F - warp_def 5, 5, 1, BURNED_TOWER_1F - warp_def 0, 18, 3, ROUTE_38_ECRUTEAK_GATE - warp_def 0, 19, 4, ROUTE_38_ECRUTEAK_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 8 + db 0, 0 ; filler + + db 15 ; warp events + warp_event 35, 26, ROUTE_42_ECRUTEAK_GATE, 1 + warp_event 35, 27, ROUTE_42_ECRUTEAK_GATE, 2 + warp_event 18, 11, ECRUTEAK_TIN_TOWER_ENTRANCE, 1 + warp_event 20, 2, WISE_TRIOS_ROOM, 1 + warp_event 20, 3, WISE_TRIOS_ROOM, 2 + warp_event 23, 27, ECRUTEAK_POKECENTER_1F, 1 + warp_event 5, 21, ECRUTEAK_LUGIA_SPEECH_HOUSE, 1 + warp_event 23, 21, DANCE_THEATRE, 1 + warp_event 29, 21, ECRUTEAK_MART, 2 + warp_event 6, 27, ECRUTEAK_GYM, 1 + warp_event 13, 27, ECRUTEAK_ITEMFINDER_HOUSE, 1 + warp_event 37, 7, TIN_TOWER_1F, 1 + warp_event 5, 5, BURNED_TOWER_1F, 1 + warp_event 0, 18, ROUTE_38_ECRUTEAK_GATE, 3 + warp_event 0, 19, ROUTE_38_ECRUTEAK_GATE, 4 + + db 0 ; coord events + + db 8 ; bg events bg_event 15, 21, BGEVENT_READ, EcruteakCitySign bg_event 38, 10, BGEVENT_READ, TinTowerSign - bg_event 8, 28, BGEVENT_READ, EcruteakGymSign + bg_event 8, 28, BGEVENT_READ, EcruteakGymSign bg_event 21, 21, BGEVENT_READ, EcruteakDanceTheaterSign - bg_event 2, 10, BGEVENT_READ, BurnedTowerSign + bg_event 2, 10, BGEVENT_READ, BurnedTowerSign bg_event 24, 27, BGEVENT_READ, EcruteakCityPokecenterSign bg_event 30, 21, BGEVENT_READ, EcruteakCityMartSign bg_event 23, 14, BGEVENT_ITEM, EcruteakCityHiddenHyperPotion -.ObjectEvents: - db 7 + db 7 ; object events object_event 18, 15, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1 object_event 20, 21, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1 object_event 21, 29, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLassScript, -1 - object_event 3, 9, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1a4015, -1 - object_event 9, 22, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1 + object_event 3, 9, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1a4015, -1 + object_event 9, 22, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1 object_event 10, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakCityYoungsterScript, -1 - object_event 3, 7, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS + object_event 3, 7, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 70776d1ee..7969dad16 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ECRUTEAKGYM_MORTY const ECRUTEAKGYM_SAGE1 const ECRUTEAKGYM_SAGE2 @@ -8,13 +8,11 @@ const_value set 2 const ECRUTEAKGYM_GRAMPS EcruteakGym_MapScripts: -.SceneScripts: - db 2 - scene_script .ForcedToLeave - scene_script .DummyScene + db 2 ; scene scripts + scene_script .ForcedToLeave ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .ForcedToLeave: priorityjump EcruteakGymClosed @@ -43,7 +41,7 @@ MortyScript_0x99d58: setflag ENGINE_FOGBADGE checkcode VAR_BADGES scall EcruteakGymActivateRockets - setmapscene ECRUTEAK_HOUSE, 1 + setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_FINISHED setevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_2 .FightDone: @@ -71,8 +69,8 @@ MortyScript_0x99d58: end EcruteakGymActivateRockets: - if_equal 7, .RadioTowerRockets - if_equal 6, .GoldenrodRockets + ifequal 7, .RadioTowerRockets + ifequal 6, .GoldenrodRockets end .GoldenrodRockets: @@ -91,17 +89,17 @@ EcruteakGymClosed: follow PLAYER, ECRUTEAKGYM_GRAMPS applymovement PLAYER, MovementData_0x99e5f stopfollow - special Special_FadeOutPalettes + special FadeOutPalettes playsound SFX_ENTER_DOOR waitsfx warp ECRUTEAK_CITY, 6, 27 end TrainerSageJeffrey: - trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, .Script + trainer SAGE, JEFFREY, EVENT_BEAT_SAGE_JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SageJeffreyAfterBattleText waitbutton @@ -109,10 +107,10 @@ TrainerSageJeffrey: end TrainerSagePing: - trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, 0, .Script + trainer SAGE, PING, EVENT_BEAT_SAGE_PING, SagePingSeenText, SagePingBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SagePingAfterBattleText waitbutton @@ -120,10 +118,10 @@ TrainerSagePing: end TrainerMediumMartha: - trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, .Script + trainer MEDIUM, MARTHA, EVENT_BEAT_MEDIUM_MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext MediumMarthaAfterBattleText waitbutton @@ -131,10 +129,10 @@ TrainerMediumMartha: end TrainerMediumGrace: - trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, .Script + trainer MEDIUM, GRACE, EVENT_BEAT_MEDIUM_GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext MediumGraceAfterBattleText waitbutton @@ -387,59 +385,54 @@ UnknownText_0x9a49c: done EcruteakGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 33 - warp_def 4, 17, 10, ECRUTEAK_CITY - warp_def 5, 17, 10, ECRUTEAK_CITY - warp_def 4, 14, 4, ECRUTEAK_GYM - warp_def 2, 4, 3, ECRUTEAK_GYM - warp_def 3, 4, 3, ECRUTEAK_GYM - warp_def 4, 4, 3, ECRUTEAK_GYM - warp_def 4, 5, 3, ECRUTEAK_GYM - warp_def 6, 7, 3, ECRUTEAK_GYM - warp_def 7, 4, 3, ECRUTEAK_GYM - warp_def 2, 6, 3, ECRUTEAK_GYM - warp_def 3, 6, 3, ECRUTEAK_GYM - warp_def 4, 6, 3, ECRUTEAK_GYM - warp_def 5, 6, 3, ECRUTEAK_GYM - warp_def 7, 6, 3, ECRUTEAK_GYM - warp_def 7, 7, 3, ECRUTEAK_GYM - warp_def 4, 8, 3, ECRUTEAK_GYM - warp_def 5, 8, 3, ECRUTEAK_GYM - warp_def 6, 8, 3, ECRUTEAK_GYM - warp_def 7, 8, 3, ECRUTEAK_GYM - warp_def 2, 8, 3, ECRUTEAK_GYM - warp_def 2, 9, 3, ECRUTEAK_GYM - warp_def 2, 10, 3, ECRUTEAK_GYM - warp_def 2, 11, 3, ECRUTEAK_GYM - warp_def 4, 10, 3, ECRUTEAK_GYM - warp_def 5, 10, 3, ECRUTEAK_GYM - warp_def 2, 12, 3, ECRUTEAK_GYM - warp_def 3, 12, 3, ECRUTEAK_GYM - warp_def 4, 12, 3, ECRUTEAK_GYM - warp_def 5, 12, 3, ECRUTEAK_GYM - warp_def 7, 10, 3, ECRUTEAK_GYM - warp_def 7, 11, 3, ECRUTEAK_GYM - warp_def 7, 12, 3, ECRUTEAK_GYM - warp_def 7, 13, 3, ECRUTEAK_GYM - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 15, BGEVENT_READ, EcruteakGymStatue - bg_event 6, 15, BGEVENT_READ, EcruteakGymStatue - -.ObjectEvents: - db 7 - object_event 5, 1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1 - object_event 2, 7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1 - object_event 3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1 - object_event 7, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1 - object_event 7, 9, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1 - object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1 - object_event 4, 14, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS + db 0, 0 ; filler + + db 33 ; warp events + warp_event 4, 17, ECRUTEAK_CITY, 10 + warp_event 5, 17, ECRUTEAK_CITY, 10 + warp_event 4, 14, ECRUTEAK_GYM, 4 + warp_event 2, 4, ECRUTEAK_GYM, 3 + warp_event 3, 4, ECRUTEAK_GYM, 3 + warp_event 4, 4, ECRUTEAK_GYM, 3 + warp_event 4, 5, ECRUTEAK_GYM, 3 + warp_event 6, 7, ECRUTEAK_GYM, 3 + warp_event 7, 4, ECRUTEAK_GYM, 3 + warp_event 2, 6, ECRUTEAK_GYM, 3 + warp_event 3, 6, ECRUTEAK_GYM, 3 + warp_event 4, 6, ECRUTEAK_GYM, 3 + warp_event 5, 6, ECRUTEAK_GYM, 3 + warp_event 7, 6, ECRUTEAK_GYM, 3 + warp_event 7, 7, ECRUTEAK_GYM, 3 + warp_event 4, 8, ECRUTEAK_GYM, 3 + warp_event 5, 8, ECRUTEAK_GYM, 3 + warp_event 6, 8, ECRUTEAK_GYM, 3 + warp_event 7, 8, ECRUTEAK_GYM, 3 + warp_event 2, 8, ECRUTEAK_GYM, 3 + warp_event 2, 9, ECRUTEAK_GYM, 3 + warp_event 2, 10, ECRUTEAK_GYM, 3 + warp_event 2, 11, ECRUTEAK_GYM, 3 + warp_event 4, 10, ECRUTEAK_GYM, 3 + warp_event 5, 10, ECRUTEAK_GYM, 3 + warp_event 2, 12, ECRUTEAK_GYM, 3 + warp_event 3, 12, ECRUTEAK_GYM, 3 + warp_event 4, 12, ECRUTEAK_GYM, 3 + warp_event 5, 12, ECRUTEAK_GYM, 3 + warp_event 7, 10, ECRUTEAK_GYM, 3 + warp_event 7, 11, ECRUTEAK_GYM, 3 + warp_event 7, 12, ECRUTEAK_GYM, 3 + warp_event 7, 13, ECRUTEAK_GYM, 3 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 15, BGEVENT_READ, EcruteakGymStatue + bg_event 6, 15, BGEVENT_READ, EcruteakGymStatue + + db 7 ; object events + object_event 5, 1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1 + object_event 2, 7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1 + object_event 3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1 + object_event 7, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1 + object_event 7, 9, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1 + object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1 + object_event 4, 14, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 0d956a181..0ae99bd65 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ECRUTEAKITEMFINDERHOUSE_COOLTRAINER_M const ECRUTEAKITEMFINDERHOUSE_POKEDEX EcruteakItemfinderHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks EcruteakItemfinderGuy: faceplayer @@ -163,22 +161,17 @@ EcruteakThreeMonText: done EcruteakItemfinderHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 7, 11, ECRUTEAK_CITY - warp_def 4, 7, 11, ECRUTEAK_CITY + db 2 ; warp events + warp_event 3, 7, ECRUTEAK_CITY, 11 + warp_event 4, 7, ECRUTEAK_CITY, 11 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 2, 1, BGEVENT_READ, ItemFinderHouseRadio + db 1 ; bg events + bg_event 2, 1, BGEVENT_READ, ItemFinderHouseRadio -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakItemfinderGuy, -1 - object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1 + db 2 ; object events + object_event 2, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakItemfinderGuy, -1 + object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1 diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 4b39f93eb..8b02bd15c 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ECRUTEAKLUGIASPEECHHOUSE_GRAMPS const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER EcruteakLugiaSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks EcruteakLugiaSpeechHouseGrampsScript: jumptextfaceplayer EcruteakLugiaSpeechHouseGrampsText @@ -45,22 +43,17 @@ EcruteakLugiaSpeechHouseYoungsterText: done EcruteakLugiaSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 7, 7, ECRUTEAK_CITY - warp_def 4, 7, 7, ECRUTEAK_CITY + db 2 ; warp events + warp_event 3, 7, ECRUTEAK_CITY, 7 + warp_event 4, 7, ECRUTEAK_CITY, 7 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 2, 1, BGEVENT_READ, LugiaSpeechHouseRadio + db 1 ; bg events + bg_event 2, 1, BGEVENT_READ, LugiaSpeechHouseRadio -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1 - object_event 5, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1 + db 2 ; object events + object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1 + object_event 5, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index c69de9a7d..2ea3cd494 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const ECRUTEAKMART_CLERK const ECRUTEAKMART_SUPER_NERD const ECRUTEAKMART_GRANNY EcruteakMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x99c3b: opentext @@ -46,22 +44,17 @@ EcruteakMartGrannyText: done EcruteakMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 9, ECRUTEAK_CITY - warp_def 3, 7, 9, ECRUTEAK_CITY + db 2 ; warp events + warp_event 2, 7, ECRUTEAK_CITY, 9 + warp_event 3, 7, ECRUTEAK_CITY, 9 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1 - object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1 - object_event 6, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1 + object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1 + object_event 6, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1 diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index 409181ddc..3456e6577 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ECRUTEAKPOKECENTER1F_NURSE const ECRUTEAKPOKECENTER1F_POKEFAN_M const ECRUTEAKPOKECENTER1F_COOLTRAINER_F @@ -6,13 +6,11 @@ const_value set 2 const ECRUTEAKPOKECENTER1F_BILL EcruteakPokecenter1F_MapScripts: -.SceneScripts: - db 2 - scene_script .MeetBill - scene_script .DummyScene + db 2 ; scene scripts + scene_script .MeetBill ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .MeetBill: priorityjump .BillActivatesTimeCapsule @@ -28,15 +26,15 @@ EcruteakPokecenter1F_MapScripts: waitsfx applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement1 applymovement PLAYER, EcruteakPokecenter1FPlayerMovement1 - spriteface ECRUTEAKPOKECENTER1F_NURSE, UP + objectface ECRUTEAKPOKECENTER1F_NURSE, UP pause 10 - spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN + objectface ECRUTEAKPOKECENTER1F_NURSE, DOWN pause 30 - spriteface ECRUTEAKPOKECENTER1F_NURSE, UP + objectface ECRUTEAKPOKECENTER1F_NURSE, UP pause 10 - spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN + objectface ECRUTEAKPOKECENTER1F_NURSE, DOWN pause 20 - spriteface ECRUTEAKPOKECENTER1F_BILL, DOWN + objectface ECRUTEAKPOKECENTER1F_BILL, DOWN pause 10 opentext writetext EcruteakPokecenter1F_BillText1 @@ -47,13 +45,13 @@ EcruteakPokecenter1F_MapScripts: writetext EcruteakPokecenter1F_BillText2 waitbutton closetext - spriteface PLAYER, DOWN + objectface PLAYER, DOWN applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement2 playsound SFX_EXIT_BUILDING disappear ECRUTEAKPOKECENTER1F_BILL clearevent EVENT_MET_BILL setflag ENGINE_TIME_CAPSULE - setscene 1 + setscene SCENE_FINISHED waitsfx end @@ -61,7 +59,7 @@ EcruteakPokecenter1FNurseScript: jumpstd pokecenternurse EcruteakPokecenter1FPokefanMScript: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer EcruteakPokecenter1FPokefanMText @@ -207,25 +205,20 @@ EcruteakPokecenter1FGymGuyText: done EcruteakPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 6, ECRUTEAK_CITY - warp_def 4, 7, 6, ECRUTEAK_CITY - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 5 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1 - object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1 - object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1 - object_event 7, 1, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuyScript, -1 - object_event 0, 7, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, ECRUTEAK_CITY, 6 + warp_event 4, 7, ECRUTEAK_CITY, 6 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 5 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1 + object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1 + object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1 + object_event 7, 1, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuyScript, -1 + object_event 0, 7, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakTinTowerEntrance.asm index 436bdd0e3..552dbc2a1 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -1,17 +1,15 @@ -const_value set 2 - const ECRUTEAKHOUSE_SAGE1 - const ECRUTEAKHOUSE_SAGE2 - const ECRUTEAKHOUSE_SAGE3 - const ECRUTEAKHOUSE_GRAMPS - -EcruteakHouse_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 - -.MapCallbacks: - db 1 + const_def 2 ; object constants + const ECRUTEAKTINTOWERENTRANCE_SAGE1 + const ECRUTEAKTINTOWERENTRANCE_SAGE2 + const ECRUTEAKTINTOWERENTRANCE_SAGE3 + const ECRUTEAKTINTOWERENTRANCE_GRAMPS + +EcruteakTinTowerEntrance_MapScripts: + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED + + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .InitializeSages .DummyScene0: @@ -32,38 +30,38 @@ EcruteakHouse_MapScripts: .BlockTower: clearevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_2 - setevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + setevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE checkitem CLEAR_BELL iftrue .NoClearBell - setscene 0 + setscene SCENE_DEFAULT .NoClearBell: return .DontBlockTower: - clearevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + clearevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE return -EcruteakHouse_CoordEvent1: +EcruteakTinTowerEntrance_CoordEvent1: checkevent EVENT_RANG_CLEAR_BELL_2 - iftrue EcruteakHouse_CoordEvent_DontMove - applymovement ECRUTEAKHOUSE_SAGE2, MovementData_0x980c7 - moveobject ECRUTEAKHOUSE_SAGE1, 4, 6 - appear ECRUTEAKHOUSE_SAGE1 + iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove + applymovement ECRUTEAKTINTOWERENTRANCE_SAGE2, MovementData_0x980c7 + moveobject ECRUTEAKTINTOWERENTRANCE_SAGE1, 4, 6 + appear ECRUTEAKTINTOWERENTRANCE_SAGE1 pause 5 - disappear ECRUTEAKHOUSE_SAGE2 + disappear ECRUTEAKTINTOWERENTRANCE_SAGE2 end -EcruteakHouse_CoordEvent2: +EcruteakTinTowerEntrance_CoordEvent2: checkevent EVENT_RANG_CLEAR_BELL_1 - iftrue EcruteakHouse_CoordEvent_DontMove - applymovement ECRUTEAKHOUSE_SAGE1, MovementData_0x980cc - moveobject ECRUTEAKHOUSE_SAGE2, 5, 6 - appear ECRUTEAKHOUSE_SAGE2 + iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove + applymovement ECRUTEAKTINTOWERENTRANCE_SAGE1, MovementData_0x980cc + moveobject ECRUTEAKTINTOWERENTRANCE_SAGE2, 5, 6 + appear ECRUTEAKTINTOWERENTRANCE_SAGE2 pause 5 - disappear ECRUTEAKHOUSE_SAGE1 + disappear ECRUTEAKTINTOWERENTRANCE_SAGE1 end -EcruteakHouse_CoordEvent_DontMove: +EcruteakTinTowerEntrance_CoordEvent_DontMove: end SageScript_0x98062: @@ -87,7 +85,7 @@ SageScript_0x98062: .CheckForClearBell: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue .AllowedThrough - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue .Event000 checkitem CLEAR_BELL iftrue .RingClearBell @@ -100,10 +98,10 @@ SageScript_0x98062: writetext UnknownText_0x98250 waitbutton closetext - setscene 1 + setscene SCENE_FINISHED setevent EVENT_RANG_CLEAR_BELL_2 clearevent EVENT_RANG_CLEAR_BELL_1 - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 end .AllowedThrough: @@ -134,8 +132,8 @@ SageScript_0x980b0: closetext end -EcruteakHouseGrampsScript: - jumptextfaceplayer EcruteakHouseGrampsText +EcruteakTinTowerEntranceGrampsScript: + jumptextfaceplayer EcruteakTinTowerEntranceGrampsText MovementData_0x980c7: fix_facing @@ -266,7 +264,7 @@ UnknownText_0x9846f: line "to the top!" done -EcruteakHouseGrampsText: +EcruteakTinTowerEntranceGrampsText: text "Two towers…" line "Two #MON…" @@ -277,29 +275,24 @@ EcruteakHouseGrampsText: line "never to return." done -EcruteakHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 4, 17, 3, ECRUTEAK_CITY - warp_def 5, 17, 3, ECRUTEAK_CITY - warp_def 5, 3, 4, ECRUTEAK_HOUSE - warp_def 17, 15, 3, ECRUTEAK_HOUSE - warp_def 17, 3, 3, WISE_TRIOS_ROOM - -.CoordEvents: - db 2 - coord_event 4, 7, 0, EcruteakHouse_CoordEvent1 - coord_event 5, 7, 0, EcruteakHouse_CoordEvent2 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 - object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 - object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE - object_event 3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHouseGrampsScript, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE +EcruteakTinTowerEntrance_MapEvents: + db 0, 0 ; filler + + db 5 ; warp events + warp_event 4, 17, ECRUTEAK_CITY, 3 + warp_event 5, 17, ECRUTEAK_CITY, 3 + warp_event 5, 3, ECRUTEAK_TIN_TOWER_ENTRANCE, 4 + warp_event 17, 15, ECRUTEAK_TIN_TOWER_ENTRANCE, 3 + warp_event 17, 3, WISE_TRIOS_ROOM, 3 + + db 2 ; coord events + coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1 + coord_event 5, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent2 + + db 0 ; bg events + + db 4 ; object events + object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 + object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 + object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE + object_event 3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceGrampsScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE diff --git a/maps/EcruteakHouse.blk b/maps/EcruteakTinTowerEntrance.blk index 8f74a6559..8f74a6559 100644 --- a/maps/EcruteakHouse.blk +++ b/maps/EcruteakTinTowerEntrance.blk diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 292562f85..544de62fb 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ELMSHOUSE_ELMS_WIFE const ELMSHOUSE_ELMS_SON ElmsHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ElmsWife: jumptextfaceplayer ElmsWifeText @@ -84,24 +82,19 @@ ElmsHousePCText: done ElmsHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 4, NEW_BARK_TOWN - warp_def 3, 7, 4, NEW_BARK_TOWN - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 0, 1, BGEVENT_READ, ElmsHousePC - bg_event 6, 1, BGEVENT_READ, ElmsHouseBookshelf - bg_event 7, 1, BGEVENT_READ, ElmsHouseBookshelf - -.ObjectEvents: - db 2 - object_event 1, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1 - object_event 5, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, NEW_BARK_TOWN, 4 + warp_event 3, 7, NEW_BARK_TOWN, 4 + + db 0 ; coord events + + db 3 ; bg events + bg_event 0, 1, BGEVENT_READ, ElmsHousePC + bg_event 6, 1, BGEVENT_READ, ElmsHouseBookshelf + bg_event 7, 1, BGEVENT_READ, ElmsHouseBookshelf + + db 2 ; object events + object_event 1, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1 + object_event 5, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index ff531500c..332dedcaf 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ELMSLAB_ELM const ELMSLAB_ELMS_AIDE const ELMSLAB_POKE_BALL1 @@ -7,17 +7,15 @@ const_value set 2 const ELMSLAB_OFFICER ElmsLab_MapScripts: -.SceneScripts: - db 6 - scene_script .MeetElm - scene_script .DummyScene1 - scene_script .DummyScene2 - scene_script .DummyScene3 - scene_script .DummyScene4 - scene_script .DummyScene5 - -.MapCallbacks: - db 1 + db 6 ; scene scripts + scene_script .MeetElm ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_ELMSLAB_CANT_LEAVE + scene_script .DummyScene2 ; SCENE_ELMSLAB_NOTHING + scene_script .DummyScene3 ; SCENE_ELMSLAB_MEET_OFFICER + scene_script .DummyScene4 ; SCENE_ELMSLAB_UNUSED + scene_script .DummyScene5 ; SCENE_ELMSLAB_AIDE_GIVES_POTION + + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .MoveElmCallback .MeetElm: @@ -41,7 +39,7 @@ ElmsLab_MapScripts: .MoveElmCallback: checkscene - iftrue .Skip + iftrue .Skip ; not SCENE_DEFAULT moveobject ELMSLAB_ELM, 3, 4 .Skip: return @@ -49,7 +47,7 @@ ElmsLab_MapScripts: .WalkUpToElm: applymovement PLAYER, ElmsLab_WalkUpToElmMovement showemote EMOTE_SHOCK, ELMSLAB_ELM, 15 - spriteface ELMSLAB_ELM, RIGHT + objectface ELMSLAB_ELM, RIGHT opentext writetext ElmText_Intro .MustSayYes: @@ -67,24 +65,24 @@ ElmsLab_MapScripts: playsound SFX_GLASS_TING pause 30 showemote EMOTE_SHOCK, ELMSLAB_ELM, 10 - spriteface ELMSLAB_ELM, DOWN + objectface ELMSLAB_ELM, DOWN opentext writetext ElmText_GotAnEmail waitbutton closetext opentext - spriteface ELMSLAB_ELM, RIGHT + objectface ELMSLAB_ELM, RIGHT writetext ElmText_MissionFromMrPokemon waitbutton closetext applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement1 - spriteface PLAYER, UP + objectface PLAYER, UP applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement2 - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT opentext writetext ElmText_ChooseAPokemon waitbutton - setscene 1 + setscene SCENE_ELMSLAB_CANT_LEAVE closetext end @@ -108,10 +106,10 @@ ElmCheckEverstone: checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE iffalse ElmCheckTogepiEgg writebyte TOGEPI - special Special_FindThatSpeciesYourTrainerID + special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writebyte TOGETIC - special Special_FindThatSpeciesYourTrainerID + special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writetext UnknownText_0x79a40 waitbutton @@ -120,10 +118,10 @@ ElmCheckEverstone: ElmEggHatchedScript: writebyte TOGEPI - special Special_FindThatSpeciesYourTrainerID + special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writebyte TOGETIC - special Special_FindThatSpeciesYourTrainerID + special FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript jump ElmCheckGotEggAgain @@ -149,7 +147,7 @@ ElmCheckGotEggAgain: end LabTryToLeaveScript: - spriteface ELMSLAB_ELM, DOWN + objectface ELMSLAB_ELM, DOWN opentext writetext LabWhereGoingText waitbutton @@ -160,7 +158,7 @@ LabTryToLeaveScript: CyndaquilPokeBallScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript - spriteface ELMSLAB_ELM, DOWN + objectface ELMSLAB_ELM, DOWN refreshscreen pokepic CYNDAQUIL cry CYNDAQUIL @@ -183,14 +181,14 @@ CyndaquilPokeBallScript: givepoke CYNDAQUIL, 5, BERRY closetext checkcode VAR_FACING - if_equal RIGHT, ElmDirectionsScript + ifequal RIGHT, ElmDirectionsScript applymovement PLAYER, AfterCyndaquilMovement jump ElmDirectionsScript TotodilePokeBallScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript - spriteface ELMSLAB_ELM, DOWN + objectface ELMSLAB_ELM, DOWN refreshscreen pokepic TOTODILE cry TOTODILE @@ -218,7 +216,7 @@ TotodilePokeBallScript: ChikoritaPokeBallScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue LookAtElmPokeBallScript - spriteface ELMSLAB_ELM, DOWN + objectface ELMSLAB_ELM, DOWN refreshscreen pokepic CHIKORITA cry CHIKORITA @@ -250,7 +248,7 @@ DidntChooseStarterScript: end ElmDirectionsScript: - spriteface PLAYER, UP + objectface PLAYER, UP opentext writetext ElmDirectionsText1 waitbutton @@ -262,20 +260,20 @@ ElmDirectionsScript: waitsfx waitbutton closetext - spriteface ELMSLAB_ELM, LEFT + objectface ELMSLAB_ELM, LEFT opentext writetext ElmDirectionsText2 waitbutton closetext - spriteface ELMSLAB_ELM, DOWN + objectface ELMSLAB_ELM, DOWN opentext writetext ElmDirectionsText3 waitbutton closetext setevent EVENT_GOT_A_POKEMON_FROM_ELM setevent EVENT_RIVAL_CHERRYGROVE_CITY - setscene 5 - setmapscene NEW_BARK_TOWN, 1 + setscene SCENE_ELMSLAB_AIDE_GIVES_POTION + setmapscene NEW_BARK_TOWN, SCENE_FINISHED end ElmDescribesMrPokemonScript: @@ -308,11 +306,11 @@ ElmsLabHealingMachine: end ElmsLabHealingMachine_HealParty: - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty playmusic MUSIC_NONE writebyte HEALMACHINE_ELMS_LAB - special Special_HealMachineAnim + special HealMachineAnim pause 30 special RestartMapMusic closetext @@ -341,13 +339,13 @@ ElmAfterTheftScript: buttonsound setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM setflag ENGINE_BUG_CONTEST_ON - setmapscene ROUTE_29, 1 + setmapscene ROUTE_29, SCENE_ROUTE29_CATCH_TUTORIAL clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY setevent EVENT_ROUTE_30_BATTLE writetext ElmAfterTheftText6 waitbutton closetext - setscene 6 + setscene SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS end ElmStudyingEggScript: @@ -422,19 +420,19 @@ ElmGiveTicketScript: ElmJumpBackScript1: closetext checkcode VAR_FACING - if_equal DOWN, ElmJumpDownScript - if_equal UP, ElmJumpUpScript - if_equal LEFT, ElmJumpLeftScript - if_equal RIGHT, ElmJumpRightScript + ifequal DOWN, ElmJumpDownScript + ifequal UP, ElmJumpUpScript + ifequal LEFT, ElmJumpLeftScript + ifequal RIGHT, ElmJumpRightScript end ElmJumpBackScript2: closetext checkcode VAR_FACING - if_equal DOWN, ElmJumpUpScript - if_equal UP, ElmJumpDownScript - if_equal LEFT, ElmJumpRightScript - if_equal RIGHT, ElmJumpLeftScript + ifequal DOWN, ElmJumpUpScript + ifequal UP, ElmJumpDownScript + ifequal LEFT, ElmJumpRightScript + ifequal RIGHT, ElmJumpLeftScript end ElmJumpUpScript: @@ -457,41 +455,41 @@ ElmJumpRightScript: opentext end -AideScript_WalkPotions1: +AideScript_WalkPotion1: applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1 - spriteface PLAYER, DOWN - scall AideScript_GivePotions + objectface PLAYER, DOWN + scall AideScript_GivePotion applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1 end -AideScript_WalkPotions2: +AideScript_WalkPotion2: applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2 - spriteface PLAYER, DOWN - scall AideScript_GivePotions + objectface PLAYER, DOWN + scall AideScript_GivePotion applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2 end -AideScript_GivePotions: +AideScript_GivePotion: opentext - writetext AideText_GiveYouPotions + writetext AideText_GiveYouPotion buttonsound verbosegiveitem POTION writetext AideText_AlwaysBusy waitbutton closetext - setscene 2 + setscene SCENE_ELMSLAB_NOTHING end AideScript_WalkBalls1: applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1 - spriteface PLAYER, DOWN + objectface PLAYER, DOWN scall AideScript_GiveYouBalls applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1 end AideScript_WalkBalls2: applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2 - spriteface PLAYER, DOWN + objectface PLAYER, DOWN scall AideScript_GiveYouBalls applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2 end @@ -507,7 +505,7 @@ AideScript_GiveYouBalls: buttonsound itemnotify closetext - setscene 2 + setscene SCENE_ELMSLAB_NOTHING end AideScript_ReceiveTheBalls: @@ -552,17 +550,17 @@ MeetCopScript2: MeetCopScript: applymovement PLAYER, MeetCopScript_WalkUp CopScript: - spriteface ELMSLAB_OFFICER, LEFT + objectface ELMSLAB_OFFICER, LEFT opentext writetext ElmsLabOfficerText1 buttonsound - special Special_NameRival + special NameRival writetext ElmsLabOfficerText2 waitbutton closetext applymovement ELMSLAB_OFFICER, OfficerLeavesMovement disappear ELMSLAB_OFFICER - setscene 2 + setscene SCENE_ELMSLAB_NOTHING end ElmsLabWindow: @@ -1217,7 +1215,7 @@ ElmsLabSignpostText_Egg: cont "by PROF.ELM." done -AideText_GiveYouPotions: +AideText_GiveYouPotion: text "<PLAY_G>, I want" line "you to have this" cont "for your errand." @@ -1371,49 +1369,44 @@ ElmsLabPCText: done ElmsLab_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 11, 1, NEW_BARK_TOWN - warp_def 5, 11, 1, NEW_BARK_TOWN - -.CoordEvents: - db 8 - coord_event 4, 6, 1, LabTryToLeaveScript - coord_event 5, 6, 1, LabTryToLeaveScript - coord_event 4, 5, 3, MeetCopScript - coord_event 5, 5, 3, MeetCopScript2 - coord_event 4, 8, 5, AideScript_WalkPotions1 - coord_event 5, 8, 5, AideScript_WalkPotions2 - coord_event 4, 8, 6, AideScript_WalkBalls1 - coord_event 5, 8, 6, AideScript_WalkBalls2 - -.BGEvents: - db 16 - bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine - bg_event 6, 1, BGEVENT_READ, ElmsLabBookshelf - bg_event 7, 1, BGEVENT_READ, ElmsLabBookshelf - bg_event 8, 1, BGEVENT_READ, ElmsLabBookshelf - bg_event 9, 1, BGEVENT_READ, ElmsLabBookshelf - bg_event 0, 7, BGEVENT_READ, ElmsLabTravelTip1 - bg_event 1, 7, BGEVENT_READ, ElmsLabTravelTip2 - bg_event 2, 7, BGEVENT_READ, ElmsLabTravelTip3 - bg_event 3, 7, BGEVENT_READ, ElmsLabTravelTip4 - bg_event 6, 7, BGEVENT_READ, ElmsLabBookshelf - bg_event 7, 7, BGEVENT_READ, ElmsLabBookshelf - bg_event 8, 7, BGEVENT_READ, ElmsLabBookshelf - bg_event 9, 7, BGEVENT_READ, ElmsLabBookshelf - bg_event 9, 3, BGEVENT_READ, ElmsLabTrashcan - bg_event 5, 0, BGEVENT_READ, ElmsLabWindow - bg_event 3, 5, BGEVENT_DOWN, ElmsLabPC - -.ObjectEvents: - db 6 - object_event 5, 2, SPRITE_ELM, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1 - object_event 2, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB - object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB - object_event 7, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB - object_event 8, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB - object_event 5, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 11, NEW_BARK_TOWN, 1 + warp_event 5, 11, NEW_BARK_TOWN, 1 + + db 8 ; coord events + coord_event 4, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript + coord_event 5, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript + coord_event 4, 5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript + coord_event 5, 5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript2 + coord_event 4, 8, SCENE_ELMSLAB_AIDE_GIVES_POTION, AideScript_WalkPotion1 + coord_event 5, 8, SCENE_ELMSLAB_AIDE_GIVES_POTION, AideScript_WalkPotion2 + coord_event 4, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls1 + coord_event 5, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls2 + + db 16 ; bg events + bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine + bg_event 6, 1, BGEVENT_READ, ElmsLabBookshelf + bg_event 7, 1, BGEVENT_READ, ElmsLabBookshelf + bg_event 8, 1, BGEVENT_READ, ElmsLabBookshelf + bg_event 9, 1, BGEVENT_READ, ElmsLabBookshelf + bg_event 0, 7, BGEVENT_READ, ElmsLabTravelTip1 + bg_event 1, 7, BGEVENT_READ, ElmsLabTravelTip2 + bg_event 2, 7, BGEVENT_READ, ElmsLabTravelTip3 + bg_event 3, 7, BGEVENT_READ, ElmsLabTravelTip4 + bg_event 6, 7, BGEVENT_READ, ElmsLabBookshelf + bg_event 7, 7, BGEVENT_READ, ElmsLabBookshelf + bg_event 8, 7, BGEVENT_READ, ElmsLabBookshelf + bg_event 9, 7, BGEVENT_READ, ElmsLabBookshelf + bg_event 9, 3, BGEVENT_READ, ElmsLabTrashcan + bg_event 5, 0, BGEVENT_READ, ElmsLabWindow + bg_event 3, 5, BGEVENT_DOWN, ElmsLabPC + + db 6 ; object events + object_event 5, 2, SPRITE_ELM, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1 + object_event 2, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB + object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB + object_event 7, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB + object_event 8, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB + object_event 5, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 6dfb2350d..9d880cfa2 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -1,18 +1,16 @@ -const_value set 2 + const_def 2 ; object constants const FASTSHIP1F_SAILOR1 const FASTSHIP1F_SAILOR2 const FASTSHIP1F_SAILOR3 const FASTSHIP1F_GENTLEMAN FastShip1F_MapScripts: -.SceneScripts: - db 3 - scene_script .DummyScene0 - scene_script .EnterFastShip - scene_script .DummyScene2 + db 3 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .EnterFastShip ; SCENE_FASTSHIP1F_ENTER_SHIP + scene_script .DummyScene2 ; SCENE_FASTSHIP1F_MEET_GRANDPA -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -35,11 +33,11 @@ FastShip1F_MapScripts: clearevent EVENT_FAST_SHIP_HAS_ARRIVED checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue .SkipGrandpa - setscene 2 + setscene SCENE_FASTSHIP1F_MEET_GRANDPA end .SkipGrandpa: - setscene 0 + setscene SCENE_DEFAULT end SailorScript_0x75160: @@ -68,10 +66,10 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - setmapscene VERMILION_PORT, 1 + setmapscene VERMILION_PORT, SCENE_VERMILIONPORT_LEAVE_SHIP warp VERMILION_PORT, 7, 17 end @@ -81,16 +79,16 @@ SailorScript_0x75160: closetext scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY - setmapscene OLIVINE_PORT, 1 + setmapscene OLIVINE_PORT, SCENE_OLIVINEPORT_LEAVE_SHIP warp OLIVINE_PORT, 7, 23 end .LetThePlayerOut: checkcode VAR_FACING - if_equal RIGHT, .YouAreFacingRight + ifequal RIGHT, .YouAreFacingRight applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e applymovement PLAYER, MovementData_0x75235 end @@ -132,10 +130,10 @@ WorriedGrandpaSceneLeft: writetext UnknownText_0x75412 waitbutton closetext - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222 disappear FASTSHIP1F_GENTLEMAN - setscene 0 + setscene SCENE_DEFAULT end MovementData_0x7520e: @@ -286,35 +284,30 @@ UnknownText_0x754be: done FastShip1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 12 - warp_def 25, 1, -1, FAST_SHIP_1F - warp_def 27, 8, 1, FAST_SHIP_CABINS_NNW_NNE_NE - warp_def 23, 8, 2, FAST_SHIP_CABINS_NNW_NNE_NE - warp_def 19, 8, 3, FAST_SHIP_CABINS_NNW_NNE_NE - warp_def 15, 8, 1, FAST_SHIP_CABINS_SW_SSW_NW - warp_def 15, 15, 2, FAST_SHIP_CABINS_SW_SSW_NW - warp_def 19, 15, 4, FAST_SHIP_CABINS_SW_SSW_NW - warp_def 23, 15, 1, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_def 27, 15, 3, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_def 3, 13, 5, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN - warp_def 6, 12, 1, FAST_SHIP_B1F - warp_def 30, 14, 2, FAST_SHIP_B1F - -.CoordEvents: - db 2 - coord_event 24, 6, 2, WorriedGrandpaSceneLeft - coord_event 25, 6, 2, WorriedGrandpaSceneRight - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 25, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1 - object_event 14, 7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1 + db 0, 0 ; filler + + db 12 ; warp events + warp_event 25, 1, FAST_SHIP_1F, -1 + warp_event 27, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 1 + warp_event 23, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 2 + warp_event 19, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 3 + warp_event 15, 8, FAST_SHIP_CABINS_SW_SSW_NW, 1 + warp_event 15, 15, FAST_SHIP_CABINS_SW_SSW_NW, 2 + warp_event 19, 15, FAST_SHIP_CABINS_SW_SSW_NW, 4 + warp_event 23, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 1 + warp_event 27, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 3 + warp_event 3, 13, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 5 + warp_event 6, 12, FAST_SHIP_B1F, 1 + warp_event 30, 14, FAST_SHIP_B1F, 2 + + db 2 ; coord events + coord_event 24, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneLeft + coord_event 25, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneRight + + db 0 ; bg events + + db 4 ; object events + object_event 25, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1 + object_event 14, 7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1 object_event 22, 17, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailorScript, -1 - object_event 19, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN + object_event 19, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index c179b490a..3984274cc 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const FASTSHIPB1F_SAILOR1 const FASTSHIPB1F_SAILOR2 const FASTSHIPB1F_SAILOR3 @@ -13,13 +13,11 @@ const_value set 2 const FASTSHIPB1F_YOUNGSTER2 FastShipB1F_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -94,10 +92,10 @@ UnknownScript_0x767a0: end TrainerSailorJeff: - trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, .Script + trainer SAILOR, JEFF, EVENT_BEAT_SAILOR_JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SailorJeffAfterBattleText waitbutton @@ -105,10 +103,10 @@ TrainerSailorJeff: end TrainerPicnickerDebra: - trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, .Script + trainer PICNICKER, DEBRA, EVENT_BEAT_PICNICKER_DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PicnickerDebraAfterBattleText waitbutton @@ -116,10 +114,10 @@ TrainerPicnickerDebra: end TrainerJugglerFritz: - trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, .Script + trainer JUGGLER, FRITZ, EVENT_BEAT_JUGGLER_FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext JugglerFritzAfterBattleText waitbutton @@ -127,10 +125,10 @@ TrainerJugglerFritz: end TrainerSailorGarrett: - trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, .Script + trainer SAILOR, GARRETT, EVENT_BEAT_SAILOR_GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SailorGarrettAfterBattleText waitbutton @@ -138,10 +136,10 @@ TrainerSailorGarrett: end TrainerFisherJonah: - trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, .Script + trainer FISHER, JONAH, EVENT_BEAT_FISHER_JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FisherJonahAfterBattleText waitbutton @@ -149,10 +147,10 @@ TrainerFisherJonah: end TrainerBlackbeltWai: - trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, .Script + trainer BLACKBELT_T, WAI, EVENT_BEAT_BLACKBELT_WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BlackbeltWaiAfterBattleText waitbutton @@ -160,10 +158,10 @@ TrainerBlackbeltWai: end TrainerSailorKenneth: - trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, .Script + trainer SAILOR, KENNETH, EVENT_BEAT_SAILOR_KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SailorKennethAfterBattleText waitbutton @@ -171,10 +169,10 @@ TrainerSailorKenneth: end TrainerTeacherShirley: - trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, .Script + trainer TEACHER, SHIRLEY, EVENT_BEAT_TEACHER_SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext TeacherShirleyAfterBattleText waitbutton @@ -182,10 +180,10 @@ TrainerTeacherShirley: end TrainerSchoolboyNate: - trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, .Script + trainer SCHOOLBOY, NATE, EVENT_BEAT_SCHOOLBOY_NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SchoolboyNateAfterBattleText waitbutton @@ -193,10 +191,10 @@ TrainerSchoolboyNate: end TrainerSchoolboyRicky: - trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, .Script + trainer SCHOOLBOY, RICKY, EVENT_BEAT_SCHOOLBOY_RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SchoolboyRickyAfterBattleText waitbutton @@ -449,34 +447,29 @@ SchoolboyRickyAfterBattleText: done FastShipB1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 5, 11, 11, FAST_SHIP_1F - warp_def 31, 13, 12, FAST_SHIP_1F - -.CoordEvents: - db 2 - coord_event 30, 7, 0, UnknownScript_0x7673c - coord_event 31, 7, 0, UnknownScript_0x76751 - -.BGEvents: - db 1 - bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan - -.ObjectEvents: - db 12 - object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT - object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT - object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 26, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 17, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - object_event 25, 8, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + db 0, 0 ; filler + + db 2 ; warp events + warp_event 5, 11, FAST_SHIP_1F, 11 + warp_event 31, 13, FAST_SHIP_1F, 12 + + db 2 ; coord events + coord_event 30, 7, SCENE_DEFAULT, UnknownScript_0x7673c + coord_event 31, 7, SCENE_DEFAULT, UnknownScript_0x76751 + + db 1 ; bg events + bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan + + db 12 ; object events + object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT + object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT + object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 26, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 17, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event 25, 8, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND object_event 15, 11, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - object_event 23, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - object_event 9, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 23, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 9, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND object_event 14, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index a6ff922dd..8bc91d408 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_M const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_F const FASTSHIPCABINS_NNW_NNE_NE_SUPER_NERD @@ -8,17 +8,15 @@ const_value set 2 const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST FastShipCabins_NNW_NNE_NE_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerCooltrainermSean: - trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script + trainer COOLTRAINERM, SEAN, EVENT_BEAT_COOLTRAINERM_SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainermSeanAfterBattleText waitbutton @@ -26,10 +24,10 @@ TrainerCooltrainermSean: end TrainerCooltrainerfCarol: - trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, .Script + trainer COOLTRAINERF, CAROL, EVENT_BEAT_COOLTRAINERF_CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainerfCarolAfterBattleText waitbutton @@ -37,10 +35,10 @@ TrainerCooltrainerfCarol: end TrainerPokemaniacEthan: - trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, .Script + trainer POKEMANIAC, ETHAN, EVENT_BEAT_POKEMANIAC_ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokemaniacEthanAfterBattleText waitbutton @@ -48,10 +46,10 @@ TrainerPokemaniacEthan: end TrainerHikerNoland: - trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, .Script + trainer HIKER, NOLAND, EVENT_BEAT_HIKER_NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerNolandAfterBattleText waitbutton @@ -59,10 +57,10 @@ TrainerHikerNoland: end TrainerGentlemanEdward: - trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, .Script + trainer GENTLEMAN, EDWARD, EVENT_BEAT_GENTLEMAN_EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GentlemanEdwardAfterBattleText waitbutton @@ -70,10 +68,10 @@ TrainerGentlemanEdward: end TrainerBurglarCorey: - trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, .Script + trainer BURGLAR, COREY, EVENT_BEAT_BURGLAR_COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BurglarCoreyAfterBattleText waitbutton @@ -98,9 +96,9 @@ SailorScript_0x755f1: waitbutton closetext setevent EVENT_FAST_SHIP_LAZY_SAILOR - setmapscene FAST_SHIP_B1F, 1 + setmapscene FAST_SHIP_B1F, SCENE_FINISHED checkcode VAR_FACING - if_equal RIGHT, UnknownScript_0x75629 + ifequal RIGHT, UnknownScript_0x75629 applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637 playsound SFX_EXIT_BUILDING disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR @@ -267,30 +265,25 @@ BurglarCoreyAfterBattleText: done FastShipCabins_NNW_NNE_NE_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 2, 0, 2, FAST_SHIP_1F - warp_def 2, 12, 3, FAST_SHIP_1F - warp_def 2, 24, 4, FAST_SHIP_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 6, 13, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan - bg_event 7, 19, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan - bg_event 7, 31, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan - -.ObjectEvents: - db 7 - object_event 4, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - object_event 1, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - object_event 4, 17, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 4, 26, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR - object_event 7, 30, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - object_event 2, 30, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + db 0, 0 ; filler + + db 3 ; warp events + warp_event 2, 0, FAST_SHIP_1F, 2 + warp_event 2, 12, FAST_SHIP_1F, 3 + warp_event 2, 24, FAST_SHIP_1F, 4 + + db 0 ; coord events + + db 3 ; bg events + bg_event 6, 13, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan + bg_event 7, 19, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan + bg_event 7, 31, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan + + db 7 ; object events + object_event 4, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event 1, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 4, 17, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 4, 26, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR + object_event 7, 30, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event 2, 30, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 5c038275d..67109ec4c 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_CAPTAIN const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 @@ -12,11 +12,9 @@ const_value set 2 const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2 FastShipCabins_SE_SSE_CaptainsCabin_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Unreferenced_0x75ea6: end @@ -38,7 +36,7 @@ SSAquaCaptain: end SSAquaGranddaughterBefore: - spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT + objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT opentext writetext SSAquaGranddaughterCaptainPlayWithMeText waitbutton @@ -48,19 +46,19 @@ SSAquaGranddaughterBefore: writetext SSAquaGranddaughterHasToFindGrandpaText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2 applymovement PLAYER, MovementData_0x76004 moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, 3, 19 appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 - spriteface PLAYER, UP - spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP - special Special_FadeInQuickly - spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN + objectface PLAYER, UP + objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP + special FadeInQuickly + objectface 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 + objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT checkflag ENGINE_PLAYER_IS_FEMALE iftrue .PlayerIsFemale opentext @@ -75,13 +73,13 @@ SSAquaGranddaughterBefore: waitbutton closetext .cont: - spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN + objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x76010 opentext writetext SSAquaEntertainedGranddaughterText buttonsound setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - setmapscene FAST_SHIP_1F, 0 + setmapscene FAST_SHIP_1F, SCENE_DEFAULT jump SSAquaMetalCoatAndDocking SSAquaGrandpa: @@ -94,7 +92,7 @@ SSAquaGrandpa: writetext SSAquaCantFindGranddaughterText waitbutton closetext - setmapscene FAST_SHIP_1F, 0 + setmapscene FAST_SHIP_1F, SCENE_DEFAULT end SSAquaMetalCoatAndDocking: @@ -141,10 +139,10 @@ SSAquaGranddaughterAfter: end TrainerPokefanmColin: - trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, .Script + trainer POKEFANM, COLIN, EVENT_BEAT_POKEFANM_COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokefanmColinAfterBattleText waitbutton @@ -152,10 +150,10 @@ TrainerPokefanmColin: end TrainerTwinsMegandpeg1: - trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, .Script + trainer TWINS, MEGANDPEG1, EVENT_BEAT_TWINS_MEG_AND_PEG, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext TwinsMegandpeg1AfterBattleText waitbutton @@ -163,10 +161,10 @@ TrainerTwinsMegandpeg1: end TrainerTwinsMegandpeg2: - trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, .Script + trainer TWINS, MEGANDPEG2, EVENT_BEAT_TWINS_MEG_AND_PEG, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext TwinsMegandpeg2AfterBattleText waitbutton @@ -174,10 +172,10 @@ TrainerTwinsMegandpeg2: end TrainerPsychicRodney: - trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, .Script + trainer PSYCHIC_T, RODNEY, EVENT_BEAT_PSYCHIC_RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PsychicRodneyAfterBattleText waitbutton @@ -185,10 +183,10 @@ TrainerPsychicRodney: end TrainerPokefanmJeremy: - trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, .Script + trainer POKEFANM, JEREMY, EVENT_BEAT_POKEFANM_JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokefanmJeremyAfterBattleText waitbutton @@ -196,10 +194,10 @@ TrainerPokefanmJeremy: end TrainerPokefanfGeorgia: - trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, .Script + trainer POKEFANF, GEORGIA, EVENT_BEAT_POKEFANF_GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokefanfGeorgiaAfterBattleText waitbutton @@ -207,10 +205,10 @@ TrainerPokefanfGeorgia: end TrainerSupernerdShawn: - trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, .Script + trainer SUPER_NERD, SHAWN, EVENT_BEAT_SUPER_NERD_SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SupernerdShawnAfterBattleText waitbutton @@ -463,35 +461,30 @@ SSAquaHasArrivedVermilionText: done FastShipCabins_SE_SSE_CaptainsCabin_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 2, 7, 8, FAST_SHIP_1F - warp_def 3, 7, 8, FAST_SHIP_1F - warp_def 2, 19, 9, FAST_SHIP_1F - warp_def 3, 19, 9, FAST_SHIP_1F - warp_def 2, 33, 10, FAST_SHIP_1F - warp_def 3, 33, 10, FAST_SHIP_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 4, 25, BGEVENT_READ, FastShipCaptainsCabinTrashcan - -.ObjectEvents: - db 11 - object_event 3, 25, SPRITE_CAPTAIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1 - object_event 2, 17, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN - object_event 3, 17, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 - object_event 2, 25, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterBefore, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 - object_event 5, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 2, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 5, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - object_event 5, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - object_event 1, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + db 0, 0 ; filler + + db 6 ; warp events + warp_event 2, 7, FAST_SHIP_1F, 8 + warp_event 3, 7, FAST_SHIP_1F, 8 + warp_event 2, 19, FAST_SHIP_1F, 9 + warp_event 3, 19, FAST_SHIP_1F, 9 + warp_event 2, 33, FAST_SHIP_1F, 10 + warp_event 3, 33, FAST_SHIP_1F, 10 + + db 0 ; coord events + + db 1 ; bg events + bg_event 4, 25, BGEVENT_READ, FastShipCaptainsCabinTrashcan + + db 11 ; object events + object_event 3, 25, SPRITE_CAPTAIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1 + object_event 2, 17, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN + object_event 3, 17, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 + object_event 2, 25, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterBefore, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 + object_event 5, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 2, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 5, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 5, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 1, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index d4d35f584..e9146447b 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -1,21 +1,19 @@ -const_value set 2 + const_def 2 ; object constants 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_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerFirebreatherLyle: - trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script + trainer FIREBREATHER, LYLE, EVENT_BEAT_FIREBREATHER_LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FirebreatherLyleAfterBattleText waitbutton @@ -23,10 +21,10 @@ TrainerFirebreatherLyle: end TrainerBugCatcherKen: - trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, BugCatcherKenSeenText, BugCatcherKenBeatenText, 0, .Script + trainer BUG_CATCHER, KEN, EVENT_BEAT_BUG_CATCHER_KEN, BugCatcherKenSeenText, BugCatcherKenBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BugCatcherKenAfterBattleText waitbutton @@ -34,10 +32,10 @@ TrainerBugCatcherKen: end TrainerBeautyCassie: - trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, .Script + trainer BEAUTY, CASSIE, EVENT_BEAT_BEAUTY_CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BeautyCassieAfterBattleText waitbutton @@ -45,11 +43,11 @@ TrainerBeautyCassie: end TrainerGuitaristClyde: - trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, .Script + trainer GUITARIST, CLYDE, EVENT_BEAT_GUITARIST_CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, .Script .Script: - end_if_just_battled - special Special_Mobile_DummyReturnFalse + endifjustbattled + special Mobile_DummyReturnFalse iftrue .mobile opentext writetext UnknownText_0x75d65 @@ -69,14 +67,14 @@ FastShipBed: writetext FastShipBedText1 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty playmusic MUSIC_HEAL pause 60 special RestartMapMusic - special Special_FadeInQuickly + special FadeInQuickly opentext writetext FastShipBedText2 waitbutton @@ -223,29 +221,24 @@ FastShipArrivedVermilionText: done FastShipCabins_SW_SSW_NW_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 2, 0, 5, FAST_SHIP_1F - warp_def 2, 19, 6, FAST_SHIP_1F - warp_def 3, 19, 6, FAST_SHIP_1F - warp_def 2, 31, 7, FAST_SHIP_1F - warp_def 3, 31, 7, FAST_SHIP_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 7, 1, BGEVENT_READ, FastShipBed - bg_event 7, 2, BGEVENT_READ, FastShipBed - bg_event 7, 7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan - -.ObjectEvents: - db 4 - object_event 1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - object_event 1, 26, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - object_event 3, 28, SPRITE_ROCKER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + db 0, 0 ; filler + + db 5 ; warp events + warp_event 2, 0, FAST_SHIP_1F, 5 + warp_event 2, 19, FAST_SHIP_1F, 6 + warp_event 3, 19, FAST_SHIP_1F, 6 + warp_event 2, 31, FAST_SHIP_1F, 7 + warp_event 3, 31, FAST_SHIP_1F, 7 + + db 0 ; coord events + + db 3 ; bg events + bg_event 7, 1, BGEVENT_READ, FastShipBed + bg_event 7, 2, BGEVENT_READ, FastShipBed + bg_event 7, 7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan + + db 4 ; object events + object_event 1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 1, 26, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event 3, 28, SPRITE_ROCKER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 46cc7ddeb..dde645d75 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const FIGHTINGDOJO_BLACK_BELT const FIGHTINGDOJO_POKE_BALL FightingDojo_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FightingDojoBlackBelt: jumptextfaceplayer FightingDojoBlackBeltText @@ -43,23 +41,18 @@ FightingDojoSign1Text: done FightingDojo_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 11, 1, SAFFRON_CITY - warp_def 5, 11, 1, SAFFRON_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 4, 0, BGEVENT_READ, MapFightingDojoSignpost0Script - bg_event 5, 0, BGEVENT_READ, MapFightingDojoSignpost1Script - -.ObjectEvents: - db 2 - object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 - object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 11, SAFFRON_CITY, 1 + warp_event 5, 11, SAFFRON_CITY, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 4, 0, BGEVENT_READ, MapFightingDojoSignpost0Script + bg_event 5, 0, BGEVENT_READ, MapFightingDojoSignpost1Script + + db 2 ; object events + object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 + object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm deleted file mode 100644 index 8a72256b6..000000000 --- a/maps/FuchsiaBillSpeechHouse.asm +++ /dev/null @@ -1,48 +0,0 @@ -const_value set 2 - const FUCHSIABILLSPEECHHOUSE_POKEFAN_F - const FUCHSIABILLSPEECHHOUSE_YOUNGSTER - -FuchsiaBillSpeechHouse_MapScripts: -.SceneScripts: - db 0 - -.MapCallbacks: - db 0 - -FuchsiaBillSpeechHousePokefanFScript: - jumptextfaceplayer FuchsiaBillSpeechHousePokefanFText - -FuchsiaBillSpeechHouseYoungsterScript: - jumptextfaceplayer FuchsiaBillSpeechHouseYoungsterText - -FuchsiaBillSpeechHousePokefanFText: - text "My grandpa is at " - line "my brother BILL's" - cont "on CERULEAN CAPE." - done - -FuchsiaBillSpeechHouseYoungsterText: - text "I saw these weird," - line "slow #MON on" - cont "CYCLING ROAD." - done - -FuchsiaBillSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 4, FUCHSIA_CITY - warp_def 3, 7, 4, FUCHSIA_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHousePokefanFScript, -1 - object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHouseYoungsterScript, -1 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 34a636aaf..0d44b0e8f 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const FUCHSIACITY_YOUNGSTER const FUCHSIACITY_POKEFAN_M const FUCHSIACITY_TEACHER const FUCHSIACITY_FRUIT_TREE FuchsiaCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -125,40 +123,35 @@ NoLitteringSignText: done FuchsiaCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 11 - warp_def 5, 13, 2, FUCHSIA_MART - warp_def 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE - warp_def 8, 27, 1, FUCHSIA_GYM - warp_def 11, 27, 1, FUCHSIA_BILL_SPEECH_HOUSE - warp_def 19, 27, 1, FUCHSIA_POKECENTER_1F - warp_def 27, 27, 1, SAFARI_ZONE_WARDENS_HOME - warp_def 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA - warp_def 37, 22, 1, ROUTE_15_FUCHSIA_GATE - warp_def 37, 23, 2, ROUTE_15_FUCHSIA_GATE - warp_def 7, 35, 1, ROUTE_19_FUCHSIA_GATE - warp_def 8, 35, 2, ROUTE_19_FUCHSIA_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 8 + db 0, 0 ; filler + + db 11 ; warp events + warp_event 5, 13, FUCHSIA_MART, 2 + warp_event 22, 13, SAFARI_ZONE_MAIN_OFFICE, 1 + warp_event 8, 27, FUCHSIA_GYM, 1 + warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1 + warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1 + warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1 + warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; inaccessible + warp_event 37, 22, ROUTE_15_FUCHSIA_GATE, 1 + warp_event 37, 23, ROUTE_15_FUCHSIA_GATE, 2 + warp_event 7, 35, ROUTE_19_FUCHSIA_GATE, 1 + warp_event 8, 35, ROUTE_19_FUCHSIA_GATE, 2 + + db 0 ; coord events + + db 8 ; bg events bg_event 21, 15, BGEVENT_READ, FuchsiaCitySign - bg_event 5, 29, BGEVENT_READ, FuchsiaGymSign + bg_event 5, 29, BGEVENT_READ, FuchsiaGymSign bg_event 25, 15, BGEVENT_READ, SafariZoneOfficeSign bg_event 27, 29, BGEVENT_READ, WardensHomeSign - bg_event 17, 5, BGEVENT_READ, SafariZoneClosedSign + bg_event 17, 5, BGEVENT_READ, SafariZoneClosedSign bg_event 13, 15, BGEVENT_READ, NoLitteringSign bg_event 20, 27, BGEVENT_READ, FuchsiaCityPokecenterSign - bg_event 6, 13, BGEVENT_READ, FuchsiaCityMartSign + bg_event 6, 13, BGEVENT_READ, FuchsiaCityMartSign -.ObjectEvents: - db 4 + db 4 ; object events object_event 23, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1 - object_event 13, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 + object_event 13, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 object_event 16, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1 - object_event 8, 1, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1 + object_event 8, 1, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index a691d1d50..715e6b907 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const FUCHSIAGYM_JANINE const FUCHSIAGYM_FUCHSIA_GYM_1 const FUCHSIAGYM_FUCHSIA_GYM_2 @@ -7,11 +7,9 @@ const_value set 2 const FUCHSIAGYM_GYM_GUY FuchsiaGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FuchsiaGymJanineScript: checkflag ENGINE_SOULBADGE @@ -35,7 +33,7 @@ FuchsiaGymJanineScript: variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext Text_ReceivedSoulBadge playsound SFX_GET_BADGE @@ -65,7 +63,7 @@ LassAliceScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_1, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX .AliceUnmasked: faceplayer opentext @@ -99,7 +97,7 @@ LassLindaScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_2, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX .LindaUnmasked: faceplayer opentext @@ -133,7 +131,7 @@ PicnickerCindyScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_3, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX .CindyUnmasked: faceplayer opentext @@ -167,7 +165,7 @@ CamperBarryScript: applymovement FUCHSIAGYM_FUCHSIA_GYM_4, Movement_NinjaSpin faceplayer variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX .BarryUnmasked: faceplayer opentext @@ -381,27 +379,22 @@ FuchsiaGymGuyWinText: done FuchsiaGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 17, 3, FUCHSIA_CITY - warp_def 5, 17, 3, FUCHSIA_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 15, BGEVENT_READ, FuchsiaGymStatue - bg_event 6, 15, BGEVENT_READ, FuchsiaGymStatue - -.ObjectEvents: - db 6 - object_event 1, 10, SPRITE_JANINE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1 - object_event 5, 7, SPRITE_FUCHSIA_GYM_1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassAliceScript, -1 - object_event 5, 11, SPRITE_FUCHSIA_GYM_2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1 - object_event 9, 4, SPRITE_FUCHSIA_GYM_3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PicnickerCindyScript, -1 - object_event 4, 2, SPRITE_FUCHSIA_GYM_4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CamperBarryScript, -1 - object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 17, FUCHSIA_CITY, 3 + warp_event 5, 17, FUCHSIA_CITY, 3 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 15, BGEVENT_READ, FuchsiaGymStatue + bg_event 6, 15, BGEVENT_READ, FuchsiaGymStatue + + db 6 ; object events + object_event 1, 10, SPRITE_JANINE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1 + object_event 5, 7, SPRITE_FUCHSIA_GYM_1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassAliceScript, -1 + object_event 5, 11, SPRITE_FUCHSIA_GYM_2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1 + object_event 9, 4, SPRITE_FUCHSIA_GYM_3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PicnickerCindyScript, -1 + object_event 4, 2, SPRITE_FUCHSIA_GYM_4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CamperBarryScript, -1 + object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 4ab7932f3..b2e819917 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const FUCHSIAMART_CLERK const FUCHSIAMART_FISHER const FUCHSIAMART_COOLTRAINER_F FuchsiaMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x195ce8: opentext @@ -38,22 +36,17 @@ FuchsiaMartCooltrainerFText: done FuchsiaMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, FUCHSIA_CITY - warp_def 3, 7, 1, FUCHSIA_CITY + db 2 ; warp events + warp_event 2, 7, FUCHSIA_CITY, 1 + warp_event 3, 7, FUCHSIA_CITY, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 - object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1 - object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 + object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1 + object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1 diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index 9bc8775a6..3e05aa719 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -1,16 +1,14 @@ -const_value set 2 + const_def 2 ; object constants const FUCHSIAPOKECENTER1F_NURSE const FUCHSIAPOKECENTER1F_COOLTRAINER_M const FUCHSIAPOKECENTER1F_COOLTRAINER_F const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR FuchsiaPokecenter1F_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -33,7 +31,7 @@ JanineImpersonatorScript_0x196462: applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext UnknownText_0x19654e waitbutton @@ -41,7 +39,7 @@ JanineImpersonatorScript_0x196462: applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX end MovementData_0x196486: @@ -89,24 +87,19 @@ UnknownText_0x19654e: done FuchsiaPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 5, FUCHSIA_CITY - warp_def 4, 7, 5, FUCHSIA_CITY - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1 - object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1 - object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1 - object_event 5, 3, SPRITE_JANINE_IMPERSONATOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, FUCHSIA_CITY, 5 + warp_event 4, 7, FUCHSIA_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1 + object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1 + object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1 + object_event 5, 3, SPRITE_JANINE_IMPERSONATOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1 diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm index dc61c55ab..bfa6be81e 100644 --- a/maps/FuchsiaPokecenter2FBeta.asm +++ b/maps/FuchsiaPokecenter2FBeta.asm @@ -1,23 +1,16 @@ FuchsiaPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FuchsiaPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, FUCHSIA_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, FUCHSIA_POKECENTER_1F, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 48cc677ab..e4bb27a4a 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODBIKESHOP_CLERK GoldenrodBikeShop_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks UnknownScript_0x5474f: end @@ -103,29 +101,24 @@ UnknownText_0x548ed: done GoldenrodBikeShop_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 2, GOLDENROD_CITY - warp_def 3, 7, 2, GOLDENROD_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 9 - bg_event 1, 2, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - bg_event 0, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - bg_event 1, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - bg_event 0, 5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - bg_event 1, 5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - bg_event 0, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - bg_event 1, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - bg_event 6, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - bg_event 7, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - -.ObjectEvents: - db 1 - object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, GOLDENROD_CITY, 2 + warp_event 3, 7, GOLDENROD_CITY, 2 + + db 0 ; coord events + + db 9 ; bg events + bg_event 1, 2, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 0, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 1, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 0, 5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 1, 5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 0, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 1, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 6, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 7, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + + db 1 ; object events + object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 89ca2bb0d..5474b85e7 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODCITY_POKEFAN_M1 const GOLDENRODCITY_YOUNGSTER1 const GOLDENRODCITY_COOLTRAINER_F1 @@ -16,17 +16,15 @@ const_value set 2 const GOLDENRODCITY_POKEFAN_M2 GoldenrodCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPointAndFloria callback MAPCALLBACK_OBJECTS, .MoveTutor .FlyPointAndFloria: setflag ENGINE_FLYPOINT_GOLDENROD - setflag ENGINE_FLORIA + setflag ENGINE_REACHED_GOLDENROD checkevent EVENT_MET_FLORIA iftrue .FloriaDone clearevent EVENT_FLORIA_AT_SUDOWOODO @@ -39,8 +37,8 @@ GoldenrodCity_MapScripts: checkitem COIN_CASE iffalse .MoveTutorDisappear checkcode VAR_WEEKDAY - if_equal WEDNESDAY, .MoveTutorAppear - if_equal SATURDAY, .MoveTutorAppear + ifequal WEDNESDAY, .MoveTutorAppear + ifequal SATURDAY, .MoveTutorAppear .MoveTutorDisappear: disappear GOLDENRODCITY_POKEFAN_M2 return @@ -52,55 +50,55 @@ GoldenrodCity_MapScripts: .MoveTutorDone: return -MoveTutor: +MoveTutorScript: faceplayer opentext writetext UnknownText_0x199042 yesorno iffalse .Refused - special Special_DisplayCoinCaseBalance + special DisplayCoinCaseBalance writetext UnknownText_0x199090 yesorno iffalse .Refused2 checkcoins 4000 - if_equal HAVE_LESS, .NotEnoughMoney + ifequal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x1990ce - loadmenudata .MoveMenuDataHeader + loadmenuheader .MoveMenuHeader verticalmenu closewindow - if_equal MOVETUTOR_FLAMETHROWER, .Flamethrower - if_equal MOVETUTOR_THUNDERBOLT, .Thunderbolt - if_equal MOVETUTOR_ICE_BEAM, .IceBeam + ifequal MOVETUTOR_FLAMETHROWER, .Flamethrower + ifequal MOVETUTOR_THUNDERBOLT, .Thunderbolt + ifequal MOVETUTOR_ICE_BEAM, .IceBeam jump .Incompatible .Flamethrower: writebyte MOVETUTOR_FLAMETHROWER writetext UnknownText_0x1991cf - special Special_MoveTutor - if_equal FALSE, .TeachMove + special MoveTutor + ifequal FALSE, .TeachMove jump .Incompatible .Thunderbolt: writebyte MOVETUTOR_THUNDERBOLT writetext UnknownText_0x1991cf - special Special_MoveTutor - if_equal FALSE, .TeachMove + special MoveTutor + ifequal FALSE, .TeachMove jump .Incompatible .IceBeam: writebyte MOVETUTOR_ICE_BEAM writetext UnknownText_0x1991cf - special Special_MoveTutor - if_equal FALSE, .TeachMove + special MoveTutor + ifequal FALSE, .TeachMove jump .Incompatible -.MoveMenuDataHeader: +.MoveMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 15, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "FLAMETHROWER@" @@ -126,12 +124,12 @@ MoveTutor: takecoins 4000 waitsfx playsound SFX_TRANSACTION - special Special_DisplayCoinCaseBalance + special DisplayCoinCaseBalance writetext UnknownText_0x19918b waitbutton closetext checkcode VAR_FACING - if_equal LEFT, .WalkAroundPlayer + ifequal LEFT, .WalkAroundPlayer applymovement GOLDENRODCITY_POKEFAN_M2, MovementData_0x198a5f jump .GoInside @@ -212,7 +210,7 @@ GoldenrodCityRocketScoutScript: writetext GoldenrodCityRocketScoutText2 waitbutton closetext - spriteface GOLDENRODCITY_ROCKETSCOUT, UP + objectface GOLDENRODCITY_ROCKETSCOUT, UP end GoldenrodCityRocket1Script: @@ -552,59 +550,54 @@ UnknownText_0x1991cf: done GoldenrodCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 15 - warp_def 24, 7, 1, GOLDENROD_GYM - warp_def 29, 29, 1, GOLDENROD_BIKE_SHOP - warp_def 31, 21, 1, GOLDENROD_HAPPINESS_RATER - warp_def 5, 25, 1, GOLDENROD_BILLS_HOUSE - warp_def 9, 13, 2, GOLDENROD_MAGNET_TRAIN_STATION - warp_def 29, 5, 1, GOLDENROD_FLOWER_SHOP - warp_def 33, 9, 1, GOLDENROD_PP_SPEECH_HOUSE - warp_def 15, 7, 1, GOLDENROD_NAME_RATER - warp_def 24, 27, 1, GOLDENROD_DEPT_STORE_1F - warp_def 14, 21, 1, GOLDENROD_GAME_CORNER - warp_def 5, 15, 1, RADIO_TOWER_1F - warp_def 19, 1, 3, ROUTE_35_GOLDENROD_GATE - warp_def 9, 5, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 11, 29, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 15, 27, 1, GOLDENROD_POKECENTER_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 12 + db 0, 0 ; filler + + db 15 ; warp events + warp_event 24, 7, GOLDENROD_GYM, 1 + warp_event 29, 29, GOLDENROD_BIKE_SHOP, 1 + warp_event 31, 21, GOLDENROD_HAPPINESS_RATER, 1 + warp_event 5, 25, BILLS_FAMILYS_HOUSE, 1 + warp_event 9, 13, GOLDENROD_MAGNET_TRAIN_STATION, 2 + warp_event 29, 5, GOLDENROD_FLOWER_SHOP, 1 + warp_event 33, 9, GOLDENROD_PP_SPEECH_HOUSE, 1 + warp_event 15, 7, GOLDENROD_NAME_RATER, 1 + warp_event 24, 27, GOLDENROD_DEPT_STORE_1F, 1 + warp_event 14, 21, GOLDENROD_GAME_CORNER, 1 + warp_event 5, 15, RADIO_TOWER_1F, 1 + warp_event 19, 1, ROUTE_35_GOLDENROD_GATE, 3 + warp_event 9, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 8 + warp_event 11, 29, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 5 + warp_event 15, 27, GOLDENROD_POKECENTER_1F, 1 + + db 0 ; coord events + + db 12 ; bg events bg_event 10, 14, BGEVENT_READ, GoldenrodCityStationSign - bg_event 4, 17, BGEVENT_READ, GoldenrodCityRadioTowerSign + bg_event 4, 17, BGEVENT_READ, GoldenrodCityRadioTowerSign bg_event 26, 27, BGEVENT_READ, GoldenrodDeptStoreSign - bg_event 26, 9, BGEVENT_READ, GoldenrodGymSign + bg_event 26, 9, BGEVENT_READ, GoldenrodGymSign bg_event 22, 18, BGEVENT_READ, GoldenrodCitySign bg_event 28, 30, BGEVENT_READ, GoldenrodCityBikeShopSign bg_event 16, 22, BGEVENT_READ, GoldenrodCityGameCornerSign - bg_event 12, 7, BGEVENT_READ, GoldenrodCityNameRaterSign - bg_event 8, 6, BGEVENT_READ, GoldenrodCityUndergroundSignNorth + bg_event 12, 7, BGEVENT_READ, GoldenrodCityNameRaterSign + bg_event 8, 6, BGEVENT_READ, GoldenrodCityUndergroundSignNorth bg_event 12, 30, BGEVENT_READ, GoldenrodCityUndergroundSignSouth bg_event 16, 27, BGEVENT_UP, GoldenrodCityPokecenterSign - bg_event 30, 6, BGEVENT_READ, GoldenrodCityFlowerShopSign + bg_event 30, 6, BGEVENT_READ, GoldenrodCityFlowerShopSign -.ObjectEvents: - db 15 - object_event 7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS + db 15 ; object events + object_event 7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS object_event 30, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS object_event 12, 16, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS object_event 20, 26, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS object_event 19, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster2Script, EVENT_GOLDENROD_CITY_CIVILIANS object_event 17, 10, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityLassScript, EVENT_GOLDENROD_CITY_CIVILIANS object_event 11, 27, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityGrampsScript, EVENT_GOLDENROD_CITY_CIVILIANS - object_event 4, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT + object_event 4, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT object_event 28, 20, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket1Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER - object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER object_event 16, 23, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket3Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 29, 20, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 29, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 29, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 31, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 12, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR + object_event 12, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutorScript, EVENT_GOLDENROD_CITY_MOVE_TUTOR diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 6f07b6ad4..5877484be 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODDEPTSTORE1F_RECEPTIONIST const GOLDENRODDEPTSTORE1F_POKEFAN_F const GOLDENRODDEPTSTORE1F_BUG_CATCHER const GOLDENRODDEPTSTORE1F_GENTLEMAN GoldenrodDeptStore1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GoldenrodDeptStore1FReceptionistScript: jumptextfaceplayer GoldenrodDeptStore1FReceptionistText @@ -79,27 +77,22 @@ GoldenrodDeptStore1FDirectoryText: done GoldenrodDeptStore1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 7, 7, 9, GOLDENROD_CITY - warp_def 8, 7, 9, GOLDENROD_CITY - warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_2F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore1FDirectory - bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton - -.ObjectEvents: - db 4 - object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1 - object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1 - object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1 - object_event 11, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 7, 7, GOLDENROD_CITY, 9 + warp_event 8, 7, GOLDENROD_CITY, 9 + warp_event 15, 0, GOLDENROD_DEPT_STORE_2F, 2 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore1FDirectory + bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton + + db 4 ; object events + object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1 + object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1 + object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1 + object_event 11, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index bfe6a398f..f28ffc240 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODDEPTSTORE2F_CLERK1 const GOLDENRODDEPTSTORE2F_CLERK2 const GOLDENRODDEPTSTORE2F_YOUNGSTER @@ -6,11 +6,9 @@ const_value set 2 const GOLDENRODDEPTSTORE2F_GENTLEMAN GoldenrodDeptStore2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x55b5d: faceplayer @@ -101,27 +99,22 @@ GoldenrodDeptStore2FDirectoryText: done GoldenrodDeptStore2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_3F - warp_def 15, 0, 3, GOLDENROD_DEPT_STORE_1F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore2FDirectory - bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton - -.ObjectEvents: - db 5 - object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1 - object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1 - object_event 9, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1 - object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1 - object_event 2, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 12, 0, GOLDENROD_DEPT_STORE_3F, 1 + warp_event 15, 0, GOLDENROD_DEPT_STORE_1F, 3 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore2FDirectory + bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton + + db 5 ; object events + object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1 + object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1 + object_event 9, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1 + object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1 + object_event 2, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index c495cb440..0be5d0a47 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODDEPTSTORE3F_CLERK const GOLDENRODDEPTSTORE3F_SUPER_NERD const GOLDENRODDEPTSTORE3F_ROCKER GoldenrodDeptStore3F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x55db8: faceplayer @@ -57,25 +55,20 @@ GoldenrodDeptStore3FDirectoryText: done GoldenrodDeptStore3F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_2F - warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_4F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore3FDirectory - bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton - -.ObjectEvents: - db 3 - object_event 6, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1 - object_event 12, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1 - object_event 2, 5, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 12, 0, GOLDENROD_DEPT_STORE_2F, 1 + warp_event 15, 0, GOLDENROD_DEPT_STORE_4F, 2 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore3FDirectory + bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton + + db 3 ; object events + object_event 6, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1 + object_event 12, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1 + object_event 2, 5, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 03882b8f2..1f9a6a92d 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODDEPTSTORE4F_CLERK const GOLDENRODDEPTSTORE4F_COOLTRAINER_M const GOLDENRODDEPTSTORE4F_BUG_CATCHER const GOLDENRODDEPTSTORE4F_GAMEBOY_KID GoldenrodDeptStore4F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x55ee9: faceplayer @@ -30,7 +28,7 @@ GameboyKidScript_0x55ef7: writetext UnknownText_0x55f74 waitbutton closetext - spriteface GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN + objectface GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN end GoldenrodDeptStore4FDirectory: @@ -78,26 +76,21 @@ GoldenrodDeptStore4FDirectoryText: done GoldenrodDeptStore4F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_5F - warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_3F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore4FDirectory - bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton - -.ObjectEvents: - db 4 - object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1 - object_event 11, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1 - object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1 - object_event 5, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 12, 0, GOLDENROD_DEPT_STORE_5F, 1 + warp_event 15, 0, GOLDENROD_DEPT_STORE_3F, 2 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore4FDirectory + bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton + + db 4 ; object events + object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1 + object_event 11, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1 + object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1 + object_event 5, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 94da64d2f..4eccdfdbd 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODDEPTSTORE5F_CLERK const GOLDENRODDEPTSTORE5F_LASS const GOLDENRODDEPTSTORE5F_MIKE @@ -7,16 +7,14 @@ const_value set 2 const GOLDENRODDEPTSTORE5F_RECEPTIONIST GoldenrodDeptStore5F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .CheckIfSunday .CheckIfSunday: checkcode VAR_WEEKDAY - if_equal SUNDAY, .yes + ifequal SUNDAY, .yes disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST return @@ -62,14 +60,14 @@ ReceptionistScript_0x560ce: faceplayer opentext checkcode VAR_WEEKDAY - if_not_equal SUNDAY, .EventIsOver - checkflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT + ifnotequal SUNDAY, .EventIsOver + checkflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN iftrue .EventIsOver - special Special_GetFirstPokemonHappiness + special GetFirstPokemonHappiness writetext UnknownText_0x56143 buttonsound - if_greater_than 150 - 1, .VeryHappy - if_greater_than 50 - 1, .SomewhatHappy + ifgreater 150 - 1, .VeryHappy + ifgreater 50 - 1, .SomewhatHappy jump .NotVeryHappy .VeryHappy: @@ -77,7 +75,7 @@ ReceptionistScript_0x560ce: buttonsound verbosegiveitem TM_RETURN iffalse .Done - setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT + setflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN closetext end @@ -92,7 +90,7 @@ ReceptionistScript_0x560ce: buttonsound verbosegiveitem TM_FRUSTRATION iffalse .Done - setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT + setflag ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN closetext end @@ -106,12 +104,12 @@ ReceptionistScript_0x560ce: Carrie: faceplayer opentext - special Special_GameboyCheck - if_not_equal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver + special GameboyCheck + ifnotequal GBCHECK_CGB, .NotGBC ; This is a dummy check from Gold/Silver writetext UnknownText_0x56241 waitbutton closetext - special Special_UnlockMysteryGift + special UnlockMysteryGift end .NotGBC: @@ -126,7 +124,7 @@ GoldenrodDeptStore5FLassScript: Mike: faceplayer opentext - trade NPCTRADE_MIKE + trade NPC_TRADE_MIKE waitbutton closetext end @@ -218,28 +216,23 @@ GoldenrodDeptStore5FDirectoryText: done GoldenrodDeptStore5F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 12, 0, 1, GOLDENROD_DEPT_STORE_4F - warp_def 15, 0, 1, GOLDENROD_DEPT_STORE_6F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore5FDirectory - bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton - -.ObjectEvents: - db 6 - object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1 - object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1 - object_event 6, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1 - object_event 13, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1 - object_event 9, 1, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Carrie, -1 - object_event 7, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY + db 0, 0 ; filler + + db 3 ; warp events + warp_event 12, 0, GOLDENROD_DEPT_STORE_4F, 1 + warp_event 15, 0, GOLDENROD_DEPT_STORE_6F, 1 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore5FDirectory + bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton + + db 6 ; object events + object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1 + object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1 + object_event 6, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1 + object_event 13, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1 + object_event 9, 1, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Carrie, -1 + object_event 7, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 995afcada..bf510a58f 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -1,31 +1,29 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODDEPTSTORE6F_LASS const GOLDENRODDEPTSTORE6F_SUPER_NERD GoldenrodDeptStore6F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GoldenrodVendingMachine: opentext writetext GoldenrodVendingText .Start: - special Special_PlaceMoneyTopRight - loadmenudata .MenuData + special PlaceMoneyTopRight + loadmenuheader .MenuHeader verticalmenu closewindow - if_equal 1, .FreshWater - if_equal 2, .SodaPop - if_equal 3, .Lemonade + ifequal 1, .FreshWater + ifequal 2, .SodaPop + ifequal 3, .Lemonade closetext end .FreshWater: checkmoney YOUR_MONEY, 200 - if_equal HAVE_LESS, .NotEnoughMoney + ifequal HAVE_LESS, .NotEnoughMoney giveitem FRESH_WATER iffalse .NotEnoughSpace takemoney YOUR_MONEY, 200 @@ -34,7 +32,7 @@ GoldenrodVendingMachine: .SodaPop: checkmoney YOUR_MONEY, 300 - if_equal HAVE_LESS, .NotEnoughMoney + ifequal HAVE_LESS, .NotEnoughMoney giveitem SODA_POP iffalse .NotEnoughSpace takemoney YOUR_MONEY, 300 @@ -43,7 +41,7 @@ GoldenrodVendingMachine: .Lemonade: checkmoney YOUR_MONEY, 350 - if_equal HAVE_LESS, .NotEnoughMoney + ifequal HAVE_LESS, .NotEnoughMoney giveitem LEMONADE iffalse .NotEnoughSpace takemoney YOUR_MONEY, 350 @@ -68,13 +66,13 @@ GoldenrodVendingMachine: waitbutton jump .Start -.MenuData: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "FRESH WATER ¥200@" @@ -148,28 +146,23 @@ GoldenrodDeptStore6FDirectoryText: done GoldenrodDeptStore6F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 15, 0, 2, GOLDENROD_DEPT_STORE_5F - warp_def 2, 0, 1, GOLDENROD_DEPT_STORE_ELEVATOR - warp_def 13, 0, 1, GOLDENROD_DEPT_STORE_ROOF - -.CoordEvents: - db 0 - -.BGEvents: - db 6 - bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore6FDirectory - bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore6FElevatorButton - bg_event 8, 1, BGEVENT_UP, GoldenrodVendingMachine - bg_event 9, 1, BGEVENT_UP, GoldenrodVendingMachine - bg_event 10, 1, BGEVENT_UP, GoldenrodVendingMachine - bg_event 11, 1, BGEVENT_UP, GoldenrodVendingMachine - -.ObjectEvents: - db 2 - object_event 10, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1 - object_event 8, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 15, 0, GOLDENROD_DEPT_STORE_5F, 2 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + warp_event 13, 0, GOLDENROD_DEPT_STORE_ROOF, 1 + + db 0 ; coord events + + db 6 ; bg events + bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore6FDirectory + bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore6FElevatorButton + bg_event 8, 1, BGEVENT_UP, GoldenrodVendingMachine + bg_event 9, 1, BGEVENT_UP, GoldenrodVendingMachine + bg_event 10, 1, BGEVENT_UP, GoldenrodVendingMachine + bg_event 11, 1, BGEVENT_UP, GoldenrodVendingMachine + + db 2 ; object events + object_event 10, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1 + object_event 8, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 4d0603d0f..3aa8b50c8 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODDEPTSTOREB1F_POKE_BALL1 const GOLDENRODDEPTSTOREB1F_POKE_BALL2 const GOLDENRODDEPTSTOREB1F_POKE_BALL3 @@ -9,11 +9,9 @@ const_value set 2 const GOLDENRODDEPTSTOREB1F_MACHOP GoldenrodDeptStoreB1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_TILES, UnknownScript_0x7d781 callback MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac @@ -110,28 +108,23 @@ UnknownText_0x7d8bb: done GoldenrodDeptStoreB1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 17, 2, 3, GOLDENROD_UNDERGROUND_WAREHOUSE - warp_def 9, 4, 1, GOLDENROD_DEPT_STORE_ELEVATOR - warp_def 10, 4, 2, GOLDENROD_DEPT_STORE_ELEVATOR - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 8 - object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER - object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN - object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL - object_event 15, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL - object_event 9, 10, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1 - object_event 4, 8, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1 - object_event 6, 13, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1 - object_event 7, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 17, 2, GOLDENROD_UNDERGROUND_WAREHOUSE, 3 + warp_event 9, 4, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + warp_event 10, 4, GOLDENROD_DEPT_STORE_ELEVATOR, 2 + + db 0 ; coord events + + db 0 ; bg events + + db 8 ; object events + object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER + object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN + object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL + object_event 15, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL + object_event 9, 10, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1 + object_event 4, 8, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1 + object_event 6, 13, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1 + object_event 7, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1 diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 6ff041e9f..80931d9ec 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -1,9 +1,7 @@ GoldenrodDeptStoreElevator_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MapGoldenrodDeptStoreElevatorSignpost0Script: opentext @@ -55,20 +53,15 @@ Elevator_0x566e0: db -1 ; end GoldenrodDeptStoreElevator_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 1, 3, -1, GOLDENROD_DEPT_STORE_1F - warp_def 2, 3, -1, GOLDENROD_DEPT_STORE_1F + db 2 ; warp events + warp_event 1, 3, GOLDENROD_DEPT_STORE_1F, -1 + warp_event 2, 3, GOLDENROD_DEPT_STORE_1F, -1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 3, 0, BGEVENT_READ, MapGoldenrodDeptStoreElevatorSignpost0Script + db 1 ; bg events + bg_event 3, 0, BGEVENT_READ, MapGoldenrodDeptStoreElevatorSignpost0Script -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 55f885e62..cd6162349 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODDEPTSTOREROOF_CLERK const GOLDENRODDEPTSTOREROOF_POKEFAN_F const GOLDENRODDEPTSTOREROOF_FISHER @@ -9,11 +9,9 @@ const_value set 2 const GOLDENRODDEPTSTOREROOF_BUG_CATCHER GoldenrodDeptStoreRoof_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_TILES, .CheckSaleChangeBlock callback MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk @@ -54,7 +52,7 @@ FisherScript_0x56749: writetext UnknownText_0x567d2 waitbutton closetext - spriteface GOLDENRODDEPTSTOREROOF_FISHER, UP + objectface GOLDENRODDEPTSTOREROOF_FISHER, UP end GoldenrodDeptStoreRoofTwinScript: @@ -65,12 +63,12 @@ SuperNerdScript_0x56757: writetext UnknownText_0x56867 waitbutton closetext - spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, UP + objectface GOLDENRODDEPTSTOREROOF_SUPER_NERD, UP opentext writetext UnknownText_0x56871 waitbutton closetext - spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT + objectface GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT end GoldenrodDeptStoreRoofPokefanMScript: @@ -212,30 +210,25 @@ PokeDollVendingMachineText: done GoldenrodDeptStoreRoof_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def 13, 1, 3, GOLDENROD_DEPT_STORE_6F - -.CoordEvents: - db 0 - -.BGEvents: - db 4 - bg_event 15, 3, BGEVENT_RIGHT, Binoculars1 - bg_event 15, 5, BGEVENT_RIGHT, Binoculars2 - bg_event 15, 6, BGEVENT_RIGHT, Binoculars3 - bg_event 3, 0, BGEVENT_UP, PokeDollVendingMachine - -.ObjectEvents: - db 8 - object_event 1, 4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF - object_event 10, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1 - object_event 2, 1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1 - object_event 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON - object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON - object_event 7, 0, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF - object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF - object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF + db 0, 0 ; filler + + db 1 ; warp events + warp_event 13, 1, GOLDENROD_DEPT_STORE_6F, 3 + + db 0 ; coord events + + db 4 ; bg events + bg_event 15, 3, BGEVENT_RIGHT, Binoculars1 + bg_event 15, 5, BGEVENT_RIGHT, Binoculars2 + bg_event 15, 6, BGEVENT_RIGHT, Binoculars3 + bg_event 3, 0, BGEVENT_UP, PokeDollVendingMachine + + db 8 ; object events + object_event 1, 4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF + object_event 10, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1 + object_event 2, 1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1 + object_event 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON + object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON + object_event 7, 0, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF + object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF + object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 38a8edc3f..6c73499b6 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODFLOWERSHOP_TEACHER const GOLDENRODFLOWERSHOP_FLORIA GoldenrodFlowerShop_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FlowerShopTeacherScript: checkevent EVENT_FOUGHT_SUDOWOODO @@ -32,7 +30,7 @@ FlowerShopTeacherScript: end .Lalala: - spriteface GOLDENRODFLOWERSHOP_TEACHER, LEFT + objectface GOLDENRODFLOWERSHOP_TEACHER, LEFT opentext writetext UnknownText_0x5552e waitbutton @@ -160,21 +158,16 @@ UnknownText_0x55604: done GoldenrodFlowerShop_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 6, GOLDENROD_CITY - warp_def 3, 7, 6, GOLDENROD_CITY + db 2 ; warp events + warp_event 2, 7, GOLDENROD_CITY, 6 + warp_event 3, 7, GOLDENROD_CITY, 6 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 - object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1 - object_event 5, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP + db 2 ; object events + object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1 + object_event 5, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 58fc67192..c1accf826 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODGAMECORNER_CLERK const GOLDENRODGAMECORNER_RECEPTIONIST1 const GOLDENRODGAMECORNER_RECEPTIONIST2 @@ -13,11 +13,9 @@ const_value set 2 const GOLDENRODGAMECORNER_POKEFAN_M3 GoldenrodGameCorner_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .Callback .Callback: @@ -26,8 +24,8 @@ GoldenrodGameCorner_MapScripts: checkitem COIN_CASE iffalse .move_tutor_inside checkcode VAR_WEEKDAY - if_equal WEDNESDAY, .move_tutor_outside - if_equal SATURDAY, .move_tutor_outside + ifequal WEDNESDAY, .move_tutor_outside + ifequal SATURDAY, .move_tutor_outside .move_tutor_inside appear GOLDENRODGAMECORNER_POKEFAN_M3 return @@ -45,7 +43,7 @@ GoldenrodGameCornerPokefanM3Script: writetext GoldenrodGameCornerPokefanM3Text waitbutton closetext - spriteface GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT + objectface GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT end GoldenrodGmeCornerCoinVendorScript: @@ -60,18 +58,18 @@ GoldenrodGmeCornerTMVendorScript: iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript writetext GoldenrodGameCornerPrizeVendorWhichPrizeText GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 - special Special_DisplayCoinCaseBalance - loadmenudata GoldenrodGameCornerTMVendorMenuData + special DisplayCoinCaseBalance + loadmenuheader GoldenrodGameCornerTMVendorMenuHeader verticalmenu closewindow - if_equal 1, .Thunder - if_equal 2, .Blizzard - if_equal 3, .FireBlast + ifequal 1, .Thunder + ifequal 2, .Blizzard + ifequal 3, .FireBlast jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript .Thunder: checkcoins 5500 - if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript itemtotext TM_THUNDER, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript @@ -82,7 +80,7 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 .Blizzard: checkcoins 5500 - if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript itemtotext TM_BLIZZARD, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript @@ -93,7 +91,7 @@ GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36 .FireBlast: checkcoins 5500 - if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript itemtotext TM_FIRE_BLAST, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript @@ -138,13 +136,13 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript: closetext end -GoldenrodGameCornerTMVendorMenuData: +GoldenrodGameCornerTMVendorMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 15, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "TM25 5500@" @@ -161,20 +159,20 @@ GoldenrodGameCornerPrizeMonVendorScript: iffalse GoldenrodGameCornerPrizeVendor_NoCoinCaseScript .loop writetext GoldenrodGameCornerPrizeVendorWhichPrizeText - special Special_DisplayCoinCaseBalance - loadmenudata .MenuDataHeader + special DisplayCoinCaseBalance + loadmenuheader .MenuHeader verticalmenu closewindow - if_equal 1, .abra - if_equal 2, .cubone - if_equal 3, .wobbuffet + ifequal 1, .abra + ifequal 2, .cubone + ifequal 3, .wobbuffet jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript .abra checkcoins 100 - if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT - if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript + ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript pokenamemem ABRA, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript @@ -183,16 +181,16 @@ GoldenrodGameCornerPrizeMonVendorScript: writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton writebyte ABRA - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke ABRA, 5 takecoins 100 jump .loop .cubone checkcoins 800 - if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT - if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript + ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript pokenamemem CUBONE, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript @@ -201,16 +199,16 @@ GoldenrodGameCornerPrizeMonVendorScript: writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton writebyte CUBONE - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke CUBONE, 15 takecoins 800 jump .loop .wobbuffet checkcoins 1500 - if_equal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript + ifequal HAVE_LESS, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT - if_equal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript + ifequal PARTY_LENGTH, GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript pokenamemem WOBBUFFET, MEM_BUFFER_0 scall GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript iffalse GoldenrodGameCornerPrizeVendor_CancelPurchaseScript @@ -219,18 +217,18 @@ GoldenrodGameCornerPrizeMonVendorScript: writetext GoldenrodGameCornerPrizeVendorHereYouGoText waitbutton writebyte WOBBUFFET - special Special_GameCornerPrizeMonCheckDex + special GameCornerPrizeMonCheckDex givepoke WOBBUFFET, 15 takecoins 1500 jump .loop -.MenuDataHeader: +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 17, TEXTBOX_Y - 1 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "ABRA 100@" @@ -244,7 +242,7 @@ GoldenrodGameCornerPharmacistScript: writetext GoldenrodGameCornerPharmacistText waitbutton closetext - spriteface LAST_TALKED, LEFT + objectface LAST_TALKED, LEFT end GoldenrodGameCornerPokefanM1Script: @@ -253,7 +251,7 @@ GoldenrodGameCornerPokefanM1Script: writetext GoldenrodGameCornerPokefanM1Text waitbutton closetext - spriteface GOLDENRODGAMECORNER_POKEFAN_M1, RIGHT + objectface GOLDENRODGAMECORNER_POKEFAN_M1, RIGHT end GoldenrodGameCornerCooltrainerMScript: @@ -262,7 +260,7 @@ GoldenrodGameCornerCooltrainerMScript: writetext GoldenrodGameCornerCooltrainerMText waitbutton closetext - spriteface GOLDENRODGAMECORNER_COOLTRAINER_M, LEFT + objectface GOLDENRODGAMECORNER_COOLTRAINER_M, LEFT end GoldenrodGameCornerPokefanFScript: @@ -271,7 +269,7 @@ GoldenrodGameCornerPokefanFScript: writetext GoldenrodGameCornerPokefanFText waitbutton closetext - spriteface GOLDENRODGAMECORNER_POKEFAN_F, RIGHT + objectface GOLDENRODGAMECORNER_POKEFAN_F, RIGHT end GoldenrodGameCornerCooltrainerFScript: @@ -283,7 +281,7 @@ GoldenrodGameCornerGentlemanScript: writetext GoldenrodGameCornerGentlemanText waitbutton closetext - spriteface GOLDENRODGAMECORNER_GENTLEMAN, RIGHT + objectface GOLDENRODGAMECORNER_GENTLEMAN, RIGHT end GoldenrodGameCornerPokefanM2Script: @@ -294,23 +292,23 @@ GoldenrodGameCornerLeftTheirDrinkScript: GoldenrodGameCornerSlotsMachineScript: random 6 - if_equal 0, GoldenrodGameCornerLuckySlotsMachineScript + ifequal 0, GoldenrodGameCornerLuckySlotsMachineScript refreshscreen writebyte FALSE - special Special_SlotMachine + special SlotMachine closetext end GoldenrodGameCornerLuckySlotsMachineScript: refreshscreen writebyte TRUE - special Special_SlotMachine + special SlotMachine closetext end GoldenrodGameCornerCardFlipMachineScript: refreshscreen - special Special_CardFlip + special CardFlip closetext end @@ -437,62 +435,57 @@ GoldenrodGameCornerLeftTheirDrinkText: done GoldenrodGameCorner_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 13, 10, GOLDENROD_CITY - warp_def 3, 13, 10, GOLDENROD_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 31 - bg_event 6, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 6, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 6, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 6, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 6, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 6, 11, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript - bg_event 7, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 7, 7, BGEVENT_READ, GoldenrodGameCornerLuckySlotsMachineScript - bg_event 7, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 7, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 7, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 7, 11, BGEVENT_LEFT, GoldenrodGameCornerSlotsMachineScript - bg_event 12, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 12, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 12, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 12, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 13, GOLDENROD_CITY, 10 + warp_event 3, 13, GOLDENROD_CITY, 10 + + db 0 ; coord events + + db 31 ; bg events + bg_event 6, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 11, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript + bg_event 7, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 7, 7, BGEVENT_READ, GoldenrodGameCornerLuckySlotsMachineScript + bg_event 7, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 7, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 7, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 7, 11, BGEVENT_LEFT, GoldenrodGameCornerSlotsMachineScript + bg_event 12, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 12, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 12, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 12, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript bg_event 12, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript bg_event 12, 11, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript - bg_event 13, 6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript - bg_event 13, 7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript - bg_event 13, 8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript - bg_event 13, 9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 13, 6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 13, 7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 13, 8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 13, 9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript bg_event 13, 10, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript bg_event 13, 11, BGEVENT_LEFT, GoldenrodGameCornerCardFlipMachineScript - bg_event 18, 6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript - bg_event 18, 7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript - bg_event 18, 8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript - bg_event 18, 9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 18, 6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 18, 7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 18, 8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 18, 9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript bg_event 18, 10, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript bg_event 18, 11, BGEVENT_RIGHT, GoldenrodGameCornerCardFlipMachineScript - bg_event 12, 1, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript - -.ObjectEvents: - db 12 - object_event 3, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1 - object_event 16, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1 - object_event 18, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 - object_event 8, 7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 - object_event 8, 7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 + bg_event 12, 1, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript + + db 12 ; object events + object_event 3, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1 + object_event 16, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1 + object_event 18, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 + object_event 8, 7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 + object_event 8, 7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 object_event 11, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1 - object_event 14, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1 - object_event 17, 6, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1 - object_event 10, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1 - object_event 5, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1 - object_event 2, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1 + object_event 14, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1 + object_event 17, 6, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1 + object_event 10, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1 + object_event 5, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1 + object_event 2, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1 object_event 17, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index f4eac1b6b..9f9524596 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODGYM_WHITNEY const GOLDENRODGYM_LASS1 const GOLDENRODGYM_LASS2 @@ -7,13 +7,11 @@ const_value set 2 const GOLDENRODGYM_GYM_GUY GoldenrodGym_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_GOLDENRODGYM_NOTHING + scene_script .DummyScene1 ; SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -35,7 +33,7 @@ WhitneyScript_0x5400c: reloadmapafterbattle setevent EVENT_BEAT_WHITNEY setevent EVENT_MADE_WHITNEY_CRY - setscene 1 + setscene SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING setevent EVENT_BEAT_BEAUTY_VICTORIA setevent EVENT_BEAT_BEAUTY_SAMANTHA setevent EVENT_BEAT_LASS_CARRIE @@ -82,8 +80,8 @@ UnknownScript_0x5407b: end GoldenrodGymActivateRockets: - if_equal 7, .RadioTowerRockets - if_equal 6, .GoldenrodRockets + ifequal 7, .RadioTowerRockets + ifequal 6, .GoldenrodRockets end .GoldenrodRockets: @@ -93,10 +91,10 @@ GoldenrodGymActivateRockets: jumpstd radiotowerrockets TrainerLassCarrie: - trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script + trainer LASS, CARRIE, EVENT_BEAT_LASS_CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext LassCarrieAfterBattleText waitbutton @@ -106,21 +104,21 @@ TrainerLassCarrie: WhitneyCriesScript: showemote EMOTE_SHOCK, GOLDENRODGYM_LASS2, 15 applymovement GOLDENRODGYM_LASS2, BridgetWalksUpMovement - spriteface PLAYER, DOWN + objectface PLAYER, DOWN opentext writetext BridgetWhitneyCriesText waitbutton closetext applymovement GOLDENRODGYM_LASS2, BridgetWalksAwayMovement - setscene 0 + setscene SCENE_GOLDENRODGYM_NOTHING clearevent EVENT_MADE_WHITNEY_CRY end TrainerLassBridget: - trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, .Script + trainer LASS, BRIDGET, EVENT_BEAT_LASS_BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext LassBridgetAfterBattleText waitbutton @@ -128,10 +126,10 @@ TrainerLassBridget: end TrainerBeautyVictoria: - trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, .Script + trainer BEAUTY, VICTORIA, EVENT_BEAT_BEAUTY_VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BeautyVictoriaAfterBattleText waitbutton @@ -139,10 +137,10 @@ TrainerBeautyVictoria: end TrainerBeautySamantha: - trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, .Script + trainer BEAUTY, SAMANTHA, EVENT_BEAT_BEAUTY_SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BeautySamanthaAfterBattleText waitbutton @@ -380,28 +378,23 @@ GoldenrodGymGuyWinText: done GoldenrodGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 17, 1, GOLDENROD_CITY - warp_def 3, 17, 1, GOLDENROD_CITY - -.CoordEvents: - db 1 - coord_event 8, 5, 1, WhitneyCriesScript - -.BGEvents: - db 2 - bg_event 1, 15, BGEVENT_READ, GoldenrodGymStatue - bg_event 4, 15, BGEVENT_READ, GoldenrodGymStatue - -.ObjectEvents: - db 6 - object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1 - object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1 - object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1 - object_event 0, 2, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1 - object_event 19, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1 - object_event 5, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 17, GOLDENROD_CITY, 1 + warp_event 3, 17, GOLDENROD_CITY, 1 + + db 1 ; coord events + coord_event 8, 5, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING, WhitneyCriesScript + + db 2 ; bg events + bg_event 1, 15, BGEVENT_READ, GoldenrodGymStatue + bg_event 4, 15, BGEVENT_READ, GoldenrodGymStatue + + db 6 ; object events + object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1 + object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1 + object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1 + object_event 0, 2, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1 + object_event 19, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1 + object_event 5, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index f31e8603f..78f1ca3ba 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -1,26 +1,24 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODHAPPINESSRATER_TEACHER const GOLDENRODHAPPINESSRATER_POKEFAN_M const GOLDENRODHAPPINESSRATER_TWIN GoldenrodHappinessRater_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TeacherScript_0x54953: faceplayer opentext - special Special_GetFirstPokemonHappiness + special GetFirstPokemonHappiness writetext UnknownText_0x549a3 buttonsound - if_greater_than 250 - 1, UnknownScript_0x54973 - if_greater_than 200 - 1, UnknownScript_0x54979 - if_greater_than 150 - 1, UnknownScript_0x5497f - if_greater_than 100 - 1, UnknownScript_0x54985 - if_greater_than 50 - 1, UnknownScript_0x5498b + ifgreater 250 - 1, UnknownScript_0x54973 + ifgreater 200 - 1, UnknownScript_0x54979 + ifgreater 150 - 1, UnknownScript_0x5497f + ifgreater 100 - 1, UnknownScript_0x54985 + ifgreater 50 - 1, UnknownScript_0x5498b jump UnknownScript_0x54991 UnknownScript_0x54973: @@ -137,25 +135,20 @@ GoldenrodHappinessRaterTwinText: done GoldenrodHappinessRater_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 3, GOLDENROD_CITY - warp_def 3, 7, 3, GOLDENROD_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 0, 1, BGEVENT_READ, HappinessRatersHouseBookshelf - bg_event 1, 1, BGEVENT_READ, HappinessRatersHouseBookshelf - bg_event 7, 1, BGEVENT_READ, HappinessRatersHouseRadio - -.ObjectEvents: - db 3 - object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x54953, -1 - object_event 5, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1 - object_event 5, 6, SPRITE_TWIN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, GOLDENROD_CITY, 3 + warp_event 3, 7, GOLDENROD_CITY, 3 + + db 0 ; coord events + + db 3 ; bg events + bg_event 0, 1, BGEVENT_READ, HappinessRatersHouseBookshelf + bg_event 1, 1, BGEVENT_READ, HappinessRatersHouseBookshelf + bg_event 7, 1, BGEVENT_READ, HappinessRatersHouseRadio + + db 3 ; object events + object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x54953, -1 + object_event 5, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1 + object_event 5, 6, SPRITE_TWIN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index c0f749413..b8992f8dd 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODMAGNETTRAINSTATION_OFFICER const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN GoldenrodMagnetTrainStation_MapScripts: -.SceneScripts: - db 1 - scene_script .DummyScene + db 1 ; scene scripts + scene_script .DummyScene ; SCENE_DEFAULT -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -35,7 +33,7 @@ OfficerScript_0x550ec: applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 applymovement PLAYER, MovementData_0x5514f writebyte FALSE - special Special_MagnetTrain + special MagnetTrain warpcheck newloadmap MAPSETUP_TRAIN applymovement PLAYER, .MovementBoardTheTrain @@ -165,24 +163,19 @@ GoldenrodMagnetTrainStationGentlemanText: done GoldenrodMagnetTrainStation_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 8, 17, 5, GOLDENROD_CITY - warp_def 9, 17, 5, GOLDENROD_CITY - warp_def 6, 5, 4, SAFFRON_MAGNET_TRAIN_STATION - warp_def 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION - -.CoordEvents: - db 1 - coord_event 11, 6, 0, Script_ArriveFromSaffron - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 - object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 8, 17, GOLDENROD_CITY, 5 + warp_event 9, 17, GOLDENROD_CITY, 5 + warp_event 6, 5, SAFFRON_MAGNET_TRAIN_STATION, 4 + warp_event 11, 5, SAFFRON_MAGNET_TRAIN_STATION, 3 + + db 1 ; coord events + coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromSaffron + + db 0 ; bg events + + db 2 ; object events + object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1 object_event 11, 14, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index fc3369a21..16ffddb2c 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -1,17 +1,15 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODNAMERATER_NAME_RATER GoldenrodNameRater_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GoldenrodNameRater: faceplayer opentext - special Special_NameRater + special NameRater waitbutton closetext end @@ -22,26 +20,21 @@ GoldenrodNameRaterBookshelf: GoldenrodNameRaterRadio: jumpstd radio2 -INCLUDE "data/unused/sweet_honey_text.asm" +INCLUDE "data/text/unused_sweet_honey.asm" GoldenrodNameRater_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 8, GOLDENROD_CITY - warp_def 3, 7, 8, GOLDENROD_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 0, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf - bg_event 1, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf - bg_event 7, 1, BGEVENT_READ, GoldenrodNameRaterRadio - -.ObjectEvents: - db 1 - object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, GOLDENROD_CITY, 8 + warp_event 3, 7, GOLDENROD_CITY, 8 + + db 0 ; coord events + + db 3 ; bg events + bg_event 0, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf + bg_event 1, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf + bg_event 7, 1, BGEVENT_READ, GoldenrodNameRaterRadio + + db 1 ; object events + object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 416ed37c7..2f43993d1 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODPPSPEECHHOUSE_FISHER const GOLDENRODPPSPEECHHOUSE_LASS GoldenrodPPSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GoldenrodPPSpeechHouseFisherScript: jumptextfaceplayer GoldenrodPPSpeechHouseFisherText @@ -52,24 +50,19 @@ GoldenrodPPSpeechHouseLassText: done GoldenrodPPSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 7, GOLDENROD_CITY - warp_def 3, 7, 7, GOLDENROD_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 0, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1 - bg_event 1, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2 - bg_event 7, 1, BGEVENT_READ, GoldenrodPPSpeechHouseRadio - -.ObjectEvents: - db 2 - object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1 - object_event 5, 3, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, GOLDENROD_CITY, 7 + warp_event 3, 7, GOLDENROD_CITY, 7 + + db 0 ; coord events + + db 3 ; bg events + bg_event 0, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1 + bg_event 1, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2 + bg_event 7, 1, BGEVENT_READ, GoldenrodPPSpeechHouseRadio + + db 2 ; object events + object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1 + object_event 5, 3, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1 diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index e835ff320..bdaea95ea 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODPOKECENTER1F_NURSE const GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST const GOLDENRODPOKECENTER1F_GAMEBOY_KID @@ -6,19 +6,17 @@ const_value set 2 const GOLDENRODPOKECENTER1F_POKEFAN_F GoldenrodPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x60f91: jumpstd pokecenternurse GoldenrodPokecenter1F_GSBallSceneLeft: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT - special Special_BattleTowerAction - if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball + special BattleTowerAction + ifequal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end .gsball @@ -30,7 +28,7 @@ GoldenrodPokecenter1F_GSBallSceneLeft: appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x6105a - spriteface PLAYER, UP + objectface PLAYER, UP opentext writetext UnknownText_0x622f0 waitbutton @@ -49,8 +47,8 @@ GoldenrodPokecenter1F_GSBallSceneLeft: GoldenrodPokecenter1F_GSBallSceneRight: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT - special Special_BattleTowerAction - if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball + special BattleTowerAction + ifequal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end .gsball @@ -62,7 +60,7 @@ GoldenrodPokecenter1F_GSBallSceneRight: appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x61065 - spriteface PLAYER, UP + objectface PLAYER, UP opentext writetext UnknownText_0x622f0 waitbutton @@ -805,28 +803,23 @@ UnknownText_0x62549: done GoldenrodPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 3, 7, 15, GOLDENROD_CITY - warp_def 4, 7, 15, GOLDENROD_CITY - warp_def 0, 6, 1, GOLDENROD_POKECOM_CENTER_2F_MOBILE - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 2 - coord_event 3, 7, 0, GoldenrodPokecenter1F_GSBallSceneLeft - coord_event 4, 7, 0, GoldenrodPokecenter1F_GSBallSceneRight - -.BGEvents: - db 0 - -.ObjectEvents: - db 5 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x60f91, -1 - object_event 16, 8, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 - object_event 6, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1 - object_event 1, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1 - object_event 7, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 3, 7, GOLDENROD_CITY, 15 + warp_event 4, 7, GOLDENROD_CITY, 15 + warp_event 0, 6, POKECOM_CENTER_ADMIN_ROOM_MOBILE, 1 + warp_event 0, 7, POKECENTER_2F, 1 + + db 2 ; coord events + coord_event 3, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneLeft + coord_event 4, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneRight + + db 0 ; bg events + + db 5 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x60f91, -1 + object_event 16, 8, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event 6, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1 + object_event 1, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1 + object_event 7, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1 diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index 06e15d67a..22bd3296c 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODUNDERGROUND_SUPER_NERD1 const GOLDENRODUNDERGROUND_SUPER_NERD2 const GOLDENRODUNDERGROUND_SUPER_NERD3 @@ -10,11 +10,9 @@ const_value set 2 const GOLDENRODUNDERGROUND_GRANNY GoldenrodUnderground_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 3 + db 3 ; callbacks callback MAPCALLBACK_NEWMAP, .ResetSwitches callback MAPCALLBACK_TILES, .CheckBasementKey callback MAPCALLBACK_OBJECTS, .CheckDayOfWeek @@ -50,12 +48,12 @@ GoldenrodUnderground_MapScripts: .CheckDayOfWeek: checkcode VAR_WEEKDAY - if_equal MONDAY, .Monday - if_equal TUESDAY, .Tuesday - if_equal WEDNESDAY, .Wednesday - if_equal THURSDAY, .Thursday - if_equal FRIDAY, .Friday - if_equal SATURDAY, .Saturday + ifequal MONDAY, .Monday + ifequal TUESDAY, .Tuesday + ifequal WEDNESDAY, .Wednesday + ifequal THURSDAY, .Thursday + ifequal FRIDAY, .Friday + ifequal SATURDAY, .Saturday .Sunday: disappear GOLDENRODUNDERGROUND_GRAMPS @@ -66,7 +64,7 @@ GoldenrodUnderground_MapScripts: .Monday: disappear GOLDENRODUNDERGROUND_GRAMPS - checkmorn + checktime MORN iffalse .NotMondayMorning appear GOLDENRODUNDERGROUND_GRAMPS .NotMondayMorning: @@ -111,10 +109,10 @@ GoldenrodUnderground_MapScripts: return TrainerSupernerdEric: - trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script + trainer SUPER_NERD, ERIC, EVENT_BEAT_SUPER_NERD_ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SupernerdEricAfterBattleText waitbutton @@ -122,10 +120,10 @@ TrainerSupernerdEric: end TrainerSupernerdTeru: - trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, .Script + trainer SUPER_NERD, TERU, EVENT_BEAT_SUPER_NERD_TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SupernerdTeruAfterBattleText waitbutton @@ -133,10 +131,10 @@ TrainerSupernerdTeru: end TrainerPokemaniacIssac: - trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, .Script + trainer POKEMANIAC, ISSAC, EVENT_BEAT_POKEMANIAC_ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokemaniacIssacAfterBattleText waitbutton @@ -144,10 +142,10 @@ TrainerPokemaniacIssac: end TrainerPokemaniacDonald: - trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, .Script + trainer POKEMANIAC, DONALD, EVENT_BEAT_POKEMANIAC_DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokemaniacDonaldAfterBattleText waitbutton @@ -157,8 +155,8 @@ TrainerPokemaniacDonald: GrannyScript_0x7c132: opentext checkcode VAR_WEEKDAY - if_equal SUNDAY, .Open - if_equal SATURDAY, .Open + ifequal SUNDAY, .Open + ifequal SATURDAY, .Open jump GoldenrodUndergroundScript_ShopClosed .Open: @@ -171,11 +169,11 @@ GrampsScript_0x7c146: checkflag ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED iftrue GoldenrodUndergroundScript_ShopClosed checkcode VAR_WEEKDAY - if_equal MONDAY, .CheckMorn + ifequal MONDAY, .CheckMorn jump GoldenrodUndergroundScript_ShopClosed .CheckMorn: - checkmorn + checktime MORN iffalse GoldenrodUndergroundScript_ShopClosed pokemart MARTTYPE_BARGAIN, 0 closetext @@ -184,65 +182,65 @@ GrampsScript_0x7c146: OlderHaircutBrotherScript: opentext checkcode VAR_WEEKDAY - if_equal TUESDAY, .DoHaircut - if_equal THURSDAY, .DoHaircut - if_equal SATURDAY, .DoHaircut + ifequal TUESDAY, .DoHaircut + ifequal THURSDAY, .DoHaircut + ifequal SATURDAY, .DoHaircut jump GoldenrodUndergroundScript_ShopClosed .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x7c5f9 yesorno iffalse .Refused checkmoney YOUR_MONEY, 500 - if_equal HAVE_LESS, .NotEnoughMoney + ifequal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x7c69a buttonsound - special Special_YoungerHaircutBrother - if_equal $0, .Refused - if_equal $1, .Refused + special YoungerHaircutBrother + ifequal $0, .Refused + ifequal $1, .Refused setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - if_equal $2, .two - if_equal $3, .three + ifequal $2, .two + ifequal $3, .three jump .else .two - setevent EVENT_GAVE_KURT_APRICORNS - clearevent EVENT_RECEIVED_BALLS_FROM_KURT - clearevent EVENT_DRAGON_SHRINE_QUESTION_2 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .three - clearevent EVENT_GAVE_KURT_APRICORNS - setevent EVENT_RECEIVED_BALLS_FROM_KURT - clearevent EVENT_DRAGON_SHRINE_QUESTION_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .else - clearevent EVENT_GAVE_KURT_APRICORNS - clearevent EVENT_RECEIVED_BALLS_FROM_KURT - setevent EVENT_DRAGON_SHRINE_QUESTION_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .then takemoney YOUR_MONEY, 500 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x7c6b8 waitbutton closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic opentext writetext UnknownText_0x7c6d8 waitbutton - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x7c2bb - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd @@ -267,65 +265,65 @@ OlderHaircutBrotherScript: YoungerHaircutBrotherScript: opentext checkcode VAR_WEEKDAY - if_equal SUNDAY, .DoHaircut - if_equal WEDNESDAY, .DoHaircut - if_equal FRIDAY, .DoHaircut + ifequal SUNDAY, .DoHaircut + ifequal WEDNESDAY, .DoHaircut + ifequal FRIDAY, .DoHaircut jump GoldenrodUndergroundScript_ShopClosed .DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT iftrue .AlreadyGotHaircut - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x7c75c yesorno iffalse .Refused checkmoney YOUR_MONEY, 300 - if_equal HAVE_LESS, .NotEnoughMoney + ifequal HAVE_LESS, .NotEnoughMoney writetext UnknownText_0x7c7f1 buttonsound - special Special_OlderHaircutBrother - if_equal $0, .Refused - if_equal $1, .Refused + special OlderHaircutBrother + ifequal $0, .Refused + ifequal $1, .Refused setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - if_equal $2, .two - if_equal $3, .three + ifequal $2, .two + ifequal $3, .three jump .else .two - setevent EVENT_GAVE_KURT_APRICORNS - clearevent EVENT_RECEIVED_BALLS_FROM_KURT - clearevent EVENT_DRAGON_SHRINE_QUESTION_2 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .three - clearevent EVENT_GAVE_KURT_APRICORNS - setevent EVENT_RECEIVED_BALLS_FROM_KURT - clearevent EVENT_DRAGON_SHRINE_QUESTION_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .else - clearevent EVENT_GAVE_KURT_APRICORNS - clearevent EVENT_RECEIVED_BALLS_FROM_KURT - setevent EVENT_DRAGON_SHRINE_QUESTION_2 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 jump .then .then takemoney YOUR_MONEY, 300 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x7c80e waitbutton closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic opentext writetext UnknownText_0x7c82a waitbutton - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x7c2bb - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd @@ -349,21 +347,21 @@ YoungerHaircutBrotherScript: UnknownScript_0x7c2bb: writetext HaircutBrosText_SlightlyHappier - special Special_PlayCurMonCry + special PlayCurMonCry waitbutton closetext end UnknownScript_0x7c2c4: writetext HaircutBrosText_Happier - special Special_PlayCurMonCry + special PlayCurMonCry waitbutton closetext end UnknownScript_0x7c2cd: writetext HaircutBrosText_MuchHappier - special Special_PlayCurMonCry + special PlayCurMonCry waitbutton closetext end @@ -409,13 +407,13 @@ MapGoldenrodUndergroundSignpost1Script: jumptext UnknownText_0x7c91a GoldenrodUndergroundHiddenParlyzHeal: - hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL + hiddenitem PARLYZ_HEAL, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_PARLYZ_HEAL GoldenrodUndergroundHiddenSuperPotion: - hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem SUPER_POTION, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_SUPER_POTION GoldenrodUndergroundHiddenAntidote: - hiddenitem EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE, ANTIDOTE + hiddenitem ANTIDOTE, EVENT_GOLDENROD_UNDERGROUND_HIDDEN_ANTIDOTE SupernerdEricSeenText: text "I got booted out" @@ -647,37 +645,32 @@ UnknownText_0x7c91a: done GoldenrodUnderground_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 3, 2, 7, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 3, 34, 4, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 18, 6, 4, GOLDENROD_UNDERGROUND - warp_def 21, 31, 3, GOLDENROD_UNDERGROUND - warp_def 22, 31, 3, GOLDENROD_UNDERGROUND - warp_def 22, 27, 1, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - -.CoordEvents: - db 0 - -.BGEvents: - db 5 - bg_event 18, 6, BGEVENT_READ, BasementDoorScript - bg_event 19, 6, BGEVENT_READ, MapGoldenrodUndergroundSignpost1Script - bg_event 6, 13, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal - bg_event 4, 18, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion - bg_event 17, 8, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote - -.ObjectEvents: - db 9 - object_event 5, 31, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1 - object_event 6, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1 - object_event 3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1 - object_event 2, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1 - object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE - object_event 7, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_GOLDENROD_UNDERGROUND_GRAMPS - object_event 7, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER - object_event 7, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER - object_event 7, 21, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_GOLDENROD_UNDERGROUND_GRANNY + db 0, 0 ; filler + + db 6 ; warp events + warp_event 3, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 7 + warp_event 3, 34, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 4 + warp_event 18, 6, GOLDENROD_UNDERGROUND, 4 + warp_event 21, 31, GOLDENROD_UNDERGROUND, 3 + warp_event 22, 31, GOLDENROD_UNDERGROUND, 3 + warp_event 22, 27, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 1 + + db 0 ; coord events + + db 5 ; bg events + bg_event 18, 6, BGEVENT_READ, BasementDoorScript + bg_event 19, 6, BGEVENT_READ, MapGoldenrodUndergroundSignpost1Script + bg_event 6, 13, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal + bg_event 4, 18, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion + bg_event 17, 8, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote + + db 9 ; object events + object_event 5, 31, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1 + object_event 6, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1 + object_event 3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1 + object_event 2, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1 + object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE + object_event 7, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_GOLDENROD_UNDERGROUND_GRAMPS + object_event 7, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER + object_event 7, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER + object_event 7, 21, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_GOLDENROD_UNDERGROUND_GRANNY diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 8e84d7d36..a3733aaec 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -31,7 +31,7 @@ doorstate: MACRO changeblock UGDOOR_\1_YCOORD, UGDOOR_\1_XCOORD, UNDERGROUND_DOOR_\2 ENDM -const_value set 2 + const_def 2 ; object constants const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET1 @@ -45,13 +45,11 @@ const_value set 2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER GoldenrodUndergroundSwitchRoomEntrances_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .UpdateDoorPositions .DummyScene0: @@ -119,39 +117,39 @@ TeacherScript_0x7ca7d: jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_TeacherText UndergroundSilverScene1: - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 playsound SFX_EXIT_BUILDING appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER waitsfx applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement1 - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT scall UndergroundSilverBattleScript applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1 playsound SFX_EXIT_BUILDING disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER - setscene 1 + setscene SCENE_FINISHED waitsfx playmapmusic end UndergroundSilverScene2: - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 playsound SFX_EXIT_BUILDING appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER waitsfx applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement2 - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT scall UndergroundSilverBattleScript applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2 playsound SFX_EXIT_BUILDING disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER - setscene 1 + setscene SCENE_FINISHED waitsfx playmapmusic end @@ -160,7 +158,7 @@ UndergroundSilverBattleScript: checkevent EVENT_RIVAL_BURNED_TOWER iftrue .Continue setevent EVENT_RIVAL_BURNED_TOWER - setmapscene BURNED_TOWER_1F, 1 + setmapscene BURNED_TOWER_1F, SCENE_BURNEDTOWER1F_RIVAL_BATTLE .Continue: playmusic MUSIC_RIVAL_ENCOUNTER opentext @@ -207,10 +205,10 @@ UndergroundSilverBattleScript: end TrainerGruntM11: - trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_11, EVENT_BEAT_ROCKET_GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM11AfterBattleText waitbutton @@ -218,10 +216,10 @@ TrainerGruntM11: end TrainerGruntM25: - trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_25, EVENT_BEAT_ROCKET_GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM25AfterBattleText waitbutton @@ -229,10 +227,10 @@ TrainerGruntM25: end TrainerBurglarDuncan: - trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, .Script + trainer BURGLAR, DUNCAN, EVENT_BEAT_BURGLAR_DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BurglarDuncanAfterBattleText waitbutton @@ -240,10 +238,10 @@ TrainerBurglarDuncan: end TrainerBurglarEddie: - trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, .Script + trainer BURGLAR, EDDIE, EVENT_BEAT_BURGLAR_EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BurglarEddieAfterBattleText waitbutton @@ -251,10 +249,10 @@ TrainerBurglarEddie: end TrainerGruntM13: - trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_13, EVENT_BEAT_ROCKET_GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM13AfterBattleText waitbutton @@ -262,10 +260,10 @@ TrainerGruntM13: end TrainerGruntF3: - trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, .Script + trainer GRUNTF, GRUNTF_3, EVENT_BEAT_ROCKET_GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntF3AfterBattleText waitbutton @@ -382,14 +380,14 @@ GoldenrodUndergroundSwitchRoomEntrances_DontToggle: GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors: copybytetovar wUndergroundSwitchPositions - 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 + ifequal 0, .Position0 + ifequal 1, .Position1 + ifequal 2, .Position2 + ifequal 3, .Position3 + ifequal 4, .Position4 + ifequal 5, .Position5 + ifequal 6, .Position6 + ifequal 7, .EmergencyPosition .Position0: playsound SFX_ENTER_DOOR scall .Clear4 @@ -631,10 +629,10 @@ GoldenrodUndergroundSwitchRoomEntrancesFullHeal: itemball FULL_HEAL GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion: - hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive: - hiddenitem EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE UndergroundSilverApproachMovement1: step DOWN @@ -931,45 +929,40 @@ SwitchRoomText_Emergency: done GoldenrodUndergroundSwitchRoomEntrances_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 23, 3, 6, GOLDENROD_UNDERGROUND - warp_def 22, 10, 1, GOLDENROD_UNDERGROUND_WAREHOUSE - warp_def 23, 10, 2, GOLDENROD_UNDERGROUND_WAREHOUSE - warp_def 5, 25, 2, GOLDENROD_UNDERGROUND - warp_def 4, 29, 14, GOLDENROD_CITY - warp_def 5, 29, 14, GOLDENROD_CITY - warp_def 21, 25, 1, GOLDENROD_UNDERGROUND - warp_def 20, 29, 13, GOLDENROD_CITY - warp_def 21, 29, 13, GOLDENROD_CITY - -.CoordEvents: - db 2 - coord_event 19, 4, 0, UndergroundSilverScene1 - coord_event 19, 5, 0, UndergroundSilverScene2 - -.BGEvents: - db 6 - bg_event 16, 1, BGEVENT_READ, Switch1Script - bg_event 10, 1, BGEVENT_READ, Switch2Script - bg_event 2, 1, BGEVENT_READ, Switch3Script + db 0, 0 ; filler + + db 9 ; warp events + warp_event 23, 3, GOLDENROD_UNDERGROUND, 6 + warp_event 22, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 1 + warp_event 23, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 2 + warp_event 5, 25, GOLDENROD_UNDERGROUND, 2 + warp_event 4, 29, GOLDENROD_CITY, 14 + warp_event 5, 29, GOLDENROD_CITY, 14 + warp_event 21, 25, GOLDENROD_UNDERGROUND, 1 + warp_event 20, 29, GOLDENROD_CITY, 13 + warp_event 21, 29, GOLDENROD_CITY, 13 + + db 2 ; coord events + coord_event 19, 4, SCENE_DEFAULT, UndergroundSilverScene1 + coord_event 19, 5, SCENE_DEFAULT, UndergroundSilverScene2 + + db 6 ; bg events + bg_event 16, 1, BGEVENT_READ, Switch1Script + bg_event 10, 1, BGEVENT_READ, Switch2Script + bg_event 2, 1, BGEVENT_READ, Switch3Script bg_event 20, 11, BGEVENT_READ, EmergencySwitchScript - bg_event 8, 9, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion - bg_event 1, 8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive - -.ObjectEvents: - db 11 - object_event 9, 12, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 4, 8, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 17, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 11, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 3, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + bg_event 8, 9, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion + bg_event 1, 8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive + + db 11 ; object events + object_event 9, 12, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 4, 8, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 17, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 11, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 3, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 19, 12, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 3, 27, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1 + object_event 3, 27, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1 object_event 19, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1 - object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL - object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL - object_event 23, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND + object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL + object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL + object_event 23, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 65e8f648a..054139331 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET1 const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET2 const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET3 @@ -8,11 +8,9 @@ const_value set 2 const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL3 GoldenrodUndergroundWarehouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .ResetSwitches .ResetSwitches: @@ -36,10 +34,10 @@ GoldenrodUndergroundWarehouse_MapScripts: return TrainerGruntM24: - trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_24, EVENT_BEAT_ROCKET_GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM24AfterBattleText waitbutton @@ -47,10 +45,10 @@ TrainerGruntM24: end TrainerGruntM14: - trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_14, EVENT_BEAT_ROCKET_GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM14AfterBattleText waitbutton @@ -58,10 +56,10 @@ TrainerGruntM14: end TrainerGruntM15: - trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_15, EVENT_BEAT_ROCKET_GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM15AfterBattleText waitbutton @@ -211,27 +209,22 @@ UnknownText_0x7dc8d: done GoldenrodUndergroundWarehouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 2, 12, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 3, 12, 3, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES - warp_def 17, 2, 1, GOLDENROD_DEPT_STORE_B1F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 7 - object_event 9, 8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 14, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 12, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 18, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseMaxEther, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER - object_event 13, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK - object_event 2, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL + db 0, 0 ; filler + + db 3 ; warp events + warp_event 2, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 2 + warp_event 3, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 3 + warp_event 17, 2, GOLDENROD_DEPT_STORE_B1F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 7 ; object events + object_event 9, 8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 14, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 12, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 18, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseMaxEther, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER + object_event 13, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK + object_event 2, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 136d0da66..376aa0d0c 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const GUIDEGENTSHOUSE_GRAMPS GuideGentsHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GuideGentsHouseGuideGent: jumptextfaceplayer GuideGentsHouseGuideGentText @@ -28,22 +26,17 @@ GuideGentsHouseGuideGentText: done GuideGentsHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, CHERRYGROVE_CITY - warp_def 3, 7, 4, CHERRYGROVE_CITY + db 2 ; warp events + warp_event 2, 7, CHERRYGROVE_CITY, 4 + warp_event 3, 7, CHERRYGROVE_CITY, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, GuideGentsHouseBookshelf - bg_event 1, 1, BGEVENT_READ, GuideGentsHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, GuideGentsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, GuideGentsHouseBookshelf -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE + db 1 ; object events + object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 3f5f6ee10..e3541bbd3 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const HALLOFFAME_LANCE HallOfFame_MapScripts: -.SceneScripts: - db 2 - scene_script .EnterHallOfFame - scene_script .DummyScene + db 2 ; scene scripts + scene_script .EnterHallOfFame ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .EnterHallOfFame: priorityjump .EnterHallOfFameScript @@ -21,24 +19,24 @@ HallOfFame_MapScripts: follow HALLOFFAME_LANCE, PLAYER applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance stopfollow - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT opentext writetext HallOfFame_LanceText waitbutton closetext - spriteface HALLOFFAME_LANCE, UP + objectface HALLOFFAME_LANCE, UP applymovement PLAYER, HallOfFame_SlowlyApproachMachine - setscene 1 + setscene SCENE_FINISHED pause 15 writebyte HEALMACHINE_HALL_OF_FAME - special Special_HealMachineAnim + special HealMachineAnim setevent EVENT_BEAT_ELITE_FOUR setevent EVENT_TELEPORT_GUY setevent EVENT_RIVAL_SPROUT_TOWER clearevent EVENT_RED_IN_MT_SILVER setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - setmapscene SPROUT_TOWER_3F, 1 + setmapscene SPROUT_TOWER_3F, SCENE_FINISHED special HealParty checkevent EVENT_GOT_SS_TICKET_FROM_ELM iftrue .SkipPhoneCall @@ -111,20 +109,15 @@ HallOfFame_LanceText: done HallOfFame_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 13, 3, LANCES_ROOM - warp_def 5, 13, 4, LANCES_ROOM + db 2 ; warp events + warp_event 4, 13, LANCES_ROOM, 3 + warp_event 5, 13, LANCES_ROOM, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 4, 12, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 + db 1 ; object events + object_event 4, 12, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index 84abeb680..9650fd346 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const ICEPATH1F_POKE_BALL1 const ICEPATH1F_POKE_BALL2 const ICEPATH1F_POKE_BALL3 IcePath1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks IcePath1FHMWaterfall: itemball HM_WATERFALL @@ -20,24 +18,19 @@ IcePath1FProtein: itemball PROTEIN IcePath1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 4, 19, 1, ROUTE_44 - warp_def 36, 27, 7, BLACKTHORN_CITY - warp_def 37, 5, 1, ICE_PATH_B1F - warp_def 37, 13, 7, ICE_PATH_B1F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 - object_event 31, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL - object_event 32, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP - object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN + db 0, 0 ; filler + + db 4 ; warp events + warp_event 4, 19, ROUTE_44, 1 + warp_event 36, 27, BLACKTHORN_CITY, 7 + warp_event 37, 5, ICE_PATH_B1F, 1 + warp_event 37, 13, ICE_PATH_B1F, 7 + + db 0 ; coord events + + db 0 ; bg events + + db 3 ; object events + object_event 31, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL + object_event 32, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP + object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 2df927ebd..149328000 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ICEPATHB1F_BOULDER1 const ICEPATHB1F_BOULDER2 const ICEPATHB1F_BOULDER3 @@ -6,11 +6,9 @@ const_value set 2 const ICEPATHB1F_POKE_BALL IcePathB1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable .SetUpStoneTable: @@ -68,7 +66,7 @@ IcePathB1FIron: itemball IRON IcePathB1FHiddenMaxPotion: - hiddenitem EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION IcePathBoulderFellThroughText: text "The boulder fell" @@ -76,31 +74,26 @@ IcePathBoulderFellThroughText: done IcePathB1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 8 - warp_def 3, 15, 3, ICE_PATH_1F - warp_def 17, 3, 1, ICE_PATH_B2F_MAHOGANY_SIDE - warp_def 11, 2, 3, ICE_PATH_B2F_MAHOGANY_SIDE ; hole - warp_def 4, 7, 4, ICE_PATH_B2F_MAHOGANY_SIDE ; hole - warp_def 5, 12, 5, ICE_PATH_B2F_MAHOGANY_SIDE ; hole - warp_def 12, 13, 6, ICE_PATH_B2F_MAHOGANY_SIDE ; hole - warp_def 5, 25, 4, ICE_PATH_1F - warp_def 11, 27, 1, ICE_PATH_B2F_BLACKTHORN_SIDE - -.CoordEvents: - db 0 - -.BGEvents: - db 1 + db 0, 0 ; filler + + db 8 ; warp events + warp_event 3, 15, ICE_PATH_1F, 3 + warp_event 17, 3, ICE_PATH_B2F_MAHOGANY_SIDE, 1 + warp_event 11, 2, ICE_PATH_B2F_MAHOGANY_SIDE, 3 ; hole + warp_event 4, 7, ICE_PATH_B2F_MAHOGANY_SIDE, 4 ; hole + warp_event 5, 12, ICE_PATH_B2F_MAHOGANY_SIDE, 5 ; hole + warp_event 12, 13, ICE_PATH_B2F_MAHOGANY_SIDE, 6 ; hole + warp_event 5, 25, ICE_PATH_1F, 4 + warp_event 11, 27, ICE_PATH_B2F_BLACKTHORN_SIDE, 1 + + db 0 ; coord events + + db 1 ; bg events bg_event 17, 30, BGEVENT_ITEM, IcePathB1FHiddenMaxPotion -.ObjectEvents: - db 5 - object_event 11, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1 - object_event 7, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 - object_event 8, 9, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 - object_event 17, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4 - object_event 5, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON + db 5 ; object events + object_event 11, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1 + object_event 7, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 + object_event 8, 9, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 + object_event 17, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4 + object_event 5, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 1fe814b66..23ba93773 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -1,35 +1,28 @@ -const_value set 2 + const_def 2 ; object constants const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL IcePathB2FBlackthornSide_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks IcePathB2FBlackthornSideTMRest: itemball TM_REST IcePathB2FBlackthornSideHiddenIceHeal: - hiddenitem EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL + hiddenitem ICE_HEAL, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL IcePathB2FBlackthornSide_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 15, 8, ICE_PATH_B1F - warp_def 3, 3, 2, ICE_PATH_B3F + db 2 ; warp events + warp_event 3, 15, ICE_PATH_B1F, 8 + warp_event 3, 3, ICE_PATH_B3F, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 2, 10, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal + db 1 ; bg events + bg_event 2, 10, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal -.ObjectEvents: - db 1 - object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST + db 1 ; object events + object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index d70dc8492..86a706db8 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ICEPATHB2FMAHOGANYSIDE_BOULDER1 const ICEPATHB2FMAHOGANYSIDE_BOULDER2 const ICEPATHB2FMAHOGANYSIDE_BOULDER3 @@ -7,11 +7,9 @@ const_value set 2 const ICEPATHB2FMAHOGANYSIDE_POKE_BALL2 IcePathB2FMahoganySide_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks IcePathB2FMahoganySideBoulder: jumptext IcePathB2FMahoganySideBoulderText @@ -23,7 +21,7 @@ IcePathB2FMahoganySideMaxPotion: itemball MAX_POTION IcePathB2FMahoganySideHiddenCarbos: - hiddenitem EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS + hiddenitem CARBOS, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS IcePathB2FMahoganySideBoulderText: text "It's immovably" @@ -31,30 +29,25 @@ IcePathB2FMahoganySideBoulderText: done IcePathB2FMahoganySide_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 17, 1, 2, ICE_PATH_B1F - warp_def 9, 11, 1, ICE_PATH_B3F - warp_def 11, 4, 3, ICE_PATH_B1F - warp_def 4, 6, 4, ICE_PATH_B1F - warp_def 4, 12, 5, ICE_PATH_B1F - warp_def 12, 12, 6, ICE_PATH_B1F - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 0, 17, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos - -.ObjectEvents: - db 6 - object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A - object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A - object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A - object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_4A - object_event 8, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL - object_event 0, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION + db 0, 0 ; filler + + db 6 ; warp events + warp_event 17, 1, ICE_PATH_B1F, 2 + warp_event 9, 11, ICE_PATH_B3F, 1 + warp_event 11, 4, ICE_PATH_B1F, 3 + warp_event 4, 6, ICE_PATH_B1F, 4 + warp_event 4, 12, ICE_PATH_B1F, 5 + warp_event 12, 12, ICE_PATH_B1F, 6 + + db 0 ; coord events + + db 1 ; bg events + bg_event 0, 17, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos + + db 6 ; object events + object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A + object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A + object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A + object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_4A + object_event 8, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL + object_event 0, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 40809dbe3..1130705af 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ICEPATHB3F_POKE_BALL const ICEPATHB3F_ROCK IcePathB3F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks IcePathB3FNevermeltice: itemball NEVERMELTICE @@ -16,21 +14,16 @@ IcePathB3FRock: jumpstd smashrock IcePathB3F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 5, 2, ICE_PATH_B2F_MAHOGANY_SIDE - warp_def 15, 5, 2, ICE_PATH_B2F_BLACKTHORN_SIDE + db 2 ; warp events + warp_event 3, 5, ICE_PATH_B2F_MAHOGANY_SIDE, 2 + warp_event 15, 5, ICE_PATH_B2F_BLACKTHORN_SIDE, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 - object_event 5, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE - object_event 6, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1 + db 2 ; object events + object_event 5, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE + object_event 6, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index de3d79152..94e1b0eb0 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ILEXFOREST_FARFETCHD const ILEXFOREST_YOUNGSTER1 const ILEXFOREST_BLACK_BELT @@ -12,27 +12,25 @@ const_value set 2 const ILEXFOREST_POKE_BALL4 IlexForest_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .FarfetchdCallback .FarfetchdCallback: checkevent EVENT_GOT_HM01_CUT iftrue .Static copybytetovar wFarfetchdPosition - 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 + ifequal 1, .PositionOne + ifequal 2, .PositionTwo + ifequal 3, .PositionThree + ifequal 4, .PositionFour + ifequal 5, .PositionFive + ifequal 6, .PositionSix + ifequal 7, .PositionSeven + ifequal 8, .PositionEight + ifequal 9, .PositionNine + ifequal 10, .PositionTen .Static: return @@ -104,16 +102,16 @@ IlexForestCharcoalApprenticeScript: IlexForestFarfetchdScript: copybytetovar wFarfetchdPosition - 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 + ifequal 1, .Position1 + ifequal 2, .Position2 + ifequal 3, .Position3 + ifequal 4, .Position4 + ifequal 5, .Position5 + ifequal 6, .Position6 + ifequal 7, .Position7 + ifequal 8, .Position8 + ifequal 9, .Position9 + ifequal 10, .Position10 .Position1: faceplayer @@ -133,7 +131,7 @@ IlexForestFarfetchdScript: .Position2: scall .CryAndCheckFacing - if_equal DOWN, .Position2_Down + ifequal DOWN, .Position2_Down applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos2_Pos3 moveobject ILEXFOREST_FARFETCHD, 20, 24 disappear ILEXFOREST_FARFETCHD @@ -151,7 +149,7 @@ IlexForestFarfetchdScript: .Position3: scall .CryAndCheckFacing - if_equal LEFT, .Position3_Left + ifequal LEFT, .Position3_Left applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos3_Pos4 moveobject ILEXFOREST_FARFETCHD, 29, 22 disappear ILEXFOREST_FARFETCHD @@ -169,7 +167,7 @@ IlexForestFarfetchdScript: .Position4: scall .CryAndCheckFacing - if_equal UP, .Position4_Up + ifequal UP, .Position4_Up applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos4_Pos5 moveobject ILEXFOREST_FARFETCHD, 28, 31 disappear ILEXFOREST_FARFETCHD @@ -187,9 +185,9 @@ IlexForestFarfetchdScript: .Position5: scall .CryAndCheckFacing - if_equal UP, .Position5_Up - if_equal LEFT, .Position5_Left - if_equal RIGHT, .Position5_Right + ifequal UP, .Position5_Up + ifequal LEFT, .Position5_Left + ifequal RIGHT, .Position5_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetchd_Pos5_Pos6 moveobject ILEXFOREST_FARFETCHD, 24, 35 disappear ILEXFOREST_FARFETCHD @@ -223,7 +221,7 @@ IlexForestFarfetchdScript: .Position6: scall .CryAndCheckFacing - if_equal RIGHT, .Position6_Right + ifequal RIGHT, .Position6_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos6_Pos7 moveobject ILEXFOREST_FARFETCHD, 22, 31 disappear ILEXFOREST_FARFETCHD @@ -241,8 +239,8 @@ IlexForestFarfetchdScript: .Position7: scall .CryAndCheckFacing - if_equal DOWN, .Position7_Down - if_equal LEFT, .Position7_Left + ifequal DOWN, .Position7_Down + ifequal LEFT, .Position7_Left applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos7_Pos8 moveobject ILEXFOREST_FARFETCHD, 15, 29 disappear ILEXFOREST_FARFETCHD @@ -268,9 +266,9 @@ IlexForestFarfetchdScript: .Position8: scall .CryAndCheckFacing - if_equal UP, .Position8_Up - if_equal LEFT, .Position8_Left - if_equal RIGHT, .Position8_Right + ifequal UP, .Position8_Up + ifequal LEFT, .Position8_Left + ifequal RIGHT, .Position8_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos8_Pos9 moveobject ILEXFOREST_FARFETCHD, 10, 35 disappear ILEXFOREST_FARFETCHD @@ -297,8 +295,8 @@ IlexForestFarfetchdScript: .Position9: scall .CryAndCheckFacing - if_equal DOWN, .Position9_Down - if_equal RIGHT, .Position9_Right + ifequal DOWN, .Position9_Down + ifequal RIGHT, .Position9_Right applymovement ILEXFOREST_FARFETCHD, MovementData_Farfetched_Pos9_Pos10 moveobject ILEXFOREST_FARFETCHD, 6, 28 disappear ILEXFOREST_FARFETCHD @@ -388,10 +386,10 @@ IlexForestHeadbuttGuyScript: end TrainerBugCatcherWayne: - trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, BugCatcherWayneSeenText, BugCatcherWayneBeatenText, 0, .Script + trainer BUG_CATCHER, WAYNE, EVENT_BEAT_BUG_CATCHER_WAYNE, BugCatcherWayneSeenText, BugCatcherWayneBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BugCatcherWayneAfterBattleText waitbutton @@ -414,13 +412,13 @@ IlexForestEther: itemball ETHER IlexForestHiddenEther: - hiddenitem EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER + hiddenitem ETHER, EVENT_ILEX_FOREST_HIDDEN_ETHER IlexForestHiddenSuperPotion: - hiddenitem EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem SUPER_POTION, EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION IlexForestHiddenFullHeal: - hiddenitem EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL IlexForestBoulder: ; unused @@ -459,18 +457,18 @@ MapIlexForestSignpost4Script: closetext pause 20 showemote EMOTE_SHOCK, PLAYER, 20 - special Special_FadeOutMusic + special FadeOutMusic applymovement PLAYER, MovementData_0x6ef58 pause 30 - spriteface PLAYER, DOWN + objectface PLAYER, DOWN pause 20 - clearflag ENGINE_HAVE_EXAMINED_GS_BALL - special Special_CelebiShrineEvent + clearflag ENGINE_FOREST_IS_RESTLESS + special CelebiShrineEvent loadwildmon CELEBI, 30 startbattle reloadmapafterbattle pause 20 - special Special_CheckCaughtCelebi + special CheckCaughtCelebi iffalse .DidntCatchCelebi appear ILEXFOREST_KURT applymovement ILEXFOREST_KURT, MovementData_0x6ef4e @@ -938,36 +936,31 @@ BugCatcherWayneAfterBattleText: done IlexForest_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 1, 5, 3, ROUTE_34_ILEX_FOREST_GATE - warp_def 3, 42, 1, ILEX_FOREST_AZALEA_GATE - warp_def 3, 43, 2, ILEX_FOREST_AZALEA_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 5 - bg_event 3, 17, BGEVENT_READ, MapIlexForestSignpost0Script - bg_event 11, 7, BGEVENT_ITEM, IlexForestHiddenEther + db 0, 0 ; filler + + db 3 ; warp events + warp_event 1, 5, ROUTE_34_ILEX_FOREST_GATE, 3 + warp_event 3, 42, ILEX_FOREST_AZALEA_GATE, 1 + warp_event 3, 43, ILEX_FOREST_AZALEA_GATE, 2 + + db 0 ; coord events + + db 5 ; bg events + bg_event 3, 17, BGEVENT_READ, MapIlexForestSignpost0Script + bg_event 11, 7, BGEVENT_ITEM, IlexForestHiddenEther bg_event 22, 14, BGEVENT_ITEM, IlexForestHiddenSuperPotion - bg_event 1, 17, BGEVENT_ITEM, IlexForestHiddenFullHeal - bg_event 8, 22, BGEVENT_UP, MapIlexForestSignpost4Script + bg_event 1, 17, BGEVENT_ITEM, IlexForestHiddenFullHeal + bg_event 8, 22, BGEVENT_UP, MapIlexForestSignpost4Script -.ObjectEvents: - db 11 + db 11 ; object events object_event 14, 31, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD - object_event 7, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE - object_event 5, 28, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER + object_event 7, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE + object_event 5, 28, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER object_event 15, 14, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestHeadbuttGuyScript, -1 - object_event 20, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE - object_event 8, 29, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT - object_event 3, 24, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS - object_event 12, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBugCatcherWayne, -1 - object_event 9, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK - object_event 17, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE - object_event 27, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER + object_event 20, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE + object_event 8, 29, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT + object_event 3, 24, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS + object_event 12, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBugCatcherWayne, -1 + object_event 9, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK + object_event 17, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE + object_event 27, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index c66483971..0e992960b 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ILEXFORESTAZALEAGATE_OFFICER const ILEXFORESTAZALEAGATE_GRANNY IlexForestAzaleaGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks IlexForestAzaleaGateOfficerScript: jumptextfaceplayer IlexForestAzaleaGateOfficerText @@ -31,23 +29,18 @@ IlexForestAzaleaGateGrannyText: done IlexForestAzaleaGate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 0, 4, 2, ILEX_FOREST - warp_def 0, 5, 3, ILEX_FOREST - warp_def 9, 4, 7, AZALEA_TOWN - warp_def 9, 5, 8, AZALEA_TOWN - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1 - object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 0, 4, ILEX_FOREST, 2 + warp_event 0, 5, ILEX_FOREST, 3 + warp_event 9, 4, AZALEA_TOWN, 7 + warp_event 9, 5, AZALEA_TOWN, 8 + + db 0 ; coord events + + db 0 ; bg events + + db 2 ; object events + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1 + object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1 diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 17a4d0663..ce5a3b782 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const INDIGOPLATEAUPOKECENTER1F_NURSE const INDIGOPLATEAUPOKECENTER1F_CLERK const INDIGOPLATEAUPOKECENTER1F_COOLTRAINER_M @@ -7,24 +7,22 @@ const_value set 2 const INDIGOPLATEAUPOKECENTER1F_ABRA IndigoPlateauPokecenter1F_MapScripts: -.SceneScripts: - db 1 - scene_script .DummyScene + db 1 ; scene scripts + scene_script .DummyScene ; SCENE_DEFAULT -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .PrepareElite4 .DummyScene: end .PrepareElite4: - setmapscene WILLS_ROOM, 0 - setmapscene KOGAS_ROOM, 0 - setmapscene BRUNOS_ROOM, 0 - setmapscene KARENS_ROOM, 0 - setmapscene LANCES_ROOM, 0 - setmapscene HALL_OF_FAME, 0 + setmapscene WILLS_ROOM, SCENE_DEFAULT + setmapscene KOGAS_ROOM, SCENE_DEFAULT + setmapscene BRUNOS_ROOM, SCENE_DEFAULT + setmapscene KARENS_ROOM, SCENE_DEFAULT + setmapscene LANCES_ROOM, SCENE_DEFAULT + setmapscene HALL_OF_FAME, SCENE_DEFAULT clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED clearevent EVENT_WILLS_ROOM_EXIT_OPEN clearevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED @@ -49,20 +47,20 @@ PlateauRivalBattle1: checkflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT iftrue PlateauRivalScriptDone checkcode VAR_WEEKDAY - if_equal SUNDAY, PlateauRivalScriptDone - if_equal TUESDAY, PlateauRivalScriptDone - if_equal THURSDAY, PlateauRivalScriptDone - if_equal FRIDAY, PlateauRivalScriptDone - if_equal SATURDAY, PlateauRivalScriptDone + ifequal SUNDAY, PlateauRivalScriptDone + ifequal TUESDAY, PlateauRivalScriptDone + ifequal THURSDAY, PlateauRivalScriptDone + ifequal FRIDAY, PlateauRivalScriptDone + ifequal SATURDAY, PlateauRivalScriptDone moveobject INDIGOPLATEAUPOKECENTER1F_SILVER, 17, 9 appear INDIGOPLATEAUPOKECENTER1F_SILVER - spriteface PLAYER, DOWN + objectface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement1 playmusic MUSIC_RIVAL_ENCOUNTER - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT jump PlateauRivalBattleCommon PlateauRivalBattle2: @@ -71,19 +69,19 @@ PlateauRivalBattle2: checkflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT iftrue PlateauRivalScriptDone checkcode VAR_WEEKDAY - if_equal SUNDAY, PlateauRivalScriptDone - if_equal TUESDAY, PlateauRivalScriptDone - if_equal THURSDAY, PlateauRivalScriptDone - if_equal FRIDAY, PlateauRivalScriptDone - if_equal SATURDAY, PlateauRivalScriptDone + ifequal SUNDAY, PlateauRivalScriptDone + ifequal TUESDAY, PlateauRivalScriptDone + ifequal THURSDAY, PlateauRivalScriptDone + ifequal FRIDAY, PlateauRivalScriptDone + ifequal SATURDAY, PlateauRivalScriptDone appear INDIGOPLATEAUPOKECENTER1F_SILVER - spriteface PLAYER, DOWN + objectface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement2 playmusic MUSIC_RIVAL_ENCOUNTER - spriteface PLAYER, LEFT + objectface PLAYER, LEFT PlateauRivalBattleCommon: opentext writetext PlateauRivalText1 @@ -127,10 +125,10 @@ PlateauRivalPostBattle: writetext PlateauRivalText2 waitbutton closetext - spriteface PLAYER, DOWN + objectface PLAYER, DOWN applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement disappear INDIGOPLATEAUPOKECENTER1F_SILVER - setscene 0 + setscene SCENE_DEFAULT playmapmusic setflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT PlateauRivalScriptDone: @@ -158,7 +156,7 @@ TeleportGuyScript: waitbutton closetext playsound SFX_WARP_TO - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx warp NEW_BARK_TOWN, 13, 6 end @@ -303,29 +301,24 @@ AbraText: done IndigoPlateauPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 5, 13, 1, ROUTE_23 - warp_def 6, 13, 2, ROUTE_23 - warp_def 0, 13, 1, POKECENTER_2F - warp_def 14, 3, 1, WILLS_ROOM - -.CoordEvents: - db 2 - coord_event 16, 4, 0, PlateauRivalBattle1 - coord_event 17, 4, 0, PlateauRivalBattle2 - -.BGEvents: - db 0 - -.ObjectEvents: - db 6 - object_event 3, 7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18012c, -1 - object_event 11, 7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 5, 13, ROUTE_23, 1 + warp_event 6, 13, ROUTE_23, 2 + warp_event 0, 13, POKECENTER_2F, 1 + warp_event 14, 3, WILLS_ROOM, 1 + + db 2 ; coord events + coord_event 16, 4, SCENE_DEFAULT, PlateauRivalBattle1 + coord_event 17, 4, SCENE_DEFAULT, PlateauRivalBattle2 + + db 0 ; bg events + + db 6 ; object events + object_event 3, 7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18012c, -1 + object_event 11, 7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1 object_event 11, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1 - object_event 16, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL - object_event 1, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY - object_event 0, 9, SPRITE_JYNX, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY + object_event 16, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL + object_event 1, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY + object_event 0, 9, SPRITE_JYNX, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index eef62321d..3cc096d1d 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const KARENSROOM_KAREN KarensRoom_MapScripts: -.SceneScripts: - db 2 - scene_script .LockDoor - scene_script .DummyScene + db 2 ; scene scripts + scene_script .LockDoor ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .KarensRoomDoors .LockDoor: @@ -37,7 +35,7 @@ KarensRoom_MapScripts: changeblock 4, 14, $2a ; wall reloadmappart closetext - setscene 1 + setscene SCENE_FINISHED setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -133,22 +131,17 @@ KarenScript_KarenDefeatText: done KarensRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 17, 3, BRUNOS_ROOM - warp_def 5, 17, 4, BRUNOS_ROOM - warp_def 4, 2, 1, LANCES_ROOM - warp_def 5, 2, 2, LANCES_ROOM + db 4 ; warp events + warp_event 4, 17, BRUNOS_ROOM, 3 + warp_event 5, 17, BRUNOS_ROOM, 4 + warp_event 4, 2, LANCES_ROOM, 1 + warp_event 5, 2, LANCES_ROOM, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 5, 7, SPRITE_KAREN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KarenScript_Battle, -1 + db 1 ; object events + object_event 5, 7, SPRITE_KAREN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KarenScript_Battle, -1 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index fe1badec4..34c9f7b5d 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const KOGASROOM_KOGA KogasRoom_MapScripts: -.SceneScripts: - db 2 - scene_script .LockDoor - scene_script .DummyScene + db 2 ; scene scripts + scene_script .LockDoor ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .KogasRoomDoors .LockDoor: @@ -37,7 +35,7 @@ KogasRoom_MapScripts: changeblock 4, 14, $2a ; wall reloadmappart closetext - setscene 1 + setscene SCENE_FINISHED setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -130,22 +128,17 @@ KogaScript_KogaDefeatText: done KogasRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 17, 2, WILLS_ROOM - warp_def 5, 17, 3, WILLS_ROOM - warp_def 4, 2, 1, BRUNOS_ROOM - warp_def 5, 2, 2, BRUNOS_ROOM + db 4 ; warp events + warp_event 4, 17, WILLS_ROOM, 2 + warp_event 5, 17, WILLS_ROOM, 3 + warp_event 4, 2, BRUNOS_ROOM, 1 + warp_event 5, 2, BRUNOS_ROOM, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 5, 7, SPRITE_KOGA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1 + db 1 ; object events + object_event 5, 7, SPRITE_KOGA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1 diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm deleted file mode 100644 index f250d2cec..000000000 --- a/maps/KrissHouse2F.asm +++ /dev/null @@ -1,141 +0,0 @@ -const_value set 2 - const KRISSHOUSE2F_CONSOLE - const KRISSHOUSE2F_DOLL_1 - const KRISSHOUSE2F_DOLL_2 - const KRISSHOUSE2F_BIG_DOLL - -KrissHouse2F_MapScripts: -.SceneScripts: - db 0 - -.MapCallbacks: - db 2 - callback MAPCALLBACK_NEWMAP, .InitializeRoom - callback MAPCALLBACK_TILES, .SetSpawn - -; unused -.Null: - end - -.InitializeRoom: - special Special_ToggleDecorationsVisibility - setevent EVENT_IN_YOUR_ROOM - checkevent EVENT_INITIALIZED_EVENTS - iftrue .SkipInitialization - jumpstd initializeevents - return - -.SkipInitialization: - return - -.SetSpawn: - special Special_ToggleMaptileDecorations - return - - db 0, 0, 0 ; filler - -Doll1: - describedecoration DECODESC_LEFT_DOLL - -Doll2: - describedecoration DECODESC_RIGHT_DOLL - -wDecoBigDoll: - describedecoration DECODESC_BIG_DOLL - -GameConsole: - describedecoration DECODESC_CONSOLE - -KrissHousePoster: - conditional_event EVENT_KRISS_ROOM_POSTER, .Script - -.Script: - describedecoration DECODESC_POSTER - -KrissHouseRadio: - checkevent EVENT_GOT_A_POKEMON_FROM_ELM - iftrue .NormalRadio - checkevent EVENT_LISTENED_TO_INITIAL_RADIO - iftrue .AbbreviatedRadio - playmusic MUSIC_POKEMON_TALK - opentext - writetext KrisRadioText1 - pause 45 - writetext KrisRadioText2 - pause 45 - writetext KrisRadioText3 - pause 45 - musicfadeout MUSIC_NEW_BARK_TOWN, 16 - writetext KrisRadioText4 - pause 45 - closetext - setevent EVENT_LISTENED_TO_INITIAL_RADIO - end - -.NormalRadio: - jumpstd radio1 - -.AbbreviatedRadio: - opentext - writetext KrisRadioText4 - pause 45 - closetext - end - -KrissHouseBookshelf: - jumpstd picturebookshelf - -KrissHousePC: - opentext - special Special_KrissHousePC - iftrue .Warp - closetext - end -.Warp: - warp NONE, 0, 0 - end - -KrisRadioText1: - text "PROF.OAK'S #MON" - line "TALK! Please tune" - cont "in next time!" - done - -KrisRadioText2: - text "#MON CHANNEL!" - done - -KrisRadioText3: - text "This is DJ MARY," - line "your co-host!" - done - -KrisRadioText4: - text "#MON!" - line "#MON CHANNEL…" - done - -KrissHouse2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def 7, 0, 3, KRISS_HOUSE_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 4 - bg_event 2, 1, BGEVENT_UP, KrissHousePC - bg_event 3, 1, BGEVENT_READ, KrissHouseRadio - bg_event 5, 1, BGEVENT_READ, KrissHouseBookshelf - bg_event 6, 0, BGEVENT_IFSET, KrissHousePoster - -.ObjectEvents: - db 4 - object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE - object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1 - object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2 - object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, wDecoBigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm deleted file mode 100644 index 457660d97..000000000 --- a/maps/KrissNeighborsHouse.asm +++ /dev/null @@ -1,122 +0,0 @@ -const_value set 2 - const KRISSNEIGHBORSHOUSE_COOLTRAINER_F - const KRISSNEIGHBORSHOUSE_POKEFAN_F - -KrissNeighborsHouse_MapScripts: -.SceneScripts: - db 0 - -.MapCallbacks: - db 0 - -KrissNeighborsDaughter: - jumptextfaceplayer KrissNeighborsDaughterText - -KrissNeighbor: - jumptextfaceplayer KrissNeighborText - -KrissNeighborsHouseBookshelf: - jumpstd magazinebookshelf - -KrissNeighborsHouseRadio: - checkevent EVENT_GOT_A_POKEMON_FROM_ELM - iftrue .NormalRadio - checkevent EVENT_LISTENED_TO_INITIAL_RADIO - iftrue .AbbreviatedRadio - playmusic MUSIC_POKEMON_TALK - opentext - writetext KrisNeighborRadioText1 - pause 45 - writetext KrisNeighborRadioText2 - pause 45 - writetext KrisNeighborRadioText3 - pause 45 - musicfadeout MUSIC_NEW_BARK_TOWN, 16 - writetext KrisNeighborRadioText4 - pause 45 - closetext - setevent EVENT_LISTENED_TO_INITIAL_RADIO - end -.NormalRadio: - jumpstd radio1 -.AbbreviatedRadio: - opentext - writetext KrisNeighborRadioText4 - pause 45 - closetext - end - -KrissNeighborsDaughterText: - text "PIKACHU is an" - line "evolved #MON." - - para "I was amazed by" - line "PROF.ELM's find-" - cont "ings." - - para "He's so famous for" - line "his research on" - cont "#MON evolution." - - para "…sigh…" - - para "I wish I could be" - line "a researcher like" - cont "him…" - done - -KrissNeighborText: - text "My daughter is" - line "adamant about" - - para "becoming PROF." - line "ELM's assistant." - - para "She really loves" - line "#MON!" - - para "But then, so do I!" - done - -KrisNeighborRadioText1: - text "PROF.OAK'S #MON" - line "TALK! Please tune" - cont "in next time!" - done - -KrisNeighborRadioText2: - text "#MON CHANNEL!" - done - -KrisNeighborRadioText3: - text "This is DJ MARY," - line "your co-host!" - done - -KrisNeighborRadioText4: - text "#MON!" - line "#MON CHANNEL…" - done - -KrissNeighborsHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 3, NEW_BARK_TOWN - warp_def 3, 7, 3, NEW_BARK_TOWN - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 0, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf - bg_event 1, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf - bg_event 7, 1, BGEVENT_READ, KrissNeighborsHouseRadio - -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighborsDaughter, -1 - object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index eb2bbcb89..97e2d5ebe 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const KURTSHOUSE_KURT1 const KURTSHOUSE_TWIN1 const KURTSHOUSE_SLOWPOKE @@ -6,11 +6,9 @@ const_value set 2 const KURTSHOUSE_TWIN2 KurtsHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .KurtCallback .KurtCallback: @@ -44,11 +42,11 @@ KurtScript_0x18e178: writetext UnknownText_0x18e473 waitbutton closetext - special Special_FadeOutMusic + special FadeOutMusic setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET checkcode VAR_FACING - if_equal UP, .RunAround - spriteface PLAYER, DOWN + ifequal UP, .RunAround + objectface PLAYER, DOWN playsound SFX_FLY applymovement KURTSHOUSE_KURT1, MovementData_0x18e466 playsound SFX_EXIT_BUILDING @@ -58,7 +56,7 @@ KurtScript_0x18e178: end .RunAround: - spriteface PLAYER, DOWN + objectface PLAYER, DOWN playsound SFX_FLY applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c playsound SFX_EXIT_BUILDING @@ -74,7 +72,7 @@ KurtScript_0x18e178: iffalse .NoRoomForBall setevent EVENT_KURT_GAVE_YOU_LURE_BALL .GotLureBall: - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue .WaitForApricorns checkevent EVENT_GAVE_KURT_RED_APRICORN iftrue .GiveLevelBall @@ -93,9 +91,9 @@ KurtScript_0x18e178: checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT iftrue .CanGiveGSBallToKurt .NoGSBall: - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .CheckApricorns - checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 iftrue .CheckApricorns writetext UnknownText_0x18e6c9 waitbutton @@ -114,9 +112,9 @@ KurtScript_0x18e178: iftrue .AskApricorn checkitem PNK_APRICORN iftrue .AskApricorn - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .ThatTurnedOutGreat - checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 iftrue .IMakeBallsFromApricorns closetext end @@ -130,15 +128,15 @@ KurtScript_0x18e178: .AskApricorn: writetext UnknownText_0x18e736 buttonsound - setevent EVENT_DRAGON_SHRINE_QUESTION_2 - special Special_SelectApricornForKurt - if_equal FALSE, .Cancel - if_equal BLU_APRICORN, .Blu - if_equal YLW_APRICORN, .Ylw - if_equal GRN_APRICORN, .Grn - if_equal WHT_APRICORN, .Wht - if_equal BLK_APRICORN, .Blk - if_equal PNK_APRICORN, .Pnk + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3 + special SelectApricornForKurt + ifequal FALSE, .Cancel + ifequal BLU_APRICORN, .Blu + ifequal YLW_APRICORN, .Ylw + ifequal GRN_APRICORN, .Grn + ifequal WHT_APRICORN, .Wht + ifequal BLK_APRICORN, .Blk + ifequal PNK_APRICORN, .Pnk ; .Red setevent EVENT_GAVE_KURT_RED_APRICORN jump .GaveKurtApricorns @@ -168,7 +166,7 @@ KurtScript_0x18e178: jump .GaveKurtApricorns .GaveKurtApricorns: - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 setflag ENGINE_KURT_MAKING_BALLS .WaitForApricorns: writetext UnknownText_0x18e779 @@ -183,7 +181,7 @@ KurtScript_0x18e178: end ._ThatTurnedOutGreat: - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 .ThatTurnedOutGreat: writetext UnknownText_0x18e82a waitbutton @@ -291,18 +289,18 @@ KurtScript_0x18e178: setevent EVENT_FOREST_IS_RESTLESS clearevent EVENT_CAN_GIVE_GS_BALL_TO_KURT clearevent EVENT_GAVE_GS_BALL_TO_KURT - special Special_FadeOutMusic + special FadeOutMusic pause 20 showemote EMOTE_SHOCK, KURTSHOUSE_KURT1, 30 checkcode VAR_FACING - if_equal UP, .GSBallRunAround - spriteface PLAYER, DOWN + ifequal UP, .GSBallRunAround + objectface PLAYER, DOWN playsound SFX_FLY applymovement KURTSHOUSE_KURT1, MovementData_0x18e466 jump .KurtHasLeftTheBuilding .GSBallRunAround: - spriteface PLAYER, DOWN + objectface PLAYER, DOWN playsound SFX_FLY applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c .KurtHasLeftTheBuilding: @@ -311,7 +309,7 @@ KurtScript_0x18e178: clearevent EVENT_AZALEA_TOWN_KURT waitsfx special RestartMapMusic - setmapscene AZALEA_TOWN, 2 + setmapscene AZALEA_TOWN, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL end KurtScript_0x18e3bd: @@ -325,21 +323,21 @@ KurtMakingBallsScript: writetext UnknownText_0x18e7d8 waitbutton closetext - spriteface KURTSHOUSE_KURT2, UP + objectface KURTSHOUSE_KURT2, UP end Script_FirstTimeBuggingKurt: writetext UnknownText_0x18e863 waitbutton closetext - spriteface KURTSHOUSE_KURT2, UP + objectface KURTSHOUSE_KURT2, UP setevent EVENT_BUGGING_KURT_TOO_MUCH end KurtScript_ImCheckingItNow: writetext UnknownText_0x18e934 waitbutton - spriteface KURTSHOUSE_KURT2, UP + objectface KURTSHOUSE_KURT2, UP writetext UnknownText_0x18e949 waitbutton closetext @@ -347,9 +345,9 @@ KurtScript_ImCheckingItNow: KurtsGranddaughter1: faceplayer - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue KurtsGranddaughter2Subscript - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue KurtsGranddaughterFunScript checkevent EVENT_FOREST_IS_RESTLESS iftrue .Lonely @@ -395,14 +393,14 @@ KurtsGranddaughter2Subscript: writetext KurtsGranddaughterHelpText waitbutton closetext - spriteface KURTSHOUSE_TWIN2, RIGHT + objectface KURTSHOUSE_TWIN2, RIGHT end .GSBall: writetext KurtsGranddaughterGSBallText waitbutton closetext - spriteface KURTSHOUSE_TWIN2, RIGHT + objectface KURTSHOUSE_TWIN2, RIGHT end KurtsGranddaughterFunScript: @@ -677,31 +675,26 @@ KurtsHouseCelebiStatueText: done KurtsHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 3, 7, 4, AZALEA_TOWN - warp_def 4, 7, 4, AZALEA_TOWN - -.CoordEvents: - db 0 - -.BGEvents: - db 7 - bg_event 6, 1, BGEVENT_READ, KurtsHouseRadio - bg_event 8, 0, BGEVENT_READ, KurtsHouseOakPhoto - bg_event 9, 0, BGEVENT_READ, KurtsHouseOakPhoto - bg_event 5, 1, BGEVENT_READ, KurtsHouseBookshelf - bg_event 2, 1, BGEVENT_READ, KurtsHouseBookshelf - bg_event 3, 1, BGEVENT_READ, KurtsHouseBookshelf - bg_event 4, 1, BGEVENT_READ, KurtsHouseCelebiStatue - -.ObjectEvents: - db 5 - object_event 3, 2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1 - object_event 5, 3, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1 - object_event 6, 3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE - object_event 14, 3, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2 - object_event 11, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 3, 7, AZALEA_TOWN, 4 + warp_event 4, 7, AZALEA_TOWN, 4 + + db 0 ; coord events + + db 7 ; bg events + bg_event 6, 1, BGEVENT_READ, KurtsHouseRadio + bg_event 8, 0, BGEVENT_READ, KurtsHouseOakPhoto + bg_event 9, 0, BGEVENT_READ, KurtsHouseOakPhoto + bg_event 5, 1, BGEVENT_READ, KurtsHouseBookshelf + bg_event 2, 1, BGEVENT_READ, KurtsHouseBookshelf + bg_event 3, 1, BGEVENT_READ, KurtsHouseBookshelf + bg_event 4, 1, BGEVENT_READ, KurtsHouseCelebiStatue + + db 5 ; object events + object_event 3, 2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1 + object_event 5, 3, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1 + object_event 6, 3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE + object_event 14, 3, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2 + object_event 11, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2 diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index fdbbeb438..01b5560a5 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const LAKEOFRAGE_LANCE const LAKEOFRAGE_GRAMPS const LAKEOFRAGE_SUPER_NERD1 @@ -13,13 +13,11 @@ const_value set 2 const LAKEOFRAGE_POKE_BALL2 LakeOfRage_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; unusable + scene_script .DummyScene1 ; unusable -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_OBJECTS, .Wesley @@ -35,7 +33,7 @@ LakeOfRage_MapScripts: .Wesley: checkcode VAR_WEEKDAY - if_equal WEDNESDAY, .WesleyAppears + ifequal WEDNESDAY, .WesleyAppears disappear LAKEOFRAGE_WESLEY return @@ -62,7 +60,7 @@ UnknownScript_0x70035: disappear LAKEOFRAGE_LANCE clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_DECIDED_TO_HELP_LANCE - setmapscene MAHOGANY_MART_1F, 1 + setmapscene MAHOGANY_MART_1F, SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS end UnknownScript_0x7004e: @@ -89,7 +87,7 @@ GyaradosScript_0x70063: loadwildmon GYARADOS, 30 writecode VAR_BATTLETYPE, BATTLETYPE_SHINY startbattle - if_equal $1, UnknownScript_0x7007a + ifequal $1, UnknownScript_0x7007a disappear LAKEOFRAGE_GYARADOS UnknownScript_0x7007a: reloadmapafterbattle @@ -101,7 +99,7 @@ UnknownScript_0x7007a: waitsfx itemnotify closetext - setscene 0 + setscene 0 ; Lake of Rage does not have a scene variable appear LAKEOFRAGE_LANCE end @@ -141,15 +139,15 @@ MapLakeOfRageSignpost1Script: UnknownScript_0x700b8: buttonsound - special Special_MagikarpHouseSign + special MagikarpHouseSign closetext end TrainerFisherAndre: - trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, .Script + trainer FISHER, ANDRE, EVENT_BEAT_FISHER_ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FisherAndreAfterBattleText waitbutton @@ -157,10 +155,10 @@ TrainerFisherAndre: end TrainerFisherRaymond: - trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, .Script + trainer FISHER, RAYMOND, EVENT_BEAT_FISHER_RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FisherRaymondAfterBattleText waitbutton @@ -168,10 +166,10 @@ TrainerFisherRaymond: end TrainerCooltrainermAaron: - trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, .Script + trainer COOLTRAINERM, AARON, EVENT_BEAT_COOLTRAINERM_AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainermAaronAfterBattleText waitbutton @@ -179,10 +177,10 @@ TrainerCooltrainermAaron: end TrainerCooltrainerfLois: - trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, .Script + trainer COOLTRAINERF, LOIS, EVENT_BEAT_COOLTRAINERF_LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainerfLoisAfterBattleText waitbutton @@ -195,7 +193,7 @@ WesleyScript: checkevent EVENT_GOT_BLACKBELT_FROM_WESLEY iftrue WesleyWednesdayScript checkcode VAR_WEEKDAY - if_not_equal WEDNESDAY, WesleyNotWednesdayScript + ifnotequal WEDNESDAY, WesleyNotWednesdayScript checkevent EVENT_MET_WESLEY_OF_WEDNESDAY iftrue .MetWesley writetext MeetWesleyText @@ -232,13 +230,13 @@ LakeOfRageTMDetect: itemball TM_DETECT LakeOfRageHiddenFullRestore: - hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE LakeOfRageHiddenRareCandy: - hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY LakeOfRageHiddenMaxPotion: - hiddenitem EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION MovementData_0x70155: teleport_from @@ -494,36 +492,31 @@ UnknownText_0x70903: done LakeOfRage_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 7, 3, 1, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE - warp_def 27, 31, 1, LAKE_OF_RAGE_MAGIKARP_HOUSE + db 2 ; warp events + warp_event 7, 3, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 1 + warp_event 27, 31, LAKE_OF_RAGE_MAGIKARP_HOUSE, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 5 + db 5 ; bg events bg_event 21, 27, BGEVENT_READ, MapLakeOfRageSignpost0Script bg_event 25, 31, BGEVENT_READ, MapLakeOfRageSignpost1Script bg_event 11, 28, BGEVENT_ITEM, LakeOfRageHiddenFullRestore - bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy - bg_event 35, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion + bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy + bg_event 35, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion -.ObjectEvents: - db 12 + db 12 ; object events object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE object_event 20, 26, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7008e, -1 object_event 36, 13, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1 object_event 25, 29, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageCooltrainerFScript, -1 object_event 30, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS object_event 24, 26, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS - object_event 4, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS - object_event 36, 7, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS + object_event 4, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS + object_event 36, 7, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS object_event 18, 22, SPRITE_GYARADOS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS - object_event 4, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY - object_event 7, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER - object_event 35, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT + object_event 4, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY + object_event 7, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER + object_event 35, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index 9d346ab0a..177d7ea27 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER LakeOfRageHiddenPowerHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks HiddenPowerGuy: faceplayer @@ -68,22 +66,17 @@ HiddenPowerGuyText3: done LakeOfRageHiddenPowerHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, LAKE_OF_RAGE - warp_def 3, 7, 1, LAKE_OF_RAGE + db 2 ; warp events + warp_event 2, 7, LAKE_OF_RAGE, 1 + warp_event 3, 7, LAKE_OF_RAGE, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, HiddenPowerHouseBookshelf - bg_event 1, 1, BGEVENT_READ, HiddenPowerHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, HiddenPowerHouseBookshelf + bg_event 1, 1, BGEVENT_READ, HiddenPowerHouseBookshelf -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HiddenPowerGuy, -1 + db 1 ; object events + object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HiddenPowerGuy, -1 diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index 92900c486..9a7b1ff3b 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU LakeOfRageMagikarpHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FishingGuruScript_0x19a6ae: faceplayer @@ -40,14 +38,14 @@ UnknownScript_0x19a6d7: UnknownScript_0x19a6e0: writebyte MAGIKARP - special Special_FindThatSpecies + special FindPartyMonThatSpecies iffalse UnknownScript_0x19a6d7 writetext UnknownText_0x19a93e waitbutton - special Special_CheckMagikarpLength - if_equal MAGIKARPLENGTH_NOT_MAGIKARP, UnknownScript_0x19a71c - if_equal MAGIKARPLENGTH_REFUSED, UnknownScript_0x19a722 - if_equal MAGIKARPLENGTH_TOO_SHORT, UnknownScript_0x19a716 + special CheckMagikarpLength + ifequal MAGIKARPLENGTH_NOT_MAGIKARP, UnknownScript_0x19a71c + ifequal MAGIKARPLENGTH_REFUSED, UnknownScript_0x19a722 + ifequal MAGIKARPLENGTH_TOO_SHORT, UnknownScript_0x19a716 ; MAGIKARPLENGTH_BEAT_RECORD jump UnknownScript_0x19a6fe @@ -207,22 +205,17 @@ UnknownText_0x19aabc: db "@@" LakeOfRageMagikarpHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, LAKE_OF_RAGE - warp_def 3, 7, 2, LAKE_OF_RAGE + db 2 ; warp events + warp_event 2, 7, LAKE_OF_RAGE, 2 + warp_event 3, 7, LAKE_OF_RAGE, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, MagikarpHouseBookshelf - bg_event 1, 1, BGEVENT_READ, MagikarpHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, MagikarpHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MagikarpHouseBookshelf -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1 + db 1 ; object events + object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index a3336251b..5e60b2718 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -1,16 +1,14 @@ -const_value set 2 + const_def 2 ; object constants const LANCESROOM_LANCE const LANCESROOM_MARY const LANCESROOM_OAK LancesRoom_MapScripts: -.SceneScripts: - db 2 - scene_script .LockDoor - scene_script .DummyScene + db 2 ; scene scripts + scene_script .LockDoor ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_LANCESROOM_APPROACH_LANCE -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .LancesRoomDoors .LockDoor: @@ -39,20 +37,20 @@ LancesRoom_MapScripts: changeblock 4, 22, $34 ; wall reloadmappart closetext - setscene 1 + setscene SCENE_LANCESROOM_APPROACH_LANCE setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED end Script_ApproachLanceFromLeft: - special Special_FadeOutMusic + special FadeOutMusic applymovement PLAYER, MovementData_ApproachLanceFromLeft jump LanceScript_0x180e7b Script_ApproachLanceFromRight: - special Special_FadeOutMusic + special FadeOutMusic applymovement PLAYER, MovementData_ApproachLanceFromRight LanceScript_0x180e7b: - spriteface LANCESROOM_LANCE, LEFT + objectface LANCESROOM_LANCE, LEFT opentext writetext LanceBattleIntroText waitbutton @@ -76,9 +74,9 @@ LanceScript_0x180e7b: musicfadeout MUSIC_BEAUTY_ENCOUNTER, 16 pause 30 showemote EMOTE_SHOCK, LANCESROOM_LANCE, 15 - spriteface LANCESROOM_LANCE, DOWN + objectface LANCESROOM_LANCE, DOWN pause 10 - spriteface PLAYER, DOWN + objectface PLAYER, DOWN appear LANCESROOM_MARY applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRushesIn opentext @@ -90,27 +88,27 @@ LanceScript_0x180e7b: follow LANCESROOM_MARY, LANCESROOM_OAK applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryYieldsToOak stopfollow - spriteface LANCESROOM_OAK, UP - spriteface LANCESROOM_LANCE, LEFT + objectface LANCESROOM_OAK, UP + objectface LANCESROOM_LANCE, LEFT opentext writetext UnknownText_0x18121b waitbutton closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryInterviewChampion - spriteface PLAYER, LEFT + objectface PLAYER, LEFT opentext writetext UnknownText_0x18134b waitbutton closetext applymovement LANCESROOM_LANCE, LancesRoomMovementData_LancePositionsSelfToGuidePlayerAway - spriteface PLAYER, UP + objectface PLAYER, UP opentext writetext UnknownText_0x18137b waitbutton closetext follow LANCESROOM_LANCE, PLAYER - spriteface LANCESROOM_MARY, UP - spriteface LANCESROOM_OAK, UP + objectface LANCESROOM_MARY, UP + objectface LANCESROOM_OAK, UP applymovement LANCESROOM_LANCE, LancesRoomMovementData_LanceLeadsPlayerToHallOfFame stopfollow playsound SFX_EXIT_BUILDING @@ -125,7 +123,7 @@ LanceScript_0x180e7b: pause 30 closetext applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth - special Special_FadeOutPalettes + special FadeOutPalettes pause 15 warpfacing UP, HALL_OF_FAME, 4, 13 end @@ -338,26 +336,21 @@ UnknownText_0x1813c5: done LancesRoom_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 4, 23, 3, KARENS_ROOM - warp_def 5, 23, 4, KARENS_ROOM - warp_def 4, 1, 1, HALL_OF_FAME - warp_def 5, 1, 2, HALL_OF_FAME - -.CoordEvents: - db 2 - coord_event 4, 5, 1, Script_ApproachLanceFromLeft - coord_event 5, 5, 1, Script_ApproachLanceFromRight - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 - object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1 - object_event 4, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY - object_event 4, 7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY + db 0, 0 ; filler + + db 4 ; warp events + warp_event 4, 23, KARENS_ROOM, 3 + warp_event 5, 23, KARENS_ROOM, 4 + warp_event 4, 1, HALL_OF_FAME, 1 + warp_event 5, 1, HALL_OF_FAME, 2 + + db 2 ; coord events + coord_event 4, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromLeft + coord_event 5, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromRight + + db 0 ; bg events + + db 3 ; object events + object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1 + object_event 4, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY + object_event 4, 7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index d16bce5f1..073dbb821 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const LAVRADIOTOWER1F_RECEPTIONIST const LAVRADIOTOWER1F_OFFICER const LAVRADIOTOWER1F_SUPER_NERD1 @@ -6,11 +6,9 @@ const_value set 2 const LAVRADIOTOWER1F_SUPER_NERD2 LavRadioTower1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks LavRadioTower1FReceptionistScript: jumptextfaceplayer LavRadioTower1FReceptionistText @@ -222,26 +220,21 @@ UnknownText_0x7f36b: done LavRadioTower1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 7, LAVENDER_TOWN - warp_def 3, 7, 7, LAVENDER_TOWN - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 11, 0, BGEVENT_READ, MapLavRadioTower1FSignpost0Script - bg_event 5, 0, BGEVENT_READ, MapLavRadioTower1FSignpost1Script - -.ObjectEvents: - db 5 - object_event 6, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1 - object_event 15, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1 - object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1 - object_event 9, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1 - object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, LAVENDER_TOWN, 7 + warp_event 3, 7, LAVENDER_TOWN, 7 + + db 0 ; coord events + + db 2 ; bg events + bg_event 11, 0, BGEVENT_READ, MapLavRadioTower1FSignpost0Script + bg_event 5, 0, BGEVENT_READ, MapLavRadioTower1FSignpost1Script + + db 5 ; object events + object_event 6, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1 + object_event 15, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1 + object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1 + object_event 9, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1 + object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index f55db399b..cd97dd8e8 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const LAVENDERMART_CLERK const LAVENDERMART_POKEFAN_M const LAVENDERMART_ROCKER LavenderMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x7eb1c: opentext @@ -48,22 +46,17 @@ LavenderMartRockerText: done LavenderMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 5, LAVENDER_TOWN - warp_def 3, 7, 5, LAVENDER_TOWN + db 2 ; warp events + warp_event 2, 7, LAVENDER_TOWN, 5 + warp_event 3, 7, LAVENDER_TOWN, 5 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1 - object_event 6, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1 - object_event 9, 2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1 + object_event 6, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1 + object_event 9, 2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 544c51d5b..0fee0798e 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const LAVENDERNAMERATER_NAME_RATER LavenderNameRater_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -15,7 +13,7 @@ LavenderNameRater_MapScripts: LavenderNameRater: faceplayer opentext - special Special_NameRater + special NameRater waitbutton closetext end @@ -24,20 +22,15 @@ LavenderNameRaterUnusedBookshelf: jumpstd difficultbookshelf LavenderNameRater_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, LAVENDER_TOWN - warp_def 3, 7, 4, LAVENDER_TOWN + db 2 ; warp events + warp_event 2, 7, LAVENDER_TOWN, 4 + warp_event 3, 7, LAVENDER_TOWN, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderNameRater, -1 + db 1 ; object events + object_event 2, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderNameRater, -1 diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index 7436697ea..84d2ec2ea 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const LAVENDERPOKECENTER1F_NURSE const LAVENDERPOKECENTER1F_GENTLEMAN const LAVENDERPOKECENTER1F_TEACHER const LAVENDERPOKECENTER1F_YOUNGSTER LavenderPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x7e6a0: jumpstd pokecenternurse @@ -81,24 +79,19 @@ UnknownText_0x7e7ed: done LavenderPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 1, LAVENDER_TOWN - warp_def 4, 7, 1, LAVENDER_TOWN - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1 - object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1 - object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1 - object_event 1, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, LAVENDER_TOWN, 1 + warp_event 4, 7, LAVENDER_TOWN, 1 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1 + object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1 + object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1 + object_event 1, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1 diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm index 537f10ea1..7157b4735 100644 --- a/maps/LavenderPokecenter2FBeta.asm +++ b/maps/LavenderPokecenter2FBeta.asm @@ -1,23 +1,16 @@ LavenderPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks LavenderPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, LAVENDER_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, LAVENDER_POKECENTER_1F, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index eacb6b4d6..dd73aa81f 100644 --- a/maps/LavenderSpeechHouse.asm +++ b/maps/LavenderSpeechHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const LAVENDERSPEECHHOUSE_POKEFAN_F LavenderSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks LavenderSpeechHousePokefanFScript: jumptextfaceplayer LavenderSpeechHousePokefanFText @@ -29,22 +27,17 @@ LavenderSpeechHousePokefanFText: done LavenderSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, LAVENDER_TOWN - warp_def 3, 7, 3, LAVENDER_TOWN + db 2 ; warp events + warp_event 2, 7, LAVENDER_TOWN, 3 + warp_event 3, 7, LAVENDER_TOWN, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1 + db 1 ; object events + object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 655acb3b3..9aeec7ab9 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const LAVENDERTOWN_POKEFAN_M const LAVENDERTOWN_TEACHER const LAVENDERTOWN_GRAMPS const LAVENDERTOWN_YOUNGSTER LavenderTown_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -106,34 +104,29 @@ SoulHouseSignText: done LavenderTown_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 7 - warp_def 5, 5, 1, LAVENDER_POKECENTER_1F - warp_def 5, 9, 1, MR_FUJIS_HOUSE - warp_def 3, 13, 1, LAVENDER_SPEECH_HOUSE - warp_def 7, 13, 1, LAVENDER_NAME_RATER - warp_def 1, 5, 2, LAVENDER_MART - warp_def 13, 11, 1, SOUL_HOUSE - warp_def 14, 5, 1, LAV_RADIO_TOWER_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 6 - bg_event 11, 3, BGEVENT_READ, LavenderTownSign - bg_event 15, 7, BGEVENT_READ, KantoRadioStationSign - bg_event 3, 9, BGEVENT_READ, VolunteerPokemonHouseSign + db 0, 0 ; filler + + db 7 ; warp events + warp_event 5, 5, LAVENDER_POKECENTER_1F, 1 + warp_event 5, 9, MR_FUJIS_HOUSE, 1 + warp_event 3, 13, LAVENDER_SPEECH_HOUSE, 1 + warp_event 7, 13, LAVENDER_NAME_RATER, 1 + warp_event 1, 5, LAVENDER_MART, 2 + warp_event 13, 11, SOUL_HOUSE, 1 + warp_event 14, 5, LAV_RADIO_TOWER_1F, 1 + + db 0 ; coord events + + db 6 ; bg events + bg_event 11, 3, BGEVENT_READ, LavenderTownSign + bg_event 15, 7, BGEVENT_READ, KantoRadioStationSign + bg_event 3, 9, BGEVENT_READ, VolunteerPokemonHouseSign bg_event 15, 13, BGEVENT_READ, SoulHouseSign - bg_event 6, 5, BGEVENT_READ, LavenderPokecenterSignText - bg_event 2, 5, BGEVENT_READ, LavenderMartSignText + bg_event 6, 5, BGEVENT_READ, LavenderPokecenterSignText + bg_event 2, 5, BGEVENT_READ, LavenderMartSignText -.ObjectEvents: - db 4 - object_event 12, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1 - object_event 2, 15, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1 + db 4 ; object events + object_event 12, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1 + object_event 2, 15, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1 object_event 14, 12, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderTownGrampsScript, -1 - object_event 6, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1 + object_event 6, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 20ab72ab1..de735549e 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const MAHOGANYGYM_PRYCE const MAHOGANYGYM_BUENA1 const MAHOGANYGYM_ROCKER1 @@ -8,11 +8,9 @@ const_value set 2 const MAHOGANYGYM_GYM_GUY MahoganyGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PryceScript_0x199a9e: faceplayer @@ -60,8 +58,8 @@ MahoganyGym_NoRoomForIcyWind: end MahoganyGymActivateRockets: - if_equal 7, .RadioTowerRockets - if_equal 6, .GoldenrodRockets + ifequal 7, .RadioTowerRockets + ifequal 6, .GoldenrodRockets end .GoldenrodRockets: @@ -71,10 +69,10 @@ MahoganyGymActivateRockets: jumpstd radiotowerrockets TrainerSkierRoxanne: - trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script + trainer SKIER, ROXANNE, EVENT_BEAT_SKIER_ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SkierRoxanneAfterBattleText waitbutton @@ -82,10 +80,10 @@ TrainerSkierRoxanne: end TrainerSkierClarissa: - trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, .Script + trainer SKIER, CLARISSA, EVENT_BEAT_SKIER_CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SkierClarissaAfterBattleText waitbutton @@ -93,10 +91,10 @@ TrainerSkierClarissa: end TrainerBoarderRonald: - trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, .Script + trainer BOARDER, RONALD, EVENT_BEAT_BOARDER_RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BoarderRonaldAfterBattleText waitbutton @@ -104,10 +102,10 @@ TrainerBoarderRonald: end TrainerBoarderBrad: - trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, .Script + trainer BOARDER, BRAD, EVENT_BEAT_BOARDER_BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BoarderBradAfterBattleText waitbutton @@ -115,10 +113,10 @@ TrainerBoarderBrad: end TrainerBoarderDouglas: - trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, .Script + trainer BOARDER, DOUGLAS, EVENT_BEAT_BOARDER_DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BoarderDouglasAfterBattleText waitbutton @@ -373,28 +371,23 @@ MahoganyGymGuyWinText: done MahoganyGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 17, 3, MAHOGANY_TOWN - warp_def 5, 17, 3, MAHOGANY_TOWN - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 15, BGEVENT_READ, MahoganyGymStatue - bg_event 6, 15, BGEVENT_READ, MahoganyGymStatue - -.ObjectEvents: - db 7 - object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1 - object_event 4, 6, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1 - object_event 0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1 - object_event 9, 17, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1 - object_event 5, 9, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderBrad, -1 - object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderDouglas, -1 - object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 17, MAHOGANY_TOWN, 3 + warp_event 5, 17, MAHOGANY_TOWN, 3 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 15, BGEVENT_READ, MahoganyGymStatue + bg_event 6, 15, BGEVENT_READ, MahoganyGymStatue + + db 7 ; object events + object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1 + object_event 4, 6, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1 + object_event 0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1 + object_event 9, 17, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1 + object_event 5, 9, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderBrad, -1 + object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderDouglas, -1 + object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 5b3cfd43c..3976a4968 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const MAHOGANYMART1F_PHARMACIST const MAHOGANYMART1F_BLACK_BELT const MAHOGANYMART1F_LANCE @@ -6,13 +6,11 @@ const_value set 2 const MAHOGANYMART1F_GRANNY MahoganyMart1F_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .LanceUncoversStaircase + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_MAHOGANYMART1F_NOTHING + scene_script .LanceUncoversStaircase ; SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase .DummyScene0: @@ -93,7 +91,7 @@ UnknownScript_0x6c38f: reloadmappart closetext setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART - spriteface MAHOGANYMART1F_LANCE, LEFT + objectface MAHOGANYMART1F_LANCE, LEFT opentext writetext UnknownText_0x6c5ba waitbutton @@ -101,7 +99,7 @@ UnknownScript_0x6c38f: applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412 playsound SFX_EXIT_BUILDING disappear MAHOGANYMART1F_LANCE - setscene 0 + setscene SCENE_MAHOGANYMART1F_NOTHING waitsfx end @@ -221,25 +219,20 @@ UnknownText_0x6c5ba: done MahoganyMart1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 1, MAHOGANY_TOWN - warp_def 4, 7, 1, MAHOGANY_TOWN - warp_def 7, 3, 1, TEAM_ROCKET_BASE_B1F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 5 - object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE - object_event 3, 6, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE - object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, MAHOGANY_TOWN, 1 + warp_event 4, 7, MAHOGANY_TOWN, 1 + warp_event 7, 3, TEAM_ROCKET_BASE_B1F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 5 ; object events + object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + object_event 3, 6, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index 9a0cfdf24..baced8e5c 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const MAHOGANYPOKECENTER1F_NURSE const MAHOGANYPOKECENTER1F_POKEFAN_M const MAHOGANYPOKECENTER1F_YOUNGSTER const MAHOGANYPOKECENTER1F_COOLTRAINER_F MahoganyPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x19a356: jumpstd pokecenternurse @@ -54,24 +52,19 @@ MahoganyPokecenter1FCooltrainerFText: done MahoganyPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 4, MAHOGANY_TOWN - warp_def 4, 7, 4, MAHOGANY_TOWN - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19a356, -1 - object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1 - object_event 1, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1 - object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, MAHOGANY_TOWN, 4 + warp_event 4, 7, MAHOGANY_TOWN, 4 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19a356, -1 + object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1 + object_event 1, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1 + object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index d6ed88a36..53159ea91 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const MAHOGANYREDGYARADOSSPEECHHOUSE_BLACK_BELT const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER MahoganyRedGyaradosSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MahoganyRedGyaradosSpeechHouseBlackBeltScript: jumptextfaceplayer MahoganyRedGyaradosSpeechHouseBlackBeltText @@ -61,21 +59,16 @@ UnknownText_0x199a3d: done MahoganyRedGyaradosSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, MAHOGANY_TOWN - warp_def 3, 7, 2, MAHOGANY_TOWN + db 2 ; warp events + warp_event 2, 7, MAHOGANY_TOWN, 2 + warp_event 3, 7, MAHOGANY_TOWN, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1 - object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1 + db 2 ; object events + object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1 + object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index d53aabce0..6677679e7 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -1,17 +1,15 @@ -const_value set 2 + const_def 2 ; object constants const MAHOGANYTOWN_POKEFAN_M const MAHOGANYTOWN_GRAMPS const MAHOGANYTOWN_FISHER const MAHOGANYTOWN_LASS MahoganyTown_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -30,7 +28,7 @@ UnknownScript_0x190013: follow PLAYER, MAHOGANYTOWN_POKEFAN_M applymovement PLAYER, MovementData_0x1900a7 stopfollow - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT scall UnknownScript_0x19002f applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900ad end @@ -53,17 +51,17 @@ UnknownScript_0x190039: UnknownScript_0x190040: opentext writetext UnknownText_0x1900b0 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight yesorno iffalse UnknownScript_0x190072 checkmoney YOUR_MONEY, 300 - if_equal HAVE_LESS, UnknownScript_0x19006c + ifequal HAVE_LESS, UnknownScript_0x19006c giveitem RAGECANDYBAR iffalse UnknownScript_0x190078 waitsfx playsound SFX_TRANSACTION takemoney YOUR_MONEY, 300 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight writetext UnknownText_0x19014a waitbutton closetext @@ -245,32 +243,27 @@ MahoganyGymSignText: done MahoganyTown_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 11, 7, 1, MAHOGANY_MART_1F - warp_def 17, 7, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE - warp_def 6, 13, 1, MAHOGANY_GYM - warp_def 15, 13, 1, MAHOGANY_POKECENTER_1F - warp_def 9, 1, 3, ROUTE_43_MAHOGANY_GATE - -.CoordEvents: - db 2 - coord_event 19, 8, 0, UnknownScript_0x190013 - coord_event 19, 9, 0, UnknownScript_0x190013 - -.BGEvents: - db 4 - bg_event 1, 5, BGEVENT_READ, MahoganyTownSign - bg_event 9, 7, BGEVENT_READ, MahoganyTownRagecandybarSign - bg_event 3, 13, BGEVENT_READ, MahoganyGymSign + db 0, 0 ; filler + + db 5 ; warp events + warp_event 11, 7, MAHOGANY_MART_1F, 1 + warp_event 17, 7, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 1 + warp_event 6, 13, MAHOGANY_GYM, 1 + warp_event 15, 13, MAHOGANY_POKECENTER_1F, 1 + warp_event 9, 1, ROUTE_43_MAHOGANY_GATE, 3 + + db 2 ; coord events + coord_event 19, 8, SCENE_DEFAULT, UnknownScript_0x190013 + coord_event 19, 9, SCENE_DEFAULT, UnknownScript_0x190013 + + db 4 ; bg events + bg_event 1, 5, BGEVENT_READ, MahoganyTownSign + bg_event 9, 7, BGEVENT_READ, MahoganyTownRagecandybarSign + bg_event 3, 13, BGEVENT_READ, MahoganyGymSign bg_event 16, 13, BGEVENT_READ, MahoganyTownPokecenterSign -.ObjectEvents: - db 4 - object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST - object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1 - object_event 6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM - object_event 12, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS + db 4 ; object events + object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST + object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1 + object_event 6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM + object_event 12, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index d5d3febb6..fab7873ca 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const MANIASHOUSE_ROCKER ManiasHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ManiaScript: faceplayer @@ -18,7 +16,7 @@ ManiaScript: writetext ManiaText_AskLookAfterShuckle yesorno iffalse .refusetotakeshuckie - special Special_GiveShuckle + special GiveShuckle iffalse .partyfull writetext ManiaText_TakeCareOfShuckle buttonsound @@ -31,7 +29,7 @@ ManiaScript: end .alreadyhaveshuckie - checkflag ENGINE_SHUCKLE_GIVEN + checkflag ENGINE_GOT_SHUCKIE_TODAY iffalse .returnshuckie writetext ManiaText_TakeCareOfShuckle waitbutton @@ -54,11 +52,11 @@ ManiaScript: writetext ManiaText_CanIHaveMyMonBack yesorno iffalse .refused - special Special_ReturnShuckle - if_equal SHUCKIE_WRONG_MON, .wrong - if_equal SHUCKIE_REFUSED, .refused - if_equal SHUCKIE_HAPPY, .superhappy - if_equal SHUCKIE_FAINTED, .default_postevent + special ReturnShuckle + ifequal SHUCKIE_WRONG_MON, .wrong + ifequal SHUCKIE_REFUSED, .refused + ifequal SHUCKIE_HAPPY, .superhappy + ifequal SHUCKIE_FAINTED, .default_postevent ; SHUCKIE_RETURNED writetext ManiaText_ThankYou waitbutton @@ -200,20 +198,15 @@ ManiaText_ShuckleIsYourLastMon: done ManiasHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, CIANWOOD_CITY - warp_def 3, 7, 1, CIANWOOD_CITY + db 2 ; warp events + warp_event 2, 7, CIANWOOD_CITY, 1 + warp_event 3, 7, CIANWOOD_CITY, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ManiaScript, -1 + db 1 ; object events + object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ManiaScript, -1 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index d65ae1006..8a8cd518d 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -1,11 +1,9 @@ MobileBattleRoom_MapScripts: -.SceneScripts: - db 2 - scene_script .InitializeMobileBattleRoom - scene_script .DummyScene + db 2 ; scene scripts + scene_script .InitializeMobileBattleRoom ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .InitializeMobileBattleRoom: priorityjump .InitializeAndPreparePokecenter2F @@ -15,42 +13,42 @@ MobileBattleRoom_MapScripts: end .InitializeAndPreparePokecenter2F: - setscene 1 - setmapscene POKECENTER_2F, 5 + setscene SCENE_FINISHED + setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM end MapMobileBattleRoomSignpost0Script: refreshscreen - special Special_Function1037c2 - if_equal $1, .one - special Special_Function1037eb + special Function1037c2 + ifequal $1, .one + special Function1037eb iffalse .false - if_equal $1, .one_ - if_equal $2, .two_ + ifequal $1, .one_ + ifequal $2, .two_ jump .false .one_ writetext MobileBattleRoom_HealText pause 20 closetext - special Special_FadeOutPalettes + special FadeOutPalettes playmusic MUSIC_HEAL - special Special_LoadMapPalettes + special LoadMapPalettes pause 60 - special Special_FadeInPalettes + special FadeInPalettes special RestartMapMusic refreshscreen .two_ - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty - special Special_Function10383c + special Function10383c iftrue .false .one - special Special_Function10387b + special Function10387b writetext MobileBattleRoom_EstablishingCommsText waitbutton reloadmappart - special Special_Function101225 + special Function101225 .false closetext end @@ -67,20 +65,15 @@ MobileBattleRoom_HealText: done MobileBattleRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 7, 6, POKECENTER_2F - warp_def 5, 7, 6, POKECENTER_2F + db 2 ; warp events + warp_event 4, 7, POKECENTER_2F, 6 + warp_event 5, 7, POKECENTER_2F, 6 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 4, 2, BGEVENT_UP, MapMobileBattleRoomSignpost0Script + db 1 ; bg events + bg_event 4, 2, BGEVENT_UP, MapMobileBattleRoomSignpost0Script -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/MobileTradeRoom.asm b/maps/MobileTradeRoom.asm new file mode 100644 index 000000000..e7c1cb476 --- /dev/null +++ b/maps/MobileTradeRoom.asm @@ -0,0 +1,47 @@ +MobileTradeRoom_MapScripts: + db 2 ; scene scripts + scene_script .InitializeMobileTradeRoom ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED + + db 0 ; callbacks + +.InitializeMobileTradeRoom: + priorityjump .InitializeAndPreparePokecenter2F + end + +.DummyScene: + end + +.InitializeAndPreparePokecenter2F: + setscene SCENE_FINISHED + setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM + end + +MapMobileTradeRoomSignpost0Script: + refreshscreen + special Function1037c2 + writetext MobileTradeRoom_EstablishingCommsText + waitbutton + reloadmappart + special Function101231 + closetext + end + +MobileTradeRoom_EstablishingCommsText: + text "Establishing" + line "communications…" + done + +MobileTradeRoom_MapEvents: + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 7, POKECENTER_2F, 5 + warp_event 5, 7, POKECENTER_2F, 5 + + db 0 ; coord events + + db 1 ; bg events + bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomSignpost0Script + + db 0 ; object events diff --git a/maps/MobileTradeRoomMobile.blk b/maps/MobileTradeRoom.blk index fbe578781..fbe578781 100644 --- a/maps/MobileTradeRoomMobile.blk +++ b/maps/MobileTradeRoom.blk diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm deleted file mode 100644 index 53713c9de..000000000 --- a/maps/MobileTradeRoomMobile.asm +++ /dev/null @@ -1,54 +0,0 @@ -MobileTradeRoomMobile_MapScripts: -.SceneScripts: - db 2 - scene_script .InitializeMobileTradeRoomMobile - scene_script .DummyScene - -.MapCallbacks: - db 0 - -.InitializeMobileTradeRoomMobile: - priorityjump .InitializeAndPreparePokecenter2F - end - -.DummyScene: - end - -.InitializeAndPreparePokecenter2F: - setscene 1 - setmapscene POKECENTER_2F, 4 - end - -MapMobileTradeRoomMobileSignpost0Script: - refreshscreen - special Special_Function1037c2 - writetext MobileTradeRoomMobile_EstablishingCommsText - waitbutton - reloadmappart - special Special_Function101231 - closetext - end - -MobileTradeRoomMobile_EstablishingCommsText: - text "Establishing" - line "communications…" - done - -MobileTradeRoomMobile_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 7, 5, POKECENTER_2F - warp_def 5, 7, 5, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomMobileSignpost0Script - -.ObjectEvents: - db 0 diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 38e5d436d..829dcf1d9 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const MOUNTMOON_SILVER MountMoon_MapScripts: -.SceneScripts: - db 2 - scene_script .RivalEncounter - scene_script .DummyScene + db 2 ; scene scripts + scene_script .RivalEncounter ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .RivalEncounter: priorityjump .RivalBattle @@ -18,9 +16,9 @@ MountMoon_MapScripts: end .RivalBattle: - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 applymovement MOUNTMOON_SILVER, MountMoonSilverMovementBefore playmusic MUSIC_RIVAL_ENCOUNTER @@ -66,7 +64,7 @@ MountMoon_MapScripts: closetext applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter disappear MOUNTMOON_SILVER - setscene 1 + setscene SCENE_FINISHED setevent EVENT_BEAT_RIVAL_IN_MT_MOON playmapmusic end @@ -161,26 +159,21 @@ MountMoonSilverTextLoss: done MountMoon_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 8 - warp_def 3, 3, 1, ROUTE_3 - warp_def 15, 15, 1, ROUTE_4 - warp_def 13, 3, 7, MOUNT_MOON - warp_def 15, 11, 8, MOUNT_MOON - warp_def 25, 5, 1, MOUNT_MOON_SQUARE - warp_def 25, 15, 2, MOUNT_MOON_SQUARE - warp_def 25, 3, 3, MOUNT_MOON - warp_def 25, 13, 4, MOUNT_MOON - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 7, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL + db 0, 0 ; filler + + db 8 ; warp events + warp_event 3, 3, ROUTE_3, 1 + warp_event 15, 15, ROUTE_4, 1 + warp_event 13, 3, MOUNT_MOON, 7 + warp_event 15, 11, MOUNT_MOON, 8 + warp_event 25, 5, MOUNT_MOON_SQUARE, 1 + warp_event 25, 15, MOUNT_MOON_SQUARE, 2 + warp_event 25, 3, MOUNT_MOON, 3 + warp_event 25, 13, MOUNT_MOON, 4 + + db 0 ; coord events + + db 0 ; bg events + + db 1 ; object events + object_event 7, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index b24a98e20..54616ea17 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const MOUNTMOONGIFTSHOP_GRAMPS1 ; morning only const MOUNTMOONGIFTSHOP_GRAMPS2 ; day only const MOUNTMOONGIFTSHOP_LASS1 ; morning only const MOUNTMOONGIFTSHOP_LASS2 ; day only MountMoonGiftShop_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MountMoonGiftShopClerkScript: faceplayer @@ -28,23 +26,18 @@ MountMoonGiftShopLassText: done MountMoonGiftShop_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 3, 7, 3, MOUNT_MOON_SQUARE - warp_def 4, 7, 3, MOUNT_MOON_SQUARE - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 4, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1 - object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1 - object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 - object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 3, 7, MOUNT_MOON_SQUARE, 3 + warp_event 4, 7, MOUNT_MOON_SQUARE, 3 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 4, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1 + object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1 + object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 + object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 1d9848f3b..502c752d3 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const MOUNTMOONSQUARE_FAIRY1 const MOUNTMOONSQUARE_FAIRY2 const MOUNTMOONSQUARE_ROCK MountMoonSquare_MapScripts: -.SceneScripts: - db 1 - scene_script .DummyScene + db 1 ; scene scripts + scene_script .DummyScene ; SCENE_DEFAULT -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_NEWMAP, .DisappearMoonStone callback MAPCALLBACK_OBJECTS, .DisappearRock @@ -28,15 +26,15 @@ ClefairyDance: checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY iftrue .NoDancing checkcode VAR_WEEKDAY - if_not_equal MONDAY, .NoDancing - checknite + ifnotequal MONDAY, .NoDancing + checktime NITE iffalse .NoDancing appear MOUNTMOONSQUARE_FAIRY1 appear MOUNTMOONSQUARE_FAIRY2 applymovement PLAYER, PlayerWalksUpToDancingClefairies pause 15 appear MOUNTMOONSQUARE_ROCK - spriteface MOUNTMOONSQUARE_FAIRY1, RIGHT + objectface MOUNTMOONSQUARE_FAIRY1, RIGHT cry CLEFAIRY waitsfx pause 30 @@ -56,10 +54,10 @@ ClefairyDance: follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2 applymovement MOUNTMOONSQUARE_FAIRY1, ClefairyDanceStep7 stopfollow - spriteface MOUNTMOONSQUARE_FAIRY1, DOWN + objectface MOUNTMOONSQUARE_FAIRY1, DOWN pause 10 showemote EMOTE_SHOCK, MOUNTMOONSQUARE_FAIRY1, 15 - spriteface MOUNTMOONSQUARE_FAIRY1, DOWN + objectface MOUNTMOONSQUARE_FAIRY1, DOWN cry CLEFAIRY pause 15 follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2 @@ -75,7 +73,7 @@ ClefairyDance: end MountMoonSquareHiddenMoonStone: - hiddenitem EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE + hiddenitem MOON_STONE, EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE DontLitterSign: jumptext DontLitterSignText @@ -133,26 +131,21 @@ DontLitterSignText: done MountMoonSquare_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 20, 5, 5, MOUNT_MOON - warp_def 22, 11, 6, MOUNT_MOON - warp_def 13, 7, 1, MOUNT_MOON_GIFT_SHOP - -.CoordEvents: - db 1 - coord_event 7, 11, 0, ClefairyDance - -.BGEvents: - db 2 - bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone - bg_event 17, 7, BGEVENT_READ, DontLitterSign - -.ObjectEvents: - db 3 - object_event 6, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY - object_event 7, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY - object_event 7, 7, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK + db 0, 0 ; filler + + db 3 ; warp events + warp_event 20, 5, MOUNT_MOON, 5 + warp_event 22, 11, MOUNT_MOON, 6 + warp_event 13, 7, MOUNT_MOON_GIFT_SHOP, 1 + + db 1 ; coord events + coord_event 7, 11, SCENE_DEFAULT, ClefairyDance + + db 2 ; bg events + bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone + bg_event 17, 7, BGEVENT_READ, DontLitterSign + + db 3 ; object events + object_event 6, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY + object_event 7, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY + object_event 7, 7, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index a67ba1144..05b39101e 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const MOUNTMORTAR1FINSIDE_BOULDER const MOUNTMORTAR1FINSIDE_POKE_BALL1 const MOUNTMORTAR1FINSIDE_POKE_BALL2 @@ -11,17 +11,15 @@ const_value set 2 const MOUNTMORTAR1FINSIDE_POKE_BALL7 MountMortar1FInside_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerPokemaniacMiller: - trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script + trainer POKEMANIAC, MILLER, EVENT_BEAT_POKEMANIAC_MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokemaniacMillerAfterBattleText waitbutton @@ -29,10 +27,10 @@ TrainerPokemaniacMiller: end TrainerSupernerdMarkus: - trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, .Script + trainer SUPER_NERD, MARKUS, EVENT_BEAT_SUPER_NERD_MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SupernerdMarkusAfterBattleText waitbutton @@ -64,7 +62,7 @@ MountMortar1FInsideUltraBall: itemball ULTRA_BALL MountMortar1FInsideHiddenMaxRepel: - hiddenitem EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL + hiddenitem MAX_REPEL, EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL PokemaniacMillerSeenText: text "I'm not losing" @@ -117,34 +115,29 @@ SupernerdMarkusAfterBattleText: done MountMortar1FInside_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 11, 47, 5, MOUNT_MORTAR_1F_OUTSIDE - warp_def 29, 47, 6, MOUNT_MORTAR_1F_OUTSIDE - warp_def 5, 39, 8, MOUNT_MORTAR_1F_OUTSIDE - warp_def 33, 41, 9, MOUNT_MORTAR_1F_OUTSIDE - warp_def 3, 19, 1, MOUNT_MORTAR_B1F - warp_def 9, 9, 2, MOUNT_MORTAR_2F_INSIDE - -.CoordEvents: - db 0 - -.BGEvents: - db 1 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 11, 47, MOUNT_MORTAR_1F_OUTSIDE, 5 + warp_event 29, 47, MOUNT_MORTAR_1F_OUTSIDE, 6 + warp_event 5, 39, MOUNT_MORTAR_1F_OUTSIDE, 8 + warp_event 33, 41, MOUNT_MORTAR_1F_OUTSIDE, 9 + warp_event 3, 19, MOUNT_MORTAR_B1F, 1 + warp_event 9, 9, MOUNT_MORTAR_2F_INSIDE, 2 + + db 0 ; coord events + + db 1 ; bg events bg_event 30, 11, BGEVENT_ITEM, MountMortar1FInsideHiddenMaxRepel -.ObjectEvents: - db 10 + db 10 ; object events object_event 21, 43, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortar1FBoulder, -1 - object_event 35, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE - object_event 16, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE - object_event 10, 27, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideHyperPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION - object_event 22, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION - object_event 35, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET + object_event 35, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideEscapeRope, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE + object_event 16, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxRevive, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE + object_event 10, 27, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideHyperPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION + object_event 22, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideMaxPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION + object_event 35, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET object_event 33, 43, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacMiller, -1 object_event 24, 28, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdMarkus, -1 - object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON - object_event 17, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL + object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON + object_event 17, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index d38f4f732..eded2353c 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const MOUNTMORTAR1FOUTSIDE_POKE_BALL1 const MOUNTMORTAR1FOUTSIDE_POKE_BALL2 MountMortar1FOutside_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MountMortar1FOutsideEther: itemball ETHER @@ -16,32 +14,27 @@ MountMortar1FOutsideRevive: itemball REVIVE MountMortar1FOutsideHiddenHyperPotion: - hiddenitem EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION MountMortar1FOutside_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 3, 33, 3, ROUTE_42 - warp_def 17, 33, 4, ROUTE_42 - warp_def 37, 33, 5, ROUTE_42 - warp_def 17, 5, 1, MOUNT_MORTAR_2F_INSIDE - warp_def 11, 21, 1, MOUNT_MORTAR_1F_INSIDE - warp_def 29, 21, 2, MOUNT_MORTAR_1F_INSIDE - warp_def 17, 29, 2, MOUNT_MORTAR_B1F - warp_def 7, 13, 3, MOUNT_MORTAR_1F_INSIDE - warp_def 33, 13, 4, MOUNT_MORTAR_1F_INSIDE - -.CoordEvents: - db 0 - -.BGEvents: - db 1 + db 0, 0 ; filler + + db 9 ; warp events + warp_event 3, 33, ROUTE_42, 3 + warp_event 17, 33, ROUTE_42, 4 + warp_event 37, 33, ROUTE_42, 5 + warp_event 17, 5, MOUNT_MORTAR_2F_INSIDE, 1 + warp_event 11, 21, MOUNT_MORTAR_1F_INSIDE, 1 + warp_event 29, 21, MOUNT_MORTAR_1F_INSIDE, 2 + warp_event 17, 29, MOUNT_MORTAR_B1F, 2 + warp_event 7, 13, MOUNT_MORTAR_1F_INSIDE, 3 + warp_event 33, 13, MOUNT_MORTAR_1F_INSIDE, 4 + + db 0 ; coord events + + db 1 ; bg events bg_event 25, 22, BGEVENT_ITEM, MountMortar1FOutsideHiddenHyperPotion -.ObjectEvents: - db 2 - object_event 13, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER - object_event 31, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE + db 2 ; object events + object_event 13, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideEther, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER + object_event 31, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FOutsideRevive, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 66120731f..a81f77697 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const MOUNTMORTAR2FINSIDE_POKE_BALL1 const MOUNTMORTAR2FINSIDE_POKE_BALL2 const MOUNTMORTAR2FINSIDE_POKE_BALL3 @@ -8,17 +8,15 @@ const_value set 2 const MOUNTMORTAR2FINSIDE_SUPER_NERD MountMortar2FInside_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerSupernerdHugh: - trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script + trainer SUPER_NERD, HUGH, EVENT_BEAT_SUPER_NERD_HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SupernerdHughAfterBattleText waitbutton @@ -44,7 +42,7 @@ MountMortar2FInsideEscapeRope: itemball ESCAPE_ROPE MountMortar2FInsideHiddenFullRestore: - hiddenitem EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE SupernerdHughSeenText: text "Yo! MARKUS!" @@ -67,27 +65,22 @@ SupernerdHughAfterBattleText: done MountMortar2FInside_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 17, 33, 4, MOUNT_MORTAR_1F_OUTSIDE - warp_def 3, 5, 6, MOUNT_MORTAR_1F_INSIDE - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 24, 8, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore - -.ObjectEvents: - db 7 - object_event 28, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION - object_event 2, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY - object_event 19, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL - object_event 16, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE - object_event 9, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER - object_event 28, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE + db 0, 0 ; filler + + db 2 ; warp events + warp_event 17, 33, MOUNT_MORTAR_1F_OUTSIDE, 4 + warp_event 3, 5, MOUNT_MORTAR_1F_INSIDE, 6 + + db 0 ; coord events + + db 1 ; bg events + bg_event 24, 8, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore + + db 7 ; object events + object_event 28, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION + object_event 2, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY + object_event 19, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL + object_event 16, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE + object_event 9, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER + object_event 28, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE object_event 13, 26, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdHugh, -1 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 7d798c22e..23937e60d 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const MOUNTMORTARB1F_POKE_BALL1 const MOUNTMORTARB1F_POKE_BALL2 const MOUNTMORTARB1F_BOULDER @@ -8,11 +8,9 @@ const_value set 2 const MOUNTMORTARB1F_POKE_BALL5 MountMortarB1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks BlackBeltScript_0x7e1f6: faceplayer @@ -35,7 +33,7 @@ UnknownScript_0x7e217: buttonsound waitsfx checkcode VAR_PARTYCOUNT - if_equal PARTY_LENGTH, UnknownScript_0x7e237 + ifequal PARTY_LENGTH, UnknownScript_0x7e237 writetext UnknownText_0x7e355 playsound SFX_CAUGHT_MON waitsfx @@ -72,7 +70,7 @@ MountMortarB1FPPUp: itemball PP_UP MountMortarB1FHiddenMaxRevive: - hiddenitem EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE + hiddenitem MAX_REVIVE, EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE UnknownText_0x7e24d: text "Hey!" @@ -135,27 +133,22 @@ UnknownText_0x7e3df: done MountMortarB1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 3, 3, 5, MOUNT_MORTAR_1F_INSIDE - warp_def 19, 29, 7, MOUNT_MORTAR_1F_OUTSIDE - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 4, 6, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive - -.ObjectEvents: - db 7 - object_event 29, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION - object_event 4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS - object_event 9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1 - object_event 16, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1 - object_event 34, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE - object_event 32, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER - object_event 21, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP + db 0, 0 ; filler + + db 2 ; warp events + warp_event 3, 3, MOUNT_MORTAR_1F_INSIDE, 5 + warp_event 19, 29, MOUNT_MORTAR_1F_OUTSIDE, 7 + + db 0 ; coord events + + db 1 ; bg events + bg_event 4, 6, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive + + db 7 ; object events + object_event 29, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION + object_event 4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS + object_event 9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1 + object_event 16, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1 + object_event 34, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE + object_event 32, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER + object_event 21, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 0635be308..e382cf226 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -1,17 +1,15 @@ -const_value set 2 + const_def 2 ; object constants const MOVEDELETERSHOUSE_SUPER_NERD MoveDeletersHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MoveDeleter: faceplayer opentext - special Special_MoveDeletion + special MoveDeletion waitbutton closetext end @@ -20,22 +18,17 @@ MoveDeletersHouseBookshelf: jumpstd difficultbookshelf MoveDeletersHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 6, BLACKTHORN_CITY - warp_def 3, 7, 6, BLACKTHORN_CITY + db 2 ; warp events + warp_event 2, 7, BLACKTHORN_CITY, 6 + warp_event 3, 7, BLACKTHORN_CITY, 6 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, MoveDeletersHouseBookshelf - bg_event 1, 1, BGEVENT_READ, MoveDeletersHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, MoveDeletersHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MoveDeletersHouseBookshelf -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoveDeleter, -1 + db 1 ; object events + object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoveDeleter, -1 diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 403134bae..4396e707d 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const MRFUJISHOUSE_SUPER_NERD const MRFUJISHOUSE_LASS const MRFUJISHOUSE_PSYDUCK @@ -6,11 +6,9 @@ const_value set 2 const MRFUJISHOUSE_PIDGEY MrFujisHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MrFujisHouseSuperNerdScript: jumptextfaceplayer MrFujisHouseSuperNerdText @@ -80,26 +78,21 @@ MrFujisPidgeyText: done MrFujisHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 2, LAVENDER_TOWN - warp_def 3, 7, 2, LAVENDER_TOWN - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, MrFujisHouseBookshelf - bg_event 1, 1, BGEVENT_READ, MrFujisHouseBookshelf - -.ObjectEvents: - db 5 - object_event 4, 1, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1 - object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1 - object_event 7, 4, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1 - object_event 5, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFujisNidorino, -1 - object_event 1, 3, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MrFujisPidgey, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, LAVENDER_TOWN, 2 + warp_event 3, 7, LAVENDER_TOWN, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, MrFujisHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MrFujisHouseBookshelf + + db 5 ; object events + object_event 4, 1, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1 + object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1 + object_event 7, 4, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1 + object_event 5, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFujisNidorino, -1 + object_event 1, 3, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MrFujisPidgey, -1 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 8ac7d0a09..53358e632 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const MRPOKEMONSHOUSE_GENTLEMAN const MRPOKEMONSHOUSE_OAK MrPokemonsHouse_MapScripts: -.SceneScripts: - db 2 - scene_script .MeetMrPokemon - scene_script .DummyScene + db 2 ; scene scripts + scene_script .MeetMrPokemon ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .MeetMrPokemon: priorityjump .MrPokemonEvent @@ -20,7 +18,7 @@ MrPokemonsHouse_MapScripts: .MrPokemonEvent: showemote EMOTE_SHOCK, MRPOKEMONSHOUSE_GENTLEMAN, 15 - spriteface MRPOKEMONSHOUSE_GENTLEMAN, DOWN + objectface MRPOKEMONSHOUSE_GENTLEMAN, DOWN opentext writetext MrPokemonIntroText1 waitbutton @@ -39,11 +37,11 @@ MrPokemonsHouse_MapScripts: blackoutmod CHERRYGROVE_CITY writetext MrPokemonIntroText3 buttonsound - spriteface MRPOKEMONSHOUSE_GENTLEMAN, RIGHT + objectface MRPOKEMONSHOUSE_GENTLEMAN, RIGHT writetext MrPokemonIntroText4 buttonsound - spriteface MRPOKEMONSHOUSE_GENTLEMAN, DOWN - spriteface MRPOKEMONSHOUSE_OAK, LEFT + objectface MRPOKEMONSHOUSE_GENTLEMAN, DOWN + objectface MRPOKEMONSHOUSE_OAK, LEFT writetext MrPokemonIntroText5 waitbutton closetext @@ -86,7 +84,7 @@ MrPokemonsHouse_MrPokemonScript: MrPokemonsHouse_OakScript: playmusic MUSIC_PROF_OAK applymovement MRPOKEMONSHOUSE_OAK, MrPokemonsHouse_OakWalksToPlayer - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT opentext writetext MrPokemonsHouse_OakText1 buttonsound @@ -98,36 +96,36 @@ MrPokemonsHouse_OakScript: writetext MrPokemonsHouse_OakText2 waitbutton closetext - spriteface PLAYER, DOWN + objectface PLAYER, DOWN applymovement MRPOKEMONSHOUSE_OAK, MrPokemonsHouse_OakExits playsound SFX_EXIT_BUILDING disappear MRPOKEMONSHOUSE_OAK waitsfx special RestartMapMusic pause 15 - spriteface PLAYER, UP + objectface PLAYER, UP opentext writetext MrPokemonsHouse_MrPokemonHealText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes playmusic MUSIC_HEAL - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty pause 60 - special Special_FadeInQuickly + special FadeInQuickly special RestartMapMusic opentext writetext MrPokemonText_ImDependingOnYou waitbutton closetext setevent EVENT_RIVAL_NEW_BARK_TOWN - setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR - clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR - setscene 1 - setmapscene CHERRYGROVE_CITY, 1 - setmapscene ELMS_LAB, 3 + setevent EVENT_PLAYERS_HOUSE_1F_NEIGHBOR + clearevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR + setscene SCENE_FINISHED + setmapscene CHERRYGROVE_CITY, SCENE_CHERRYGROVECITY_MEET_RIVAL + setmapscene ELMS_LAB, SCENE_ELMSLAB_MEET_OFFICER specialphonecall SPECIALCALL_ROBBED clearevent EVENT_COP_IN_ELMS_LAB checkevent EVENT_GOT_TOTODILE_FROM_ELM @@ -373,26 +371,21 @@ MrPokemonsHouse_StrangeCoinsText: done MrPokemonsHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 2, ROUTE_30 - warp_def 3, 7, 2, ROUTE_30 - -.CoordEvents: - db 0 - -.BGEvents: - db 5 - bg_event 0, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script - bg_event 1, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script - bg_event 6, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script - bg_event 7, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script - bg_event 6, 4, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script - -.ObjectEvents: - db 2 - object_event 3, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1 - object_event 6, 5, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, ROUTE_30, 2 + warp_event 3, 7, ROUTE_30, 2 + + db 0 ; coord events + + db 5 ; bg events + bg_event 0, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script + bg_event 1, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script + bg_event 6, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script + bg_event 7, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script + bg_event 6, 4, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script + + db 2 ; object events + object_event 3, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1 + object_event 6, 5, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 042b922d0..c5121e247 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const MRPSYCHICSHOUSE_FISHING_GURU MrPsychicsHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MrPsychic: faceplayer @@ -48,22 +46,17 @@ MrPsychicText2: done MrPsychicsHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 5, SAFFRON_CITY - warp_def 3, 7, 5, SAFFRON_CITY + db 2 ; warp events + warp_event 2, 7, SAFFRON_CITY, 5 + warp_event 3, 7, SAFFRON_CITY, 5 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, MrPsychicsHouseBookshelf - bg_event 1, 1, BGEVENT_READ, MrPsychicsHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, MrPsychicsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MrPsychicsHouseBookshelf -.ObjectEvents: - db 1 - object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1 + db 1 ; object events + object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 9429c5845..d28654bdd 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const NATIONALPARK_LASS1 const NATIONALPARK_POKEFAN_F1 const NATIONALPARK_TEACHER1 @@ -15,11 +15,9 @@ const_value set 2 const NATIONALPARK_POKE_BALL2 NationalPark_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NationalParkLassScript: jumptextfaceplayer NationalParkLassText @@ -68,15 +66,15 @@ GameboyKidScript_0x5c037: writetext UnknownText_0x5c42a waitbutton closetext - spriteface NATIONALPARK_GAMEBOY_KID, DOWN + objectface NATIONALPARK_GAMEBOY_KID, DOWN end TrainerSchoolboyJack1: - trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, .Script + trainer SCHOOLBOY, JACK1, EVENT_BEAT_SCHOOLBOY_JACK, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_JACK iftrue UnknownScript_0x5c088 @@ -94,8 +92,8 @@ UnknownScript_0x5c071: scall UnknownScript_0x5c100 UnknownScript_0x5c074: askforphonenumber PHONE_SCHOOLBOY_JACK - if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5c110 - if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5c10c + ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5c110 + ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5c10c trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0 scall UnknownScript_0x5c104 jump UnknownScript_0x5c108 @@ -104,11 +102,11 @@ UnknownScript_0x5c088: scall UnknownScript_0x5c114 winlosstext SchoolboyJack1BeatenText, 0 copybytetovar wJackFightCount - if_equal 4, .Fight4 - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 4, .Fight4 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 @@ -189,10 +187,10 @@ UnknownScript_0x5c114: end TrainerPokefanmWilliam: - trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, .Script + trainer POKEFANM, WILLIAM, EVENT_BEAT_POKEFANM_WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokefanmWilliamAfterBattleText waitbutton @@ -200,11 +198,11 @@ TrainerPokefanmWilliam: end TrainerPokefanfBeverly1: - trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, .Script + trainer POKEFANF, BEVERLY1, EVENT_BEAT_POKEFANF_BEVERLY, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_BEVERLY_HAS_NUGGET iftrue UnknownScript_0x5c177 @@ -224,8 +222,8 @@ UnknownScript_0x5c160: scall UnknownScript_0x5c193 UnknownScript_0x5c163: askforphonenumber PHONE_POKEFAN_BEVERLY - if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5c1a3 - if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5c19f + ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5c1a3 + ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5c19f trainertotext POKEFANF, BEVERLY1, MEM_BUFFER_0 scall UnknownScript_0x5c197 jump UnknownScript_0x5c19b @@ -279,10 +277,10 @@ UnknownScript_0x5c1ab: end TrainerLassKrise: - trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, .Script + trainer LASS, KRISE, EVENT_BEAT_LASS_KRISE, LassKriseSeenText, LassKriseBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext LassKriseAfterBattleText waitbutton @@ -305,7 +303,7 @@ NationalParkTMDig: itemball TM_DIG NationalParkHiddenFullHeal: - hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL NationalParkLassText: text "Look! Check out my" @@ -514,30 +512,25 @@ UnknownText_0x5c7c6: done NationalPark_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE - warp_def 33, 19, 2, ROUTE_36_NATIONAL_PARK_GATE - warp_def 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE - warp_def 11, 47, 2, ROUTE_35_NATIONAL_PARK_GATE + db 4 ; warp events + warp_event 33, 18, ROUTE_36_NATIONAL_PARK_GATE, 1 + warp_event 33, 19, ROUTE_36_NATIONAL_PARK_GATE, 2 + warp_event 10, 47, ROUTE_35_NATIONAL_PARK_GATE, 1 + warp_event 11, 47, ROUTE_35_NATIONAL_PARK_GATE, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 4 + db 4 ; bg events bg_event 14, 44, BGEVENT_READ, MapNationalParkSignpost0Script bg_event 27, 31, BGEVENT_READ, MapNationalParkSignpost1Script - bg_event 6, 47, BGEVENT_ITEM, NationalParkHiddenFullHeal - bg_event 12, 4, BGEVENT_READ, MapNationalParkSignpost3Script + bg_event 6, 47, BGEVENT_ITEM, NationalParkHiddenFullHeal + bg_event 12, 4, BGEVENT_READ, MapNationalParkSignpost3Script -.ObjectEvents: - db 14 + db 14 ; object events object_event 15, 24, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkLassScript, -1 - object_event 14, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1 + object_event 14, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1 object_event 27, 40, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1 object_event 11, 41, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster1Script, -1 object_event 10, 41, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster2Script, -1 @@ -545,8 +538,8 @@ NationalPark_MapEvents: object_event 26, 40, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPersian, -1 object_event 27, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1 object_event 18, 29, SPRITE_POKEFAN_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1 - object_event 16, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1 - object_event 8, 14, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1 - object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL - object_event 26, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1 - object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG + object_event 16, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1 + object_event 8, 14, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1 + object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL + object_event 26, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1 + object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index c69e55854..6c718ff61 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const NATIONALPARKBUGCONTEST_YOUNGSTER1 const NATIONALPARKBUGCONTEST_YOUNGSTER2 const NATIONALPARKBUGCONTEST_ROCKER @@ -13,11 +13,9 @@ const_value set 2 const NATIONALPARKBUGCONTEST_POKE_BALL2 NationalParkBugContest_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks YoungsterScript_0x5c8ec: faceplayer @@ -115,7 +113,7 @@ NationalParkBugContestTMDig: itemball TM_DIG NationalParkBugContestHiddenFullHeal: - hiddenitem EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL UnknownText_0x5c94c: text "DON: I'm going to" @@ -221,37 +219,32 @@ UnknownText_0x5cc1d: done NationalParkBugContest_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 33, 18, 1, ROUTE_36_NATIONAL_PARK_GATE - warp_def 33, 19, 1, ROUTE_36_NATIONAL_PARK_GATE - warp_def 10, 47, 1, ROUTE_35_NATIONAL_PARK_GATE - warp_def 11, 47, 1, ROUTE_35_NATIONAL_PARK_GATE + db 4 ; warp events + warp_event 33, 18, ROUTE_36_NATIONAL_PARK_GATE, 1 + warp_event 33, 19, ROUTE_36_NATIONAL_PARK_GATE, 1 + warp_event 10, 47, ROUTE_35_NATIONAL_PARK_GATE, 1 + warp_event 11, 47, ROUTE_35_NATIONAL_PARK_GATE, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 4 + db 4 ; bg events bg_event 14, 44, BGEVENT_READ, MapNationalParkBugContestSignpost0Script bg_event 27, 31, BGEVENT_READ, MapNationalParkBugContestSignpost1Script - bg_event 6, 47, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal - bg_event 12, 4, BGEVENT_READ, MapNationalParkBugContestSignpost3Script + bg_event 6, 47, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal + bg_event 12, 4, BGEVENT_READ, MapNationalParkBugContestSignpost3Script -.ObjectEvents: - db 12 + db 12 ; object events object_event 19, 29, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A object_event 28, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A - object_event 9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A - object_event 7, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A - object_event 23, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A + object_event 9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A + object_event 7, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A + object_event 23, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A object_event 27, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A - object_event 7, 23, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A + object_event 7, 23, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A - object_event 16, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A + object_event 16, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A object_event 17, 34, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A - object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL - object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG + object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL + object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index f4cad71eb..d4ae92d48 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -1,16 +1,14 @@ -const_value set 2 + const_def 2 ; object constants const NEWBARKTOWN_TEACHER const NEWBARKTOWN_FISHER const NEWBARKTOWN_SILVER NewBarkTown_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -26,12 +24,12 @@ NewBarkTown_MapScripts: NewBarkTown_TeacherStopsYouScene1: playmusic MUSIC_MOM - spriteface NEWBARKTOWN_TEACHER, LEFT + objectface NEWBARKTOWN_TEACHER, LEFT opentext writetext Text_WaitPlayer waitbutton closetext - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou1_NBT opentext writetext Text_WhatDoYouThinkYoureDoing @@ -49,14 +47,14 @@ NewBarkTown_TeacherStopsYouScene1: NewBarkTown_TeacherStopsYouScene2: playmusic MUSIC_MOM - spriteface NEWBARKTOWN_TEACHER, LEFT + objectface NEWBARKTOWN_TEACHER, LEFT opentext writetext Text_WaitPlayer waitbutton closetext - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou2_NBT - spriteface PLAYER, UP + objectface PLAYER, UP opentext writetext Text_WhatDoYouThinkYoureDoing waitbutton @@ -111,7 +109,7 @@ NewBarkTownSilverScript: writetext NewBarkTownRivalText1 waitbutton closetext - spriteface NEWBARKTOWN_SILVER, LEFT + objectface NEWBARKTOWN_SILVER, LEFT opentext writetext NewBarkTownRivalText2 waitbutton @@ -120,7 +118,7 @@ NewBarkTownSilverScript: applymovement PLAYER, Movement_SilverPushesYouAway_NBT stopfollow pause 5 - spriteface NEWBARKTOWN_SILVER, DOWN + objectface NEWBARKTOWN_SILVER, DOWN pause 5 playsound SFX_TACKLE applymovement PLAYER, Movement_SilverShovesYouOut_NBT @@ -282,30 +280,25 @@ ElmsHouseSignText: done NewBarkTown_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 6, 3, 1, ELMS_LAB - warp_def 13, 5, 1, KRISS_HOUSE_1F - warp_def 3, 11, 1, KRISS_NEIGHBORS_HOUSE - warp_def 11, 13, 1, ELMS_HOUSE - -.CoordEvents: - db 2 - coord_event 1, 8, 0, NewBarkTown_TeacherStopsYouScene1 - coord_event 1, 9, 0, NewBarkTown_TeacherStopsYouScene2 - -.BGEvents: - db 4 - bg_event 8, 8, BGEVENT_READ, NewBarkTownSign - bg_event 11, 5, BGEVENT_READ, MapNewBarkTownSignpost1Script - bg_event 3, 3, BGEVENT_READ, MapNewBarkTownSignpost2Script - bg_event 9, 13, BGEVENT_READ, MapNewBarkTownSignpost3Script - -.ObjectEvents: - db 3 - object_event 6, 8, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1 - object_event 12, 9, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1 - object_event 3, 2, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN + db 0, 0 ; filler + + db 4 ; warp events + warp_event 6, 3, ELMS_LAB, 1 + warp_event 13, 5, PLAYERS_HOUSE_1F, 1 + warp_event 3, 11, PLAYERS_NEIGHBORS_HOUSE, 1 + warp_event 11, 13, ELMS_HOUSE, 1 + + db 2 ; coord events + coord_event 1, 8, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene1 + coord_event 1, 9, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene2 + + db 4 ; bg events + bg_event 8, 8, BGEVENT_READ, NewBarkTownSign + bg_event 11, 5, BGEVENT_READ, MapNewBarkTownSignpost1Script + bg_event 3, 3, BGEVENT_READ, MapNewBarkTownSignpost2Script + bg_event 9, 13, BGEVENT_READ, MapNewBarkTownSignpost3Script + + db 3 ; object events + object_event 6, 8, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1 + object_event 12, 9, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1 + object_event 3, 2, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index d78641c28..1931747e5 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const OAKSLAB_OAK const OAKSLAB_SCIENTIST1 const OAKSLAB_SCIENTIST2 const OAKSLAB_SCIENTIST3 OaksLab_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -26,14 +24,14 @@ Oak: setevent EVENT_TALKED_TO_OAK_IN_KANTO .CheckBadges: checkcode VAR_BADGES - if_equal NUM_BADGES, .OpenMtSilver - if_equal NUM_JOHTO_BADGES, .Complain + ifequal NUM_BADGES, .OpenMtSilver + ifequal NUM_JOHTO_BADGES, .Complain jump .AhGood .CheckPokedex: writetext OakLabDexCheckText waitbutton - special Special_ProfOaksPCBoot + special ProfOaksPCBoot writetext OakLabGoodbyeText waitbutton closetext @@ -257,39 +255,34 @@ OaksLabPCText: done OaksLab_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 11, 3, PALLET_TOWN - warp_def 5, 11, 3, PALLET_TOWN - -.CoordEvents: - db 0 - -.BGEvents: - db 16 - bg_event 6, 1, BGEVENT_READ, OaksLabBookshelf - bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf - bg_event 8, 1, BGEVENT_READ, OaksLabBookshelf - bg_event 9, 1, BGEVENT_READ, OaksLabBookshelf - bg_event 0, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 1, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 2, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 3, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 6, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 7, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 8, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 9, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 4, 0, BGEVENT_READ, OaksLabPoster1 - bg_event 5, 0, BGEVENT_READ, OaksLabPoster2 - bg_event 9, 3, BGEVENT_READ, OaksLabTrashcan - bg_event 0, 1, BGEVENT_READ, OaksLabPC - -.ObjectEvents: - db 4 - object_event 4, 2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1 - object_event 1, 8, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1 - object_event 8, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1 - object_event 1, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant3Script, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 11, PALLET_TOWN, 3 + warp_event 5, 11, PALLET_TOWN, 3 + + db 0 ; coord events + + db 16 ; bg events + bg_event 6, 1, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf + bg_event 8, 1, BGEVENT_READ, OaksLabBookshelf + bg_event 9, 1, BGEVENT_READ, OaksLabBookshelf + bg_event 0, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 1, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 2, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 3, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 6, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 8, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 9, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 4, 0, BGEVENT_READ, OaksLabPoster1 + bg_event 5, 0, BGEVENT_READ, OaksLabPoster2 + bg_event 9, 3, BGEVENT_READ, OaksLabTrashcan + bg_event 0, 1, BGEVENT_READ, OaksLabPC + + db 4 ; object events + object_event 4, 2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1 + object_event 1, 8, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1 + object_event 8, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1 + object_event 1, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant3Script, -1 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 269357d21..6e3ffbe5f 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINECAFE_SAILOR1 const OLIVINECAFE_FISHING_GURU const OLIVINECAFE_SAILOR2 OlivineCafe_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SailorScript_0x9c8c1: faceplayer @@ -79,22 +77,17 @@ OlivineCafeSailorText: done OlivineCafe_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 7, OLIVINE_CITY - warp_def 3, 7, 7, OLIVINE_CITY + db 2 ; warp events + warp_event 2, 7, OLIVINE_CITY, 7 + warp_event 3, 7, OLIVINE_CITY, 7 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1 - object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1 - object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1 + db 3 ; object events + object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1 + object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1 + object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index e2fd0c4c7..053001a47 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -1,17 +1,15 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINECITY_SAILOR1 const OLIVINECITY_STANDING_YOUNGSTER const OLIVINECITY_SAILOR2 const OLIVINECITY_OLIVINE_RIVAL OlivineCity_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -25,9 +23,9 @@ OlivineCity_MapScripts: return UnknownScript_0x1a8833: - spriteface PLAYER, LEFT + objectface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 playsound SFX_ENTER_DOOR appear OLIVINECITY_OLIVINE_RIVAL @@ -39,19 +37,19 @@ UnknownScript_0x1a8833: waitbutton closetext applymovement PLAYER, MovementData_0x1a88f4 - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db - setscene 1 + setscene SCENE_FINISHED disappear OLIVINECITY_OLIVINE_RIVAL special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX end UnknownScript_0x1a886b: - spriteface PLAYER, LEFT + objectface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 playsound SFX_ENTER_DOOR appear OLIVINECITY_OLIVINE_RIVAL @@ -63,13 +61,13 @@ UnknownScript_0x1a886b: waitbutton closetext applymovement PLAYER, MovementData_0x1a88f7 - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8 disappear OLIVINECITY_OLIVINE_RIVAL - setscene 1 + setscene SCENE_FINISHED special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX end OlivineCitySailor1Script: @@ -79,7 +77,7 @@ StandingYoungsterScript_0x1a88a6: faceplayer opentext random 2 - if_equal 0, UnknownScript_0x1a88b4 + ifequal 0, UnknownScript_0x1a88b4 writetext UnknownText_0x1a8b04 waitbutton closetext @@ -288,40 +286,35 @@ UnknownText_0x1a8cba: done OlivineCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 11 - warp_def 13, 21, 1, OLIVINE_POKECENTER_1F - warp_def 10, 11, 1, OLIVINE_GYM - warp_def 25, 11, 1, OLIVINE_TIMS_HOUSE - warp_def 0, 0, 1, OLIVINE_HOUSE_BETA - warp_def 29, 11, 1, OLIVINE_PUNISHMENT_SPEECH_HOUSE - warp_def 13, 15, 1, OLIVINE_GOOD_ROD_HOUSE - warp_def 7, 21, 1, OLIVINE_CAFE - warp_def 19, 17, 2, OLIVINE_MART - warp_def 29, 27, 1, OLIVINE_LIGHTHOUSE_1F - warp_def 19, 27, 1, OLIVINE_PORT_PASSAGE - warp_def 20, 27, 2, OLIVINE_PORT_PASSAGE - -.CoordEvents: - db 2 - coord_event 13, 12, 0, UnknownScript_0x1a8833 - coord_event 13, 13, 0, UnknownScript_0x1a886b - -.BGEvents: - db 7 + db 0, 0 ; filler + + db 11 ; warp events + warp_event 13, 21, OLIVINE_POKECENTER_1F, 1 + warp_event 10, 11, OLIVINE_GYM, 1 + warp_event 25, 11, OLIVINE_TIMS_HOUSE, 1 + warp_event 0, 0, OLIVINE_HOUSE_BETA, 1 ; inaccessible + warp_event 29, 11, OLIVINE_PUNISHMENT_SPEECH_HOUSE, 1 + warp_event 13, 15, OLIVINE_GOOD_ROD_HOUSE, 1 + warp_event 7, 21, OLIVINE_CAFE, 1 + warp_event 19, 17, OLIVINE_MART, 2 + warp_event 29, 27, OLIVINE_LIGHTHOUSE_1F, 1 + warp_event 19, 27, OLIVINE_PORT_PASSAGE, 1 + warp_event 20, 27, OLIVINE_PORT_PASSAGE, 2 + + db 2 ; coord events + coord_event 13, 12, SCENE_DEFAULT, UnknownScript_0x1a8833 + coord_event 13, 13, SCENE_DEFAULT, UnknownScript_0x1a886b + + db 7 ; bg events bg_event 17, 11, BGEVENT_READ, OlivineCitySign bg_event 20, 24, BGEVENT_READ, OlivineCityPortSign - bg_event 7, 11, BGEVENT_READ, OlivineGymSign + bg_event 7, 11, BGEVENT_READ, OlivineGymSign bg_event 30, 28, BGEVENT_READ, OlivineLighthouseSign - bg_event 3, 23, BGEVENT_READ, OlivineCityBattleTowerSign + bg_event 3, 23, BGEVENT_READ, OlivineCityBattleTowerSign bg_event 14, 21, BGEVENT_READ, OlivineCityPokecenterSign bg_event 20, 17, BGEVENT_READ, OlivineCityMartSign -.ObjectEvents: - db 4 + db 4 ; object events object_event 26, 27, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor1Script, -1 object_event 20, 13, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1 object_event 17, 21, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor2Script, -1 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 3f7c3eced..67acb021c 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINEGOODRODHOUSE_FISHING_GURU OlivineGoodRodHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GoodRodGuru: faceplayer @@ -83,20 +81,15 @@ HaveGoodRodText: done OlivineGoodRodHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 6, OLIVINE_CITY - warp_def 3, 7, 6, OLIVINE_CITY + db 2 ; warp events + warp_event 2, 7, OLIVINE_CITY, 6 + warp_event 3, 7, OLIVINE_CITY, 6 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1 + db 1 ; object events + object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 40e2bd711..27133cc36 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINEGYM_JASMINE const OLIVINEGYM_GYM_GUY OlivineGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks JasmineScript_0x9c12f: faceplayer @@ -50,8 +48,8 @@ JasmineScript_0x9c12f: end OlivineGymActivateRockets: - if_equal 7, .RadioTowerRockets - if_equal 6, .GoldenrodRockets + ifequal 7, .RadioTowerRockets + ifequal 6, .GoldenrodRockets end .GoldenrodRockets: @@ -198,23 +196,18 @@ OlivineGymGuyPreText: done OlivineGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 15, 2, OLIVINE_CITY - warp_def 5, 15, 2, OLIVINE_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 13, BGEVENT_READ, OlivineGymStatue - bg_event 6, 13, BGEVENT_READ, OlivineGymStatue - -.ObjectEvents: - db 2 - object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE - object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 15, OLIVINE_CITY, 2 + warp_event 5, 15, OLIVINE_CITY, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 13, BGEVENT_READ, OlivineGymStatue + bg_event 6, 13, BGEVENT_READ, OlivineGymStatue + + db 2 ; object events + object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE + object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1 diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 336469c21..ff92907d7 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINEHOUSEBETA_TEACHER const OLIVINEHOUSEBETA_RHYDON OlivineHouseBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks OlivineHouseBetaTeacherScript: jumptextfaceplayer OlivineHouseBetaTeacherText @@ -40,23 +38,18 @@ UnknownText_0x9c5f0: done OlivineHouseBeta_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 4, OLIVINE_CITY - warp_def 3, 7, 4, OLIVINE_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, OlivineHouseBetaBookshelf1 - bg_event 1, 1, BGEVENT_READ, OlivineHouseBetaBookshelf2 - -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1 - object_event 6, 4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, OLIVINE_CITY, 4 + warp_event 3, 7, OLIVINE_CITY, 4 + + db 0 ; coord events + + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, OlivineHouseBetaBookshelf1 + bg_event 1, 1, BGEVENT_READ, OlivineHouseBetaBookshelf2 + + db 2 ; object events + object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1 + object_event 6, 4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 769bf13da..f411731e5 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINELIGHTHOUSE1F_SAILOR const OLIVINELIGHTHOUSE1F_POKEFAN_F OlivineLighthouse1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks OlivineLighthouse1FSailorScript: jumptextfaceplayer OlivineLighthouse1FSailorText @@ -37,24 +35,19 @@ OlivineLighthouse1FPokefanFText: done OlivineLighthouse1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 10, 17, 9, OLIVINE_CITY - warp_def 11, 17, 9, OLIVINE_CITY - warp_def 3, 11, 1, OLIVINE_LIGHTHOUSE_2F - warp_def 16, 13, 3, OLIVINE_LIGHTHOUSE_2F - warp_def 17, 13, 4, OLIVINE_LIGHTHOUSE_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 - object_event 8, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1 - object_event 16, 9, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 10, 17, OLIVINE_CITY, 9 + warp_event 11, 17, OLIVINE_CITY, 9 + warp_event 3, 11, OLIVINE_LIGHTHOUSE_2F, 1 + warp_event 16, 13, OLIVINE_LIGHTHOUSE_2F, 3 + warp_event 17, 13, OLIVINE_LIGHTHOUSE_2F, 4 + + db 0 ; coord events + + db 0 ; bg events + + db 2 ; object events + object_event 8, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1 + object_event 16, 9, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index d2fd6427f..21c19b8fb 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -1,19 +1,17 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINELIGHTHOUSE2F_SAILOR const OLIVINELIGHTHOUSE2F_GENTLEMAN OlivineLighthouse2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerGentlemanAlfred: - trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script + trainer GENTLEMAN, ALFRED, EVENT_BEAT_GENTLEMAN_ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GentlemanAlfredAfterBattleText waitbutton @@ -21,11 +19,11 @@ TrainerGentlemanAlfred: end TrainerSailorHuey1: - trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, 0, .Script + trainer SAILOR, HUEY1, EVENT_BEAT_SAILOR_HUEY, SailorHuey1SeenText, SailorHuey1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_SAILOR_HUEY - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_HUEY iftrue UnknownScript_0x5afc7 @@ -41,8 +39,8 @@ UnknownScript_0x5afb0: scall UnknownScript_0x5b057 UnknownScript_0x5afb3: askforphonenumber PHONE_SAILOR_HUEY - if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5b067 - if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5b063 + ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5b067 + ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5b063 trainertotext SAILOR, HUEY1, MEM_BUFFER_0 scall UnknownScript_0x5b05b jump UnknownScript_0x5b05f @@ -51,10 +49,10 @@ UnknownScript_0x5afc7: scall UnknownScript_0x5b06b winlosstext SailorHuey1BeatenText, 0 copybytetovar wHueyFightCount - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight3: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight3 @@ -205,25 +203,20 @@ UnknownText_0x5b1b6: done OlivineLighthouse2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 3, 11, 3, OLIVINE_LIGHTHOUSE_1F - warp_def 5, 3, 2, OLIVINE_LIGHTHOUSE_3F - warp_def 16, 13, 4, OLIVINE_LIGHTHOUSE_1F - warp_def 17, 13, 5, OLIVINE_LIGHTHOUSE_1F - warp_def 16, 11, 4, OLIVINE_LIGHTHOUSE_3F - warp_def 17, 11, 5, OLIVINE_LIGHTHOUSE_3F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 - object_event 9, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey1, -1 - object_event 17, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1 + db 0, 0 ; filler + + db 6 ; warp events + warp_event 3, 11, OLIVINE_LIGHTHOUSE_1F, 3 + warp_event 5, 3, OLIVINE_LIGHTHOUSE_3F, 2 + warp_event 16, 13, OLIVINE_LIGHTHOUSE_1F, 4 + warp_event 17, 13, OLIVINE_LIGHTHOUSE_1F, 5 + warp_event 16, 11, OLIVINE_LIGHTHOUSE_3F, 4 + warp_event 17, 11, OLIVINE_LIGHTHOUSE_3F, 5 + + db 0 ; coord events + + db 0 ; bg events + + db 2 ; object events + object_event 9, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey1, -1 + object_event 17, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 2cd0dc64c..53b2c5914 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -1,21 +1,19 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINELIGHTHOUSE3F_SAILOR const OLIVINELIGHTHOUSE3F_GENTLEMAN const OLIVINELIGHTHOUSE3F_YOUNGSTER const OLIVINELIGHTHOUSE3F_POKE_BALL OlivineLighthouse3F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperTheo: - trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, BirdKeeperTheoSeenText, BirdKeeperTheoBeatenText, 0, .Script + trainer BIRD_KEEPER, THEO, EVENT_BEAT_BIRD_KEEPER_THEO, BirdKeeperTheoSeenText, BirdKeeperTheoBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperTheoAfterBattleText waitbutton @@ -23,10 +21,10 @@ TrainerBirdKeeperTheo: end TrainerGentlemanPreston: - trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, .Script + trainer GENTLEMAN, PRESTON, EVENT_BEAT_GENTLEMAN_PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GentlemanPrestonAfterBattleText waitbutton @@ -34,10 +32,10 @@ TrainerGentlemanPreston: end TrainerSailorTerrell: - trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, .Script + trainer SAILOR, TERRELL, EVENT_BEAT_SAILOR_TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SailorTerrellAfterBattleText waitbutton @@ -113,30 +111,25 @@ GentlemanPrestonAfterBattleText: done OlivineLighthouse3F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 13, 3, 1, OLIVINE_LIGHTHOUSE_4F - warp_def 5, 3, 2, OLIVINE_LIGHTHOUSE_2F - warp_def 9, 5, 4, OLIVINE_LIGHTHOUSE_4F - warp_def 16, 11, 5, OLIVINE_LIGHTHOUSE_2F - warp_def 17, 11, 6, OLIVINE_LIGHTHOUSE_2F - warp_def 16, 9, 5, OLIVINE_LIGHTHOUSE_4F - warp_def 17, 9, 6, OLIVINE_LIGHTHOUSE_4F - warp_def 8, 3, 7, OLIVINE_LIGHTHOUSE_4F - warp_def 9, 3, 8, OLIVINE_LIGHTHOUSE_4F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 9, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1 - object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 - object_event 3, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1 - object_event 8, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER + db 0, 0 ; filler + + db 9 ; warp events + warp_event 13, 3, OLIVINE_LIGHTHOUSE_4F, 1 + warp_event 5, 3, OLIVINE_LIGHTHOUSE_2F, 2 + warp_event 9, 5, OLIVINE_LIGHTHOUSE_4F, 4 + warp_event 16, 11, OLIVINE_LIGHTHOUSE_2F, 5 + warp_event 17, 11, OLIVINE_LIGHTHOUSE_2F, 6 + warp_event 16, 9, OLIVINE_LIGHTHOUSE_4F, 5 + warp_event 17, 9, OLIVINE_LIGHTHOUSE_4F, 6 + warp_event 8, 3, OLIVINE_LIGHTHOUSE_4F, 7 + warp_event 9, 3, OLIVINE_LIGHTHOUSE_4F, 8 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 9, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1 + object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 + object_event 3, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1 + object_event 8, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 7580d3499..50a4d17fc 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -1,19 +1,17 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINELIGHTHOUSE4F_SAILOR const OLIVINELIGHTHOUSE4F_LASS OlivineLighthouse4F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerLassConnie: - trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script + trainer LASS, CONNIE1, EVENT_BEAT_LASS_CONNIE, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext LassConnie1AfterBattleText waitbutton @@ -21,10 +19,10 @@ TrainerLassConnie: end TrainerSailorKent: - trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, 0, .Script + trainer SAILOR, KENT, EVENT_BEAT_SAILOR_KENT, SailorKentSeenText, SailorKentBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SailorKentAfterBattleText waitbutton @@ -82,29 +80,24 @@ LassConnie1AfterBattleText: done OlivineLighthouse4F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 10 - warp_def 13, 3, 1, OLIVINE_LIGHTHOUSE_3F - warp_def 3, 5, 2, OLIVINE_LIGHTHOUSE_5F - warp_def 9, 7, 3, OLIVINE_LIGHTHOUSE_5F - warp_def 9, 5, 3, OLIVINE_LIGHTHOUSE_3F - warp_def 16, 9, 6, OLIVINE_LIGHTHOUSE_3F - warp_def 17, 9, 7, OLIVINE_LIGHTHOUSE_3F - warp_def 8, 3, 8, OLIVINE_LIGHTHOUSE_3F - warp_def 9, 3, 9, OLIVINE_LIGHTHOUSE_3F - warp_def 16, 7, 4, OLIVINE_LIGHTHOUSE_5F - warp_def 17, 7, 5, OLIVINE_LIGHTHOUSE_5F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 - object_event 7, 14, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorKent, -1 - object_event 11, 2, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassConnie, -1 + db 0, 0 ; filler + + db 10 ; warp events + warp_event 13, 3, OLIVINE_LIGHTHOUSE_3F, 1 + warp_event 3, 5, OLIVINE_LIGHTHOUSE_5F, 2 + warp_event 9, 7, OLIVINE_LIGHTHOUSE_5F, 3 + warp_event 9, 5, OLIVINE_LIGHTHOUSE_3F, 3 + warp_event 16, 9, OLIVINE_LIGHTHOUSE_3F, 6 + warp_event 17, 9, OLIVINE_LIGHTHOUSE_3F, 7 + warp_event 8, 3, OLIVINE_LIGHTHOUSE_3F, 8 + warp_event 9, 3, OLIVINE_LIGHTHOUSE_3F, 9 + warp_event 16, 7, OLIVINE_LIGHTHOUSE_5F, 4 + warp_event 17, 7, OLIVINE_LIGHTHOUSE_5F, 5 + + db 0 ; coord events + + db 0 ; bg events + + db 2 ; object events + object_event 7, 14, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorKent, -1 + object_event 11, 2, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassConnie, -1 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index ccee7f0c7..84e5948b6 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINELIGHTHOUSE5F_SAILOR const OLIVINELIGHTHOUSE5F_YOUNGSTER const OLIVINELIGHTHOUSE5F_POKE_BALL1 @@ -6,17 +6,15 @@ const_value set 2 const OLIVINELIGHTHOUSE5F_POKE_BALL3 OlivineLighthouse5F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperDenis: - trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, BirdKeeperDenisSeenText, BirdKeeperDenisBeatenText, 0, .Script + trainer BIRD_KEEPER, DENIS, EVENT_BEAT_BIRD_KEEPER_DENIS, BirdKeeperDenisSeenText, BirdKeeperDenisBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperDenisAfterBattleText waitbutton @@ -24,10 +22,10 @@ TrainerBirdKeeperDenis: end TrainerSailorErnest: - trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, .Script + trainer SAILOR, ERNEST, EVENT_BEAT_SAILOR_ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SailorErnestAfterBattleText waitbutton @@ -44,7 +42,7 @@ OlivineLighthouse5FTMSwagger: itemball TM_SWAGGER OlivineLighthouse5FHiddenHyperPotion: - hiddenitem EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION SailorErnestSeenText: text "I wanted to battle" @@ -91,30 +89,25 @@ BirdKeeperDenisAfterBattleText: done OlivineLighthouse5F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 7 - warp_def 9, 15, 1, OLIVINE_LIGHTHOUSE_6F - warp_def 3, 5, 2, OLIVINE_LIGHTHOUSE_4F - warp_def 9, 7, 3, OLIVINE_LIGHTHOUSE_4F - warp_def 16, 7, 9, OLIVINE_LIGHTHOUSE_4F - warp_def 17, 7, 10, OLIVINE_LIGHTHOUSE_4F - warp_def 16, 5, 2, OLIVINE_LIGHTHOUSE_6F - warp_def 17, 5, 3, OLIVINE_LIGHTHOUSE_6F - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 3, 13, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion - -.ObjectEvents: - db 5 - object_event 8, 11, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1 - object_event 8, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1 - object_event 15, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY - object_event 6, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL - object_event 2, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER + db 0, 0 ; filler + + db 7 ; warp events + warp_event 9, 15, OLIVINE_LIGHTHOUSE_6F, 1 + warp_event 3, 5, OLIVINE_LIGHTHOUSE_4F, 2 + warp_event 9, 7, OLIVINE_LIGHTHOUSE_4F, 3 + warp_event 16, 7, OLIVINE_LIGHTHOUSE_4F, 9 + warp_event 17, 7, OLIVINE_LIGHTHOUSE_4F, 10 + warp_event 16, 5, OLIVINE_LIGHTHOUSE_6F, 2 + warp_event 17, 5, OLIVINE_LIGHTHOUSE_6F, 3 + + db 0 ; coord events + + db 1 ; bg events + bg_event 3, 13, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion + + db 5 ; object events + object_event 8, 11, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1 + object_event 8, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1 + object_event 15, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY + object_event 6, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL + object_event 2, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index d036dc56f..8023a6a3c 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINELIGHTHOUSE6F_JASMINE const OLIVINELIGHTHOUSE6F_MONSTER const OLIVINELIGHTHOUSE6F_POKE_BALL OlivineLighthouse6F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks JasmineScript_0x60b91: faceplayer @@ -36,9 +34,9 @@ UnknownScript_0x60bab: writetext UnknownText_0x60dea waitbutton closetext - spriteface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT + objectface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT pause 15 - spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT + objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT opentext playmusic MUSIC_HEAL writetext UnknownText_0x60e44 @@ -47,20 +45,20 @@ UnknownScript_0x60bab: closetext special RestartMapMusic cry AMPHAROS - special Special_FadeOutPalettes + special FadeOutPalettes pause 10 - special Special_FadeInPalettes + special FadeInPalettes opentext writetext UnknownText_0x60f3d waitbutton closetext - spriteface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT + objectface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT pause 10 - spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT + objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT pause 10 - spriteface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT + objectface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT pause 10 - spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT + objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT pause 10 faceplayer opentext @@ -70,8 +68,8 @@ UnknownScript_0x60bab: setevent EVENT_JASMINE_RETURNED_TO_GYM clearevent EVENT_OLIVINE_GYM_JASMINE checkcode VAR_FACING - if_equal DOWN, UnknownScript_0x60c17 - if_equal RIGHT, UnknownScript_0x60c1e + ifequal DOWN, UnknownScript_0x60c17 + ifequal RIGHT, UnknownScript_0x60c1e applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c68 disappear OLIVINELIGHTHOUSE6F_JASMINE end @@ -90,9 +88,9 @@ UnknownScript_0x60c25: writetext UnknownText_0x60edf waitbutton closetext - spriteface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT + objectface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT pause 15 - spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT + objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT opentext writetext UnknownText_0x60ef1 waitbutton @@ -109,7 +107,7 @@ MonsterScript_0x60c3a: iftrue UnknownScript_0x60c51 writetext UnknownText_0x60f03 writebyte AMPHAROS - special Special_PlaySlowCry + special PlaySlowCry buttonsound writetext UnknownText_0x60f19 waitbutton @@ -121,10 +119,10 @@ UnknownScript_0x60c51: cry AMPHAROS waitbutton closetext - special Special_FadeOutPalettes - special Special_FadeInPalettes - special Special_FadeOutPalettes - special Special_FadeInPalettes + special FadeOutPalettes + special FadeInPalettes + special FadeOutPalettes + special FadeInPalettes end OlivineLighthouse6FSuperPotion: @@ -258,23 +256,18 @@ UnknownText_0x60f3d: done OlivineLighthouse6F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 9, 15, 1, OLIVINE_LIGHTHOUSE_5F - warp_def 16, 5, 6, OLIVINE_LIGHTHOUSE_5F - warp_def 17, 5, 7, OLIVINE_LIGHTHOUSE_5F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 - object_event 8, 8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE - object_event 9, 8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1 - object_event 3, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION + db 0, 0 ; filler + + db 3 ; warp events + warp_event 9, 15, OLIVINE_LIGHTHOUSE_5F, 1 + warp_event 16, 5, OLIVINE_LIGHTHOUSE_5F, 6 + warp_event 17, 5, OLIVINE_LIGHTHOUSE_5F, 7 + + db 0 ; coord events + + db 0 ; bg events + + db 3 ; object events + object_event 8, 8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE + object_event 9, 8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1 + object_event 3, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index ea980fe3c..3bc0774f3 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINEMART_CLERK const OLIVINEMART_COOLTRAINER_F const OLIVINEMART_LASS OlivineMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x9cac7: opentext @@ -46,22 +44,17 @@ OlivineMartLassText: done OlivineMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 8, OLIVINE_CITY - warp_def 3, 7, 8, OLIVINE_CITY + db 2 ; warp events + warp_event 2, 7, OLIVINE_CITY, 8 + warp_event 3, 7, OLIVINE_CITY, 8 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1 - object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1 - object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1 + object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1 + object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1 diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index 3345636ff..173c7a9b4 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINEPOKECENTER1F_NURSE const OLIVINEPOKECENTER1F_FISHING_GURU const OLIVINEPOKECENTER1F_FISHER const OLIVINEPOKECENTER1F_TEACHER OlivinePokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x9c002: jumpstd pokecenternurse @@ -48,24 +46,19 @@ OlivinePokecenter1FTeacherText: done OlivinePokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 1, OLIVINE_CITY - warp_def 4, 7, 1, OLIVINE_CITY - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9c002, -1 - object_event 8, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1 - object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1 - object_event 7, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, OLIVINE_CITY, 1 + warp_event 4, 7, OLIVINE_CITY, 1 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9c002, -1 + object_event 8, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1 + object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1 + object_event 7, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 0b9b8882a..fec26c331 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINEPORT_SAILOR1 const OLIVINEPORT_SAILOR2 const OLIVINEPORT_SAILOR3 @@ -8,13 +8,11 @@ const_value set 2 const OLIVINEPORT_COOLTRAINER_F OlivinePort_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .LeaveFastShip + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .LeaveFastShip ; SCENE_OLIVINEPORT_LEAVE_SHIP -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -26,27 +24,27 @@ OlivinePort_MapScripts: .LeaveFastShipScript: applymovement PLAYER, MovementData_0x74a32 appear OLIVINEPORT_SAILOR1 - setscene 0 - setevent EVENT_GAVE_KURT_APRICORNS + setscene SCENE_DEFAULT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 blackoutmod OLIVINE_CITY end SailorScript_0x748c0: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74919 writetext UnknownText_0x74a55 waitbutton closetext - spriteface OLIVINEPORT_SAILOR1, DOWN + objectface OLIVINEPORT_SAILOR1, DOWN pause 10 playsound SFX_EXIT_BUILDING disappear OLIVINEPORT_SAILOR1 waitsfx applymovement PLAYER, MovementData_0x74a30 playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7490a @@ -64,7 +62,7 @@ SailorScript_0x748c0: UnknownScript_0x7490a: clearevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear OLIVINEPORT_SAILOR1 - setmapscene FAST_SHIP_1F, 1 + setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_ENTER_SHIP warp FAST_SHIP_1F, 25, 1 end @@ -75,21 +73,21 @@ UnknownScript_0x74919: end UnknownScript_0x7491f: - spriteface OLIVINEPORT_SAILOR3, RIGHT - checkevent EVENT_GAVE_KURT_APRICORNS + objectface OLIVINEPORT_SAILOR3, RIGHT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x7498b - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue UnknownScript_0x7498b - spriteface PLAYER, LEFT + objectface PLAYER, LEFT opentext checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7494e checkcode VAR_WEEKDAY - if_equal SUNDAY, UnknownScript_0x74977 - if_equal SATURDAY, UnknownScript_0x74977 - if_equal TUESDAY, UnknownScript_0x74981 - if_equal WEDNESDAY, UnknownScript_0x74981 - if_equal THURSDAY, UnknownScript_0x74981 + ifequal SUNDAY, UnknownScript_0x74977 + ifequal SATURDAY, UnknownScript_0x74977 + ifequal TUESDAY, UnknownScript_0x74981 + ifequal WEDNESDAY, UnknownScript_0x74981 + ifequal THURSDAY, UnknownScript_0x74981 UnknownScript_0x7494e: writetext UnknownText_0x74a9c yesorno @@ -101,7 +99,7 @@ UnknownScript_0x7494e: writetext UnknownText_0x74b11 waitbutton closetext - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 applymovement PLAYER, MovementData_0x74a37 jump SailorScript_0x748c0 @@ -145,16 +143,16 @@ UnknownScript_0x74992: SailorScript_0x7499c: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74919 checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x749c0 checkcode VAR_WEEKDAY - if_equal SUNDAY, UnknownScript_0x749f2 - if_equal SATURDAY, UnknownScript_0x749f2 - if_equal TUESDAY, UnknownScript_0x749f8 - if_equal WEDNESDAY, UnknownScript_0x749f8 - if_equal THURSDAY, UnknownScript_0x749f8 + ifequal SUNDAY, UnknownScript_0x749f2 + ifequal SATURDAY, UnknownScript_0x749f2 + ifequal TUESDAY, UnknownScript_0x749f8 + ifequal WEDNESDAY, UnknownScript_0x749f8 + ifequal THURSDAY, UnknownScript_0x749f8 UnknownScript_0x749c0: writetext UnknownText_0x74a9c yesorno @@ -166,9 +164,9 @@ UnknownScript_0x749c0: writetext UnknownText_0x74b11 waitbutton closetext - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 checkcode VAR_FACING - if_equal RIGHT, UnknownScript_0x749e5 + ifequal RIGHT, UnknownScript_0x749e5 applymovement PLAYER, MovementData_0x74a3f jump SailorScript_0x748c0 @@ -203,7 +201,7 @@ FishingGuruScript_0x74a01: writetext UnknownText_0x74bf4 waitbutton closetext - spriteface OLIVINEPORT_FISHING_GURU1, UP + objectface OLIVINEPORT_FISHING_GURU1, UP end FishingGuruScript_0x74a0c: @@ -212,7 +210,7 @@ FishingGuruScript_0x74a0c: writetext UnknownText_0x74c35 waitbutton closetext - spriteface OLIVINEPORT_FISHING_GURU2, UP + objectface OLIVINEPORT_FISHING_GURU2, UP end YoungsterScript_0x74a17: @@ -221,7 +219,7 @@ YoungsterScript_0x74a17: writetext UnknownText_0x74c76 waitbutton closetext - spriteface OLIVINEPORT_YOUNGSTER, DOWN + objectface OLIVINEPORT_YOUNGSTER, DOWN end CooltrainerFScript_0x74a22: @@ -230,11 +228,11 @@ CooltrainerFScript_0x74a22: writetext UnknownText_0x74ca2 waitbutton closetext - spriteface OLIVINEPORT_COOLTRAINER_F, DOWN + objectface OLIVINEPORT_COOLTRAINER_F, DOWN end OlivinePortHiddenProtein: - hiddenitem EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN + hiddenitem PROTEIN, EVENT_OLIVINE_PORT_HIDDEN_PROTEIN MovementData_0x74a30: step DOWN @@ -385,28 +383,23 @@ OlivinePortSailorText: done OlivinePort_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 11, 7, 5, OLIVINE_PORT_PASSAGE - warp_def 7, 23, 1, FAST_SHIP_1F - -.CoordEvents: - db 1 - coord_event 7, 15, 0, UnknownScript_0x7491f - -.BGEvents: - db 1 - bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein - -.ObjectEvents: - db 7 - object_event 7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY - object_event 7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME - object_event 6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - object_event 4, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + db 0, 0 ; filler + + db 2 ; warp events + warp_event 11, 7, OLIVINE_PORT_PASSAGE, 5 + warp_event 7, 23, FAST_SHIP_1F, 1 + + db 1 ; coord events + coord_event 7, 15, SCENE_DEFAULT, UnknownScript_0x7491f + + db 1 ; bg events + bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein + + db 7 ; object events + object_event 7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY + object_event 7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + object_event 6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + object_event 4, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME object_event 13, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME - object_event 4, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + object_event 4, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME object_event 11, 15, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 5b9615a73..98040307f 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINEPORTPASSAGE_POKEFAN_M OlivinePortPassage_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks OlivinePortPassagePokefanMScript: jumptextfaceplayer OlivinePortPassagePokefanMText @@ -20,23 +18,18 @@ OlivinePortPassagePokefanMText: done OlivinePortPassage_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 15, 0, 10, OLIVINE_CITY - warp_def 16, 0, 11, OLIVINE_CITY - warp_def 15, 4, 4, OLIVINE_PORT_PASSAGE - warp_def 3, 2, 3, OLIVINE_PORT_PASSAGE - warp_def 3, 14, 1, OLIVINE_PORT - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 17, 1, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M + db 0, 0 ; filler + + db 5 ; warp events + warp_event 15, 0, OLIVINE_CITY, 10 + warp_event 16, 0, OLIVINE_CITY, 11 + warp_event 15, 4, OLIVINE_PORT_PASSAGE, 4 + warp_event 3, 2, OLIVINE_PORT_PASSAGE, 3 + warp_event 3, 14, OLIVINE_PORT, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 1 ; object events + object_event 17, 1, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index ed0e86e32..e590f158d 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINEPUNISHMENTSPEECHHOUSE_POKEFAN_M const OLIVINEPUNISHMENTSPEECHHOUSE_LASS OlivinePunishmentSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks OlivinePunishmentSpeechHouseDad: jumptextfaceplayer OlivinePunishmentSpeechHouseDadText @@ -40,23 +38,18 @@ OlivinePunishmentSpeechHouseDaughterText: done OlivinePunishmentSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 5, OLIVINE_CITY - warp_def 3, 7, 5, OLIVINE_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf1 - bg_event 1, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf2 - -.ObjectEvents: - db 2 - object_event 1, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1 - object_event 5, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, OLIVINE_CITY, 5 + warp_event 3, 7, OLIVINE_CITY, 5 + + db 0 ; coord events + + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf1 + bg_event 1, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf2 + + db 2 ; object events + object_event 1, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1 + object_event 5, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1 diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 5d1b19263..60263cf3c 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -1,17 +1,15 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINETIMSHOUSE_TIM OlivineTimsHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Tim: faceplayer opentext - trade NPCTRADE_TIM + trade NPC_TRADE_TIM waitbutton closetext end @@ -20,22 +18,17 @@ TimsHouseBookshelf: jumpstd magazinebookshelf OlivineTimsHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, OLIVINE_CITY - warp_def 3, 7, 3, OLIVINE_CITY + db 2 ; warp events + warp_event 2, 7, OLIVINE_CITY, 3 + warp_event 3, 7, OLIVINE_CITY, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, TimsHouseBookshelf - bg_event 1, 1, BGEVENT_READ, TimsHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, TimsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, TimsHouseBookshelf -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1 + db 1 ; object events + object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 8e18b6d08..0bc820103 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const PALLETTOWN_TEACHER const PALLETTOWN_FISHER PalletTown_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -70,26 +68,21 @@ BluesHouseSignText: done PalletTown_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 5, 5, 1, REDS_HOUSE_1F - warp_def 13, 5, 1, BLUES_HOUSE - warp_def 12, 11, 1, OAKS_LAB - -.CoordEvents: - db 0 - -.BGEvents: - db 4 - bg_event 7, 9, BGEVENT_READ, PalletTownSign - bg_event 3, 5, BGEVENT_READ, RedsHouseSign + db 0, 0 ; filler + + db 3 ; warp events + warp_event 5, 5, REDS_HOUSE_1F, 1 + warp_event 13, 5, BLUES_HOUSE, 1 + warp_event 12, 11, OAKS_LAB, 1 + + db 0 ; coord events + + db 4 ; bg events + bg_event 7, 9, BGEVENT_READ, PalletTownSign + bg_event 3, 5, BGEVENT_READ, RedsHouseSign bg_event 13, 13, BGEVENT_READ, OaksLabSign - bg_event 11, 5, BGEVENT_READ, BluesHouseSign + bg_event 11, 5, BGEVENT_READ, BluesHouseSign -.ObjectEvents: - db 2 - object_event 3, 8, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1 + db 2 ; object events + object_event 3, 8, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1 object_event 12, 14, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PalletTownFisherScript, -1 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index a4467ec4a..87e918d35 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const PEWTERCITY_COOLTRAINER_F const PEWTERCITY_BUG_CATCHER const PEWTERCITY_GRAMPS @@ -6,11 +6,9 @@ const_value set 2 const PEWTERCITY_FRUIT_TREE2 PewterCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -153,34 +151,29 @@ PewterCityWelcomeSignText: done PewterCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 29, 13, 1, PEWTER_NIDORAN_SPEECH_HOUSE - warp_def 16, 17, 1, PEWTER_GYM - warp_def 23, 17, 2, PEWTER_MART - warp_def 13, 25, 1, PEWTER_POKECENTER_1F - warp_def 7, 29, 1, PEWTER_SNOOZE_SPEECH_HOUSE - -.CoordEvents: - db 0 - -.BGEvents: - db 7 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 29, 13, PEWTER_NIDORAN_SPEECH_HOUSE, 1 + warp_event 16, 17, PEWTER_GYM, 1 + warp_event 23, 17, PEWTER_MART, 2 + warp_event 13, 25, PEWTER_POKECENTER_1F, 1 + warp_event 7, 29, PEWTER_SNOOZE_SPEECH_HOUSE, 1 + + db 0 ; coord events + + db 7 ; bg events bg_event 25, 23, BGEVENT_READ, PewterCitySign bg_event 11, 17, BGEVENT_READ, PewterGymSign - bg_event 15, 9, BGEVENT_READ, PewterMuseumSign + bg_event 15, 9, BGEVENT_READ, PewterMuseumSign bg_event 33, 19, BGEVENT_READ, PewterCityMtMoonGiftShopSign bg_event 19, 29, BGEVENT_READ, PewterCityWelcomeSign bg_event 14, 25, BGEVENT_READ, PewterCityPokecenterSign bg_event 24, 17, BGEVENT_READ, PewterCityMartSign -.ObjectEvents: - db 5 + db 5 ; object events object_event 19, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1 object_event 14, 29, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1 object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1 - object_event 32, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1 - object_event 30, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1 + object_event 32, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1 + object_event 30, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 9e6395f13..d6a0f3998 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const PEWTERGYM_BROCK const PEWTERGYM_YOUNGSTER const PEWTERGYM_GYM_GUY PewterGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks BrockScript_0x1a2864: faceplayer @@ -41,10 +39,10 @@ BrockScript_0x1a2864: end TrainerCamperJerry: - trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, .Script + trainer CAMPER, JERRY, EVENT_BEAT_CAMPER_JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CamperJerryAfterBattleText waitbutton @@ -209,24 +207,19 @@ PewterGymGuyWinText: done PewterGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 13, 2, PEWTER_CITY - warp_def 5, 13, 2, PEWTER_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 2, 11, BGEVENT_READ, PewterGymStatue - bg_event 7, 11, BGEVENT_READ, PewterGymStatue - -.ObjectEvents: - db 3 - object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1 - object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1 - object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 13, PEWTER_CITY, 2 + warp_event 5, 13, PEWTER_CITY, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 2, 11, BGEVENT_READ, PewterGymStatue + bg_event 7, 11, BGEVENT_READ, PewterGymStatue + + db 3 ; object events + object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1 + object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1 + object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index cc5047d7c..1862f99b1 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const PEWTERMART_CLERK const PEWTERMART_YOUNGSTER const PEWTERMART_SUPER_NERD PewterMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x1a2dcb: opentext @@ -46,22 +44,17 @@ PewterMartSuperNerdText: done PewterMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, PEWTER_CITY - warp_def 3, 7, 3, PEWTER_CITY + db 2 ; warp events + warp_event 2, 7, PEWTER_CITY, 3 + warp_event 3, 7, PEWTER_CITY, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1 - object_event 9, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1 - object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1 + object_event 9, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1 + object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index b70294cef..cf90488be 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const PEWTERNIDORANSPEECHHOUSE_SUPER_NERD const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M PewterNidoranSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PewterNidoranSpeechHouseSuperNerdScript: jumptextfaceplayer PewterNidoranSpeechHouseSuperNerdText @@ -29,21 +27,16 @@ PewterNidoranText: done PewterNidoranSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, PEWTER_CITY - warp_def 3, 7, 1, PEWTER_CITY + db 2 ; warp events + warp_event 2, 7, PEWTER_CITY, 1 + warp_event 3, 7, PEWTER_CITY, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 - object_event 3, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1 - object_event 4, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterNidoran, -1 + db 2 ; object events + object_event 3, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1 + object_event 4, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterNidoran, -1 diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index 25234385d..14f1870c3 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const PEWTERPOKECENTER1F_NURSE const PEWTERPOKECENTER1F_TEACHER const PEWTERPOKECENTER1F_JIGGLYPUFF @@ -6,11 +6,9 @@ const_value set 2 const PEWTERPOKECENTER1F_CHRIS PewterPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x1a2ee7: jumpstd pokecenternurse @@ -32,7 +30,7 @@ PewterPokecenter1FBugCatcherScript: Chris: faceplayer opentext - trade NPCTRADE_CHRIS + trade NPC_TRADE_CHRIS waitbutton closetext end @@ -68,25 +66,20 @@ PewterPokecenter1FBugCatcherText: done PewterPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 4, PEWTER_CITY - warp_def 4, 7, 4, PEWTER_CITY - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 5 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1 - object_event 8, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1 - object_event 1, 3, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1 - object_event 2, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1 - object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Chris, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, PEWTER_CITY, 4 + warp_event 4, 7, PEWTER_CITY, 4 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 5 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1 + object_event 8, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1 + object_event 1, 3, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1 + object_event 2, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1 + object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Chris, -1 diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm index 0e6e7b916..6e5e6c14a 100644 --- a/maps/PewterPokecenter2FBeta.asm +++ b/maps/PewterPokecenter2FBeta.asm @@ -1,23 +1,16 @@ PewterPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PewterPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, PEWTER_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, PEWTER_POKECENTER_1F, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 43e423cc4..61a96a50f 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const PEWTERSNOOZESPEECHHOUSE_GRAMPS PewterSnoozeSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PewterSnoozeSpeechHouseGrampsScript: jumptextfaceplayer PewterSnoozeSpeechHouseGrampsText @@ -21,22 +19,17 @@ PewterSnoozeSpeechHouseGrampsText: done PewterSnoozeSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 5, PEWTER_CITY - warp_def 3, 7, 5, PEWTER_CITY + db 2 ; warp events + warp_event 2, 7, PEWTER_CITY, 5 + warp_event 3, 7, PEWTER_CITY, 5 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf -.ObjectEvents: - db 1 - object_event 5, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1 + db 1 ; object events + object_event 5, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1 diff --git a/maps/KrissHouse1F.asm b/maps/PlayersHouse1F.asm index f94534332..1e9f368d4 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -1,18 +1,16 @@ -const_value set 2 - const KRISSHOUSE1F_MOM1 - const KRISSHOUSE1F_MOM2 - const KRISSHOUSE1F_MOM3 - const KRISSHOUSE1F_MOM4 - const KRISSHOUSE1F_POKEFAN_F - -KrissHouse1F_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 - -.MapCallbacks: - db 0 + const_def 2 ; object constants + const PLAYERSHOUSE1F_MOM1 + const PLAYERSHOUSE1F_MOM2 + const PLAYERSHOUSE1F_MOM3 + const PLAYERSHOUSE1F_MOM4 + const PLAYERSHOUSE1F_POKEFAN_F + +PlayersHouse1F_MapScripts: + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED + + db 0 ; callbacks .DummyScene0: end @@ -21,19 +19,19 @@ KrissHouse1F_MapScripts: end UnknownScript_0x7a4d8: - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 UnknownScript_0x7a4db: playmusic MUSIC_MOM - showemote EMOTE_SHOCK, KRISSHOUSE1F_MOM1, 15 - spriteface PLAYER, LEFT - checkevent EVENT_GAVE_KURT_APRICORNS + showemote EMOTE_SHOCK, PLAYERSHOUSE1F_MOM1, 15 + objectface PLAYER, LEFT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x7a4f2 - applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fc + applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fc jump UnknownScript_0x7a4f6 UnknownScript_0x7a4f2: - applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fe + applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fe UnknownScript_0x7a4f6: opentext writetext UnknownText_0x7a604 @@ -43,23 +41,23 @@ UnknownScript_0x7a4f6: setflag ENGINE_POKEGEAR setflag ENGINE_PHONE_CARD addcellnum PHONE_MOM - setscene 1 - setevent EVENT_KRISS_HOUSE_MOM_1 - clearevent EVENT_KRISS_HOUSE_MOM_2 + setscene SCENE_FINISHED + setevent EVENT_PLAYERS_HOUSE_MOM_1 + clearevent EVENT_PLAYERS_HOUSE_MOM_2 writetext UnknownText_0x7a6bd buttonsound - special Special_SetDayOfWeek + special SetDayOfWeek UnknownScript_0x7a519: writetext UnknownText_0x7a742 yesorno iffalse UnknownScript_0x7a52a - special Special_InitialSetDSTFlag + special InitialSetDSTFlag yesorno iffalse UnknownScript_0x7a519 jump UnknownScript_0x7a531 UnknownScript_0x7a52a: - special Special_InitialClearDSTFlag + special InitialClearDSTFlag yesorno iffalse UnknownScript_0x7a519 UnknownScript_0x7a531: @@ -82,23 +80,23 @@ UnknownScript_0x7a549: writetext UnknownText_0x7a850 waitbutton closetext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x7a55d - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iffalse UnknownScript_0x7a564 jump UnknownScript_0x7a56b UnknownScript_0x7a55d: - applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a600 + applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a600 jump UnknownScript_0x7a56b UnknownScript_0x7a564: - applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a602 + applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a602 jump UnknownScript_0x7a56b UnknownScript_0x7a56b: special RestartMapMusic - spriteface KRISSHOUSE1F_MOM1, LEFT + objectface PLAYERSHOUSE1F_MOM1, LEFT end UnknownScript_0x7a572: @@ -114,9 +112,9 @@ UnknownScript_0x7a57e: MomScript_0x7a582: faceplayer - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 checkscene - iffalse UnknownScript_0x7a572 + iffalse UnknownScript_0x7a572 ; SCENE_DEFAULT opentext checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM iftrue UnknownScript_0x7a5af @@ -147,7 +145,7 @@ UnknownScript_0x7a5b5: setevent EVENT_FIRST_TIME_BANKING_WITH_MOM UnknownScript_0x7a5b8: setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST - special Special_BankOfMom + special BankOfMom waitbutton closetext end @@ -155,11 +153,11 @@ UnknownScript_0x7a5b8: NeighborScript: faceplayer opentext - checkmorn + checktime MORN iftrue .MornScript - checkday + checktime DAY iftrue .DayScript - checknite + checktime NITE iftrue .NiteScript .MornScript: @@ -181,7 +179,7 @@ NeighborScript: writetext NeighborText waitbutton closetext - spriteface KRISSHOUSE1F_POKEFAN_F, RIGHT + objectface PLAYERSHOUSE1F_POKEFAN_F, RIGHT end TVScript: @@ -385,32 +383,27 @@ TVText: line "rolling too!" done -KrissHouse1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 6, 7, 2, NEW_BARK_TOWN - warp_def 7, 7, 2, NEW_BARK_TOWN - warp_def 9, 0, 1, KRISS_HOUSE_2F - -.CoordEvents: - db 2 - coord_event 8, 4, 0, UnknownScript_0x7a4d8 - coord_event 9, 4, 0, UnknownScript_0x7a4db - -.BGEvents: - db 4 - bg_event 0, 1, BGEVENT_READ, StoveScript - bg_event 1, 1, BGEVENT_READ, SinkScript - bg_event 2, 1, BGEVENT_READ, FridgeScript - bg_event 4, 1, BGEVENT_READ, TVScript - -.ObjectEvents: - db 5 - object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1 - object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR +PlayersHouse1F_MapEvents: + db 0, 0 ; filler + + db 3 ; warp events + warp_event 6, 7, NEW_BARK_TOWN, 2 + warp_event 7, 7, NEW_BARK_TOWN, 2 + warp_event 9, 0, PLAYERS_HOUSE_2F, 1 + + db 2 ; coord events + coord_event 8, 4, SCENE_DEFAULT, UnknownScript_0x7a4d8 + coord_event 9, 4, SCENE_DEFAULT, UnknownScript_0x7a4db + + db 4 ; bg events + bg_event 0, 1, BGEVENT_READ, StoveScript + bg_event 1, 1, BGEVENT_READ, SinkScript + bg_event 2, 1, BGEVENT_READ, FridgeScript + bg_event 4, 1, BGEVENT_READ, TVScript + + db 5 ; object events + object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_1 + object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 + object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 + object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 + object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_PLAYERS_HOUSE_1F_NEIGHBOR diff --git a/maps/KrissHouse1F.blk b/maps/PlayersHouse1F.blk index 8b85e1535..8b85e1535 100644 --- a/maps/KrissHouse1F.blk +++ b/maps/PlayersHouse1F.blk diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm new file mode 100644 index 000000000..a5c03a749 --- /dev/null +++ b/maps/PlayersHouse2F.asm @@ -0,0 +1,134 @@ + const_def 2 ; object constants + const PLAYERSHOUSE2F_CONSOLE + const PLAYERSHOUSE2F_DOLL_1 + const PLAYERSHOUSE2F_DOLL_2 + const PLAYERSHOUSE2F_BIG_DOLL + +PlayersHouse2F_MapScripts: + db 0 ; scene scripts + + db 2 ; callbacks + callback MAPCALLBACK_NEWMAP, .InitializeRoom + callback MAPCALLBACK_TILES, .SetSpawn + +; unused +.Null: + end + +.InitializeRoom: + special ToggleDecorationsVisibility + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8 + checkevent EVENT_INITIALIZED_EVENTS + iftrue .SkipInitialization + jumpstd initializeevents + return + +.SkipInitialization: + return + +.SetSpawn: + special ToggleMaptileDecorations + return + + db 0, 0, 0 ; filler + +Doll1Script: + describedecoration DECODESC_LEFT_DOLL + +Doll2Script: + describedecoration DECODESC_RIGHT_DOLL + +BigDollScript: + describedecoration DECODESC_BIG_DOLL + +GameConsoleScript: + describedecoration DECODESC_CONSOLE + +PlayersHousePosterScript: + conditional_event EVENT_PLAYERS_ROOM_POSTER, .Script + +.Script: + describedecoration DECODESC_POSTER + +PlayersHouseRadioScript: + checkevent EVENT_GOT_A_POKEMON_FROM_ELM + iftrue .NormalRadio + checkevent EVENT_LISTENED_TO_INITIAL_RADIO + iftrue .AbbreviatedRadio + playmusic MUSIC_POKEMON_TALK + opentext + writetext PlayersRadioText1 + pause 45 + writetext PlayersRadioText2 + pause 45 + writetext PlayersRadioText3 + pause 45 + musicfadeout MUSIC_NEW_BARK_TOWN, 16 + writetext PlayersRadioText4 + pause 45 + closetext + setevent EVENT_LISTENED_TO_INITIAL_RADIO + end + +.NormalRadio: + jumpstd radio1 + +.AbbreviatedRadio: + opentext + writetext PlayersRadioText4 + pause 45 + closetext + end + +PlayersHouseBookshelfScript: + jumpstd picturebookshelf + +PlayersHousePCScript: + opentext + special PlayersHousePC + iftrue .Warp + closetext + end +.Warp: + warp NONE, 0, 0 + end + +PlayersRadioText1: + text "PROF.OAK'S #MON" + line "TALK! Please tune" + cont "in next time!" + done + +PlayersRadioText2: + text "#MON CHANNEL!" + done + +PlayersRadioText3: + text "This is DJ MARY," + line "your co-host!" + done + +PlayersRadioText4: + text "#MON!" + line "#MON CHANNEL…" + done + +PlayersHouse2F_MapEvents: + db 0, 0 ; filler + + db 1 ; warp events + warp_event 7, 0, PLAYERS_HOUSE_1F, 3 + + db 0 ; coord events + + db 4 ; bg events + bg_event 2, 1, BGEVENT_UP, PlayersHousePCScript + bg_event 3, 1, BGEVENT_READ, PlayersHouseRadioScript + bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelfScript + bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript + + db 4 ; object events + object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE + object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1 + object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2 + object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL diff --git a/maps/KrissHouse2F.blk b/maps/PlayersHouse2F.blk index 63d33c2f8..63d33c2f8 100644 --- a/maps/KrissHouse2F.blk +++ b/maps/PlayersHouse2F.blk diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm new file mode 100644 index 000000000..84400b09e --- /dev/null +++ b/maps/PlayersNeighborsHouse.asm @@ -0,0 +1,115 @@ + const_def 2 ; object constants + const PLAYERSNEIGHBORSHOUSE_COOLTRAINER_F + const PLAYERSNEIGHBORSHOUSE_POKEFAN_F + +PlayersNeighborsHouse_MapScripts: + db 0 ; scene scripts + + db 0 ; callbacks + +PlayersNeighborsDaughterScript: + jumptextfaceplayer PlayersNeighborsDaughterText + +PlayersNeighborScript: + jumptextfaceplayer PlayersNeighborText + +PlayersNeighborsHouseBookshelfScript: + jumpstd magazinebookshelf + +PlayersNeighborsHouseRadioScript: + checkevent EVENT_GOT_A_POKEMON_FROM_ELM + iftrue .NormalRadio + checkevent EVENT_LISTENED_TO_INITIAL_RADIO + iftrue .AbbreviatedRadio + playmusic MUSIC_POKEMON_TALK + opentext + writetext PlayerNeighborRadioText1 + pause 45 + writetext PlayerNeighborRadioText2 + pause 45 + writetext PlayerNeighborRadioText3 + pause 45 + musicfadeout MUSIC_NEW_BARK_TOWN, 16 + writetext PlayerNeighborRadioText4 + pause 45 + closetext + setevent EVENT_LISTENED_TO_INITIAL_RADIO + end +.NormalRadio: + jumpstd radio1 +.AbbreviatedRadio: + opentext + writetext PlayerNeighborRadioText4 + pause 45 + closetext + end + +PlayersNeighborsDaughterText: + text "PIKACHU is an" + line "evolved #MON." + + para "I was amazed by" + line "PROF.ELM's find-" + cont "ings." + + para "He's so famous for" + line "his research on" + cont "#MON evolution." + + para "…sigh…" + + para "I wish I could be" + line "a researcher like" + cont "him…" + done + +PlayersNeighborText: + text "My daughter is" + line "adamant about" + + para "becoming PROF." + line "ELM's assistant." + + para "She really loves" + line "#MON!" + + para "But then, so do I!" + done + +PlayerNeighborRadioText1: + text "PROF.OAK'S #MON" + line "TALK! Please tune" + cont "in next time!" + done + +PlayerNeighborRadioText2: + text "#MON CHANNEL!" + done + +PlayerNeighborRadioText3: + text "This is DJ MARY," + line "your co-host!" + done + +PlayerNeighborRadioText4: + text "#MON!" + line "#MON CHANNEL…" + done + +PlayersNeighborsHouse_MapEvents: + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, NEW_BARK_TOWN, 3 + warp_event 3, 7, NEW_BARK_TOWN, 3 + + db 0 ; coord events + + db 3 ; bg events + bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript + bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript + bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadioScript + + db 2 ; object events + object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughterScript, -1 + object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborScript, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 89dfe05ba..05d2f9779 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -1,36 +1,29 @@ -const_value set 2 + const_def 2 ; object constants const POKESEERSHOUSE_GRANNY PokeSeersHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SeerScript: faceplayer opentext - special Special_PokeSeer + special PokeSeer waitbutton closetext end PokeSeersHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 7, CIANWOOD_CITY - warp_def 3, 7, 7, CIANWOOD_CITY + db 2 ; warp events + warp_event 2, 7, CIANWOOD_CITY, 7 + warp_event 3, 7, CIANWOOD_CITY, 7 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SeerScript, -1 + db 1 ; object events + object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SeerScript, -1 diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 40900519c..1e7f7222b 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -1,27 +1,25 @@ -const_value set 2 + const_def 2 ; object constants const POKECENTER2F_TRADE_RECEPTIONIST const POKECENTER2F_BATTLE_RECEPTIONIST const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST const POKECENTER2F_OFFICER Pokecenter2F_MapScripts: -.SceneScripts: - db 6 - scene_script .Scene0 - scene_script .Scene1 - scene_script .Scene2 - scene_script .Scene3 - scene_script .Scene4 - scene_script .Scene5 - -.MapCallbacks: - db 0 + db 6 ; scene scripts + scene_script .Scene0 ; SCENE_DEFAULT + scene_script .Scene1 ; SCENE_POKECENTER2F_LEAVE_TRADE_CENTER + scene_script .Scene2 ; SCENE_POKECENTER2F_LEAVE_COLOSSEUM + scene_script .Scene3 ; SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE + scene_script .Scene4 ; SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM + scene_script .Scene5 ; SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM + + db 0 ; callbacks .Scene0: - special Special_CheckMysteryGift - if_equal $0, .Scene0Done + special CheckMysteryGift + ifequal $0, .Scene0Done clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .Scene0Done priorityjump Pokecenter2F_AppearMysteryGiftDeliveryGuy @@ -50,7 +48,7 @@ Pokecenter2F_MapScripts: Pokecenter2F_AppearMysteryGiftDeliveryGuy: appear POKECENTER2F_OFFICER - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 end Script_TradeCenterClosed: @@ -76,28 +74,28 @@ LinkReceptionistScript_Trade: writetext Text_TradeReceptionistIntro yesorno iffalse .Cancel - special Special_Mobile_DummyReturnFalse ; always returns false + special Mobile_DummyReturnFalse ; always returns false iffalse .NoMobile writetext Text_TradeReceptionistMobile - special Special_AskMobileOrCable + special AskMobileOrCable iffalse .Cancel - if_equal $1, .Mobile + ifequal $1, .Mobile .NoMobile: - special Special_SetBitsForLinkTradeRequest + special SetBitsForLinkTradeRequest writetext Text_PleaseWait - special Special_WaitForLinkedFriend + special WaitForLinkedFriend iffalse .FriendNotReady writetext Text_MustSaveGame yesorno iffalse .DidNotSave - special Special_TryQuickSave + special TryQuickSave iffalse .DidNotSave writetext Text_PleaseWait - special Special_CheckLinkTimeout + special CheckLinkTimeout iffalse .LinkTimedOut copybytetovar wOtherPlayerLinkMode iffalse .LinkedToFirstGen - special Special_CheckBothSelectedSameRoom + special CheckBothSelectedSameRoom iffalse .IncompatibleRooms writetext Text_PleaseComeIn2 waitbutton @@ -107,21 +105,21 @@ LinkReceptionistScript_Trade: end .FriendNotReady: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end .LinkedToFirstGen: - special Special_FailedLinkToPast + special FailedLinkToPast writetext Text_CantLinkToThePast - special Special_CloseLink + special CloseLink closetext end .IncompatibleRooms: writetext Text_IncompatibleRooms - special Special_CloseLink + special CloseLink closetext end @@ -132,7 +130,7 @@ LinkReceptionistScript_Trade: .DidNotSave: writetext Text_PleaseComeAgain .AbortLink: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit .Cancel: closetext end @@ -151,9 +149,9 @@ LinkReceptionistScript_Trade: writetext Text_MustSaveGame yesorno iffalse .Mobile_DidNotSave - special Special_TryQuickSave + special TryQuickSave iffalse .Mobile_DidNotSave - special Special_Function1011f1 + special Function1011f1 writetext Text_PleaseComeIn2 waitbutton closetext @@ -178,28 +176,28 @@ LinkReceptionistScript_Battle: writetext Text_BattleReceptionistIntro yesorno iffalse .Cancel - special Special_Mobile_DummyReturnFalse ; always returns false + special Mobile_DummyReturnFalse ; always returns false iffalse .NoMobile writetext Text_BattleReceptionistMobile - special Special_AskMobileOrCable + special AskMobileOrCable iffalse .Cancel - if_equal $1, .Mobile + ifequal $1, .Mobile .NoMobile: - special Special_SetBitsForBattleRequest + special SetBitsForBattleRequest writetext Text_PleaseWait - special Special_WaitForLinkedFriend + special WaitForLinkedFriend iffalse .FriendNotReady writetext Text_MustSaveGame yesorno iffalse .DidNotSave - special Special_TryQuickSave + special TryQuickSave iffalse .DidNotSave writetext Text_PleaseWait - special Special_CheckLinkTimeout + special CheckLinkTimeout iffalse .LinkTimedOut copybytetovar wOtherPlayerLinkMode iffalse .LinkedToFirstGen - special Special_CheckBothSelectedSameRoom + special CheckBothSelectedSameRoom iffalse .IncompatibleRooms writetext Text_PleaseComeIn2 waitbutton @@ -209,21 +207,21 @@ LinkReceptionistScript_Battle: end .FriendNotReady: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end .LinkedToFirstGen: - special Special_FailedLinkToPast + special FailedLinkToPast writetext Text_CantLinkToThePast - special Special_CloseLink + special CloseLink closetext end .IncompatibleRooms: writetext Text_IncompatibleRooms - special Special_CloseLink + special CloseLink closetext end @@ -234,7 +232,7 @@ LinkReceptionistScript_Battle: .DidNotSave: writetext Text_PleaseComeAgain .AbortLink: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit .Cancel: closetext end @@ -255,9 +253,9 @@ LinkReceptionistScript_Battle: writetext Text_MustSaveGame yesorno iffalse .Mobile_DidNotSave - special Special_Function103780 + special Function103780 iffalse .Mobile_DidNotSave - special Special_Function1011f1 + special Function1011f1 writetext Text_PleaseComeIn2 waitbutton closetext @@ -271,11 +269,11 @@ LinkReceptionistScript_Battle: end .SelectThreeMons: - special Special_Mobile_SelectThreeMons + special Mobile_SelectThreeMons iffalse .Mobile_DidNotSelect - if_equal $1, .Mobile_OK - if_equal $2, .Mobile_OK - if_equal $3, .Mobile_InvalidParty + ifequal $1, .Mobile_OK + ifequal $2, .Mobile_OK + ifequal $3, .Mobile_InvalidParty jump .Mobile_DidNotSelect .Mobile_InvalidParty: @@ -303,37 +301,37 @@ LinkReceptionistScript_TimeCapsule: iftrue Script_TimeCapsuleClosed checkflag ENGINE_TIME_CAPSULE iftrue Script_TimeCapsuleClosed - special Special_SetBitsForTimeCapsuleRequest + special SetBitsForTimeCapsuleRequest faceplayer opentext writetext Text_TimeCapsuleReceptionistIntro yesorno iffalse .Cancel - special Special_CheckTimeCapsuleCompatibility - if_equal $1, .MonTooNew - if_equal $2, .MonMoveTooNew - if_equal $3, .MonHasMail + special CheckTimeCapsuleCompatibility + ifequal $1, .MonTooNew + ifequal $2, .MonMoveTooNew + ifequal $3, .MonHasMail writetext Text_PleaseWait - special Special_WaitForLinkedFriend + special WaitForLinkedFriend iffalse .FriendNotReady writetext Text_MustSaveGame yesorno iffalse .DidNotSave - special Special_TryQuickSave + special TryQuickSave iffalse .DidNotSave writetext Text_PleaseWait - special Special_CheckLinkTimeout + special CheckLinkTimeout iffalse .LinkTimedOut copybytetovar wOtherPlayerLinkMode iffalse .OK - special Special_CheckBothSelectedSameRoom + special CheckBothSelectedSameRoom writetext Text_IncompatibleRooms - special Special_CloseLink + special CloseLink closetext end .OK: - special Special_EnterTimeCapsule + special EnterTimeCapsule writetext Text_PleaseComeIn2 waitbutton closetext @@ -342,7 +340,7 @@ LinkReceptionistScript_TimeCapsule: end .FriendNotReady: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit writetext Text_FriendNotReady closetext end @@ -354,7 +352,7 @@ LinkReceptionistScript_TimeCapsule: .DidNotSave: writetext Text_PleaseComeAgain .Cancel: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit closetext end @@ -374,17 +372,17 @@ LinkReceptionistScript_TimeCapsule: end Script_LeftCableTradeCenter: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit scall Script_WalkOutOfLinkTradeRoom - setscene 0 - setmapscene TRADE_CENTER, 0 + setscene SCENE_DEFAULT + setmapscene TRADE_CENTER, SCENE_DEFAULT end Script_LeftMobileTradeRoom: - special Special_Function101220 + special Function101220 scall Script_WalkOutOfMobileTradeRoom - setscene 0 - setmapscene MOBILE_TRADE_ROOM_MOBILE, 0 + setscene SCENE_DEFAULT + setmapscene MOBILE_TRADE_ROOM, SCENE_DEFAULT end Script_WalkOutOfMobileTradeRoom: @@ -394,17 +392,17 @@ Script_WalkOutOfMobileTradeRoom: end Script_LeftCableColosseum: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit scall Script_WalkOutOfLinkBattleRoom - setscene 0 - setmapscene COLOSSEUM, 0 + setscene SCENE_DEFAULT + setmapscene COLOSSEUM, SCENE_DEFAULT end Script_LeftMobileBattleRoom: - special Special_Function101220 + special Function101220 scall Script_WalkOutOfMobileBattleRoom - setscene 0 - setmapscene MOBILE_BATTLE_ROOM, 0 + setscene SCENE_DEFAULT + setmapscene MOBILE_BATTLE_ROOM, SCENE_DEFAULT end Script_WalkOutOfMobileBattleRoom: @@ -428,7 +426,7 @@ Pokecenter2F_CheckGender: waitbutton closetext applymovement2 Pokecenter2FMovementData_ReceptionistLooksRight - spriteface PLAYER, LEFT + objectface PLAYER, LEFT opentext writetext Text_ChangeTheLook waitbutton @@ -436,7 +434,7 @@ Pokecenter2F_CheckGender: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_RED << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft setflag ENGINE_KRIS_IN_CABLE_CLUB special ReplaceKrisSprite @@ -463,7 +461,7 @@ Script_WalkOutOfLinkTradeRoom: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_BLUE << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2 @@ -485,7 +483,7 @@ Script_WalkOutOfLinkBattleRoom: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_BLUE << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2 @@ -496,8 +494,8 @@ TimeCapsuleScript_CheckPlayerGender: checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Female checkcode VAR_FACING - if_equal LEFT, .MaleFacingLeft - if_equal RIGHT, .MaleFacingRight + ifequal LEFT, .MaleFacingLeft + ifequal RIGHT, .MaleFacingRight applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksDown applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsUp_2 end @@ -514,8 +512,8 @@ TimeCapsuleScript_CheckPlayerGender: .Female: checkcode VAR_FACING - if_equal RIGHT, .FemaleFacingRight - if_equal LEFT, .FemaleFacingLeft + ifequal RIGHT, .FemaleFacingRight + ifequal LEFT, .FemaleFacingLeft applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight_2 applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepUp_2 jump .FemaleContinue @@ -534,8 +532,8 @@ TimeCapsuleScript_CheckPlayerGender: waitbutton closetext checkcode VAR_FACING - if_not_equal UP, .FemaleChangeApperance - spriteface PLAYER, LEFT + ifnotequal UP, .FemaleChangeApperance + objectface PLAYER, LEFT .FemaleChangeApperance: opentext writetext Text_ChangeTheLook @@ -544,7 +542,7 @@ TimeCapsuleScript_CheckPlayerGender: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_RED << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown faceobject PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST setflag ENGINE_KRIS_IN_CABLE_CLUB @@ -558,7 +556,7 @@ TimeCapsuleScript_CheckPlayerGender: end Script_LeftTimeCapsule: - special Special_WaitForOtherPlayerToExit + special WaitForOtherPlayerToExit checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight @@ -573,19 +571,19 @@ Script_LeftTimeCapsule: playsound SFX_TINGLE applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_BLUE << 4) - special Special_SetPlayerPalette + special SetPlayerPalette applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2 .Done: - setscene 0 - setmapscene TIME_CAPSULE, 0 + setscene SCENE_DEFAULT + setmapscene TIME_CAPSULE, SCENE_DEFAULT end MapPokecenter2FSignpost0Script: refreshscreen - special Special_DisplayLinkRecord + special DisplayLinkRecord closetext end @@ -600,7 +598,7 @@ OfficerScript_0x192c9a: writetext Text_MysteryGiftDeliveryGuy_HereYouGo buttonsound waitsfx - special Special_GetMysteryGiftItem + special GetMysteryGiftItem iffalse .BagIsFull itemnotify setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY @@ -1023,28 +1021,23 @@ Text_BrokeStadiumRules: done Pokecenter2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 0, 7, -1, POKECENTER_2F - warp_def 5, 0, 1, TRADE_CENTER - warp_def 9, 0, 1, COLOSSEUM - warp_def 13, 2, 1, TIME_CAPSULE - warp_def 6, 0, 1, MOBILE_TRADE_ROOM_MOBILE - warp_def 10, 0, 1, MOBILE_BATTLE_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 7, 3, BGEVENT_READ, MapPokecenter2FSignpost0Script - -.ObjectEvents: - db 4 - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1 - object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1 - object_event 1, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY + db 0, 0 ; filler + + db 6 ; warp events + warp_event 0, 7, POKECENTER_2F, -1 + warp_event 5, 0, TRADE_CENTER, 1 + warp_event 9, 0, COLOSSEUM, 1 + warp_event 13, 2, TIME_CAPSULE, 1 + warp_event 6, 0, MOBILE_TRADE_ROOM, 1 + warp_event 10, 0, MOBILE_BATTLE_ROOM, 1 + + db 0 ; coord events + + db 1 ; bg events + bg_event 7, 3, BGEVENT_READ, MapPokecenter2FSignpost0Script + + db 4 ; object events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1 + object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1 + object_event 1, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm index d45b3ac56..96d319cc2 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/PokecomCenterAdminRoomMobile.asm @@ -1,35 +1,33 @@ -const_value set 2 - const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST1 - const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST2 - const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST3 + const_def 2 ; object constants + const POKECOMCENTERADMINROOMMOBILE_SCIENTIST1 + const POKECOMCENTERADMINROOMMOBILE_SCIENTIST2 + const POKECOMCENTERADMINROOMMOBILE_SCIENTIST3 -GoldenrodPokeComCenter2FMobile_MapScripts: -.SceneScripts: - db 0 +PokecomCenterAdminRoomMobile_MapScripts: + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks -GoldenrodPokeComCenter2FMobileScientist1Script: - jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist1Text +PokecomCenterAdminRoomMobileScientist1Script: + jumptextfaceplayer PokecomCenterAdminRoomMobileScientist1Text -GoldenrodPokeComCenter2FMobileScientist2Script: - jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist2Text +PokecomCenterAdminRoomMobileScientist2Script: + jumptextfaceplayer PokecomCenterAdminRoomMobileScientist2Text -GoldenrodPokeComCenter2FMobileScientist3Script: - jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist3Text +PokecomCenterAdminRoomMobileScientist3Script: + jumptextfaceplayer PokecomCenterAdminRoomMobileScientist3Text -MapGoldenrodPokeComCenter2FMobileSignpost0Script: +PokecomCenterAdminRoomMobileSignpost0Script: opentext writetext UnknownText_0x627ee waitbutton UnknownScript_0x625df: reloadmappart - loadmenudata MenuDataHeader_0x62602 + loadmenuheader MenuHeader_0x62602 verticalmenu closewindow - if_equal 1, UnknownScript_0x625f0 - if_equal 2, UnknownScript_0x625f8 + ifequal 1, UnknownScript_0x625f0 + ifequal 2, UnknownScript_0x625f8 jump UnknownScript_0x62600 UnknownScript_0x625f0: @@ -48,30 +46,30 @@ UnknownScript_0x62600: closetext end -MenuDataHeader_0x62602: +MenuHeader_0x62602: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 15, 8 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 3 ; items db "# つうしん クラブ@" ; # COM CLUB db "モバイルセンター@" ; MOBILE CENTER db "やめる@" ; QUIT -MapGoldenrodPokeComCenter2FMobileSignpost1Script: +PokecomCenterAdminRoomMobileSignpost1Script: opentext writetext UnknownText_0x62989 waitbutton UnknownScript_0x62629: reloadmappart - loadmenudata MenuDataHeader_0x6264c + loadmenuheader MenuHeader_0x6264c verticalmenu closewindow - if_equal 1, UnknownScript_0x6263a - if_equal 2, UnknownScript_0x62642 + ifequal 1, UnknownScript_0x6263a + ifequal 2, UnknownScript_0x62642 jump UnknownScript_0x6264a UnknownScript_0x6263a: @@ -90,23 +88,23 @@ UnknownScript_0x6264a: closetext end -MenuDataHeader_0x6264c: +MenuHeader_0x6264c: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 15, 8 - dw .MenuData2 + dw .MenuData db 1 ; default option -.MenuData2: +.MenuData: db STATICMENU_CURSOR ; flags db 3 ; items db "でんわ<WO>つかうとき@" ; Use phone db "でんわ<GA>つながらないとき@" ; Don't use phone db "やめる@" ; QUIT -MapGoldenrodPokeComCenter2FMobileSignpost2Script: +PokecomCenterAdminRoomMobileSignpost2Script: jumptext UnknownText_0x62b26 -GoldenrodPokeComCenter2FMobileScientist1Text: +PokecomCenterAdminRoomMobileScientist1Text: text "#COM CENTER and" line "MOBILE CENTER were" @@ -120,7 +118,7 @@ GoldenrodPokeComCenter2FMobileScientist1Text: line "strangers." done -GoldenrodPokeComCenter2FMobileScientist2Text: +PokecomCenterAdminRoomMobileScientist2Text: text "When you linked" line "with someone by" @@ -137,7 +135,7 @@ GoldenrodPokeComCenter2FMobileScientist2Text: line "got the shakes!" done -GoldenrodPokeComCenter2FMobileScientist3Text: +PokecomCenterAdminRoomMobileScientist3Text: text "They were able to" line "build this huge" @@ -262,26 +260,21 @@ UnknownText_0x62b26: para "<……> <……> <……>" done -GoldenrodPokeComCenter2FMobile_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 0, 31, 3, GOLDENROD_POKECENTER_1F - warp_def 1, 31, 3, GOLDENROD_POKECENTER_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 6, 26, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script - bg_event 6, 28, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script - bg_event 3, 26, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script - -.ObjectEvents: - db 3 - object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist1Script, -1 - object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist2Script, -1 - object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist3Script, -1 +PokecomCenterAdminRoomMobile_MapEvents: + db 0, 0 ; filler + + db 2 ; warp events + warp_event 0, 31, GOLDENROD_POKECENTER_1F, 3 + warp_event 1, 31, GOLDENROD_POKECENTER_1F, 3 + + db 0 ; coord events + + db 3 ; bg events + bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost0Script + bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost1Script + bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost2Script + + db 3 ; object events + object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist1Script, -1 + object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist2Script, -1 + object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist3Script, -1 diff --git a/maps/GoldenrodPokeComCenter2FMobile.blk b/maps/PokecomCenterAdminRoomMobile.blk index d4fd92414..d4fd92414 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.blk +++ b/maps/PokecomCenterAdminRoomMobile.blk diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 0c8bb70ec..1f54460ba 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const POKEMONFANCLUB_GENTLEMAN const POKEMONFANCLUB_RECEPTIONIST const POKEMONFANCLUB_FISHER @@ -7,11 +7,9 @@ const_value set 2 const POKEMONFANCLUB_ODDISH PokemonFanClub_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GentlemanScript_0x1917e9: faceplayer @@ -297,27 +295,22 @@ UnknownText_0x191e29: done PokemonFanClub_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 3, VERMILION_CITY - warp_def 3, 7, 3, VERMILION_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 7, 0, BGEVENT_READ, MapPokemonFanClubSignpost0Script - bg_event 9, 0, BGEVENT_READ, MapPokemonFanClubSignpost1Script - -.ObjectEvents: - db 6 - object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1 - object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1 - object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FisherScript_0x191824, -1 - object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1 - object_event 2, 4, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL - object_event 7, 3, SPRITE_ODDISH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FanClubBayleef, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, VERMILION_CITY, 3 + warp_event 3, 7, VERMILION_CITY, 3 + + db 0 ; coord events + + db 2 ; bg events + bg_event 7, 0, BGEVENT_READ, MapPokemonFanClubSignpost0Script + bg_event 9, 0, BGEVENT_READ, MapPokemonFanClubSignpost1Script + + db 6 ; object events + object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1 + object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1 + object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FisherScript_0x191824, -1 + object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1 + object_event 2, 4, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL + object_event 7, 3, SPRITE_ODDISH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FanClubBayleef, -1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index ef855e40e..89ec341b2 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const POWERPLANT_OFFICER1 const POWERPLANT_GYM_GUY1 const POWERPLANT_GYM_GUY2 @@ -8,13 +8,11 @@ const_value set 2 const POWERPLANT_FOREST PowerPlant_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_POWERPLANT_NOTHING + scene_script .DummyScene1 ; SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -28,21 +26,21 @@ PowerPlantGuardPhoneScript: waitsfx pause 30 applymovement POWERPLANT_OFFICER1, MovementData_0x188ed5 - spriteface POWERPLANT_GYM_GUY1, DOWN - spriteface POWERPLANT_GYM_GUY2, DOWN + objectface POWERPLANT_GYM_GUY1, DOWN + objectface POWERPLANT_GYM_GUY2, DOWN opentext writetext UnknownText_0x188f22 waitbutton closetext - spriteface POWERPLANT_OFFICER1, LEFT - spriteface PLAYER, RIGHT + objectface POWERPLANT_OFFICER1, LEFT + objectface PLAYER, RIGHT opentext writetext UnknownText_0x188f7f waitbutton closetext - spriteface PLAYER, DOWN + objectface PLAYER, DOWN applymovement POWERPLANT_OFFICER1, MovementData_0x188eda - setscene 0 + setscene SCENE_POWERPLANT_NOTHING end OfficerScript_0x188df5: @@ -148,8 +146,8 @@ PowerPlantManager: setevent EVENT_MET_MANAGER_AT_POWER_PLANT clearevent EVENT_CERULEAN_GYM_ROCKET clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM - setmapscene CERULEAN_GYM, 1 - setscene 1 + setmapscene CERULEAN_GYM, SCENE_CERULEANGYM_GRUNT_RUNS_OUT + setscene SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL end UnknownScript_0x188e8d: @@ -191,7 +189,7 @@ UnknownScript_0x188ec5: Forest: faceplayer opentext - trade NPCTRADE_FOREST + trade NPC_TRADE_FOREST waitbutton closetext end @@ -389,29 +387,24 @@ UnknownText_0x189475: done PowerPlant_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 17, 2, ROUTE_10_NORTH - warp_def 3, 17, 2, ROUTE_10_NORTH - -.CoordEvents: - db 1 - coord_event 5, 12, 1, PowerPlantGuardPhoneScript - -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, PowerPlantBookshelf - bg_event 1, 1, BGEVENT_READ, PowerPlantBookshelf - -.ObjectEvents: - db 7 - object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1 - object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1 - object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1 - object_event 9, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1 - object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 17, ROUTE_10_NORTH, 2 + warp_event 3, 17, ROUTE_10_NORTH, 2 + + db 1 ; coord events + coord_event 5, 12, SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL, PowerPlantGuardPhoneScript + + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, PowerPlantBookshelf + bg_event 1, 1, BGEVENT_READ, PowerPlantBookshelf + + db 7 ; object events + object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1 + object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1 + object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1 + object_event 9, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1 + object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1 object_event 14, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PowerPlantManager, -1 - object_event 5, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1 + object_event 5, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index d17798f1f..fdc85f46f 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const RADIOTOWER1F_RECEPTIONIST const RADIOTOWER1F_LASS const RADIOTOWER1F_YOUNGSTER @@ -7,11 +7,9 @@ const_value set 2 const RADIOTOWER1F_COOLTRAINER_F RadioTower1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ReceptionistScript_0x5cd29: faceplayer @@ -34,11 +32,11 @@ GentlemanScript_0x5cd3d: opentext writetext UnknownText_0x5ceba buttonsound - special Special_CheckLuckyNumberShowFlag + special CheckLuckyNumberShowFlag iffalse .skip - special Special_ResetLuckyNumberShowFlag + special ResetLuckyNumberShowFlag .skip - special Special_PrintTodaysLuckyNumber + special PrintTodaysLuckyNumber checkflag ENGINE_LUCKY_NUMBER_SHOW iftrue .GameOver writetext UnknownText_0x5cf3a @@ -53,13 +51,13 @@ GentlemanScript_0x5cd3d: playsound SFX_DEX_FANFARE_20_49 waitsfx buttonsound - special Special_CheckForLuckyNumberWinners + special CheckForLuckyNumberWinners closetext applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce74 opentext - if_equal 1, .FirstPlace - if_equal 2, .SecondPlace - if_equal 3, .ThirdPlace + ifequal 1, .FirstPlace + ifequal 2, .SecondPlace + ifequal 3, .ThirdPlace jump .NoPrize .GameOver: @@ -186,10 +184,10 @@ RadioTower1FYoungsterScript: jumptextfaceplayer RadioTower1FYoungsterText TrainerGruntM3: - trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_3, EVENT_BEAT_ROCKET_GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM3AfterBattleText waitbutton @@ -473,28 +471,23 @@ UnknownText_0x5d631: done RadioTower1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 2, 7, 11, GOLDENROD_CITY - warp_def 3, 7, 11, GOLDENROD_CITY - warp_def 15, 0, 2, RADIO_TOWER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 0, BGEVENT_READ, MapRadioTower1FSignpost0Script - bg_event 13, 0, BGEVENT_READ, MapRadioTower1FSignpost1Script - -.ObjectEvents: - db 6 - object_event 5, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1 - object_event 16, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS - object_event 15, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS - object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS - object_event 12, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS + db 0, 0 ; filler + + db 3 ; warp events + warp_event 2, 7, GOLDENROD_CITY, 11 + warp_event 3, 7, GOLDENROD_CITY, 11 + warp_event 15, 0, RADIO_TOWER_2F, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 0, BGEVENT_READ, MapRadioTower1FSignpost0Script + bg_event 13, 0, BGEVENT_READ, MapRadioTower1FSignpost1Script + + db 6 ; object events + object_event 5, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1 + object_event 16, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event 15, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS + object_event 12, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 99f4dbe4c..0c992176d 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const RADIOTOWER2F_SUPER_NERD const RADIOTOWER2F_TEACHER const RADIOTOWER2F_ROCKET1 @@ -12,11 +12,9 @@ const_value set 2 const RADIOTOWER2F_RECEPTIONIST RadioTower2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks UnknownScript_0x5d6fd: end @@ -55,10 +53,10 @@ RadioTower2FBlackBelt2Script: jumptextfaceplayer RadioTower2FBlackBelt2Text TrainerGruntM4: - trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_4, EVENT_BEAT_ROCKET_GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM4AfterBattleText waitbutton @@ -66,10 +64,10 @@ TrainerGruntM4: end TrainerGruntM5: - trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_5, EVENT_BEAT_ROCKET_GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM5AfterBattleText waitbutton @@ -77,10 +75,10 @@ TrainerGruntM5: end TrainerGruntM6: - trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_6, EVENT_BEAT_ROCKET_GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM6AfterBattleText waitbutton @@ -88,10 +86,10 @@ TrainerGruntM6: end TrainerGruntF2: - trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, .Script + trainer GRUNTF, GRUNTF_2, EVENT_BEAT_ROCKET_GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntF2AfterBattleText waitbutton @@ -108,33 +106,33 @@ Buena: checkflag ENGINE_BUENAS_PASSWORD_2 iftrue UnknownScript_0x5d82f checkcode VAR_HOUR - if_less_than 18, UnknownScript_0x5d893 + ifless 18, UnknownScript_0x5d893 checkflag ENGINE_BUENAS_PASSWORD iffalse UnknownScript_0x5d80a checkitem BLUE_CARD iffalse UnknownScript_0x5d86b checkcode VAR_BLUECARDBALANCE - if_equal 30, UnknownScript_0x5d87f + ifequal 30, UnknownScript_0x5d87f playmusic MUSIC_BUENAS_PASSWORD writetext UnknownText_0x5de35 - special Special_AskRememberPassword + special AskRememberPassword iffalse UnknownScript_0x5d81e writetext UnknownText_0x5de84 waitbutton closetext - spriteface RADIOTOWER2F_BUENA, RIGHT + objectface RADIOTOWER2F_BUENA, RIGHT checkcode VAR_FACING - if_not_equal RIGHT, UnknownScript_0x5d7be + ifnotequal RIGHT, UnknownScript_0x5d7be applymovement PLAYER, MovementData_0x5d921 UnknownScript_0x5d7be: - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT opentext writetext UnknownText_0x5dedd waitbutton closetext - spriteface RADIOTOWER2F_BUENA, DOWN + objectface RADIOTOWER2F_BUENA, DOWN refreshscreen - special Special_BuenasPassword + special BuenasPassword closetext iffalse UnknownScript_0x5d845 opentext @@ -148,16 +146,16 @@ UnknownScript_0x5d7be: playsound SFX_TRANSACTION setflag ENGINE_BUENAS_PASSWORD_2 pause 20 - spriteface RADIOTOWER2F_BUENA, RIGHT + objectface RADIOTOWER2F_BUENA, RIGHT opentext writetext UnknownText_0x5e054 waitbutton closetext - special Special_FadeOutMusic + special FadeOutMusic pause 20 special RestartMapMusic checkcode VAR_BLUECARDBALANCE - if_equal 30, UnknownScript_0x5d8a4 + ifequal 30, UnknownScript_0x5d8a4 end UnknownScript_0x5d800: @@ -174,15 +172,15 @@ UnknownScript_0x5d80a: checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc UnknownScript_0x5d81a: - spriteface RADIOTOWER2F_BUENA, RIGHT + objectface RADIOTOWER2F_BUENA, RIGHT end UnknownScript_0x5d81e: writetext UnknownText_0x5df29 waitbutton closetext - spriteface RADIOTOWER2F_BUENA, RIGHT - special Special_FadeOutMusic + objectface RADIOTOWER2F_BUENA, RIGHT + special FadeOutMusic pause 20 special RestartMapMusic end @@ -196,7 +194,7 @@ UnknownScript_0x5d82f: checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc UnknownScript_0x5d83f: - spriteface RADIOTOWER2F_BUENA, RIGHT + objectface RADIOTOWER2F_BUENA, RIGHT pause 10 end @@ -206,14 +204,14 @@ UnknownScript_0x5d845: writetext UnknownText_0x5e01c waitbutton closetext - spriteface RADIOTOWER2F_BUENA, RIGHT + objectface RADIOTOWER2F_BUENA, RIGHT pause 20 opentext writetext UnknownText_0x5e054 waitbutton closetext - spriteface RADIOTOWER2F_BUENA, RIGHT - special Special_FadeOutMusic + objectface RADIOTOWER2F_BUENA, RIGHT + special FadeOutMusic pause 20 special RestartMapMusic end @@ -233,7 +231,7 @@ UnknownScript_0x5d86b: checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc UnknownScript_0x5d87b: - spriteface RADIOTOWER2F_BUENA, RIGHT + objectface RADIOTOWER2F_BUENA, RIGHT end UnknownScript_0x5d87f: @@ -245,7 +243,7 @@ UnknownScript_0x5d87f: checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc UnknownScript_0x5d88f: - spriteface RADIOTOWER2F_BUENA, RIGHT + objectface RADIOTOWER2F_BUENA, RIGHT end UnknownScript_0x5d893: @@ -263,9 +261,9 @@ UnknownScript_0x5d8a4: checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d8fe pause 20 - spriteface RADIOTOWER2F_BUENA, DOWN + objectface RADIOTOWER2F_BUENA, DOWN pause 15 - spriteface PLAYER, UP + objectface PLAYER, UP pause 15 checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc @@ -281,8 +279,8 @@ UnknownScript_0x5d8cc: writetext UnknownText_0x5e2bf UnknownScript_0x5d8d0: askforphonenumber PHONE_BUENA - if_equal PHONE_CONTACTS_FULL, UnknownScript_0x5d8f6 - if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x5d8ed + ifequal PHONE_CONTACTS_FULL, UnknownScript_0x5d8f6 + ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x5d8ed writetext UnknownText_0x5e2f3 playsound SFX_REGISTER_PHONE_NUMBER waitsfx @@ -290,7 +288,7 @@ UnknownScript_0x5d8d0: writetext UnknownText_0x5e310 waitbutton closetext - spriteface RADIOTOWER2F_BUENA, RIGHT + objectface RADIOTOWER2F_BUENA, RIGHT addcellnum PHONE_BUENA end @@ -298,14 +296,14 @@ UnknownScript_0x5d8ed: writetext UnknownText_0x5e33c waitbutton closetext - spriteface RADIOTOWER2F_BUENA, RIGHT + objectface RADIOTOWER2F_BUENA, RIGHT end UnknownScript_0x5d8f6: writetext UnknownText_0x5e35e waitbutton closetext - spriteface RADIOTOWER2F_BUENA, RIGHT + objectface RADIOTOWER2F_BUENA, RIGHT UnknownScript_0x5d8fe: end @@ -316,7 +314,7 @@ ReceptionistScript_0x5d8ff: iffalse UnknownScript_0x5d90f writetext UnknownText_0x5e392 buttonsound - special Special_BuenaPrize + special BuenaPrize closetext end @@ -711,36 +709,31 @@ UnknownText_0x5e463: done RadioTower2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 0, 0, 1, RADIO_TOWER_3F - warp_def 15, 0, 3, RADIO_TOWER_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 6 - bg_event 3, 0, BGEVENT_READ, MapRadioTower2FSignpost0Script - bg_event 5, 0, BGEVENT_READ, MapRadioTower2FSignpost1Script - bg_event 9, 1, BGEVENT_READ, RadioTower2FBookshelf - bg_event 10, 1, BGEVENT_READ, RadioTower2FBookshelf - bg_event 11, 1, BGEVENT_READ, RadioTower2FBookshelf - bg_event 13, 0, BGEVENT_READ, MapRadioTower2FSignpost5Script - -.ObjectEvents: - db 11 - object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS - object_event 17, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1 - object_event 1, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 8, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 10, 5, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 0, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS - object_event 1, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER - object_event 12, 1, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1 - object_event 14, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1 - object_event 12, 7, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS + db 0, 0 ; filler + + db 2 ; warp events + warp_event 0, 0, RADIO_TOWER_3F, 1 + warp_event 15, 0, RADIO_TOWER_1F, 3 + + db 0 ; coord events + + db 6 ; bg events + bg_event 3, 0, BGEVENT_READ, MapRadioTower2FSignpost0Script + bg_event 5, 0, BGEVENT_READ, MapRadioTower2FSignpost1Script + bg_event 9, 1, BGEVENT_READ, RadioTower2FBookshelf + bg_event 10, 1, BGEVENT_READ, RadioTower2FBookshelf + bg_event 11, 1, BGEVENT_READ, RadioTower2FBookshelf + bg_event 13, 0, BGEVENT_READ, MapRadioTower2FSignpost5Script + + db 11 ; object events + object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event 17, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1 + object_event 1, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 8, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 10, 5, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 0, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS + object_event 1, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER + object_event 12, 1, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1 + object_event 14, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1 + object_event 12, 7, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 0efc9e2db..b409066dc 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const RADIOTOWER3F_SUPER_NERD const RADIOTOWER3F_GYM_GUY const RADIOTOWER3F_COOLTRAINER_F @@ -8,11 +8,9 @@ const_value set 2 const RADIOTOWER3F_SCIENTIST RadioTower3F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .CardKeyShutterCallback .CardKeyShutterCallback: @@ -83,10 +81,10 @@ UnknownScript_0x5e5a1: end TrainerGruntM7: - trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_7, EVENT_BEAT_ROCKET_GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM7AfterBattleText waitbutton @@ -94,10 +92,10 @@ TrainerGruntM7: end TrainerGruntM8: - trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_8, EVENT_BEAT_ROCKET_GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM8AfterBattleText waitbutton @@ -105,10 +103,10 @@ TrainerGruntM8: end TrainerGruntM9: - trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_9, EVENT_BEAT_ROCKET_GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM9AfterBattleText waitbutton @@ -116,10 +114,10 @@ TrainerGruntM9: end TrainerScientistMarc: - trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, .Script + trainer SCIENTIST, MARC, EVENT_BEAT_SCIENTIST_MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext ScientistMarcAfterBattleText waitbutton @@ -329,30 +327,25 @@ UnknownText_0x5eae4: done RadioTower3F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 0, 0, 1, RADIO_TOWER_2F - warp_def 7, 0, 2, RADIO_TOWER_4F - warp_def 17, 0, 4, RADIO_TOWER_4F - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 3, 0, BGEVENT_READ, MapRadioTower3FSignpost0Script - bg_event 9, 0, BGEVENT_READ, MapRadioTower3FSignpost1Script - bg_event 14, 2, BGEVENT_UP, MapRadioTower3FSignpost2Script - -.ObjectEvents: - db 7 - object_event 7, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER - object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1 - object_event 11, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1 - object_event 5, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 6, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 16, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 9, 6, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + db 0, 0 ; filler + + db 3 ; warp events + warp_event 0, 0, RADIO_TOWER_2F, 1 + warp_event 7, 0, RADIO_TOWER_4F, 2 + warp_event 17, 0, RADIO_TOWER_4F, 4 + + db 0 ; coord events + + db 3 ; bg events + bg_event 3, 0, BGEVENT_READ, MapRadioTower3FSignpost0Script + bg_event 9, 0, BGEVENT_READ, MapRadioTower3FSignpost1Script + bg_event 14, 2, BGEVENT_UP, MapRadioTower3FSignpost2Script + + db 7 ; object events + object_event 7, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER + object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1 + object_event 11, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1 + object_event 5, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 6, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 16, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 9, 6, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 99815f819..b2fe23c64 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const RADIOTOWER4F_FISHER const RADIOTOWER4F_TEACHER const RADIOTOWER4F_GROWLITHE @@ -8,11 +8,9 @@ const_value set 2 const RADIOTOWER4F_SCIENTIST RadioTower4F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RadioTower4FFisherScript: jumptextfaceplayer RadioTower4FFisherText @@ -56,10 +54,10 @@ RadioTowerMeowth: end TrainerGruntM10: - trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_10, EVENT_BEAT_ROCKET_GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM10AfterBattleText waitbutton @@ -67,10 +65,10 @@ TrainerGruntM10: end TrainerExecutivem2: - trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, .Script + trainer EXECUTIVEM, EXECUTIVEM_2, EVENT_BEAT_ROCKET_EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext Executivem2AfterBattleText waitbutton @@ -78,10 +76,10 @@ TrainerExecutivem2: end TrainerGruntF4: - trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, .Script + trainer GRUNTF, GRUNTF_4, EVENT_BEAT_ROCKET_GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntF4AfterBattleText waitbutton @@ -89,10 +87,10 @@ TrainerGruntF4: end TrainerScientistRich: - trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, .Script + trainer SCIENTIST, RICH, EVENT_BEAT_SCIENTIST_RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext ScientistRichAfterBattleText waitbutton @@ -246,30 +244,25 @@ UnknownText_0x5f00d: done RadioTower4F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 0, 0, 1, RADIO_TOWER_5F - warp_def 9, 0, 2, RADIO_TOWER_3F - warp_def 12, 0, 2, RADIO_TOWER_5F - warp_def 17, 0, 3, RADIO_TOWER_3F - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 7, 0, BGEVENT_READ, MapRadioTower4FSignpost0Script - bg_event 15, 0, BGEVENT_READ, MapRadioTower4FSignpost1Script - -.ObjectEvents: - db 7 - object_event 6, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER - object_event 14, 6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1 - object_event 12, 7, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1 - object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 12, 4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 4, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + db 0, 0 ; filler + + db 4 ; warp events + warp_event 0, 0, RADIO_TOWER_5F, 1 + warp_event 9, 0, RADIO_TOWER_3F, 2 + warp_event 12, 0, RADIO_TOWER_5F, 2 + warp_event 17, 0, RADIO_TOWER_3F, 3 + + db 0 ; coord events + + db 2 ; bg events + bg_event 7, 0, BGEVENT_READ, MapRadioTower4FSignpost0Script + bg_event 15, 0, BGEVENT_READ, MapRadioTower4FSignpost1Script + + db 7 ; object events + object_event 6, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER + object_event 14, 6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1 + object_event 12, 7, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1 + object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 12, 4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 4, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 009c1e91d..ceeb94cde 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const RADIOTOWER5F_DIRECTOR const RADIOTOWER5F_ROCKET const RADIOTOWER5F_ROCKET_GIRL @@ -6,14 +6,12 @@ const_value set 2 const RADIOTOWER5F_POKE_BALL RadioTower5F_MapScripts: -.SceneScripts: - db 3 - scene_script .DummyScene0 - scene_script .DummyScene1 - scene_script .DummyScene2 + db 3 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_RADIOTOWER5F_ROCKET_BOSS + scene_script .DummyScene2 ; SCENE_RADIOTOWER5F_NOTHING -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -25,7 +23,7 @@ RadioTower5F_MapScripts: end FakeDirectorScript: - spriteface RADIOTOWER5F_DIRECTOR, UP + objectface RADIOTOWER5F_DIRECTOR, UP showemote EMOTE_SHOCK, RADIOTOWER5F_DIRECTOR, 15 opentext writetext FakeDirectorTextBefore1 @@ -47,7 +45,7 @@ FakeDirectorScript: buttonsound verbosegiveitem BASEMENT_KEY closetext - setscene 1 + setscene SCENE_RADIOTOWER5F_ROCKET_BOSS setevent EVENT_BEAT_ROCKET_EXECUTIVEM_3 end @@ -68,10 +66,10 @@ Director: end TrainerExecutivef1: - trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, .Script + trainer EXECUTIVEF, EXECUTIVEF_1, EVENT_BEAT_ROCKET_EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext Executivef1AfterBattleText waitbutton @@ -81,7 +79,7 @@ TrainerExecutivef1: RadioTower5FRocketBossScene: applymovement PLAYER, MovementData_0x60125 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface RADIOTOWER5F_ROCKET, RIGHT + objectface RADIOTOWER5F_ROCKET, RIGHT opentext writetext RadioTower5FRocketBossBeforeText waitbutton @@ -95,12 +93,12 @@ RadioTower5FRocketBossScene: writetext RadioTower5FRocketBossAfterText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear RADIOTOWER5F_ROCKET disappear RADIOTOWER5F_ROCKET_GIRL pause 15 - special Special_FadeInQuickly + special FadeInQuickly setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1 setevent EVENT_CLEARED_RADIO_TOWER clearflag ENGINE_ROCKETS_IN_RADIO_TOWER @@ -118,7 +116,7 @@ RadioTower5FRocketBossScene: moveobject RADIOTOWER5F_DIRECTOR, 12, 0 appear RADIOTOWER5F_DIRECTOR applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksIn - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT opentext writetext RadioTower5FDirectorThankYouText buttonsound @@ -126,8 +124,8 @@ RadioTower5FRocketBossScene: writetext RadioTower5FDirectorDescribeClearBellText waitbutton closetext - setscene 2 - setmapscene ECRUTEAK_HOUSE, 0 + setscene SCENE_RADIOTOWER5F_NOTHING + setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_DEFAULT setevent EVENT_GOT_CLEAR_BELL setevent EVENT_TEAM_ROCKET_DISBANDED jump .UselessJump @@ -421,31 +419,26 @@ SignpostRadioTower5FStudio: done RadioTower5F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 0, 0, 1, RADIO_TOWER_4F - warp_def 12, 0, 3, RADIO_TOWER_4F - -.CoordEvents: - db 2 - coord_event 0, 3, 0, FakeDirectorScript - coord_event 16, 5, 1, RadioTower5FRocketBossScene - -.BGEvents: - db 5 - bg_event 3, 0, BGEVENT_READ, MapRadioTower5FSignpost0Script - bg_event 11, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script - bg_event 15, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script - bg_event 16, 1, BGEVENT_READ, RadioTower5FBookshelf - bg_event 17, 1, BGEVENT_READ, RadioTower5FBookshelf - -.ObjectEvents: - db 5 - object_event 3, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Director, -1 - object_event 13, 5, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 17, 2, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 13, 5, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER - object_event 8, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL + db 0, 0 ; filler + + db 2 ; warp events + warp_event 0, 0, RADIO_TOWER_4F, 1 + warp_event 12, 0, RADIO_TOWER_4F, 3 + + db 2 ; coord events + coord_event 0, 3, SCENE_DEFAULT, FakeDirectorScript + coord_event 16, 5, SCENE_RADIOTOWER5F_ROCKET_BOSS, RadioTower5FRocketBossScene + + db 5 ; bg events + bg_event 3, 0, BGEVENT_READ, MapRadioTower5FSignpost0Script + bg_event 11, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script + bg_event 15, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script + bg_event 16, 1, BGEVENT_READ, RadioTower5FBookshelf + bg_event 17, 1, BGEVENT_READ, RadioTower5FBookshelf + + db 5 ; object events + object_event 3, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Director, -1 + object_event 13, 5, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 17, 2, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 13, 5, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER + object_event 8, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 2f9d2828a..a07b231a4 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const REDSHOUSE1F_REDS_MOM RedsHouse1F_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -75,24 +73,19 @@ RedsHouse1FTVText: done RedsHouse1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 2, 7, 1, PALLET_TOWN - warp_def 3, 7, 1, PALLET_TOWN - warp_def 7, 0, 1, REDS_HOUSE_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 0, 1, BGEVENT_READ, RedsHouse1FBookshelf - bg_event 1, 1, BGEVENT_READ, RedsHouse1FBookshelf - bg_event 2, 1, BGEVENT_READ, RedsHouse1FTV - -.ObjectEvents: - db 1 - object_event 5, 3, SPRITE_REDS_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RedsMom, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 2, 7, PALLET_TOWN, 1 + warp_event 3, 7, PALLET_TOWN, 1 + warp_event 7, 0, REDS_HOUSE_2F, 1 + + db 0 ; coord events + + db 3 ; bg events + bg_event 0, 1, BGEVENT_READ, RedsHouse1FBookshelf + bg_event 1, 1, BGEVENT_READ, RedsHouse1FBookshelf + bg_event 2, 1, BGEVENT_READ, RedsHouse1FTV + + db 1 ; object events + object_event 5, 3, SPRITE_REDS_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RedsMom, -1 diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index b69790cdd..6ff76ec80 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -1,9 +1,7 @@ RedsHouse2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RedsHouse2FN64Script: jumptext RedsHouse2FN64Text @@ -26,20 +24,15 @@ RedsHouse2FPCText: done RedsHouse2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 7, 0, 3, REDS_HOUSE_1F + db 1 ; warp events + warp_event 7, 0, REDS_HOUSE_1F, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 3, 5, BGEVENT_READ, RedsHouse2FN64Script - bg_event 0, 1, BGEVENT_READ, RedsHouse2FPCScript + db 2 ; bg events + bg_event 3, 5, BGEVENT_READ, RedsHouse2FN64Script + bg_event 0, 1, BGEVENT_READ, RedsHouse2FPCScript -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 570b4b2f5..008f7aec8 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ROCKTUNNEL1F_POKE_BALL1 const ROCKTUNNEL1F_POKE_BALL2 RockTunnel1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RockTunnel1FElixer: itemball ELIXER @@ -16,33 +14,28 @@ RockTunnel1FTMSteelWing: itemball TM_STEEL_WING RockTunnel1FHiddenXAccuracy: - hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY + hiddenitem X_ACCURACY, EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY RockTunnel1FHiddenXDefend: - hiddenitem EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND + hiddenitem X_DEFEND, EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND RockTunnel1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 15, 3, 1, ROUTE_9 - warp_def 11, 25, 1, ROUTE_10_SOUTH - warp_def 5, 3, 3, ROCK_TUNNEL_B1F - warp_def 15, 9, 2, ROCK_TUNNEL_B1F - warp_def 27, 3, 4, ROCK_TUNNEL_B1F - warp_def 27, 13, 1, ROCK_TUNNEL_B1F - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 24, 4, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy + db 0, 0 ; filler + + db 6 ; warp events + warp_event 15, 3, ROUTE_9, 1 + warp_event 11, 25, ROUTE_10_SOUTH, 1 + warp_event 5, 3, ROCK_TUNNEL_B1F, 3 + warp_event 15, 9, ROCK_TUNNEL_B1F, 2 + warp_event 27, 3, ROCK_TUNNEL_B1F, 4 + warp_event 27, 13, ROCK_TUNNEL_B1F, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 24, 4, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy bg_event 21, 15, BGEVENT_ITEM, RockTunnel1FHiddenXDefend -.ObjectEvents: - db 2 - object_event 4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER - object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING + db 2 ; object events + object_event 4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER + object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index d94f1f412..82cea7924 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const ROCKTUNNELB1F_POKE_BALL1 const ROCKTUNNELB1F_POKE_BALL2 const ROCKTUNNELB1F_POKE_BALL3 RockTunnelB1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RockTunnelB1FIron: itemball IRON @@ -20,28 +18,23 @@ RockTunnelB1FRevive: itemball REVIVE RockTunnelB1FHiddenMaxPotion: - hiddenitem EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION RockTunnelB1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 3, 3, 6, ROCK_TUNNEL_1F - warp_def 17, 9, 4, ROCK_TUNNEL_1F - warp_def 23, 3, 3, ROCK_TUNNEL_1F - warp_def 25, 23, 5, ROCK_TUNNEL_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 4, 14, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion - -.ObjectEvents: - db 3 - object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON - object_event 6, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP - object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE + db 0, 0 ; filler + + db 4 ; warp events + warp_event 3, 3, ROCK_TUNNEL_1F, 6 + warp_event 17, 9, ROCK_TUNNEL_1F, 4 + warp_event 23, 3, ROCK_TUNNEL_1F, 3 + warp_event 25, 23, ROCK_TUNNEL_1F, 5 + + db 0 ; coord events + + db 1 ; bg events + bg_event 4, 14, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion + + db 3 ; object events + object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON + object_event 6, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP + object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE diff --git a/maps/Route1.asm b/maps/Route1.asm index 8be70d4d6..7f7cf828b 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -1,20 +1,18 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE1_YOUNGSTER const ROUTE1_COOLTRAINER_F const ROUTE1_FRUIT_TREE Route1_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerSchoolboyDanny: - trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script + trainer SCHOOLBOY, DANNY, EVENT_BEAT_SCHOOLBOY_DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SchoolboyDannyAfterBattleText waitbutton @@ -22,10 +20,10 @@ TrainerSchoolboyDanny: end TrainerCooltrainerfQuinn: - trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, .Script + trainer COOLTRAINERF, QUINN, EVENT_BEAT_COOLTRAINERF_QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainerfQuinnAfterBattleText waitbutton @@ -81,21 +79,16 @@ Route1SignText: done Route1_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 0 + db 0 ; warp events -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 7, 27, BGEVENT_READ, Route1Sign + db 1 ; bg events + bg_event 7, 27, BGEVENT_READ, Route1Sign -.ObjectEvents: - db 3 - object_event 4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1 - object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1 - object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1 + db 3 ; object events + object_event 4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1 + object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1 + object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1 diff --git a/maps/Route10North.asm b/maps/Route10North.asm index feb7dd033..e04d646b7 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -1,9 +1,7 @@ Route10North_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PowerPlantSign: jumptext PowerPlantSignText @@ -16,21 +14,16 @@ PowerPlantSignText: done Route10North_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 11, 1, 1, ROUTE_10_POKECENTER_1F - warp_def 3, 9, 1, POWER_PLANT + db 2 ; warp events + warp_event 11, 1, ROUTE_10_POKECENTER_1F, 1 + warp_event 3, 9, POWER_PLANT, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 5, 11, BGEVENT_READ, PowerPlantSign - bg_event 12, 1, BGEVENT_READ, Route10PokecenterSign + db 2 ; bg events + bg_event 5, 11, BGEVENT_READ, PowerPlantSign + bg_event 12, 1, BGEVENT_READ, Route10PokecenterSign -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index 4a75da2ec..ecd56522d 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE10POKECENTER1F_NURSE const ROUTE10POKECENTER1F_GENTLEMAN const ROUTE10POKECENTER1F_GYM_GUY const ROUTE10POKECENTER1F_COOLTRAINER_F Route10Pokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x188bd4: jumpstd pokecenternurse @@ -81,24 +79,19 @@ Route10Pokecenter1FCooltrainerFText: done Route10Pokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 1, ROUTE_10_NORTH - warp_def 4, 7, 1, ROUTE_10_NORTH - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1 - object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1 - object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1 - object_event 1, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, ROUTE_10_NORTH, 1 + warp_event 4, 7, ROUTE_10_NORTH, 1 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1 + object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1 + object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1 + object_event 1, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1 diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm index c3b2d39cc..86927bb5a 100644 --- a/maps/Route10Pokecenter2FBeta.asm +++ b/maps/Route10Pokecenter2FBeta.asm @@ -1,23 +1,16 @@ Route10Pokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route10Pokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, ROUTE_10_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, ROUTE_10_POKECENTER_1F, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Route10South.asm b/maps/Route10South.asm index a03a5d485..6161995df 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -1,19 +1,17 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE10SOUTH_POKEFAN_M1 const ROUTE10SOUTH_POKEFAN_M2 Route10South_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerHikerJim: - trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script + trainer HIKER, JIM, EVENT_BEAT_HIKER_JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerJimAfterBattleText waitbutton @@ -21,10 +19,10 @@ TrainerHikerJim: end TrainerPokefanmRobert: - trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, .Script + trainer POKEFANM, ROBERT, EVENT_BEAT_POKEFANM_ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokefanmRobertAfterBattleText waitbutton @@ -76,21 +74,16 @@ Route10SignText: done Route10South_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 6, 1, 2, ROCK_TUNNEL_1F + db 1 ; warp events + warp_event 6, 1, ROCK_TUNNEL_1F, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 5, 3, BGEVENT_READ, Route10Sign + db 1 ; bg events + bg_event 5, 3, BGEVENT_READ, Route10Sign -.ObjectEvents: - db 2 - object_event 17, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1 - object_event 8, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1 + db 2 ; object events + object_event 17, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1 + object_event 8, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1 diff --git a/maps/Route11.asm b/maps/Route11.asm index 353877969..e8f630af4 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE11_YOUNGSTER1 const ROUTE11_YOUNGSTER2 const ROUTE11_YOUNGSTER3 @@ -6,17 +6,15 @@ const_value set 2 const ROUTE11_FRUIT_TREE Route11_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerYoungsterOwen: - trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script + trainer YOUNGSTER, OWEN, EVENT_BEAT_YOUNGSTER_OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext YoungsterOwenAfterBattleText waitbutton @@ -24,10 +22,10 @@ TrainerYoungsterOwen: end TrainerYoungsterJason: - trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script + trainer YOUNGSTER, JASON, EVENT_BEAT_YOUNGSTER_JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext YoungsterJasonAfterBattleText waitbutton @@ -35,10 +33,10 @@ TrainerYoungsterJason: end TrainerPsychicHerman: - trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script + trainer PSYCHIC_T, HERMAN, EVENT_BEAT_PSYCHIC_HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PsychicHermanAfterBattleText waitbutton @@ -46,10 +44,10 @@ TrainerPsychicHerman: end TrainerPsychicFidel: - trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script + trainer PSYCHIC_T, FIDEL, EVENT_BEAT_PSYCHIC_FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PsychicFidelAfterBattleText waitbutton @@ -63,7 +61,7 @@ FruitTreeScript_0x68055: fruittree FRUITTREE_ROUTE_11 Route11HiddenRevive: - hiddenitem EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_ROUTE_11_HIDDEN_REVIVE YoungsterOwenSeenText: text "There's no cheat-" @@ -146,24 +144,19 @@ Route11SignText: done Route11_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 0 + db 0 ; warp events -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 3, 7, BGEVENT_READ, Route11Sign - bg_event 32, 5, BGEVENT_ITEM, Route11HiddenRevive + db 2 ; bg events + bg_event 3, 7, BGEVENT_READ, Route11Sign + bg_event 32, 5, BGEVENT_ITEM, Route11HiddenRevive -.ObjectEvents: - db 5 + db 5 ; object events object_event 22, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterOwen, -1 - object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1 - object_event 28, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1 - object_event 8, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1 - object_event 32, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1 + object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1 + object_event 28, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1 + object_event 8, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1 + object_event 32, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1 diff --git a/maps/Route12.asm b/maps/Route12.asm index 3aaf37991..607ed498b 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE12_FISHER1 const ROUTE12_FISHER2 const ROUTE12_FISHER3 @@ -7,17 +7,15 @@ const_value set 2 const ROUTE12_POKE_BALL2 Route12_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerFisherKyle: - trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script + trainer FISHER, KYLE, EVENT_BEAT_FISHER_KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FisherKyleAfterBattleText waitbutton @@ -25,10 +23,10 @@ TrainerFisherKyle: end TrainerFisherMartin: - trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, .Script + trainer FISHER, MARTIN, EVENT_BEAT_FISHER_MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FisherMartinAfterBattleText waitbutton @@ -36,10 +34,10 @@ TrainerFisherMartin: end TrainerFisherStephen: - trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, .Script + trainer FISHER, STEPHEN, EVENT_BEAT_FISHER_STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FisherStephenAfterBattleText waitbutton @@ -47,10 +45,10 @@ TrainerFisherStephen: end TrainerFisherBarney: - trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, .Script + trainer FISHER, BARNEY, EVENT_BEAT_FISHER_BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FisherBarneyAfterBattleText waitbutton @@ -70,7 +68,7 @@ Route12Nugget: itemball NUGGET Route12HiddenElixer: - hiddenitem EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER + hiddenitem ELIXER, EVENT_ROUTE_12_HIDDEN_ELIXER FisherMartinSeenText: text "Patience is the" @@ -167,27 +165,22 @@ FishingSpotSignText: done Route12_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 11, 33, 1, ROUTE_12_SUPER_ROD_HOUSE + db 1 ; warp events + warp_event 11, 33, ROUTE_12_SUPER_ROD_HOUSE, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 11, 27, BGEVENT_READ, Route12Sign - bg_event 13, 9, BGEVENT_READ, FishingSpotSign + bg_event 13, 9, BGEVENT_READ, FishingSpotSign bg_event 14, 13, BGEVENT_ITEM, Route12HiddenElixer -.ObjectEvents: - db 6 - object_event 5, 13, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1 + db 6 ; object events + object_event 5, 13, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1 object_event 14, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherStephen, -1 object_event 10, 38, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerFisherBarney, -1 - object_event 6, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherKyle, -1 - object_event 5, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM - object_event 5, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET + object_event 6, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherKyle, -1 + object_event 5, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM + object_event 5, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index ca39effaf..fe1161bd4 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE12SUPERRODHOUSE_FISHING_GURU Route12SuperRodHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FishingGuruScript_0x7f484: faceplayer @@ -80,20 +78,15 @@ UnknownText_0x7f5ec: done Route12SuperRodHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, ROUTE_12 - warp_def 3, 7, 1, ROUTE_12 + db 2 ; warp events + warp_event 2, 7, ROUTE_12, 1 + warp_event 3, 7, ROUTE_12, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1 + db 1 ; object events + object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1 diff --git a/maps/Route13.asm b/maps/Route13.asm index 88753afbb..295f8c5e7 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE13_YOUNGSTER1 const ROUTE13_YOUNGSTER2 const ROUTE13_POKEFAN_M1 @@ -6,17 +6,15 @@ const_value set 2 const ROUTE13_POKEFAN_M3 Route13_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerPokefanmAlex: - trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script + trainer POKEFANM, ALEX, EVENT_BEAT_POKEFANM_ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokefanmAlexAfterBattleText waitbutton @@ -24,10 +22,10 @@ TrainerPokefanmAlex: end TrainerPokefanmJoshua: - trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, .Script + trainer POKEFANM, JOSHUA, EVENT_BEAT_POKEFANM_JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokefanmJoshuaAfterBattleText waitbutton @@ -35,10 +33,10 @@ TrainerPokefanmJoshua: end TrainerBirdKeeperPerry: - trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, BirdKeeperPerrySeenText, BirdKeeperPerryBeatenText, 0, .Script + trainer BIRD_KEEPER, PERRY, EVENT_BEAT_BIRD_KEEPER_PERRY, BirdKeeperPerrySeenText, BirdKeeperPerryBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperPerryAfterBattleText waitbutton @@ -46,10 +44,10 @@ TrainerBirdKeeperPerry: end TrainerBirdKeeperBret: - trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, BirdKeeperBretSeenText, BirdKeeperBretBeatenText, 0, .Script + trainer BIRD_KEEPER, BRET, EVENT_BEAT_BIRD_KEEPER_BRET, BirdKeeperBretSeenText, BirdKeeperBretBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperBretAfterBattleText waitbutton @@ -57,10 +55,10 @@ TrainerBirdKeeperBret: end TrainerHikerKenny: - trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, .Script + trainer HIKER, KENNY, EVENT_BEAT_HIKER_KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerKennyAfterBattleText waitbutton @@ -77,7 +75,7 @@ Route13DirectionsSign: jumptext Route13DirectionsSignText Route13HiddenCalcium: - hiddenitem EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM + hiddenitem CALCIUM, EVENT_ROUTE_13_HIDDEN_CALCIUM PokefanmAlexSeenText: text "Bow down before my" @@ -192,26 +190,21 @@ Route13DirectionsSignText: done Route13_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 0 + db 0 ; warp events -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 4 + db 4 ; bg events bg_event 29, 13, BGEVENT_READ, Route13TrainerTips bg_event 41, 11, BGEVENT_READ, Route13Sign bg_event 17, 13, BGEVENT_READ, Route13DirectionsSign bg_event 30, 13, BGEVENT_ITEM, Route13HiddenCalcium -.ObjectEvents: - db 5 - object_event 42, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1 - object_event 43, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1 - object_event 32, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1 + db 5 ; object events + object_event 42, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1 + object_event 43, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1 + object_event 32, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1 object_event 14, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerHikerKenny, -1 - object_event 25, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmAlex, -1 + object_event 25, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmAlex, -1 diff --git a/maps/Route14.asm b/maps/Route14.asm index 3f5a58357..939cbfd20 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -1,29 +1,27 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE14_POKEFAN_M1 const ROUTE14_YOUNGSTER const ROUTE14_POKEFAN_M2 const ROUTE14_KIM Route14_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Kim: faceplayer opentext - trade NPCTRADE_KIM + trade NPC_TRADE_KIM waitbutton closetext end TrainerPokefanmCarter: - trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, .Script + trainer POKEFANM, CARTER, EVENT_BEAT_POKEFANM_CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokefanmCarterAfterBattleText waitbutton @@ -31,10 +29,10 @@ TrainerPokefanmCarter: end TrainerBirdKeeperRoy: - trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, BirdKeeperRoySeenText, BirdKeeperRoyBeatenText, 0, .Script + trainer BIRD_KEEPER, ROY, EVENT_BEAT_BIRD_KEEPER_ROY, BirdKeeperRoySeenText, BirdKeeperRoyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperRoyAfterBattleText waitbutton @@ -42,10 +40,10 @@ TrainerBirdKeeperRoy: end TrainerPokefanmTrevor: - trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, .Script + trainer POKEFANM, TREVOR, EVENT_BEAT_POKEFANM_TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokefanmTrevorAfterBattleText waitbutton @@ -116,21 +114,16 @@ PokefanmTrevorAfterBattleText: done Route14_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 0 + db 0 ; warp events -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 4 + db 4 ; object events object_event 11, 15, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmCarter, -1 object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRoy, -1 - object_event 6, 11, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1 - object_event 7, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 4, Kim, -1 + object_event 6, 11, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1 + object_event 7, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 4, Kim, -1 diff --git a/maps/Route15.asm b/maps/Route15.asm index 58fe79c9b..3364a224b 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE15_YOUNGSTER1 const ROUTE15_YOUNGSTER2 const ROUTE15_YOUNGSTER3 @@ -8,17 +8,15 @@ const_value set 2 const ROUTE15_POKE_BALL Route15_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerTeacherColette: - trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script + trainer TEACHER, COLETTE, EVENT_BEAT_TEACHER_COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext TeacherColetteAfterBattleText waitbutton @@ -26,10 +24,10 @@ TrainerTeacherColette: end TrainerTeacherHillary: - trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, .Script + trainer TEACHER, HILLARY, EVENT_BEAT_TEACHER_HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext TeacherHillaryAfterBattleText waitbutton @@ -37,10 +35,10 @@ TrainerTeacherHillary: end TrainerSchoolboyKipp: - trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, .Script + trainer SCHOOLBOY, KIPP, EVENT_BEAT_SCHOOLBOY_KIP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SchoolboyKippAfterBattleText waitbutton @@ -48,10 +46,10 @@ TrainerSchoolboyKipp: end TrainerSchoolboyTommy: - trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, .Script + trainer SCHOOLBOY, TOMMY, EVENT_BEAT_SCHOOLBOY_TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SchoolboyTommyAfterBattleText waitbutton @@ -59,10 +57,10 @@ TrainerSchoolboyTommy: end TrainerSchoolboyJohnny: - trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, .Script + trainer SCHOOLBOY, JOHNNY, EVENT_BEAT_SCHOOLBOY_JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SchoolboyJohnnyAfterBattleText waitbutton @@ -70,10 +68,10 @@ TrainerSchoolboyJohnny: end TrainerSchoolboyBilly: - trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, .Script + trainer SCHOOLBOY, BILLY, EVENT_BEAT_SCHOOLBOY_BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SchoolboyBillyAfterBattleText waitbutton @@ -202,27 +200,22 @@ Route15SignText: done Route15_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 4, 3, ROUTE_15_FUCHSIA_GATE - warp_def 2, 5, 4, ROUTE_15_FUCHSIA_GATE + db 2 ; warp events + warp_event 2, 4, ROUTE_15_FUCHSIA_GATE, 3 + warp_event 2, 5, ROUTE_15_FUCHSIA_GATE, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 19, 9, BGEVENT_READ, Route15Sign + db 1 ; bg events + bg_event 19, 9, BGEVENT_READ, Route15Sign -.ObjectEvents: - db 7 + db 7 ; object events object_event 10, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1 object_event 15, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyTommy, -1 object_event 33, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJohnny, -1 object_event 27, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1 object_event 30, 12, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerTeacherColette, -1 object_event 20, 10, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherHillary, -1 - object_event 12, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP + object_event 12, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 80966bd2b..002b31348 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE15FUCHSIAGATE_OFFICER Route15FuchsiaGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route15FuchsiaGateOfficerScript: jumptextfaceplayer Route15FuchsiaGateOfficerText @@ -20,22 +18,17 @@ Route15FuchsiaGateOfficerText: done Route15FuchsiaGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 4, 8, FUCHSIA_CITY - warp_def 0, 5, 9, FUCHSIA_CITY - warp_def 9, 4, 1, ROUTE_15 - warp_def 9, 5, 2, ROUTE_15 + db 4 ; warp events + warp_event 0, 4, FUCHSIA_CITY, 8 + warp_event 0, 5, FUCHSIA_CITY, 9 + warp_event 9, 4, ROUTE_15, 1 + warp_event 9, 5, ROUTE_15, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1 + db 1 ; object events + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1 diff --git a/maps/Route16.asm b/maps/Route16.asm index 0e0fb2dc4..327b90a85 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -1,16 +1,14 @@ Route16_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .AlwaysOnBike .AlwaysOnBike: checkcode VAR_YCOORD - if_less_than 5, .CanWalk + ifless 5, .CanWalk checkcode VAR_XCOORD - if_greater_than 13, .CanWalk + ifgreater 13, .CanWalk setflag ENGINE_ALWAYS_ON_BIKE return @@ -29,23 +27,18 @@ CyclingRoadSignText: done Route16_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 3, 1, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE - warp_def 14, 6, 3, ROUTE_16_GATE - warp_def 14, 7, 4, ROUTE_16_GATE - warp_def 9, 6, 1, ROUTE_16_GATE - warp_def 9, 7, 2, ROUTE_16_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 5, 5, BGEVENT_READ, CyclingRoadSign - -.ObjectEvents: - db 0 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 3, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE, 1 + warp_event 14, 6, ROUTE_16_GATE, 3 + warp_event 14, 7, ROUTE_16_GATE, 4 + warp_event 9, 6, ROUTE_16_GATE, 1 + warp_event 9, 7, ROUTE_16_GATE, 2 + + db 0 ; coord events + + db 1 ; bg events + bg_event 5, 5, BGEVENT_READ, CyclingRoadSign + + db 0 ; object events diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 1d709e4ea..53af80d35 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD Route16FuchsiaSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route16FuchsiaSpeechHouseSuperNerdScript: jumptextfaceplayer Route16FuchsiaSpeechHouseSuperNerdText @@ -23,22 +21,17 @@ Route16FuchsiaSpeechHouseSuperNerdText: done Route16FuchsiaSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, ROUTE_16 - warp_def 3, 7, 1, ROUTE_16 + db 2 ; warp events + warp_event 2, 7, ROUTE_16, 1 + warp_event 3, 7, ROUTE_16, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1 + db 1 ; object events + object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index d59425640..0eb121e05 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE16GATE_OFFICER Route16Gate_MapScripts: -.SceneScripts: - db 1 - scene_script .DummyScene + db 1 ; scene scripts + scene_script .DummyScene ; SCENE_DEFAULT -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -22,7 +20,7 @@ UnknownScript_0x733ed: UnknownScript_0x733f3: showemote EMOTE_SHOCK, ROUTE16GATE_OFFICER, 15 - spriteface PLAYER, UP + objectface PLAYER, UP opentext writetext UnknownText_0x73496 waitbutton @@ -61,24 +59,19 @@ UnknownText_0x73496: done Route16Gate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 0, 4, 4, ROUTE_16 - warp_def 0, 5, 5, ROUTE_16 - warp_def 9, 4, 2, ROUTE_16 - warp_def 9, 5, 3, ROUTE_16 - -.CoordEvents: - db 2 - coord_event 5, 4, 0, UnknownScript_0x733ed - coord_event 5, 5, 0, UnknownScript_0x733ed - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 0, 4, ROUTE_16, 4 + warp_event 0, 5, ROUTE_16, 5 + warp_event 9, 4, ROUTE_16, 2 + warp_event 9, 5, ROUTE_16, 3 + + db 2 ; coord events + coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x733ed + coord_event 5, 5, SCENE_DEFAULT, UnknownScript_0x733ed + + db 0 ; bg events + + db 1 ; object events + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1 diff --git a/maps/Route17.asm b/maps/Route17.asm index b2c1a820d..a913835e0 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE17_BIKER1 const ROUTE17_BIKER2 const ROUTE17_BIKER3 const ROUTE17_BIKER4 Route17_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .AlwaysOnBike .AlwaysOnBike: @@ -18,10 +16,10 @@ Route17_MapScripts: return TrainerBikerCharles: - trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script + trainer BIKER, CHARLES, EVENT_BEAT_BIKER_CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BikerCharlesAfterBattleText waitbutton @@ -29,10 +27,10 @@ TrainerBikerCharles: end TrainerBikerRiley: - trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, .Script + trainer BIKER, RILEY, EVENT_BEAT_BIKER_RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BikerRileyAfterBattleText waitbutton @@ -40,10 +38,10 @@ TrainerBikerRiley: end TrainerBikerJoel: - trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, .Script + trainer BIKER, JOEL, EVENT_BEAT_BIKER_JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BikerJoelAfterBattleText waitbutton @@ -51,10 +49,10 @@ TrainerBikerJoel: end TrainerBikerGlenn: - trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, .Script + trainer BIKER, GLENN, EVENT_BEAT_BIKER_GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BikerGlennAfterBattleText waitbutton @@ -62,10 +60,10 @@ TrainerBikerGlenn: end Route17HiddenMaxEther: - hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem MAX_ETHER, EVENT_ROUTE_17_HIDDEN_MAX_ETHER Route17HiddenMaxElixer: - hiddenitem EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER + hiddenitem MAX_ELIXER, EVENT_ROUTE_17_HIDDEN_MAX_ELIXER BikerRileySeenText: text "Hey, you! You're" @@ -133,25 +131,20 @@ BikerCharlesAfterBattleText: done Route17_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 17, 82, 1, ROUTE_17_ROUTE_18_GATE - warp_def 17, 83, 2, ROUTE_17_ROUTE_18_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 9, 54, BGEVENT_ITEM, Route17HiddenMaxEther - bg_event 8, 77, BGEVENT_ITEM, Route17HiddenMaxElixer - -.ObjectEvents: - db 4 - object_event 4, 17, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1 - object_event 9, 68, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1 - object_event 3, 53, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1 - object_event 6, 80, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerCharles, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 17, 82, ROUTE_17_ROUTE_18_GATE, 1 + warp_event 17, 83, ROUTE_17_ROUTE_18_GATE, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 9, 54, BGEVENT_ITEM, Route17HiddenMaxEther + bg_event 8, 77, BGEVENT_ITEM, Route17HiddenMaxElixer + + db 4 ; object events + object_event 4, 17, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1 + object_event 9, 68, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1 + object_event 3, 53, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1 + object_event 6, 80, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerCharles, -1 diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm index 367a2634b..dcf24da14 100644 --- a/maps/Route17Route18Gate.asm +++ b/maps/Route17Route18Gate.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE17ROUTE18GATE_OFFICER Route17Route18Gate_MapScripts: -.SceneScripts: - db 1 - scene_script .DummyScene + db 1 ; scene scripts + scene_script .DummyScene ; SCENE_DEFAULT -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -22,7 +20,7 @@ UnknownScript_0x73611: UnknownScript_0x73617: showemote EMOTE_SHOCK, ROUTE17ROUTE18GATE_OFFICER, 15 - spriteface PLAYER, UP + objectface PLAYER, UP opentext writetext UnknownText_0x7364d waitbutton @@ -52,24 +50,19 @@ UnknownText_0x7364d: done Route17Route18Gate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 0, 4, 1, ROUTE_17 - warp_def 0, 5, 2, ROUTE_17 - warp_def 9, 4, 1, ROUTE_18 - warp_def 9, 5, 2, ROUTE_18 - -.CoordEvents: - db 2 - coord_event 5, 4, 0, UnknownScript_0x73611 - coord_event 5, 5, 0, UnknownScript_0x73611 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route17Route18GateOfficerScript, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 0, 4, ROUTE_17, 1 + warp_event 0, 5, ROUTE_17, 2 + warp_event 9, 4, ROUTE_18, 1 + warp_event 9, 5, ROUTE_18, 2 + + db 2 ; coord events + coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x73611 + coord_event 5, 5, SCENE_DEFAULT, UnknownScript_0x73611 + + db 0 ; bg events + + db 1 ; object events + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route17Route18GateOfficerScript, -1 diff --git a/maps/Route18.asm b/maps/Route18.asm index 8cff37f09..23d6cb4ed 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -1,19 +1,17 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE18_YOUNGSTER1 const ROUTE18_YOUNGSTER2 Route18_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperBoris: - trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script + trainer BIRD_KEEPER, BORIS, EVENT_BEAT_BIRD_KEEPER_BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperBorisAfterBattleText waitbutton @@ -21,10 +19,10 @@ TrainerBirdKeeperBoris: end TrainerBirdKeeperBob: - trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, BirdKeeperBobSeenText, BirdKeeperBobBeatenText, 0, .Script + trainer BIRD_KEEPER, BOB, EVENT_BEAT_BIRD_KEEPER_BOB, BirdKeeperBobSeenText, BirdKeeperBobBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperBobAfterBattleText waitbutton @@ -78,22 +76,17 @@ Route18SignText: done Route18_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 6, 3, ROUTE_17_ROUTE_18_GATE - warp_def 2, 7, 4, ROUTE_17_ROUTE_18_GATE + db 2 ; warp events + warp_event 2, 6, ROUTE_17_ROUTE_18_GATE, 3 + warp_event 2, 7, ROUTE_17_ROUTE_18_GATE, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 9, 5, BGEVENT_READ, Route18Sign + db 1 ; bg events + bg_event 9, 5, BGEVENT_READ, Route18Sign -.ObjectEvents: - db 2 - object_event 9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1 - object_event 13, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1 + db 2 ; object events + object_event 9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1 + object_event 13, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1 diff --git a/maps/Route19.asm b/maps/Route19.asm index 8767a8b3b..a032c5e69 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE19_SWIMMER_GIRL const ROUTE19_SWIMMER_GUY1 const ROUTE19_SWIMMER_GUY2 @@ -7,11 +7,9 @@ const_value set 2 const ROUTE19_FISHER2 Route19_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .ClearRocks .ClearRocks: @@ -27,10 +25,10 @@ Route19_MapScripts: return TrainerSwimmerfDawn: - trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script + trainer SWIMMERF, DAWN, EVENT_BEAT_SWIMMERF_DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfDawnAfterBattleText waitbutton @@ -38,10 +36,10 @@ TrainerSwimmerfDawn: end TrainerSwimmermHarold: - trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, .Script + trainer SWIMMERM, HAROLD, EVENT_BEAT_SWIMMERM_HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermHaroldAfterBattleText waitbutton @@ -49,10 +47,10 @@ TrainerSwimmermHarold: end TrainerSwimmermJerome: - trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, .Script + trainer SWIMMERM, JEROME, EVENT_BEAT_SWIMMERM_JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermJeromeAfterBattleText waitbutton @@ -60,10 +58,10 @@ TrainerSwimmermJerome: end TrainerSwimmermTucker: - trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, .Script + trainer SWIMMERM, TUCKER, EVENT_BEAT_SWIMMERM_TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermTuckerAfterBattleText waitbutton @@ -235,26 +233,21 @@ CarefulSwimmingSignText: done Route19_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 7, 3, 3, ROUTE_19_FUCHSIA_GATE + db 1 ; warp events + warp_event 7, 3, ROUTE_19_FUCHSIA_GATE, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 11, 13, BGEVENT_READ, Route19Sign - bg_event 11, 1, BGEVENT_READ, CarefulSwimmingSign + bg_event 11, 1, BGEVENT_READ, CarefulSwimmingSign -.ObjectEvents: - db 6 - object_event 9, 23, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1 + db 6 ; object events + object_event 9, 23, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1 object_event 13, 28, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermHarold, -1 object_event 11, 17, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermJerome, -1 - object_event 8, 23, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerSwimmermTucker, -1 - object_event 9, 5, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1 - object_event 11, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1 + object_event 8, 23, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerSwimmermTucker, -1 + object_event 9, 5, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1 + object_event 11, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 4446de2e3..b8f3d02e0 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE19FUCHSIAGATE_OFFICER Route19FuchsiaGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks OfficerScript_0x1ab3f6: faceplayer @@ -46,22 +44,17 @@ UnknownText_0x1ab48a: done Route19FuchsiaGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 10, FUCHSIA_CITY - warp_def 5, 0, 11, FUCHSIA_CITY - warp_def 4, 7, 1, ROUTE_19 - warp_def 5, 7, 1, ROUTE_19 + db 4 ; warp events + warp_event 4, 0, FUCHSIA_CITY, 10 + warp_event 5, 0, FUCHSIA_CITY, 11 + warp_event 4, 7, ROUTE_19, 1 + warp_event 5, 7, ROUTE_19, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1 + db 1 ; object events + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1 diff --git a/maps/Route2.asm b/maps/Route2.asm index 09b885df3..36de9dc5f 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE2_BUG_CATCHER1 const ROUTE2_BUG_CATCHER2 const ROUTE2_BUG_CATCHER3 @@ -9,17 +9,15 @@ const_value set 2 const ROUTE2_FRUIT_TREE Route2_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBugCatcherRob: - trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script + trainer BUG_CATCHER, ROB, EVENT_BEAT_BUG_CATCHER_ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BugCatcherRobAfterBattleText waitbutton @@ -27,10 +25,10 @@ TrainerBugCatcherRob: end TrainerBugCatcherEd: - trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, BugCatcherEdSeenText, BugCatcherEdBeatenText, 0, .Script + trainer BUG_CATCHER, ED, EVENT_BEAT_BUG_CATCHER_ED, BugCatcherEdSeenText, BugCatcherEdBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BugCatcherEdAfterBattleText waitbutton @@ -38,10 +36,10 @@ TrainerBugCatcherEd: end TrainerBugCatcherDoug: - trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, BugCatcherDougSeenText, BugCatcherDougBeatenText, 0, .Script + trainer BUG_CATCHER, DOUG, EVENT_BEAT_BUG_CATCHER_DOUG, BugCatcherDougSeenText, BugCatcherDougBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BugCatcherDougAfterBattleText waitbutton @@ -70,16 +68,16 @@ FruitTreeScript_0x1ac306: fruittree FRUITTREE_ROUTE_2 Route2HiddenMaxEther: - hiddenitem EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem MAX_ETHER, EVENT_ROUTE_2_HIDDEN_MAX_ETHER Route2HiddenFullHeal: - hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_ROUTE_2_HIDDEN_FULL_HEAL Route2HiddenFullRestore: - hiddenitem EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_ROUTE_2_HIDDEN_FULL_RESTORE Route2HiddenRevive: - hiddenitem EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_ROUTE_2_HIDDEN_REVIVE BugCatcherRobSeenText: text "My bug #MON are" @@ -147,36 +145,31 @@ UnknownText_0x1ac49f: done Route2_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 15, 15, 1, ROUTE_2_NUGGET_SPEECH_HOUSE - warp_def 15, 31, 3, ROUTE_2_GATE - warp_def 16, 27, 1, ROUTE_2_GATE - warp_def 17, 27, 2, ROUTE_2_GATE - warp_def 12, 7, 3, DIGLETTS_CAVE - -.CoordEvents: - db 0 - -.BGEvents: - db 6 - bg_event 7, 51, BGEVENT_READ, Route2Sign - bg_event 11, 9, BGEVENT_READ, MapRoute2Signpost1Script - bg_event 7, 23, BGEVENT_ITEM, Route2HiddenMaxEther - bg_event 4, 14, BGEVENT_ITEM, Route2HiddenFullHeal - bg_event 4, 27, BGEVENT_ITEM, Route2HiddenFullRestore + db 0, 0 ; filler + + db 5 ; warp events + warp_event 15, 15, ROUTE_2_NUGGET_HOUSE, 1 + warp_event 15, 31, ROUTE_2_GATE, 3 + warp_event 16, 27, ROUTE_2_GATE, 1 + warp_event 17, 27, ROUTE_2_GATE, 2 + warp_event 12, 7, DIGLETTS_CAVE, 3 + + db 0 ; coord events + + db 6 ; bg events + bg_event 7, 51, BGEVENT_READ, Route2Sign + bg_event 11, 9, BGEVENT_READ, MapRoute2Signpost1Script + bg_event 7, 23, BGEVENT_ITEM, Route2HiddenMaxEther + bg_event 4, 14, BGEVENT_ITEM, Route2HiddenFullHeal + bg_event 4, 27, BGEVENT_ITEM, Route2HiddenFullRestore bg_event 11, 30, BGEVENT_ITEM, Route2HiddenRevive -.ObjectEvents: - db 8 + db 8 ; object events object_event 10, 45, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1 - object_event 6, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1 - object_event 0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1 - object_event 0, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT - object_event 2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION - object_event 19, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS - object_event 14, 50, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER - object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1 + object_event 6, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1 + object_event 0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1 + object_event 0, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT + object_event 2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION + object_event 19, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS + object_event 14, 50, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER + object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1 diff --git a/maps/Route20.asm b/maps/Route20.asm index e7a776b2b..8339bb5d0 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE20_SWIMMER_GIRL1 const ROUTE20_SWIMMER_GIRL2 const ROUTE20_SWIMMER_GUY Route20_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .ClearRocks .ClearRocks: @@ -16,10 +14,10 @@ Route20_MapScripts: return TrainerSwimmerfNicole: - trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script + trainer SWIMMERF, NICOLE, EVENT_BEAT_SWIMMERF_NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfNicoleAfterBattleText waitbutton @@ -27,10 +25,10 @@ TrainerSwimmerfNicole: end TrainerSwimmerfLori: - trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, .Script + trainer SWIMMERF, LORI, EVENT_BEAT_SWIMMERF_LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfLoriAfterBattleText waitbutton @@ -38,10 +36,10 @@ TrainerSwimmerfLori: end TrainerSwimmermCameron: - trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, .Script + trainer SWIMMERM, CAMERON, EVENT_BEAT_SWIMMERM_CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermCameronAfterBattleText waitbutton @@ -113,22 +111,17 @@ CinnabarGymSignText: done Route20_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 38, 7, 1, SEAFOAM_GYM + db 1 ; warp events + warp_event 38, 7, SEAFOAM_GYM, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 37, 11, BGEVENT_READ, CinnabarGymSign -.ObjectEvents: - db 3 - object_event 52, 8, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1 + db 3 ; object events + object_event 52, 8, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1 object_event 45, 13, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfLori, -1 object_event 12, 13, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCameron, -1 diff --git a/maps/Route21.asm b/maps/Route21.asm index e6b4eb564..68c15c526 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -1,20 +1,18 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE21_SWIMMER_GIRL const ROUTE21_SWIMMER_GUY const ROUTE21_FISHER Route21_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerSwimmermSeth: - trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script + trainer SWIMMERM, SETH, EVENT_BEAT_SWIMMERM_SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermSethAfterBattleText waitbutton @@ -22,10 +20,10 @@ TrainerSwimmermSeth: end TrainerSwimmerfNikki: - trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, .Script + trainer SWIMMERF, NIKKI, EVENT_BEAT_SWIMMERF_NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfNikkiAfterBattleText waitbutton @@ -33,10 +31,10 @@ TrainerSwimmerfNikki: end TrainerFisherArnold: - trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, .Script + trainer FISHER, ARNOLD, EVENT_BEAT_FISHER_ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FisherArnoldAfterBattleText waitbutton @@ -90,20 +88,15 @@ FisherArnoldAfterBattleText: done Route21_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 0 + db 0 ; warp events -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 + db 3 ; object events object_event 11, 16, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1 - object_event 2, 30, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1 + object_event 2, 30, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1 object_event 14, 22, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherArnold, -1 diff --git a/maps/Route22.asm b/maps/Route22.asm index c9d520cb1..8402f5e4c 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -1,9 +1,7 @@ Route22_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VictoryRoadEntranceSign: jumptext VictoryRoadEntranceSignText @@ -16,19 +14,14 @@ VictoryRoadEntranceSignText: done Route22_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 13, 5, 1, VICTORY_ROAD_GATE + db 1 ; warp events + warp_event 13, 5, VICTORY_ROAD_GATE, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 15, 7, BGEVENT_READ, VictoryRoadEntranceSign + db 1 ; bg events + bg_event 15, 7, BGEVENT_READ, VictoryRoadEntranceSign -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Route23.asm b/maps/Route23.asm index 99c527303..86e5935f3 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -1,9 +1,7 @@ Route23_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -23,22 +21,17 @@ IndigoPlateauSignText: done Route23_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 9, 5, 1, INDIGO_PLATEAU_POKECENTER_1F - warp_def 10, 5, 2, INDIGO_PLATEAU_POKECENTER_1F - warp_def 9, 13, 10, VICTORY_ROAD - warp_def 10, 13, 10, VICTORY_ROAD + db 4 ; warp events + warp_event 9, 5, INDIGO_PLATEAU_POKECENTER_1F, 1 + warp_event 10, 5, INDIGO_PLATEAU_POKECENTER_1F, 2 + warp_event 9, 13, VICTORY_ROAD, 10 + warp_event 10, 13, VICTORY_ROAD, 10 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 11, 7, BGEVENT_READ, IndigoPlateauSign + db 1 ; bg events + bg_event 11, 7, BGEVENT_READ, IndigoPlateauSign -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Route24.asm b/maps/Route24.asm index afb4a514e..042353bb6 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE24_ROCKET Route24_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RocketScript_0x1adbfa: faceplayer @@ -24,15 +22,15 @@ RocketScript_0x1adbfa: opentext writetext UnknownText_0x1addc0 buttonsound - special Special_FadeOutMusic + special FadeOutMusic writetext UnknownText_0x1adee1 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear ROUTE24_ROCKET pause 25 - special Special_FadeInQuickly + special FadeInQuickly playmapmusic end @@ -119,18 +117,13 @@ UnknownText_0x1adee1: done Route24_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 0 + db 0 ; warp events -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 8, 7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET + db 1 ; object events + object_event 8, 7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET diff --git a/maps/Route25.asm b/maps/Route25.asm index 1183600c9..62e247756 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE25_MISTY const ROUTE25_COOLTRAINER_M1 const ROUTE25_YOUNGSTER1 @@ -12,13 +12,11 @@ const_value set 2 const ROUTE25_POKE_BALL Route25_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_ROUTE25_NOTHING + scene_script .DummyScene1 ; SCENE_ROUTE25_MISTYS_DATE -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -30,25 +28,25 @@ Route25MistyDate1Script: showemote EMOTE_HEART, ROUTE25_MISTY, 15 pause 30 showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10 - spriteface ROUTE25_MISTY, DOWN + objectface ROUTE25_MISTY, DOWN applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efe8 disappear ROUTE25_COOLTRAINER_M1 pause 15 playmusic MUSIC_BEAUTY_ENCOUNTER - spriteface ROUTE25_MISTY, UP + objectface ROUTE25_MISTY, UP pause 10 applymovement ROUTE25_MISTY, MovementData_0x19efed opentext writetext Route25MistyDateText waitbutton closetext - spriteface PLAYER, DOWN + objectface PLAYER, DOWN applymovement ROUTE25_MISTY, MovementData_0x19effa - spriteface PLAYER, LEFT + objectface PLAYER, LEFT applymovement ROUTE25_MISTY, MovementData_0x19f000 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM - setscene 0 + setscene SCENE_ROUTE25_NOTHING special RestartMapMusic end @@ -56,33 +54,33 @@ Route25MistyDate2Script: showemote EMOTE_HEART, ROUTE25_MISTY, 15 pause 30 showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10 - spriteface ROUTE25_MISTY, DOWN + objectface ROUTE25_MISTY, DOWN applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efea disappear ROUTE25_COOLTRAINER_M1 pause 15 playmusic MUSIC_BEAUTY_ENCOUNTER - spriteface ROUTE25_MISTY, UP + objectface ROUTE25_MISTY, UP pause 10 applymovement ROUTE25_MISTY, MovementData_0x19eff4 opentext writetext Route25MistyDateText waitbutton closetext - spriteface PLAYER, UP + objectface PLAYER, UP applymovement ROUTE25_MISTY, MovementData_0x19effd - spriteface PLAYER, LEFT + objectface PLAYER, LEFT applymovement ROUTE25_MISTY, MovementData_0x19f000 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM - setscene 0 + setscene SCENE_ROUTE25_NOTHING special RestartMapMusic end TrainerSchoolboyDudley: - trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script + trainer SCHOOLBOY, DUDLEY, EVENT_BEAT_SCHOOLBOY_DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SchoolboyDudleyAfterBattleText waitbutton @@ -90,10 +88,10 @@ TrainerSchoolboyDudley: end TrainerLassEllen: - trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script + trainer LASS, ELLEN, EVENT_BEAT_LASS_ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext LassEllenAfterBattleText waitbutton @@ -101,10 +99,10 @@ TrainerLassEllen: end TrainerSchoolboyJoe: - trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script + trainer SCHOOLBOY, JOE, EVENT_BEAT_SCHOOLBOY_JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SchoolboyJoeAfterBattleText waitbutton @@ -112,10 +110,10 @@ TrainerSchoolboyJoe: end TrainerLassLaura: - trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script + trainer LASS, LAURA, EVENT_BEAT_LASS_LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext LassLauraAfterBattleText waitbutton @@ -123,10 +121,10 @@ TrainerLassLaura: end TrainerCamperLloyd: - trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script + trainer CAMPER, LLOYD, EVENT_BEAT_CAMPER_LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CamperLloydAfterBattleText waitbutton @@ -134,10 +132,10 @@ TrainerCamperLloyd: end TrainerLassShannon: - trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script + trainer LASS, SHANNON, EVENT_BEAT_LASS_SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext LassShannonAfterBattleText waitbutton @@ -145,10 +143,10 @@ TrainerLassShannon: end TrainerSupernerdPat: - trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script + trainer SUPER_NERD, PAT, EVENT_BEAT_SUPER_NERD_PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SupernerdPatAfterBattleText waitbutton @@ -191,7 +189,7 @@ Route25Protein: itemball PROTEIN Route25HiddenPotion: - hiddenitem EVENT_ROUTE_25_HIDDEN_POTION, POTION + hiddenitem POTION, EVENT_ROUTE_25_HIDDEN_POTION MovementData_0x19efe8: big_step DOWN @@ -430,33 +428,28 @@ BillsHouseSignText: done Route25_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def 47, 5, 1, BILLS_HOUSE - -.CoordEvents: - db 2 - coord_event 42, 6, 1, Route25MistyDate1Script - coord_event 42, 7, 1, Route25MistyDate2Script - -.BGEvents: - db 2 - bg_event 45, 5, BGEVENT_READ, BillsHouseSign - bg_event 4, 5, BGEVENT_ITEM, Route25HiddenPotion - -.ObjectEvents: - db 11 - object_event 46, 9, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND + db 0, 0 ; filler + + db 1 ; warp events + warp_event 47, 5, BILLS_HOUSE, 1 + + db 2 ; coord events + coord_event 42, 6, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate1Script + coord_event 42, 7, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate2Script + + db 2 ; bg events + bg_event 45, 5, BGEVENT_READ, BillsHouseSign + bg_event 4, 5, BGEVENT_ITEM, Route25HiddenPotion + + db 11 ; object events + object_event 46, 9, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND object_event 46, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND - object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1 + object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1 object_event 16, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassEllen, -1 - object_event 21, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1 - object_event 22, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassLaura, -1 - object_event 25, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1 + object_event 21, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1 + object_event 22, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassLaura, -1 + object_event 25, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1 object_event 28, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassShannon, -1 - object_event 31, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1 - object_event 37, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerCooltrainermKevin, -1 - object_event 32, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN + object_event 31, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1 + object_event 37, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerCooltrainermKevin, -1 + object_event 32, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN diff --git a/maps/Route26.asm b/maps/Route26.asm index 25b04283b..9e298d597 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE26_COOLTRAINER_M1 const ROUTE26_COOLTRAINER_M2 const ROUTE26_COOLTRAINER_F1 @@ -9,17 +9,15 @@ const_value set 2 const ROUTE26_POKE_BALL Route26_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerCooltrainermJake: - trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script + trainer COOLTRAINERM, JAKE, EVENT_BEAT_COOLTRAINERM_JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainermJakeAfterBattleText waitbutton @@ -27,11 +25,11 @@ TrainerCooltrainermJake: end TrainerCooltrainermGaven3: - trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, .Script + trainer COOLTRAINERM, GAVEN3, EVENT_BEAT_COOLTRAINERM_GAVEN, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_GAVEN iftrue .WantsBattle @@ -49,8 +47,8 @@ TrainerCooltrainermGaven3: scall .AskNumber2 .AskForNumber: askforphonenumber PHONE_COOLTRAINERM_GAVEN - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -59,9 +57,9 @@ TrainerCooltrainermGaven3: scall .Rematch winlosstext CooltrainermGaven3BeatenText, 0 copybytetovar wGavenFightCount - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight2: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight2 @@ -120,10 +118,10 @@ TrainerCooltrainermGaven3: end TrainerCooltrainerfJoyce: - trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, .Script + trainer COOLTRAINERF, JOYCE, EVENT_BEAT_COOLTRAINERF_JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainerfJoyceAfterBattleText waitbutton @@ -131,11 +129,11 @@ TrainerCooltrainerfJoyce: end TrainerCooltrainerfBeth1: - trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, .Script + trainer COOLTRAINERF, BETH1, EVENT_BEAT_COOLTRAINERF_BETH, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_BETH iftrue .WantsBattle @@ -153,8 +151,8 @@ TrainerCooltrainerfBeth1: scall .AskNumber2 .AskForNumber: askforphonenumber PHONE_COOLTRAINERF_BETH - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -163,9 +161,9 @@ TrainerCooltrainerfBeth1: scall .Rematch winlosstext CooltrainerfBeth1BeatenText, 0 copybytetovar wBethFightCount - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight2: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight2 @@ -224,10 +222,10 @@ TrainerCooltrainerfBeth1: end TrainerPsychicRichard: - trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, .Script + trainer PSYCHIC_T, RICHARD, EVENT_BEAT_PSYCHIC_RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PsychicRichardAfterBattleText waitbutton @@ -235,10 +233,10 @@ TrainerPsychicRichard: end TrainerFisherScott: - trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, .Script + trainer FISHER, SCOTT, EVENT_BEAT_FISHER_SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FisherScottAfterBattleText waitbutton @@ -413,29 +411,24 @@ Route26SignText: done Route26_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 7, 5, 3, VICTORY_ROAD_GATE - warp_def 15, 57, 1, ROUTE_26_HEAL_SPEECH_HOUSE - warp_def 5, 71, 1, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE + db 3 ; warp events + warp_event 7, 5, VICTORY_ROAD_GATE, 3 + warp_event 15, 57, ROUTE_26_HEAL_HOUSE, 1 + warp_event 5, 71, DAY_OF_WEEK_SIBLINGS_HOUSE, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 8, 6, BGEVENT_READ, Route26Sign + db 1 ; bg events + bg_event 8, 6, BGEVENT_READ, Route26Sign -.ObjectEvents: - db 8 + db 8 ; object events object_event 14, 24, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermJake, -1 - object_event 9, 38, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1 + object_event 9, 38, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1 object_event 10, 56, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1 - object_event 5, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1 + object_event 5, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1 object_event 13, 79, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicRichard, -1 object_event 10, 92, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherScott, -1 - object_event 14, 54, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1 - object_event 9, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER + object_event 14, 54, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1 + object_event 9, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm new file mode 100644 index 000000000..536154500 --- /dev/null +++ b/maps/Route26HealHouse.asm @@ -0,0 +1,63 @@ + const_def 2 ; object constants + const ROUTE26HEALHOUSE_TEACHER + +Route26HealHouse_MapScripts: + db 0 ; scene scripts + + db 0 ; callbacks + +TeacherScript_0x7b125: + faceplayer + opentext + writetext UnknownText_0x7b14d + waitbutton + closetext + special FadeBlackQuickly + special ReloadSpritesNoPalettes + special StubbedTrainerRankings_Healings + playmusic MUSIC_HEAL + special HealParty + pause 60 + special FadeInQuickly + special RestartMapMusic + opentext + writetext UnknownText_0x7b18b + waitbutton + closetext + end + +Route26HealHouseBookshelf: + jumpstd picturebookshelf + +UnknownText_0x7b14d: + text "Your #MON look" + line "a little tired." + + para "You should rest" + line "them a while." + done + +UnknownText_0x7b18b: + text "There!" + + para "Your #MON are" + line "looking good!" + + para "Keep at it!" + done + +Route26HealHouse_MapEvents: + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, ROUTE_26, 2 + warp_event 3, 7, ROUTE_26, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, Route26HealHouseBookshelf + bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf + + db 1 ; object events + object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1 diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm deleted file mode 100644 index d1759dc9d..000000000 --- a/maps/Route26HealSpeechHouse.asm +++ /dev/null @@ -1,70 +0,0 @@ -const_value set 2 - const ROUTE26HEALSPEECHHOUSE_TEACHER - -Route26HealSpeechHouse_MapScripts: -.SceneScripts: - db 0 - -.MapCallbacks: - db 0 - -TeacherScript_0x7b125: - faceplayer - opentext - writetext UnknownText_0x7b14d - waitbutton - closetext - special Special_FadeBlackQuickly - special ReloadSpritesNoPalettes - special Special_StubbedTrainerRankings_Healings - playmusic MUSIC_HEAL - special HealParty - pause 60 - special Special_FadeInQuickly - special RestartMapMusic - opentext - writetext UnknownText_0x7b18b - waitbutton - closetext - end - -Route26HealHouseBookshelf: - jumpstd picturebookshelf - -UnknownText_0x7b14d: - text "Your #MON look" - line "a little tired." - - para "You should rest" - line "them a while." - done - -UnknownText_0x7b18b: - text "There!" - - para "Your #MON are" - line "looking good!" - - para "Keep at it!" - done - -Route26HealSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 2, ROUTE_26 - warp_def 3, 7, 2, ROUTE_26 - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, Route26HealHouseBookshelf - bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf - -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1 diff --git a/maps/Route27.asm b/maps/Route27.asm index 7df5d61a6..f19acf508 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE27_COOLTRAINER_M1 const ROUTE27_COOLTRAINER_M2 const ROUTE27_COOLTRAINER_F1 @@ -10,13 +10,11 @@ const_value set 2 const ROUTE27_FISHER Route27_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -25,34 +23,34 @@ Route27_MapScripts: end UnknownScript_0x1a0873: - spriteface ROUTE27_FISHER, LEFT + objectface ROUTE27_FISHER, LEFT showemote EMOTE_SHOCK, ROUTE27_FISHER, 15 applymovement ROUTE27_FISHER, MovementData_0x1a0a66 jump UnknownScript_0x1a088c UnknownScript_0x1a0881: - spriteface ROUTE27_FISHER, LEFT + objectface ROUTE27_FISHER, LEFT showemote EMOTE_SHOCK, ROUTE27_FISHER, 15 applymovement ROUTE27_FISHER, MovementData_0x1a0a69 UnknownScript_0x1a088c: - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT opentext writetext Route27FisherHeyText buttonsound writetext Route27FisherText waitbutton closetext - setscene 1 + setscene SCENE_FINISHED end Route27FisherScript: jumptextfaceplayer Route27FisherText TrainerPsychicGilbert: - trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, .Script + trainer PSYCHIC_T, GILBERT, EVENT_BEAT_PSYCHIC_GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PsychicGilbertAfterBattleText waitbutton @@ -60,11 +58,11 @@ TrainerPsychicGilbert: end TrainerBirdKeeperJose2: - trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, BirdKeeperJose2SeenText, BirdKeeperJose2BeatenText, 0, .Script + trainer BIRD_KEEPER, JOSE2, EVENT_BEAT_BIRD_KEEPER_JOSE2, BirdKeeperJose2SeenText, BirdKeeperJose2BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_JOSE iftrue .WantsBattle @@ -84,8 +82,8 @@ TrainerBirdKeeperJose2: scall .AskNumber2 .AskForNumber: askforphonenumber PHONE_BIRDKEEPER_JOSE - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext BIRD_KEEPER, JOSE2, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -94,9 +92,9 @@ TrainerBirdKeeperJose2: scall .Rematch winlosstext BirdKeeperJose2BeatenText, 0 copybytetovar wJoseFightCount - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight2: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight2 @@ -173,10 +171,10 @@ TrainerBirdKeeperJose2: end TrainerCooltrainermBlake: - trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, .Script + trainer COOLTRAINERM, BLAKE, EVENT_BEAT_COOLTRAINERM_BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainermBlakeAfterBattleText waitbutton @@ -184,10 +182,10 @@ TrainerCooltrainermBlake: end TrainerCooltrainermBrian: - trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, .Script + trainer COOLTRAINERM, BRIAN, EVENT_BEAT_COOLTRAINERM_BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainermBrianAfterBattleText waitbutton @@ -195,11 +193,11 @@ TrainerCooltrainermBrian: end TrainerCooltrainerfReena: - trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReenaSeenText, CooltrainerfReenaBeatenText, 0, .Script + trainer COOLTRAINERF, REENA1, EVENT_BEAT_COOLTRAINERF_REENA, CooltrainerfReenaSeenText, CooltrainerfReenaBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_REENA iftrue .WantsBattle @@ -217,8 +215,8 @@ TrainerCooltrainerfReena: scall .AskNumber2 .AskForNumber: askforphonenumber PHONE_COOLTRAINERF_REENA - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext COOLTRAINERF, REENA1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -227,9 +225,9 @@ TrainerCooltrainerfReena: scall .Rematch winlosstext CooltrainerfReenaBeatenText, 0 copybytetovar wReenaFightCount - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight2: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight2 @@ -288,10 +286,10 @@ TrainerCooltrainerfReena: end TrainerCooltrainerfMegan: - trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, .Script + trainer COOLTRAINERF, MEGAN, EVENT_BEAT_COOLTRAINERF_MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainerfMeganAfterBattleText waitbutton @@ -468,32 +466,27 @@ TohjoFallsSignText: done Route27_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 33, 7, 1, ROUTE_27_SANDSTORM_HOUSE - warp_def 26, 5, 1, TOHJO_FALLS - warp_def 36, 5, 2, TOHJO_FALLS - -.CoordEvents: - db 2 - coord_event 18, 10, 0, UnknownScript_0x1a0873 - coord_event 19, 10, 0, UnknownScript_0x1a0881 - -.BGEvents: - db 1 - bg_event 25, 7, BGEVENT_READ, TohjoFallsSign - -.ObjectEvents: - db 9 - object_event 48, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1 - object_event 58, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 33, 7, ROUTE_27_SANDSTORM_HOUSE, 1 + warp_event 26, 5, TOHJO_FALLS, 1 + warp_event 36, 5, TOHJO_FALLS, 2 + + db 2 ; coord events + coord_event 18, 10, SCENE_DEFAULT, UnknownScript_0x1a0873 + coord_event 19, 10, SCENE_DEFAULT, UnknownScript_0x1a0881 + + db 1 ; bg events + bg_event 25, 7, BGEVENT_READ, TohjoFallsSign + + db 9 ; object events + object_event 48, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1 + object_event 58, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1 object_event 72, 10, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1 - object_event 37, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1 - object_event 65, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicGilbert, -1 + object_event 37, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1 + object_event 65, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicGilbert, -1 object_event 58, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperJose2, -1 - object_event 60, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM - object_event 53, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY + object_event 60, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM + object_event 53, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY object_event 21, 10, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 3, Route27FisherScript, -1 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 629af1536..886e7aa26 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -1,22 +1,20 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE27SANDSTORMHOUSE_GRANNY Route27SandstormHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SandstormHouseWoman: faceplayer opentext checkevent EVENT_GOT_TM37_SANDSTORM iftrue .AlreadyGotItem - special Special_GetFirstPokemonHappiness + special GetFirstPokemonHappiness writetext SandstormHouseWomanText1 buttonsound - if_greater_than 150 - 1, .Loyal + ifgreater 150 - 1, .Loyal jump .Disloyal .Loyal: @@ -94,22 +92,17 @@ SandstormHouseWomanDisloyalText: done Route27SandstormHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, ROUTE_27 - warp_def 3, 7, 1, ROUTE_27 + db 2 ; warp events + warp_event 2, 7, ROUTE_27, 1 + warp_event 3, 7, ROUTE_27, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, SandstormHouseBookshelf - bg_event 1, 1, BGEVENT_READ, SandstormHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, SandstormHouseBookshelf + bg_event 1, 1, BGEVENT_READ, SandstormHouseBookshelf -.ObjectEvents: - db 1 - object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1 + db 1 ; object events + object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1 diff --git a/maps/Route28.asm b/maps/Route28.asm index 0599fd9d9..af41de7c5 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -1,36 +1,29 @@ Route28_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route28Sign: jumptext Route28SignText Route28HiddenRareCandy: - hiddenitem EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_ROUTE_28_HIDDEN_RARE_CANDY Route28SignText: text "ROUTE 28" done Route28_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 7, 3, 1, ROUTE_28_FAMOUS_SPEECH_HOUSE - warp_def 33, 5, 7, VICTORY_ROAD_GATE + db 2 ; warp events + warp_event 7, 3, ROUTE_28_STEEL_WING_HOUSE, 1 + warp_event 33, 5, VICTORY_ROAD_GATE, 7 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 31, 5, BGEVENT_READ, Route28Sign - bg_event 25, 2, BGEVENT_ITEM, Route28HiddenRareCandy + db 2 ; bg events + bg_event 31, 5, BGEVENT_READ, Route28Sign + bg_event 25, 2, BGEVENT_ITEM, Route28HiddenRareCandy -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28SteelWingHouse.asm index 662e7279b..a62f94d52 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28SteelWingHouse.asm @@ -1,14 +1,12 @@ -const_value set 2 - const ROUTE28FAMOUSSPEECHHOUSE_CELEBRITY - const ROUTE28FAMOUSSPEECHHOUSE_FEAROW + const_def 2 ; object constants + const ROUTE28STEELWINGHOUSE_CELEBRITY + const ROUTE28STEELWINGHOUSE_FEAROW -Route28FamousSpeechHouse_MapScripts: -.SceneScripts: - db 1 +Route28SteelWingHouse_MapScripts: + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -70,24 +68,19 @@ CelebritysFearowText: text "FEAROW: Feero!" done -Route28FamousSpeechHouse_MapEvents: - ; filler - db 0, 0 +Route28SteelWingHouse_MapEvents: + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, ROUTE_28 - warp_def 3, 7, 1, ROUTE_28 + db 2 ; warp events + warp_event 2, 7, ROUTE_28, 1 + warp_event 3, 7, ROUTE_28, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, CelebrityHouseBookshelf - bg_event 1, 1, BGEVENT_READ, CelebrityHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, CelebrityHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CelebrityHouseBookshelf -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1 - object_event 6, 5, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1 + db 2 ; object events + object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1 + object_event 6, 5, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1 diff --git a/maps/Route29.asm b/maps/Route29.asm index 6c7239d92..e8fc8878a 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE29_COOLTRAINER_M1 const ROUTE29_YOUNGSTER const ROUTE29_TEACHER1 @@ -9,13 +9,11 @@ const_value set 2 const ROUTE29_POKE_BALL Route29_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_ROUTE29_NOTHING + scene_script .DummyScene1 ; SCENE_ROUTE29_CATCH_TUTORIAL -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .Tuscany .DummyScene0: @@ -34,15 +32,15 @@ Route29_MapScripts: .DoesTuscanyAppear: checkcode VAR_WEEKDAY - if_not_equal TUESDAY, .TuscanyDisappears + ifnotequal TUESDAY, .TuscanyDisappears appear ROUTE29_TUSCANY return Route29Tutorial1: - spriteface ROUTE29_COOLTRAINER_M1, UP + objectface ROUTE29_COOLTRAINER_M1, UP showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15 applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1a - spriteface PLAYER, LEFT + objectface PLAYER, LEFT setevent EVENT_DUDE_TALKED_TO_YOU opentext writetext CatchingTutorialIntroText @@ -54,20 +52,20 @@ Route29Tutorial1: stopfollow loadwildmon RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL - spriteface ROUTE29_COOLTRAINER_M1, UP + objectface ROUTE29_COOLTRAINER_M1, UP opentext writetext CatchingTutorialDebriefText waitbutton closetext - setscene 0 + setscene SCENE_ROUTE29_NOTHING setevent EVENT_LEARNED_TO_CATCH_POKEMON end Route29Tutorial2: - spriteface ROUTE29_COOLTRAINER_M1, UP + objectface ROUTE29_COOLTRAINER_M1, UP showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15 applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2a - spriteface PLAYER, LEFT + objectface PLAYER, LEFT setevent EVENT_DUDE_TALKED_TO_YOU opentext writetext CatchingTutorialIntroText @@ -79,12 +77,12 @@ Route29Tutorial2: stopfollow loadwildmon RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL - spriteface ROUTE29_COOLTRAINER_M1, UP + objectface ROUTE29_COOLTRAINER_M1, UP opentext writetext CatchingTutorialDebriefText waitbutton closetext - setscene 0 + setscene SCENE_ROUTE29_NOTHING setevent EVENT_LEARNED_TO_CATCH_POKEMON end @@ -93,7 +91,7 @@ Script_RefusedTutorial1: waitbutton closetext applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b - setscene 0 + setscene SCENE_ROUTE29_NOTHING end Script_RefusedTutorial2: @@ -101,14 +99,14 @@ Script_RefusedTutorial2: waitbutton closetext applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b - setscene 0 + setscene SCENE_ROUTE29_NOTHING end CatchingTutorialDudeScript: faceplayer opentext checkcode VAR_BOXSPACE - if_equal 0, .BoxFull + ifequal 0, .BoxFull checkevent EVENT_LEARNED_TO_CATCH_POKEMON iftrue .BoxFull checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM @@ -150,9 +148,9 @@ Route29FisherScript: CooltrainerMScript_0x1a1031: faceplayer opentext - checkday + checktime DAY iftrue .day_morn - checknite + checktime NITE iftrue .nite .day_morn writetext Text_WaitingForNight @@ -172,7 +170,7 @@ TuscanyScript: checkevent EVENT_GOT_PINK_BOW_FROM_TUSCANY iftrue TuscanyTuesdayScript checkcode VAR_WEEKDAY - if_not_equal TUESDAY, TuscanyNotTuesdayScript + ifnotequal TUESDAY, TuscanyNotTuesdayScript checkevent EVENT_MET_TUSCANY_OF_TUESDAY iftrue .MetTuscany writetext MeetTuscanyText @@ -416,30 +414,25 @@ Route29Sign2Text: done Route29_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 27, 1, 3, ROUTE_29_ROUTE_46_GATE + db 1 ; warp events + warp_event 27, 1, ROUTE_29_ROUTE_46_GATE, 3 -.CoordEvents: - db 2 - coord_event 53, 8, 1, Route29Tutorial1 - coord_event 53, 9, 1, Route29Tutorial2 + db 2 ; coord events + coord_event 53, 8, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial1 + coord_event 53, 9, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial2 -.BGEvents: - db 2 - bg_event 51, 7, BGEVENT_READ, Route29Sign1 - bg_event 3, 5, BGEVENT_READ, Route29Sign2 + db 2 ; bg events + bg_event 51, 7, BGEVENT_READ, Route29Sign1 + bg_event 3, 5, BGEVENT_READ, Route29Sign2 -.ObjectEvents: - db 8 + db 8 ; object events object_event 50, 12, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1 object_event 27, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29YoungsterScript, -1 object_event 15, 11, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1 - object_event 12, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1 - object_event 25, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route29FisherScript, -1 - object_event 13, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1 + object_event 12, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1 + object_event 25, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route29FisherScript, -1 + object_event 13, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1 object_event 29, 12, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY - object_event 48, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION + object_event 48, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm index f0b69ab5d..f575df1ca 100644 --- a/maps/Route29Route46Gate.asm +++ b/maps/Route29Route46Gate.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE29ROUTE46GATE_OFFICER const ROUTE29ROUTE46GATE_YOUNGSTER Route29Route46Gate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route29Route46GateOfficerScript: jumptextfaceplayer Route29Route46GateOfficerText @@ -37,23 +35,18 @@ Route29Route46GateYoungsterText: done Route29Route46Gate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 4, 0, 1, ROUTE_46 - warp_def 5, 0, 2, ROUTE_46 - warp_def 4, 7, 1, ROUTE_29 - warp_def 5, 7, 1, ROUTE_29 - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29Route46GateOfficerScript, -1 - object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29Route46GateYoungsterScript, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 4, 0, ROUTE_46, 1 + warp_event 5, 0, ROUTE_46, 2 + warp_event 4, 7, ROUTE_29, 1 + warp_event 5, 7, ROUTE_29, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 2 ; object events + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29Route46GateOfficerScript, -1 + object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29Route46GateYoungsterScript, -1 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 60585b267..1b665799f 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE2GATE_SCIENTIST Route2Gate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route2GateScientistScript: jumptextfaceplayer Route2GateScientistText @@ -26,22 +24,17 @@ Route2GateScientistText: done Route2Gate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 3, ROUTE_2 - warp_def 5, 0, 4, ROUTE_2 - warp_def 4, 7, 2, ROUTE_2 - warp_def 5, 7, 2, ROUTE_2 + db 4 ; warp events + warp_event 4, 0, ROUTE_2, 3 + warp_event 5, 0, ROUTE_2, 4 + warp_event 4, 7, ROUTE_2, 2 + warp_event 5, 7, ROUTE_2, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 6, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1 + db 1 ; object events + object_event 6, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetHouse.asm index 231b568ed..a8a560b79 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 - const ROUTE2NUGGETSPEECHHOUSE_FISHER + const_def 2 ; object constants + const ROUTE2NUGGETHOUSE_FISHER -Route2NuggetSpeechHouse_MapScripts: -.SceneScripts: - db 0 +Route2NuggetHouse_MapScripts: + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FisherScript_0x9b847: faceplayer @@ -25,7 +23,7 @@ FisherScript_0x9b847: closetext end -Route2NuggetSpeechHouseBookshelf: +Route2NuggetHouseBookshelf: ; unused jumpstd difficultbookshelf @@ -52,21 +50,16 @@ UnknownText_0x9b8e5: line "have to do!" done -Route2NuggetSpeechHouse_MapEvents: - ; filler - db 0, 0 +Route2NuggetHouse_MapEvents: + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, ROUTE_2 - warp_def 3, 7, 1, ROUTE_2 + db 2 ; warp events + warp_event 2, 7, ROUTE_2, 1 + warp_event 3, 7, ROUTE_2, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1 + db 1 ; object events + object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1 diff --git a/maps/Route3.asm b/maps/Route3.asm index 6ce01aeb1..5390bba97 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -1,21 +1,19 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE3_FISHER1 const ROUTE3_YOUNGSTER1 const ROUTE3_YOUNGSTER2 const ROUTE3_FISHER2 Route3_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerFirebreatherOtis: - trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script + trainer FIREBREATHER, OTIS, EVENT_BEAT_FIREBREATHER_OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FirebreatherOtisAfterBattleText waitbutton @@ -23,10 +21,10 @@ TrainerFirebreatherOtis: end TrainerYoungsterWarren: - trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, .Script + trainer YOUNGSTER, WARREN, EVENT_BEAT_YOUNGSTER_WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext YoungsterWarrenAfterBattleText waitbutton @@ -34,10 +32,10 @@ TrainerYoungsterWarren: end TrainerYoungsterJimmy: - trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, .Script + trainer YOUNGSTER, JIMMY, EVENT_BEAT_YOUNGSTER_JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext YoungsterJimmyAfterBattleText waitbutton @@ -45,10 +43,10 @@ TrainerYoungsterJimmy: end TrainerFirebreatherBurt: - trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, .Script + trainer FIREBREATHER, BURT, EVENT_BEAT_FIREBREATHER_BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FirebreatherBurtAfterBattleText waitbutton @@ -133,23 +131,18 @@ UnknownText_0x1ae163: done Route3_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 52, 1, 1, MOUNT_MOON + db 1 ; warp events + warp_event 52, 1, MOUNT_MOON, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 49, 13, BGEVENT_READ, MapRoute3Signpost0Script -.ObjectEvents: - db 4 + db 4 ; object events object_event 26, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1 - object_event 10, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1 - object_event 16, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1 - object_event 49, 5, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1 + object_event 10, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1 + object_event 16, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1 + object_event 49, 5, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1 diff --git a/maps/Route30.asm b/maps/Route30.asm index df8b593d6..5f20a239d 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE30_YOUNGSTER1 const ROUTE30_YOUNGSTER2 const ROUTE30_YOUNGSTER3 @@ -12,11 +12,9 @@ const_value set 2 const ROUTE30_POKE_BALL Route30_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks YoungsterJoey_ImportantBattleScript: waitsfx @@ -31,7 +29,7 @@ YoungsterJoey_ImportantBattleScript: faceplayer writetext Text_ThisIsABigBattle waitbutton - spriteface ROUTE30_YOUNGSTER1, UP + objectface ROUTE30_YOUNGSTER1, UP closetext playsound SFX_TACKLE applymovement ROUTE30_MONSTER1, Route30_MikeysRattataAttacksMovement @@ -39,11 +37,11 @@ YoungsterJoey_ImportantBattleScript: end TrainerYoungsterJoey: - trainer EVENT_BEAT_YOUNGSTER_JOEY, YOUNGSTER, JOEY1, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, 0, .Script + trainer YOUNGSTER, JOEY1, EVENT_BEAT_YOUNGSTER_JOEY, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_JOEY iftrue .Rematch @@ -61,8 +59,8 @@ TrainerYoungsterJoey: scall .AskNumber2 .RequestNumber: askforphonenumber PHONE_YOUNGSTER_JOEY - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -71,11 +69,11 @@ TrainerYoungsterJoey: scall .RematchStd winlosstext YoungsterJoey1BeatenText, 0 copybytetovar wJoeyFightCount - if_equal 4, .Fight4 - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 4, .Fight4 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight4: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight4 @@ -186,10 +184,10 @@ TrainerYoungsterJoey: end TrainerYoungsterMikey: - trainer EVENT_BEAT_YOUNGSTER_MIKEY, YOUNGSTER, MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script + trainer YOUNGSTER, MIKEY, EVENT_BEAT_YOUNGSTER_MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext YoungsterMikeyAfterText waitbutton @@ -197,10 +195,10 @@ TrainerYoungsterMikey: end TrainerBugCatcherDon: - trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, BugCatcherDonSeenText, BugCatcherDonBeatenText, 0, .Script + trainer BUG_CATCHER, DON, EVENT_BEAT_BUG_CATCHER_DON, BugCatcherDonSeenText, BugCatcherDonBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BugCatcherDonAfterText waitbutton @@ -248,7 +246,7 @@ Route30FruitTree2: fruittree FRUITTREE_ROUTE_30_2 Route30HiddenPotion: - hiddenitem EVENT_ROUTE_30_HIDDEN_POTION, POTION + hiddenitem POTION, EVENT_ROUTE_30_HIDDEN_POTION Route30_JoeysRattataAttacksMovement: fix_facing @@ -407,35 +405,30 @@ YoungsterJoeyText_GiveHPUpAfterBattle: done Route30_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 7, 39, 1, ROUTE_30_BERRY_SPEECH_HOUSE - warp_def 17, 5, 1, MR_POKEMONS_HOUSE + db 2 ; warp events + warp_event 7, 39, ROUTE_30_BERRY_HOUSE, 1 + warp_event 17, 5, MR_POKEMONS_HOUSE, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 5 - bg_event 9, 43, BGEVENT_READ, Route30Sign + db 5 ; bg events + bg_event 9, 43, BGEVENT_READ, Route30Sign bg_event 13, 29, BGEVENT_READ, MrPokemonsHouseDirectionsSign - bg_event 15, 5, BGEVENT_READ, MrPokemonsHouseSign - bg_event 3, 21, BGEVENT_READ, Route30TrainerTips - bg_event 14, 9, BGEVENT_ITEM, Route30HiddenPotion - -.ObjectEvents: - db 11 - object_event 5, 26, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE - object_event 2, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY - object_event 5, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 - object_event 1, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDon, -1 - object_event 7, 30, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1 - object_event 5, 24, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE - object_event 5, 25, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE - object_event 5, 39, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree1, -1 - object_event 11, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree2, -1 - object_event 2, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1 - object_event 8, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE + bg_event 15, 5, BGEVENT_READ, MrPokemonsHouseSign + bg_event 3, 21, BGEVENT_READ, Route30TrainerTips + bg_event 14, 9, BGEVENT_ITEM, Route30HiddenPotion + + db 11 ; object events + object_event 5, 26, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE + object_event 2, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY + object_event 5, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 + object_event 1, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDon, -1 + object_event 7, 30, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1 + object_event 5, 24, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE + object_event 5, 25, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE + object_event 5, 39, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree1, -1 + object_event 11, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree2, -1 + object_event 2, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1 + object_event 8, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerryHouse.asm index 96605b3c8..829ea271f 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 - const ROUTE30BERRYSPEECHHOUSE_POKEFAN_M + const_def 2 ; object constants + const ROUTE30BERRYHOUSE_POKEFAN_M -Route30BerrySpeechHouse_MapScripts: -.SceneScripts: - db 0 +Route30BerryHouse_MapScripts: + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PokefanMScript_0x196d64: faceplayer @@ -25,7 +23,7 @@ UnknownScript_0x196d7d: closetext end -Route30BerrySpeechHouseBookshelf: +Route30BerryHouseBookshelf: jumpstd magazinebookshelf UnknownText_0x196d82: @@ -46,23 +44,18 @@ UnknownText_0x196dec: cont "drop right off." done -Route30BerrySpeechHouse_MapEvents: - ; filler - db 0, 0 +Route30BerryHouse_MapEvents: + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, ROUTE_30 - warp_def 3, 7, 1, ROUTE_30 + db 2 ; warp events + warp_event 2, 7, ROUTE_30, 1 + warp_event 3, 7, ROUTE_30, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, Route30BerryHouseBookshelf + bg_event 1, 1, BGEVENT_READ, Route30BerryHouseBookshelf -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1 + db 1 ; object events + object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1 diff --git a/maps/Route31.asm b/maps/Route31.asm index f8ea93d2a..36bf98412 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE31_FISHER const ROUTE31_YOUNGSTER const ROUTE31_BUG_CATCHER @@ -8,11 +8,9 @@ const_value set 2 const ROUTE31_POKE_BALL2 Route31_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .CheckMomCall .CheckMomCall: @@ -25,11 +23,11 @@ Route31_MapScripts: return TrainerBugCatcherWade1: - trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, BugCatcherWade1SeenText, BugCatcherWade1BeatenText, 0, .Script + trainer BUG_CATCHER, WADE1, EVENT_BEAT_BUG_CATCHER_WADE, BugCatcherWade1SeenText, BugCatcherWade1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_WADE iftrue .WadeRematch @@ -49,8 +47,8 @@ TrainerBugCatcherWade1: scall .AskAgainSTD .Continue: askforphonenumber PHONE_BUG_CATCHER_WADE - if_equal PHONE_CONTACTS_FULL, .PhoneFullSTD - if_equal PHONE_CONTACT_REFUSED, .DeclinedNumberSTD + ifequal PHONE_CONTACTS_FULL, .PhoneFullSTD + ifequal PHONE_CONTACT_REFUSED, .DeclinedNumberSTD trainertotext BUG_CATCHER, WADE1, MEM_BUFFER_0 scall .RegisterNumberSTD jump .AcceptedNumberSTD @@ -59,11 +57,11 @@ TrainerBugCatcherWade1: scall .RematchSTD winlosstext BugCatcherWade1BeatenText, 0 copybytetovar wWadeFightCount - if_equal 4, .Fight4 - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 4, .Fight4 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight4: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight4 @@ -198,10 +196,10 @@ Route31MailRecipientScript: writetext Text_Route31SleepyManGotMail buttonsound checkpokeitem ReceivedSpearowMailText - if_equal POKEMAIL_WRONG_MAIL, .WrongMail - if_equal POKEMAIL_REFUSED, .Refused - if_equal POKEMAIL_NO_MAIL, .NoMail - if_equal POKEMAIL_LAST_MON, .LastMon + ifequal POKEMAIL_WRONG_MAIL, .WrongMail + ifequal POKEMAIL_REFUSED, .Refused + ifequal POKEMAIL_NO_MAIL, .NoMail + ifequal POKEMAIL_LAST_MON, .LastMon ; POKEMAIL_CORRECT writetext Text_Route31HandOverMailMon buttonsound @@ -418,29 +416,24 @@ DarkCaveSignText: done Route31_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 4, 6, 3, ROUTE_31_VIOLET_GATE - warp_def 4, 7, 4, ROUTE_31_VIOLET_GATE - warp_def 34, 5, 1, DARK_CAVE_VIOLET_ENTRANCE - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 7, 5, BGEVENT_READ, Route31Sign - bg_event 31, 5, BGEVENT_READ, DarkCaveSign - -.ObjectEvents: - db 7 - object_event 17, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1 - object_event 9, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 4, 6, ROUTE_31_VIOLET_GATE, 3 + warp_event 4, 7, ROUTE_31_VIOLET_GATE, 4 + warp_event 34, 5, DARK_CAVE_VIOLET_ENTRANCE, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 7, 5, BGEVENT_READ, Route31Sign + bg_event 31, 5, BGEVENT_READ, DarkCaveSign + + db 7 ; object events + object_event 17, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1 + object_event 9, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1 object_event 21, 13, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherWade1, -1 - object_event 33, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1 - object_event 16, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31FruitTree, -1 - object_event 29, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION - object_event 19, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL + object_event 33, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1 + object_event 16, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31FruitTree, -1 + object_event 29, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION + object_event 19, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 6d62f9398..7e08b226c 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE31VIOLETGATE_OFFICER const ROUTE31VIOLETGATE_COOLTRAINER_F Route31VioletGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route31VioletGateOfficerScript: jumptextfaceplayer Route31VioletGateOfficerText @@ -28,23 +26,18 @@ Route31VioletGateCooltrainerFText: done Route31VioletGate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 0, 4, 8, VIOLET_CITY - warp_def 0, 5, 9, VIOLET_CITY - warp_def 9, 4, 1, ROUTE_31 - warp_def 9, 5, 2, ROUTE_31 - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1 - object_event 1, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 0, 4, VIOLET_CITY, 8 + warp_event 0, 5, VIOLET_CITY, 9 + warp_event 9, 4, ROUTE_31, 1 + warp_event 9, 5, ROUTE_31, 2 + + db 0 ; coord events + + db 0 ; bg events + + db 2 ; object events + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1 + object_event 1, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1 diff --git a/maps/Route32.asm b/maps/Route32.asm index afd946c2b..cbfe311cd 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE32_FISHER1 const ROUTE32_FISHER2 const ROUTE32_FISHER3 @@ -15,14 +15,12 @@ const_value set 2 const ROUTE32_POKE_BALL2 Route32_MapScripts: -.SceneScripts: - db 3 - scene_script .DummyScene0 - scene_script .DummyScene1 - scene_script .DummyScene2 - -.MapCallbacks: - db 1 + db 3 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_ROUTE32_OFFER_SLOWPOKETAIL + scene_script .DummyScene2 ; SCENE_ROUTE32_NOTHING + + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .Frieda .DummyScene0: @@ -36,7 +34,7 @@ Route32_MapScripts: .Frieda: checkcode VAR_WEEKDAY - if_equal FRIDAY, .FriedaAppears + ifequal FRIDAY, .FriedaAppears disappear ROUTE32_FRIEDA return @@ -87,8 +85,8 @@ Route32CooltrainerMContinueScene: end Route32CooltrainerMStopsYouScene: - spriteface ROUTE32_COOLTRAINER_M, LEFT - spriteface PLAYER, RIGHT + objectface ROUTE32_COOLTRAINER_M, LEFT + objectface PLAYER, RIGHT opentext writetext Route32CooltrainerMText_WhatsTheHurry waitbutton @@ -96,7 +94,7 @@ Route32CooltrainerMStopsYouScene: follow PLAYER, ROUTE32_COOLTRAINER_M applymovement PLAYER, Movement_Route32CooltrainerMPushesYouBackToViolet stopfollow - spriteface PLAYER, DOWN + objectface PLAYER, DOWN scall Route32CooltrainerMContinueScene applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset1 applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset2 @@ -120,14 +118,14 @@ Route32RoarTMGuyScript: end Route32WannaBuyASlowpokeTailScript: - spriteface ROUTE32_FISHER4, DOWN - spriteface PLAYER, UP + objectface ROUTE32_FISHER4, DOWN + objectface PLAYER, UP jump _OfferToSellSlowpokeTail SlowpokeTailSalesmanScript: faceplayer _OfferToSellSlowpokeTail: - setscene 2 + setscene SCENE_ROUTE32_NOTHING opentext writetext Text_MillionDollarSlowpokeTail yesorno @@ -144,10 +142,10 @@ _OfferToSellSlowpokeTail: end TrainerCamperRoland: - trainer EVENT_BEAT_CAMPER_ROLAND, CAMPER, ROLAND, CamperRolandSeenText, CamperRolandBeatenText, 0, .Script + trainer CAMPER, ROLAND, EVENT_BEAT_CAMPER_ROLAND, CamperRolandSeenText, CamperRolandBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CamperRolandAfterText waitbutton @@ -155,10 +153,10 @@ TrainerCamperRoland: end TrainerFisherJustin: - trainer EVENT_BEAT_FISHER_JUSTIN, FISHER, JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, 0, .Script + trainer FISHER, JUSTIN, EVENT_BEAT_FISHER_JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FisherJustinAfterText waitbutton @@ -166,15 +164,15 @@ TrainerFisherJustin: end TrainerFisherRalph1: - trainer EVENT_BEAT_FISHER_RALPH, FISHER, RALPH1, FisherRalph1SeenText, FisherRalph1BeatenText, 0, .Script + trainer FISHER, RALPH1, EVENT_BEAT_FISHER_RALPH, FisherRalph1SeenText, FisherRalph1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_FISHER_RALPH - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_RALPH iftrue .Rematch - checkflag ENGINE_SPECIAL_WILDDATA + checkflag ENGINE_FISH_SWARM iftrue .Swarm checkcellnum PHONE_FISHER_RALPH iftrue .NumberAccepted @@ -190,8 +188,8 @@ TrainerFisherRalph1: scall .AskNumber2 .AskForNumber: askforphonenumber PHONE_FISHER_RALPH - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext FISHER, RALPH1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -200,11 +198,11 @@ TrainerFisherRalph1: scall .RematchStd winlosstext FisherRalph1BeatenText, 0 copybytetovar wRalphFightCount - if_equal 4, .Fight4 - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 4, .Fight4 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 @@ -291,10 +289,10 @@ TrainerFisherRalph1: end TrainerFisherHenry: - trainer EVENT_BEAT_FISHER_HENRY, FISHER, HENRY, FisherHenrySeenText, FisherHenryBeatenText, 0, .Script + trainer FISHER, HENRY, EVENT_BEAT_FISHER_HENRY, FisherHenrySeenText, FisherHenryBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FisherHenryAfterText waitbutton @@ -302,11 +300,11 @@ TrainerFisherHenry: end TrainerPicnickerLiz1: - trainer EVENT_BEAT_PICNICKER_LIZ, PICNICKER, LIZ1, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, 0, .Script + trainer PICNICKER, LIZ1, EVENT_BEAT_PICNICKER_LIZ, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_PICNICKER_LIZ - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_LIZ iftrue .Rematch @@ -324,8 +322,8 @@ TrainerPicnickerLiz1: scall .AskNumber2 .AskForNumber: askforphonenumber PHONE_PICNICKER_LIZ - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext PICNICKER, LIZ1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -334,11 +332,11 @@ TrainerPicnickerLiz1: scall .RematchStd winlosstext PicnickerLiz1BeatenText, 0 copybytetovar wLizFightCount - if_equal 4, .Fight4 - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 4, .Fight4 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight4: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight4 @@ -419,10 +417,10 @@ TrainerPicnickerLiz1: end TrainerYoungsterAlbert: - trainer EVENT_BEAT_YOUNGSTER_ALBERT, YOUNGSTER, ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, 0, .Script + trainer YOUNGSTER, ALBERT, EVENT_BEAT_YOUNGSTER_ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext YoungsterAlbertAfterText waitbutton @@ -430,10 +428,10 @@ TrainerYoungsterAlbert: end TrainerYoungsterGordon: - trainer EVENT_BEAT_YOUNGSTER_GORDON, YOUNGSTER, GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, 0, .Script + trainer YOUNGSTER, GORDON, EVENT_BEAT_YOUNGSTER_GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext YoungsterGordonAfterText waitbutton @@ -441,10 +439,10 @@ TrainerYoungsterGordon: end TrainerBirdKeeperPeter: - trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, BirdKeeperPeterSeenText, BirdKeeperPeterBeatenText, 0, .Script + trainer BIRD_KEEPER, PETER, EVENT_BEAT_BIRD_KEEPER_PETER, BirdKeeperPeterSeenText, BirdKeeperPeterBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperPeterAfterText waitbutton @@ -457,7 +455,7 @@ FriedaScript: checkevent EVENT_GOT_POISON_BARB_FROM_FRIEDA iftrue .Friday checkcode VAR_WEEKDAY - if_not_equal FRIDAY, .NotFriday + ifnotequal FRIDAY, .NotFriday checkevent EVENT_MET_FRIEDA_OF_FRIDAY iftrue .MetFrieda writetext MeetFriedaText @@ -506,10 +504,10 @@ Route32PokecenterSign: jumpstd pokecentersign Route32HiddenGreatBall: - hiddenitem EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL + hiddenitem GREAT_BALL, EVENT_ROUTE_32_HIDDEN_GREAT_BALL Route32HiddenSuperPotion: - hiddenitem EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem SUPER_POTION, EVENT_ROUTE_32_HIDDEN_SUPER_POTION Movement_Route32CooltrainerMPushesYouBackToViolet: step UP @@ -929,43 +927,38 @@ Route32UnionCaveSignText: done Route32_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 11, 73, 1, ROUTE_32_POKECENTER_1F - warp_def 4, 2, 3, ROUTE_32_RUINS_OF_ALPH_GATE - warp_def 4, 3, 4, ROUTE_32_RUINS_OF_ALPH_GATE - warp_def 6, 79, 4, UNION_CAVE_1F - -.CoordEvents: - db 2 - coord_event 18, 8, 0, Route32CooltrainerMStopsYouScene - coord_event 7, 71, 1, Route32WannaBuyASlowpokeTailScript - -.BGEvents: - db 6 - bg_event 13, 5, BGEVENT_READ, Route32Sign - bg_event 9, 1, BGEVENT_READ, Route32RuinsSign + db 0, 0 ; filler + + db 4 ; warp events + warp_event 11, 73, ROUTE_32_POKECENTER_1F, 1 + warp_event 4, 2, ROUTE_32_RUINS_OF_ALPH_GATE, 3 + warp_event 4, 3, ROUTE_32_RUINS_OF_ALPH_GATE, 4 + warp_event 6, 79, UNION_CAVE_1F, 4 + + db 2 ; coord events + coord_event 18, 8, SCENE_DEFAULT, Route32CooltrainerMStopsYouScene + coord_event 7, 71, SCENE_ROUTE32_OFFER_SLOWPOKETAIL, Route32WannaBuyASlowpokeTailScript + + db 6 ; bg events + bg_event 13, 5, BGEVENT_READ, Route32Sign + bg_event 9, 1, BGEVENT_READ, Route32RuinsSign bg_event 10, 84, BGEVENT_READ, Route32UnionCaveSign bg_event 12, 73, BGEVENT_READ, Route32PokecenterSign bg_event 12, 67, BGEVENT_ITEM, Route32HiddenGreatBall bg_event 11, 40, BGEVENT_ITEM, Route32HiddenSuperPotion -.ObjectEvents: - db 14 - object_event 8, 49, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1 + db 14 ; object events + object_event 8, 49, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1 object_event 12, 56, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherRalph1, -1 - object_event 6, 48, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1 + object_event 6, 48, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1 object_event 12, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterAlbert, -1 - object_event 4, 63, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterGordon, -1 - object_event 3, 45, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1 + object_event 4, 63, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterGordon, -1 + object_event 3, 45, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1 object_event 10, 30, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1 - object_event 19, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1 + object_event 19, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1 object_event 11, 82, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperPeter, -1 - object_event 7, 70, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS - object_event 6, 53, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL + object_event 7, 70, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS + object_event 6, 53, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL object_event 15, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1 object_event 12, 67, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY - object_event 3, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL + object_event 3, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 5bedc7853..7d4571668 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE32POKECENTER1F_NURSE const ROUTE32POKECENTER1F_FISHING_GURU const ROUTE32POKECENTER1F_COOLTRAINER_F Route32Pokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x69b52: jumpstd pokecenternurse @@ -95,23 +93,18 @@ Route32Pokecenter1FCooltrainerFText: done Route32Pokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 1, ROUTE_32 - warp_def 4, 7, 1, ROUTE_32 - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1 - object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1 - object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, ROUTE_32, 1 + warp_event 4, 7, ROUTE_32, 1 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 3 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1 + object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1 + object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1 diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index 345e46dd4..3329d54f5 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE32RUINSOFALPHGATE_OFFICER const ROUTE32RUINSOFALPHGATE_POKEFAN_M const ROUTE32RUINSOFALPHGATE_YOUNGSTER Route32RuinsOfAlphGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route32RuinsOfAlphGateOfficerScript: jumptextfaceplayer Route32RuinsOfAlphGateOfficerText @@ -47,24 +45,19 @@ Route32RuinsOfAlphGateYoungsterText: done Route32RuinsOfAlphGate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 0, 4, 10, RUINS_OF_ALPH_OUTSIDE - warp_def 0, 5, 11, RUINS_OF_ALPH_OUTSIDE - warp_def 9, 4, 2, ROUTE_32 - warp_def 9, 5, 3, ROUTE_32 - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1 - object_event 8, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1 - object_event 1, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 0, 4, RUINS_OF_ALPH_OUTSIDE, 10 + warp_event 0, 5, RUINS_OF_ALPH_OUTSIDE, 11 + warp_event 9, 4, ROUTE_32, 2 + warp_event 9, 5, ROUTE_32, 3 + + db 0 ; coord events + + db 0 ; bg events + + db 3 ; object events + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1 + object_event 8, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1 + object_event 1, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1 diff --git a/maps/Route33.asm b/maps/Route33.asm index be2abbf4c..9fbecb775 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -1,24 +1,22 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE33_POKEFAN_M const ROUTE33_LASS const ROUTE33_FRUIT_TREE Route33_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route33LassScript: jumptextfaceplayer Route33LassText TrainerHikerAnthony: - trainer EVENT_BEAT_HIKER_ANTHONY, HIKER, ANTHONY2, HikerAnthony2SeenText, HikerAnthony2BeatenText, 0, .Script + trainer HIKER, ANTHONY2, EVENT_BEAT_HIKER_ANTHONY, HikerAnthony2SeenText, HikerAnthony2BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_HIKER_ANTHONY - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_ANTHONY iftrue .Rematch @@ -38,8 +36,8 @@ TrainerHikerAnthony: scall .AskNumber2 .AskForPhoneNumber: askforphonenumber PHONE_HIKER_ANTHONY - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext HIKER, ANTHONY2, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -48,11 +46,11 @@ TrainerHikerAnthony: scall .RematchStd winlosstext HikerAnthony2BeatenText, 0 copybytetovar wAnthonyFightCount - if_equal 4, .Fight4 - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 4, .Fight4 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 @@ -195,22 +193,17 @@ Route33SignText: done Route33_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 11, 9, 3, UNION_CAVE_1F + db 1 ; warp events + warp_event 11, 9, UNION_CAVE_1F, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 11, 11, BGEVENT_READ, Route33Sign -.ObjectEvents: - db 3 - object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1 + db 3 ; object events + object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1 object_event 13, 16, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1 - object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1 + object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1 diff --git a/maps/Route34.asm b/maps/Route34.asm index 786ffb022..33ac3ceed 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE34_YOUNGSTER1 const ROUTE34_YOUNGSTER2 const ROUTE34_YOUNGSTER3 @@ -14,11 +14,9 @@ const_value set 2 const ROUTE34_POKE_BALL Route34_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: @@ -56,13 +54,13 @@ Route34_MapScripts: DayCareManScript_Outside: faceplayer opentext - special Special_DayCareManOutside + special DayCareManOutside waitbutton closetext - if_equal TRUE, .end_fail + ifequal TRUE, .end_fail clearflag ENGINE_DAY_CARE_MAN_HAS_EGG checkcode VAR_FACING - if_equal RIGHT, .walk_around_player + ifequal RIGHT, .walk_around_player applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside playsound SFX_ENTER_DOOR disappear ROUTE34_GRAMPS @@ -77,22 +75,22 @@ DayCareManScript_Outside: DayCareMon1Script: opentext - special Special_DayCareMon1 + special DayCareMon1 closetext end DayCareMon2Script: opentext - special Special_DayCareMon2 + special DayCareMon2 closetext end TrainerCamperTodd1: - trainer EVENT_BEAT_CAMPER_TODD, CAMPER, TODD1, CamperTodd1SeenText, CamperTodd1BeatenText, 0, .Script + trainer CAMPER, TODD1, EVENT_BEAT_CAMPER_TODD, CamperTodd1SeenText, CamperTodd1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_CAMPER_TODD - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_TODD iftrue .Rematch @@ -112,8 +110,8 @@ TrainerCamperTodd1: scall .AskNumber2 .FinishAsk: askforphonenumber PHONE_CAMPER_TODD - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext CAMPER, TODD1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -122,11 +120,11 @@ TrainerCamperTodd1: scall .RematchStd winlosstext CamperTodd1BeatenText, 0 copybytetovar wToddFightCount - if_equal 4, .Fight4 - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 4, .Fight4 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 @@ -213,11 +211,11 @@ TrainerCamperTodd1: end TrainerPicnickerGina1: - trainer EVENT_BEAT_PICNICKER_GINA, PICNICKER, GINA1, PicnickerGina1SeenText, PicnickerGina1BeatenText, 0, .Script + trainer PICNICKER, GINA1, EVENT_BEAT_PICNICKER_GINA, PicnickerGina1SeenText, PicnickerGina1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_PICNICKER_GINA - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_GINA iftrue .Rematch @@ -237,8 +235,8 @@ TrainerPicnickerGina1: scall .AskNumber2 .FinishAsk: askforphonenumber PHONE_PICNICKER_GINA - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext PICNICKER, GINA1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -247,11 +245,11 @@ TrainerPicnickerGina1: scall .RematchStd winlosstext PicnickerGina1BeatenText, 0 copybytetovar wGinaFightCount - if_equal 4, .Fight4 - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 4, .Fight4 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 @@ -353,7 +351,7 @@ TrainerPicnickerGina1: OfficerKeithScript: faceplayer opentext - checknite + checktime NITE iffalse .NoFight checkevent EVENT_BEAT_OFFICER_KEITH iftrue .AfterScript @@ -382,10 +380,10 @@ OfficerKeithScript: end TrainerYoungsterSamuel: - trainer EVENT_BEAT_YOUNGSTER_SAMUEL, YOUNGSTER, SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, .Script + trainer YOUNGSTER, SAMUEL, EVENT_BEAT_YOUNGSTER_SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext YoungsterSamuelAfterText waitbutton @@ -393,10 +391,10 @@ TrainerYoungsterSamuel: end TrainerYoungsterIan: - trainer EVENT_BEAT_YOUNGSTER_IAN, YOUNGSTER, IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, .Script + trainer YOUNGSTER, IAN, EVENT_BEAT_YOUNGSTER_IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext YoungsterIanAfterText waitbutton @@ -404,10 +402,10 @@ TrainerYoungsterIan: end TrainerPokefanmBrandon: - trainer EVENT_BEAT_POKEFANM_BRANDON, POKEFANM, BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, .Script + trainer POKEFANM, BRANDON, EVENT_BEAT_POKEFANM_BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokefanmBrandonAfterText waitbutton @@ -415,10 +413,10 @@ TrainerPokefanmBrandon: end TrainerCooltrainerfIrene: - trainer EVENT_BEAT_COOLTRAINERF_IRENE, COOLTRAINERF, IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, .Script + trainer COOLTRAINERF, IRENE, EVENT_BEAT_COOLTRAINERF_IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue .GotSoftSand @@ -434,10 +432,10 @@ TrainerCooltrainerfIrene: end TrainerCooltrainerfJenn: - trainer EVENT_BEAT_COOLTRAINERF_JENN, COOLTRAINERF, JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, .Script + trainer COOLTRAINERF, JENN, EVENT_BEAT_COOLTRAINERF_JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue .GotSoftSand @@ -453,10 +451,10 @@ TrainerCooltrainerfJenn: end TrainerCooltrainerfKate: - trainer EVENT_BEAT_COOLTRAINERF_KATE, COOLTRAINERF, KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, .Script + trainer COOLTRAINERF, KATE, EVENT_BEAT_COOLTRAINERF_KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue .GotSoftSand @@ -488,10 +486,10 @@ Route34Nugget: itemball NUGGET Route34HiddenRareCandy: - hiddenitem EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_ROUTE_34_HIDDEN_RARE_CANDY Route34HiddenSuperPotion: - hiddenitem EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION + hiddenitem SUPER_POTION, EVENT_ROUTE_34_HIDDEN_SUPER_POTION Route34MovementData_DayCareManWalksBackInside: slow_step LEFT @@ -761,40 +759,35 @@ DayCareSignText: done Route34_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 13, 37, 1, ROUTE_34_ILEX_FOREST_GATE - warp_def 14, 37, 2, ROUTE_34_ILEX_FOREST_GATE - warp_def 11, 14, 1, DAY_CARE - warp_def 11, 15, 2, DAY_CARE - warp_def 13, 15, 3, DAY_CARE - -.CoordEvents: - db 0 - -.BGEvents: - db 5 - bg_event 12, 6, BGEVENT_READ, Route34Sign + db 0, 0 ; filler + + db 5 ; warp events + warp_event 13, 37, ROUTE_34_ILEX_FOREST_GATE, 1 + warp_event 14, 37, ROUTE_34_ILEX_FOREST_GATE, 2 + warp_event 11, 14, DAY_CARE, 1 + warp_event 11, 15, DAY_CARE, 2 + warp_event 13, 15, DAY_CARE, 3 + + db 0 ; coord events + + db 5 ; bg events + bg_event 12, 6, BGEVENT_READ, Route34Sign bg_event 13, 33, BGEVENT_READ, Route34TrainerTips bg_event 10, 13, BGEVENT_READ, DayCareSign - bg_event 8, 32, BGEVENT_ITEM, Route34HiddenRareCandy + bg_event 8, 32, BGEVENT_ITEM, Route34HiddenRareCandy bg_event 17, 19, BGEVENT_ITEM, Route34HiddenSuperPotion -.ObjectEvents: - db 13 - object_event 13, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1 + db 13 ; object events + object_event 13, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1 object_event 15, 32, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1 object_event 11, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterIan, -1 object_event 10, 26, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerGina1, -1 - object_event 9, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerKeithScript, -1 + object_event 9, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerKeithScript, -1 object_event 18, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1 object_event 15, 16, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAY_CARE_MAN_ON_ROUTE_34 object_event 14, 18, SPRITE_DAY_CARE_MON_1, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon1Script, EVENT_DAY_CARE_MON_1 object_event 17, 19, SPRITE_DAY_CARE_MON_2, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon2Script, EVENT_DAY_CARE_MON_2 object_event 11, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1 - object_event 3, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1 - object_event 6, 51, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1 - object_event 7, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET + object_event 3, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1 + object_event 6, 51, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1 + object_event 7, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 38dc04729..19291b412 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE34ILEXFORESTGATE_TEACHER1 const ROUTE34ILEXFORESTGATE_BUTTERFREE const ROUTE34ILEXFORESTGATE_LASS const ROUTE34ILEXFORESTGATE_TEACHER2 Route34IlexForestGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .IsForestRestless .IsForestRestless: @@ -28,12 +26,12 @@ UnknownScript_0x62d3d: checkevent EVENT_FOREST_IS_RESTLESS iffalse UnknownScript_0x62d62 showemote EMOTE_SHOCK, ROUTE34ILEXFORESTGATE_TEACHER2, 20 - spriteface ROUTE34ILEXFORESTGATE_TEACHER2, LEFT - spriteface PLAYER, RIGHT + objectface ROUTE34ILEXFORESTGATE_TEACHER2, LEFT + objectface PLAYER, RIGHT follow PLAYER, ROUTE34ILEXFORESTGATE_TEACHER2 applymovement PLAYER, MovementData_0x62d97 stopfollow - spriteface PLAYER, DOWN + objectface PLAYER, DOWN opentext writetext UnknownText_0x62e41 waitbutton @@ -136,26 +134,21 @@ Route34IlexForestGateLassText: done Route34IlexForestGate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 4, 0, 1, ROUTE_34 - warp_def 5, 0, 2, ROUTE_34 - warp_def 4, 7, 1, ILEX_FOREST - warp_def 5, 7, 1, ILEX_FOREST - -.CoordEvents: - db 1 - coord_event 4, 7, 0, UnknownScript_0x62d3d - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 9, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER - object_event 9, 4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexGateButterfree, -1 - object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS - object_event 5, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY + db 0, 0 ; filler + + db 4 ; warp events + warp_event 4, 0, ROUTE_34, 1 + warp_event 5, 0, ROUTE_34, 2 + warp_event 4, 7, ILEX_FOREST, 1 + warp_event 5, 7, ILEX_FOREST, 1 + + db 1 ; coord events + coord_event 4, 7, SCENE_DEFAULT, UnknownScript_0x62d3d + + db 0 ; bg events + + db 4 ; object events + object_event 9, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER + object_event 9, 4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexGateButterfree, -1 + object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS + object_event 5, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY diff --git a/maps/Route35.asm b/maps/Route35.asm index 7d9aa9e53..0b471f25f 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE35_YOUNGSTER1 const ROUTE35_YOUNGSTER2 const ROUTE35_LASS1 @@ -12,17 +12,15 @@ const_value set 2 const ROUTE35_POKE_BALL Route35_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperBryan: - trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, BirdKeeperBryanSeenText, BirdKeeperBryanBeatenText, 0, .Script + trainer BIRD_KEEPER, BRYAN, EVENT_BEAT_BIRD_KEEPER_BRYAN, BirdKeeperBryanSeenText, BirdKeeperBryanBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperBryanAfterBattleText waitbutton @@ -30,11 +28,11 @@ TrainerBirdKeeperBryan: end TrainerJugglerIrwin: - trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, .Script + trainer JUGGLER, IRWIN1, EVENT_BEAT_JUGGLER_IRWIN, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN - end_if_just_battled + endifjustbattled opentext checkcellnum PHONE_JUGGLER_IRWIN iftrue Route35NumberAcceptedM @@ -50,8 +48,8 @@ TrainerJugglerIrwin: scall Route35AskNumber2M .AskForNumber: askforphonenumber PHONE_JUGGLER_IRWIN - if_equal PHONE_CONTACTS_FULL, Route35PhoneFullM - if_equal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM + ifequal PHONE_CONTACTS_FULL, Route35PhoneFullM + ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM trainertotext JUGGLER, IRWIN1, MEM_BUFFER_0 scall Route35RegisteredNumberM jump Route35NumberAcceptedM @@ -85,10 +83,10 @@ Route35RematchM: end TrainerCamperIvan: - trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, .Script + trainer CAMPER, IVAN, EVENT_BEAT_CAMPER_IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CamperIvanAfterBattleText waitbutton @@ -96,10 +94,10 @@ TrainerCamperIvan: end TrainerCamperElliot: - trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, .Script + trainer CAMPER, ELLIOT, EVENT_BEAT_CAMPER_ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CamperElliotAfterBattleText waitbutton @@ -107,10 +105,10 @@ TrainerCamperElliot: end TrainerPicnickerBrooke: - trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, .Script + trainer PICNICKER, BROOKE, EVENT_BEAT_PICNICKER_BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PicnickerBrookeAfterBattleText waitbutton @@ -118,10 +116,10 @@ TrainerPicnickerBrooke: end TrainerPicnickerKim: - trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, .Script + trainer PICNICKER, KIM, EVENT_BEAT_PICNICKER_KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PicnickerKimAfterBattleText waitbutton @@ -129,11 +127,11 @@ TrainerPicnickerKim: end TrainerBugCatcherArnie: - trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, BugCatcherArnieSeenText, BugCatcherArnieBeatenText, 0, .Script + trainer BUG_CATCHER, ARNIE1, EVENT_BEAT_BUG_CATCHER_ARNIE, BugCatcherArnieSeenText, BugCatcherArnieBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_ARNIE iftrue .WantsBattle @@ -153,8 +151,8 @@ TrainerBugCatcherArnie: scall Route35AskNumber2M .AskForNumber: askforphonenumber PHONE_BUG_CATCHER_ARNIE - if_equal PHONE_CONTACTS_FULL, Route35PhoneFullM - if_equal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM + ifequal PHONE_CONTACTS_FULL, Route35PhoneFullM + ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM trainertotext BUG_CATCHER, ARNIE1, MEM_BUFFER_0 scall Route35RegisteredNumberM jump Route35NumberAcceptedM @@ -163,11 +161,11 @@ TrainerBugCatcherArnie: scall Route35RematchM winlosstext BugCatcherArnieBeatenText, 0 copybytetovar wArnieFightCount - if_equal 4, .Fight4 - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 4, .Fight4 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 @@ -226,10 +224,10 @@ TrainerBugCatcherArnie: end TrainerFirebreatherWalt: - trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, .Script + trainer FIREBREATHER, WALT, EVENT_BEAT_FIREBREATHER_WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FirebreatherWaltAfterBattleText waitbutton @@ -239,7 +237,7 @@ TrainerFirebreatherWalt: TrainerOfficerDirk: faceplayer opentext - checknite + checktime NITE iffalse .NotNight checkevent EVENT_BEAT_OFFICER_DIRK iftrue .AfterBattle @@ -463,33 +461,28 @@ Route35SignText: done Route35_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 9, 33, 1, ROUTE_35_GOLDENROD_GATE - warp_def 10, 33, 2, ROUTE_35_GOLDENROD_GATE - warp_def 3, 5, 3, ROUTE_35_NATIONAL_PARK_GATE + db 3 ; warp events + warp_event 9, 33, ROUTE_35_GOLDENROD_GATE, 1 + warp_event 10, 33, ROUTE_35_GOLDENROD_GATE, 2 + warp_event 3, 5, ROUTE_35_NATIONAL_PARK_GATE, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 1, 7, BGEVENT_READ, Route35Sign + db 2 ; bg events + bg_event 1, 7, BGEVENT_READ, Route35Sign bg_event 11, 31, BGEVENT_READ, Route35Sign -.ObjectEvents: - db 11 - object_event 4, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1 - object_event 8, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1 - object_event 7, 20, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1 + db 11 ; object events + object_event 4, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1 + object_event 8, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1 + object_event 7, 20, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1 object_event 10, 26, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerKim, -1 object_event 14, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerBirdKeeperBryan, -1 - object_event 2, 10, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1 - object_event 16, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie, -1 - object_event 5, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1 - object_event 5, 6, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TrainerOfficerDirk, -1 - object_event 2, 25, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1 - object_event 13, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT + object_event 2, 10, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1 + object_event 16, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie, -1 + object_event 5, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1 + object_event 5, 6, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TrainerOfficerDirk, -1 + object_event 2, 25, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1 + object_event 13, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index a783781dd..3bd8ec0ae 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE35GOLDENRODGATE_OFFICER const ROUTE35GOLDENRODGATE_POKEFAN_F const ROUTE35GOLDENRODGATE_FISHER Route35GoldenrodGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks OfficerScript_0x69d37: faceplayer @@ -26,7 +24,7 @@ OfficerScript_0x69d37: buttonsound waitsfx checkcode VAR_PARTYCOUNT - if_equal PARTY_LENGTH, .partyfull + ifequal PARTY_LENGTH, .partyfull writetext UnknownText_0x69eb8 playsound SFX_KEY_ITEM waitsfx @@ -196,24 +194,19 @@ Route35GoldenrodGateFisherText: done Route35GoldenrodGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 1, ROUTE_35 - warp_def 5, 0, 2, ROUTE_35 - warp_def 4, 7, 12, GOLDENROD_CITY - warp_def 5, 7, 12, GOLDENROD_CITY + db 4 ; warp events + warp_event 4, 0, ROUTE_35, 1 + warp_event 5, 0, ROUTE_35, 2 + warp_event 4, 7, GOLDENROD_CITY, 12 + warp_event 5, 7, GOLDENROD_CITY, 12 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1 - object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1 - object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1 + db 3 ; object events + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1 + object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1 + object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1 diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 6dbfe9671..4bde14d74 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -1,17 +1,15 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE35NATIONALPARKGATE_OFFICER1 const ROUTE35NATIONALPARKGATE_YOUNGSTER const ROUTE35NATIONALPARKGATE_OFFICER2 Route35NationalParkGate_MapScripts: -.SceneScripts: - db 3 - scene_script .DummyScene0 - scene_script .DummyScene1 - scene_script .LeaveContestEarly - -.MapCallbacks: - db 2 + db 3 ; scene scripts + scene_script .DummyScene0 ; SCENE_ROUTE35NATIONALPARKGATE_NOTHING + scene_script .DummyScene1 ; SCENE_ROUTE35NATIONALPARKGATE_UNUSED + scene_script .LeaveContestEarly ; SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY + + db 2 ; callbacks callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable @@ -28,18 +26,18 @@ Route35NationalParkGate_MapScripts: .CheckIfContestRunning: checkflag ENGINE_BUG_CONTEST_TIMER iftrue .BugContestIsRunning - setscene 0 + setscene SCENE_ROUTE35NATIONALPARKGATE_NOTHING return .BugContestIsRunning: - setscene 2 + setscene SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY return .CheckIfContestAvailable: checkcode VAR_WEEKDAY - if_equal TUESDAY, .SetContestOfficer - if_equal THURSDAY, .SetContestOfficer - if_equal SATURDAY, .SetContestOfficer + ifequal TUESDAY, .SetContestOfficer + ifequal THURSDAY, .SetContestOfficer + ifequal SATURDAY, .SetContestOfficer checkflag ENGINE_BUG_CONTEST_TIMER iftrue .BugContestIsRunning disappear ROUTE35NATIONALPARKGATE_OFFICER1 @@ -55,7 +53,7 @@ Route35NationalParkGate_MapScripts: .LeavingContestEarly: applymovement PLAYER, MovementData_0x6a2e2 - spriteface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT + objectface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT opentext checkcode VAR_CONTESTMINUTES addvar 1 @@ -74,17 +72,17 @@ Route35NationalParkGate_MapScripts: closetext scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47 end OfficerScript_0x6a204: checkcode VAR_WEEKDAY - if_equal SUNDAY, Route35NationalParkGate_NoContestToday - if_equal MONDAY, Route35NationalParkGate_NoContestToday - if_equal WEDNESDAY, Route35NationalParkGate_NoContestToday - if_equal FRIDAY, Route35NationalParkGate_NoContestToday + ifequal SUNDAY, Route35NationalParkGate_NoContestToday + ifequal MONDAY, Route35NationalParkGate_NoContestToday + ifequal WEDNESDAY, Route35NationalParkGate_NoContestToday + ifequal FRIDAY, Route35NationalParkGate_NoContestToday faceplayer opentext checkflag ENGINE_DAILY_BUG_CONTEST @@ -94,8 +92,8 @@ OfficerScript_0x6a204: yesorno iffalse Route35NationalParkGate_DeclinedToParticipate checkcode VAR_PARTYCOUNT - if_greater_than 1, Route35NationalParkGate_LeaveTheRestBehind - special Special_ContestDropOffMons + ifgreater 1, Route35NationalParkGate_LeaveTheRestBehind + special ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER Route35NationalParkGate_OkayToProceed: setflag ENGINE_BUG_CONTEST_TIMER @@ -108,18 +106,18 @@ Route35NationalParkGate_OkayToProceed: writetext UnknownText_0x6a3e2 waitbutton closetext - special Special_GiveParkBalls + special GiveParkBalls scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx - special Special_SelectRandomBugContestContestants + special SelectRandomBugContestContestants warpfacing UP, NATIONAL_PARK_BUG_CONTEST, 10, 47 end Route35NationalParkGate_EnterContest: checkcode VAR_FACING - if_equal LEFT, Route35NationalParkGate_FacingLeft + ifequal LEFT, Route35NationalParkGate_FacingLeft applymovement PLAYER, MovementData_0x6a2e5 end @@ -129,17 +127,17 @@ Route35NationalParkGate_FacingLeft: Route35NationalParkGate_LeaveTheRestBehind: checkcode VAR_PARTYCOUNT - if_less_than PARTY_LENGTH, Route35NationalParkGate_LessThanFullParty + ifless PARTY_LENGTH, Route35NationalParkGate_LessThanFullParty checkcode VAR_BOXSPACE - if_equal 0, Route35NationalParkGate_NoRoomInBox + ifequal 0, Route35NationalParkGate_NoRoomInBox Route35NationalParkGate_LessThanFullParty: ; 6a27d - special Special_CheckFirstMonIsEgg - if_equal TRUE, Route35NationalParkGate_FirstMonIsEgg + special CheckFirstMonIsEgg + ifequal TRUE, Route35NationalParkGate_FirstMonIsEgg writetext UnknownText_0x6a4c6 yesorno iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind - special Special_ContestDropOffMons + special ContestDropOffMons iftrue Route35NationalParkGate_FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6a537 @@ -438,25 +436,20 @@ UnknownText_0x6a90e: done Route35NationalParkGate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 3, 0, 3, NATIONAL_PARK - warp_def 4, 0, 4, NATIONAL_PARK - warp_def 3, 7, 3, ROUTE_35 - warp_def 4, 7, 3, ROUTE_35 - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 5, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script - -.ObjectEvents: - db 3 - object_event 2, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY - object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER - object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY + db 0, 0 ; filler + + db 4 ; warp events + warp_event 3, 0, NATIONAL_PARK, 3 + warp_event 4, 0, NATIONAL_PARK, 4 + warp_event 3, 7, ROUTE_35, 3 + warp_event 4, 7, ROUTE_35, 3 + + db 0 ; coord events + + db 1 ; bg events + bg_event 5, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script + + db 3 ; object events + object_event 2, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER + object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36.asm b/maps/Route36.asm index fceef3306..0a46f1ca7 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE36_YOUNGSTER1 const ROUTE36_YOUNGSTER2 const ROUTE36_WEIRD_TREE @@ -10,13 +10,11 @@ const_value set 2 const ROUTE36_SUICUNE Route36_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_ROUTE36_NOTHING + scene_script .DummyScene1 ; SCENE_ROUTE36_SUICUNE -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .ArthurCallback .DummyScene0: @@ -27,7 +25,7 @@ Route36_MapScripts: .ArthurCallback: checkcode VAR_WEEKDAY - if_equal THURSDAY, .ArthurAppears + ifequal THURSDAY, .ArthurAppears disappear ROUTE36_ARTHUR return @@ -39,14 +37,14 @@ Route36SuicuneScript: showemote EMOTE_SHOCK, PLAYER, 15 pause 15 playsound SFX_WARP_FROM - spriteface PLAYER, UP + objectface PLAYER, UP applymovement ROUTE36_SUICUNE, Route36SuicuneMovement disappear ROUTE36_SUICUNE - spriteface PLAYER, DOWN + objectface PLAYER, DOWN pause 10 - setscene 0 + setscene SCENE_ROUTE36_NOTHING clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - setmapscene CIANWOOD_CITY, 1 + setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE end SudowoodoScript: @@ -79,7 +77,7 @@ WateredWeirdTreeScript:: ; export (for when you use Squirtbottle from pack) loadwildmon SUDOWOODO, 20 startbattle setevent EVENT_FOUGHT_SUDOWOODO - if_equal $2, DidntCatchSudowoodo + ifequal $2, DidntCatchSudowoodo disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN reloadmapafterbattle @@ -94,8 +92,8 @@ DidntCatchSudowoodo: applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Flee disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN - special Special_LoadUsedSpritesGFX - special Special_RefreshSprites + special LoadUsedSpritesGFX + special RefreshSprites end Route36FloriaScript: @@ -109,7 +107,7 @@ Route36FloriaScript: closetext clearevent EVENT_FLORIA_AT_FLOWER_SHOP checkcode VAR_FACING - if_equal UP, .Up + ifequal UP, .Up applymovement ROUTE36_FLORIA, FloriaMovement1 disappear ROUTE36_FLORIA end @@ -167,11 +165,11 @@ LassScript_0x1940e0: end TrainerSchoolboyAlan1: - trainer EVENT_BEAT_SCHOOLBOY_ALAN, SCHOOLBOY, ALAN1, SchoolboyAlan1SeenText, SchoolboyAlan1BeatenText, 0, .Script + trainer SCHOOLBOY, ALAN1, EVENT_BEAT_SCHOOLBOY_ALAN, SchoolboyAlan1SeenText, SchoolboyAlan1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_ALAN - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_ALAN iftrue .ChooseRematch @@ -191,8 +189,8 @@ TrainerSchoolboyAlan1: scall .AskNumber2 .ContinueAskForPhoneNumber: askforphonenumber PHONE_SCHOOLBOY_ALAN - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -201,11 +199,11 @@ TrainerSchoolboyAlan1: scall .Rematch winlosstext SchoolboyAlan1BeatenText, 0 copybytetovar wAlanFightCount - if_equal 4, .Fight4 - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 4, .Fight4 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 @@ -305,10 +303,10 @@ TrainerSchoolboyAlan1: end TrainerPsychicMark: - trainer EVENT_BEAT_PSYCHIC_MARK, PSYCHIC_T, MARK, PsychicMarkSeenText, PsychicMarkBeatenText, 0, .Script + trainer PSYCHIC_T, MARK, EVENT_BEAT_PSYCHIC_MARK, PsychicMarkSeenText, PsychicMarkBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PsychicMarkAfterBattleText waitbutton @@ -321,7 +319,7 @@ ArthurScript: checkevent EVENT_GOT_HARD_STONE_FROM_ARTHUR iftrue .AlreadyGotStone checkcode VAR_WEEKDAY - if_not_equal THURSDAY, ArthurNotThursdayScript + ifnotequal THURSDAY, ArthurNotThursdayScript checkevent EVENT_MET_ARTHUR_OF_THURSDAY iftrue .MetArthur writetext MeetArthurText @@ -660,36 +658,31 @@ Route36TrainerTips2Text: done Route36_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 18, 8, 3, ROUTE_36_NATIONAL_PARK_GATE - warp_def 18, 9, 4, ROUTE_36_NATIONAL_PARK_GATE - warp_def 47, 13, 1, ROUTE_36_RUINS_OF_ALPH_GATE - warp_def 48, 13, 2, ROUTE_36_RUINS_OF_ALPH_GATE - -.CoordEvents: - db 2 - coord_event 20, 7, 1, Route36SuicuneScript - coord_event 22, 7, 1, Route36SuicuneScript - -.BGEvents: - db 4 - bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 18, 8, ROUTE_36_NATIONAL_PARK_GATE, 3 + warp_event 18, 9, ROUTE_36_NATIONAL_PARK_GATE, 4 + warp_event 47, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 1 + warp_event 48, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 2 + + db 2 ; coord events + coord_event 20, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript + coord_event 22, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript + + db 4 ; bg events + bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2 bg_event 45, 11, BGEVENT_READ, RuinsOfAlphNorthSign - bg_event 55, 7, BGEVENT_READ, Route36Sign - bg_event 21, 7, BGEVENT_READ, Route36TrainerTips1 + bg_event 55, 7, BGEVENT_READ, Route36Sign + bg_event 21, 7, BGEVENT_READ, Route36TrainerTips1 -.ObjectEvents: - db 9 + db 9 ; object events object_event 20, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1 object_event 31, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1 - object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO - object_event 51, 8, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1940e0, -1 - object_event 44, 9, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1 - object_event 21, 4, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1 - object_event 46, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY + object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO + object_event 51, 8, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1940e0, -1 + object_event 44, 9, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1 + object_event 21, 4, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1 + object_event 46, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY object_event 33, 12, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO - object_event 21, 6, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 + object_event 21, 6, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 5251fa470..7afa94b5e 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE36NATIONALPARKGATE_OFFICER1 const ROUTE36NATIONALPARKGATE_YOUNGSTER1 const ROUTE36NATIONALPARKGATE_YOUNGSTER2 @@ -13,14 +13,12 @@ const_value set 2 const ROUTE36NATIONALPARKGATE_OFFICER2 Route36NationalParkGate_MapScripts: -.SceneScripts: - db 3 - scene_script .DummyScene0 - scene_script .DummyScene1 - scene_script .LeaveContestEarly - -.MapCallbacks: - db 2 + db 3 ; scene scripts + scene_script .DummyScene0 ; SCENE_ROUTE36NATIONALPARKGATE_NOTHING + scene_script .DummyScene1 ; SCENE_ROUTE36NATIONALPARKGATE_UNUSED + scene_script .LeaveContestEarly ; SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY + + db 2 ; callbacks callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable @@ -37,20 +35,20 @@ Route36NationalParkGate_MapScripts: .CheckIfContestRunning: checkflag ENGINE_BUG_CONTEST_TIMER iftrue .BugContestIsRunning - setscene 0 + setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING return .BugContestIsRunning: - setscene 2 + setscene SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY return .CheckIfContestAvailable: checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE iftrue .Return checkcode VAR_WEEKDAY - if_equal TUESDAY, .SetContestOfficer - if_equal THURSDAY, .SetContestOfficer - if_equal SATURDAY, .SetContestOfficer + ifequal TUESDAY, .SetContestOfficer + ifequal THURSDAY, .SetContestOfficer + ifequal SATURDAY, .SetContestOfficer checkflag ENGINE_BUG_CONTEST_TIMER iftrue .SetContestOfficer disappear ROUTE36NATIONALPARKGATE_OFFICER1 @@ -64,7 +62,7 @@ Route36NationalParkGate_MapScripts: return .LeavingContestEarly: - spriteface PLAYER, UP + objectface PLAYER, UP opentext checkcode VAR_CONTESTMINUTES addvar 1 @@ -75,23 +73,23 @@ Route36NationalParkGate_MapScripts: writetext UnknownText_0x6b2c5 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes scall .CopyContestants disappear ROUTE36NATIONALPARKGATE_OFFICER1 appear ROUTE36NATIONALPARKGATE_OFFICER2 applymovement PLAYER, MovementData_0x6add1 pause 15 - special Special_FadeInQuickly + special FadeInQuickly jumpstd bugcontestresults .GoBackToContest: writetext UnknownText_0x6b300 waitbutton closetext - spriteface PLAYER, LEFT + objectface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18 end @@ -142,10 +140,10 @@ Route36NationalParkGate_MapScripts: Route36OfficerScriptContest: checkcode VAR_WEEKDAY - if_equal SUNDAY, _ContestNotOn - if_equal MONDAY, _ContestNotOn - if_equal WEDNESDAY, _ContestNotOn - if_equal FRIDAY, _ContestNotOn + ifequal SUNDAY, _ContestNotOn + ifequal MONDAY, _ContestNotOn + ifequal WEDNESDAY, _ContestNotOn + ifequal FRIDAY, _ContestNotOn faceplayer opentext checkflag ENGINE_DAILY_BUG_CONTEST @@ -155,8 +153,8 @@ Route36OfficerScriptContest: yesorno iffalse .DecidedNotToJoinContest checkcode VAR_PARTYCOUNT - if_greater_than 1, .LeaveMonsWithOfficer - special Special_ContestDropOffMons + ifgreater 1, .LeaveMonsWithOfficer + special ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER .ResumeStartingContest: setflag ENGINE_BUG_CONTEST_TIMER @@ -171,27 +169,27 @@ Route36OfficerScriptContest: waitbutton closetext setflag ENGINE_BUG_CONTEST_TIMER - special Special_GiveParkBalls - spriteface PLAYER, LEFT + special GiveParkBalls + objectface PLAYER, LEFT playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx - special Special_SelectRandomBugContestContestants + special SelectRandomBugContestContestants warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, 33, 18 end .LeaveMonsWithOfficer: checkcode VAR_PARTYCOUNT - if_less_than PARTY_LENGTH, .ContinueLeavingMons + ifless PARTY_LENGTH, .ContinueLeavingMons checkcode VAR_BOXSPACE - if_equal 0, .BoxFull + ifequal 0, .BoxFull .ContinueLeavingMons: - special Special_CheckFirstMonIsEgg - if_equal TRUE, .FirstMonIsEgg + special CheckFirstMonIsEgg + ifequal TRUE, .FirstMonIsEgg writetext UnknownText_0x6afb0 yesorno iffalse .RefusedToLeaveMons - special Special_ContestDropOffMons + special ContestDropOffMons iftrue .FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6b021 @@ -308,7 +306,7 @@ Route36ParkGate_DayToText: YoungsterScript_0x6ad06: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad14 writetext UnknownText_0x6b399 waitbutton @@ -324,7 +322,7 @@ UnknownScript_0x6ad14: YoungsterScript_0x6ad1a: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad28 writetext UnknownText_0x6b40f waitbutton @@ -340,7 +338,7 @@ UnknownScript_0x6ad28: RockerScript_0x6ad2e: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad3c writetext UnknownText_0x6b462 waitbutton @@ -356,7 +354,7 @@ UnknownScript_0x6ad3c: PokefanMScript_0x6ad42: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad50 writetext UnknownText_0x6b4da waitbutton @@ -372,7 +370,7 @@ UnknownScript_0x6ad50: YoungsterScript_0x6ad56: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad64 writetext UnknownText_0x6b54e waitbutton @@ -388,7 +386,7 @@ UnknownScript_0x6ad64: YoungsterScript_0x6ad6a: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad78 writetext UnknownText_0x6b5b0 waitbutton @@ -404,7 +402,7 @@ UnknownScript_0x6ad78: LassScript_0x6ad7e: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ad8c writetext UnknownText_0x6b64b waitbutton @@ -420,7 +418,7 @@ UnknownScript_0x6ad8c: YoungsterScript_0x6ad92: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6ada0 writetext UnknownText_0x6b6b8 waitbutton @@ -436,7 +434,7 @@ UnknownScript_0x6ada0: YoungsterScript_0x6ada6: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6adb4 writetext UnknownText_0x6b71b waitbutton @@ -452,7 +450,7 @@ UnknownScript_0x6adb4: YoungsterScript_0x6adba: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iffalse UnknownScript_0x6adc8 writetext UnknownText_0x6b76f waitbutton @@ -850,34 +848,29 @@ UnknownText_0x6b97f: done Route36NationalParkGate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 0, 4, 1, NATIONAL_PARK - warp_def 0, 5, 2, NATIONAL_PARK - warp_def 9, 4, 1, ROUTE_36 - warp_def 9, 5, 2, ROUTE_36 - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 6, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script - -.ObjectEvents: - db 12 - object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY - object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B - object_event 4, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B - object_event 2, 6, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B - object_event 6, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B - object_event 2, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B - object_event 5, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B - object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B - object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B - object_event 6, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B - object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B - object_event 3, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY + db 0, 0 ; filler + + db 4 ; warp events + warp_event 0, 4, NATIONAL_PARK, 1 + warp_event 0, 5, NATIONAL_PARK, 2 + warp_event 9, 4, ROUTE_36, 1 + warp_event 9, 5, ROUTE_36, 2 + + db 0 ; coord events + + db 1 ; bg events + bg_event 6, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script + + db 12 ; object events + object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B + object_event 4, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B + object_event 2, 6, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B + object_event 6, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B + object_event 2, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B + object_event 5, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B + object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B + object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B + object_event 6, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B + object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B + object_event 3, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index c7355dd04..ed894445d 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE36RUINSOFALPHGATE_OFFICER const ROUTE36RUINSOFALPHGATE_GRAMPS Route36RuinsOfAlphGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route36RuinsOfAlphGateOfficerScript: jumptextfaceplayer Route36RuinsOfAlphGateOfficerText @@ -35,23 +33,18 @@ Route36RuinsOfAlphGateGrampsText: done Route36RuinsOfAlphGate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 4, 0, 3, ROUTE_36 - warp_def 5, 0, 4, ROUTE_36 - warp_def 4, 7, 9, RUINS_OF_ALPH_OUTSIDE - warp_def 5, 7, 9, RUINS_OF_ALPH_OUTSIDE - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1 - object_event 7, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 4, 0, ROUTE_36, 3 + warp_event 5, 0, ROUTE_36, 4 + warp_event 4, 7, RUINS_OF_ALPH_OUTSIDE, 9 + warp_event 5, 7, RUINS_OF_ALPH_OUTSIDE, 9 + + db 0 ; coord events + + db 0 ; bg events + + db 2 ; object events + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1 + object_event 7, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1 diff --git a/maps/Route37.asm b/maps/Route37.asm index 27dd38893..8a5a2b8a5 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE37_WEIRD_TREE1 const ROUTE37_WEIRD_TREE2 const ROUTE37_YOUNGSTER @@ -8,16 +8,14 @@ const_value set 2 const ROUTE37_FRUIT_TREE3 Route37_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .Sunny .Sunny: checkcode VAR_WEEKDAY - if_equal SUNDAY, .SunnyAppears + ifequal SUNDAY, .SunnyAppears disappear ROUTE37_SUNNY return @@ -26,10 +24,10 @@ Route37_MapScripts: return TrainerTwinsAnnandanne1: - trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script + trainer TWINS, ANNANDANNE1, EVENT_BEAT_TWINS_ANN_AND_ANNE, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext TwinsAnnandanne1AfterBattleText waitbutton @@ -37,10 +35,10 @@ TrainerTwinsAnnandanne1: end TrainerTwinsAnnandanne2: - trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, .Script + trainer TWINS, ANNANDANNE2, EVENT_BEAT_TWINS_ANN_AND_ANNE, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext TwinsAnnandanne2AfterBattleText waitbutton @@ -48,10 +46,10 @@ TrainerTwinsAnnandanne2: end TrainerPsychicGreg: - trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, .Script + trainer PSYCHIC_T, GREG, EVENT_BEAT_PSYCHIC_GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PsychicGregAfterBattleText waitbutton @@ -64,7 +62,7 @@ SunnyScript: checkevent EVENT_GOT_MAGNET_FROM_SUNNY iftrue SunnySundayScript checkcode VAR_WEEKDAY - if_not_equal SUNDAY, SunnyNotSundayScript + ifnotequal SUNDAY, SunnyNotSundayScript checkevent EVENT_MET_SUNNY_OF_SUNDAY iftrue .MetSunny writetext MeetSunnyText @@ -114,7 +112,7 @@ FruitTreeScript_0x1a8e0d: fruittree FRUITTREE_ROUTE_37_3 Route37HiddenEther: - hiddenitem EVENT_ROUTE_37_HIDDEN_ETHER, ETHER + hiddenitem ETHER, EVENT_ROUTE_37_HIDDEN_ETHER TwinsAnnandanne1SeenText: text "ANN: ANNE and I" @@ -238,26 +236,21 @@ Route37SignText: done Route37_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 0 - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 5, 3, BGEVENT_READ, Route37Sign - bg_event 4, 2, BGEVENT_ITEM, Route37HiddenEther - -.ObjectEvents: - db 7 - object_event 6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1 - object_event 7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1 - object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1 - object_event 13, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1 - object_event 16, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY - object_event 16, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1 - object_event 15, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1 + db 0, 0 ; filler + + db 0 ; warp events + + db 0 ; coord events + + db 2 ; bg events + bg_event 5, 3, BGEVENT_READ, Route37Sign + bg_event 4, 2, BGEVENT_ITEM, Route37HiddenEther + + db 7 ; object events + object_event 6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1 + object_event 7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1 + object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1 + object_event 13, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1 + object_event 16, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY + object_event 16, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1 + object_event 15, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1 diff --git a/maps/Route38.asm b/maps/Route38.asm index c228429ba..67fff4f30 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE38_STANDING_YOUNGSTER1 const ROUTE38_LASS const ROUTE38_STANDING_YOUNGSTER2 @@ -8,17 +8,15 @@ const_value set 2 const ROUTE38_BUENA2 Route38_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperToby: - trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script + trainer BIRD_KEEPER, TOBY, EVENT_BEAT_BIRD_KEEPER_TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script .Script - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperTobyAfterBattleText waitbutton @@ -26,10 +24,10 @@ TrainerBirdKeeperToby: end TrainerSailorHarry: - trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script + trainer SAILOR, HARRY, EVENT_BEAT_SAILOR_HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script .Script - end_if_just_battled + endifjustbattled opentext writetext SailorHarryAfterBattleText waitbutton @@ -37,11 +35,11 @@ TrainerSailorHarry: end TrainerLassDana1: - trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .Script + trainer LASS, DANA1, EVENT_BEAT_LASS_DANA, LassDana1SeenText, LassDana1BeatenText, 0, .Script .Script writecode VAR_CALLERID, PHONE_LASS_DANA - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_DANA iftrue .DanaRematch @@ -61,8 +59,8 @@ TrainerLassDana1: scall .AskNumber2F .AskForPhoneNumber: askforphonenumber PHONE_LASS_DANA - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber trainertotext LASS, DANA1, MEM_BUFFER_0 scall .RegisteredPhoneNumber jump .NumberAccepted @@ -71,11 +69,11 @@ TrainerLassDana1: scall .Rematch winlosstext LassDana1BeatenText, 0 copybytetovar wDanaFightCount - if_equal 4, .Fight4 - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 4, .Fight4 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 @@ -175,11 +173,11 @@ TrainerLassDana1: end TrainerSchoolboyChad1: - trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .Script + trainer SCHOOLBOY, CHAD1, EVENT_BEAT_SCHOOLBOY_CHAD, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .Script .Script writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_CHAD iftrue .ChadRematch @@ -197,8 +195,8 @@ TrainerSchoolboyChad1: scall .AskPhoneNumber2 .AskToRegisterNumber: askforphonenumber PHONE_SCHOOLBOY_CHAD - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .SaidNo + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .SaidNo trainertotext SCHOOLBOY, CHAD1, MEM_BUFFER_0 scall .RegisteredChad jump .HaveChadsNumber @@ -207,11 +205,11 @@ TrainerSchoolboyChad1: scall .Rematch winlosstext SchoolboyChad1BeatenText, 0 copybytetovar wChadFightCount - if_equal 4, .Fight4 - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 4, .Fight4 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 @@ -292,10 +290,10 @@ TrainerSchoolboyChad1: end TrainerBeautyValerie: - trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script + trainer BEAUTY, VALERIE, EVENT_BEAT_BEAUTY_VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script .Script - end_if_just_battled + endifjustbattled opentext writetext BeautyValerieAfterBattleText waitbutton @@ -303,10 +301,10 @@ TrainerBeautyValerie: end TrainerBeautyOlivia: - trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script + trainer BEAUTY, OLIVIA, EVENT_BEAT_BEAUTY_OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script .Script - end_if_just_battled + endifjustbattled opentext writetext BeautyOliviaAfterBattleText waitbutton @@ -473,28 +471,23 @@ Route38TrainerTipsText: done Route38_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 35, 8, 1, ROUTE_38_ECRUTEAK_GATE - warp_def 35, 9, 2, ROUTE_38_ECRUTEAK_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 33, 7, BGEVENT_READ, Route38Sign - bg_event 5, 13, BGEVENT_READ, Route38TrainerTips - -.ObjectEvents: - db 7 - object_event 4, 1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1 - object_event 15, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 35, 8, ROUTE_38_ECRUTEAK_GATE, 1 + warp_event 35, 9, ROUTE_38_ECRUTEAK_GATE, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 33, 7, BGEVENT_READ, Route38Sign + bg_event 5, 13, BGEVENT_READ, Route38TrainerTips + + db 7 ; object events + object_event 4, 1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1 + object_event 15, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1 object_event 12, 15, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1 - object_event 19, 9, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1 - object_event 24, 5, SPRITE_SAILOR, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1 - object_event 12, 10, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1 - object_event 5, 8, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1 + object_event 19, 9, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1 + object_event 24, 5, SPRITE_SAILOR, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1 + object_event 12, 10, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1 + object_event 5, 8, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index fa7280b57..2277c3a1d 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE38ECRUTEAKGATE_OFFICER Route38EcruteakGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route38EcruteakGateOfficerScript: jumptextfaceplayer Route38EcruteakGateOfficerText @@ -25,22 +23,17 @@ Route38EcruteakGateOfficerText: done Route38EcruteakGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 4, 1, ROUTE_38 - warp_def 0, 5, 2, ROUTE_38 - warp_def 9, 4, 14, ECRUTEAK_CITY - warp_def 9, 5, 15, ECRUTEAK_CITY + db 4 ; warp events + warp_event 0, 4, ROUTE_38, 1 + warp_event 0, 5, ROUTE_38, 2 + warp_event 9, 4, ECRUTEAK_CITY, 14 + warp_event 9, 5, ECRUTEAK_CITY, 15 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1 + db 1 ; object events + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1 diff --git a/maps/Route39.asm b/maps/Route39.asm index 36ecda5fc..2321a7fb1 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE39_SAILOR const ROUTE39_POKEFAN_M const ROUTE39_POKEFAN_F1 @@ -11,11 +11,9 @@ const_value set 2 const ROUTE39_POKEFAN_F2 Route39_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route39Miltank: opentext @@ -26,11 +24,11 @@ Route39Miltank: end TrainerPokefanmDerek: - trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerekSeenText, PokefanmDerekBeatenText, 0, .Script + trainer POKEFANM, DEREK1, EVENT_BEAT_POKEFANM_DEREK, PokefanmDerekSeenText, PokefanmDerekBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_POKEFANM_DEREK - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_DEREK_HAS_NUGGET iftrue .HasNugget @@ -50,8 +48,8 @@ TrainerPokefanmDerek: scall .AskNumber2 .AskForNumber: askforphonenumber PHONE_POKEFANM_DEREK - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext POKEFANM, DEREK1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -105,10 +103,10 @@ TrainerPokefanmDerek: end TrainerPokefanfRuth: - trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, .Script + trainer POKEFANF, RUTH, EVENT_BEAT_POKEFANF_RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokefanfRuthAfterBattleText waitbutton @@ -116,10 +114,10 @@ TrainerPokefanfRuth: end TrainerSailorEugene: - trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, .Script + trainer SAILOR, EUGENE, EVENT_BEAT_SAILOR_EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SailorEugeneAfterBattleText waitbutton @@ -127,10 +125,10 @@ TrainerSailorEugene: end TrainerPsychicNorman: - trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, .Script + trainer PSYCHIC_T, NORMAN, EVENT_BEAT_PSYCHIC_NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PsychicNormanAfterBattleText waitbutton @@ -140,7 +138,7 @@ TrainerPsychicNorman: TrainerPokefanfJaime: faceplayer opentext - checknite + checktime NITE iffalse .NotNight checkevent EVENT_BEAT_POKEFANF_JAIME iftrue .Beaten @@ -180,7 +178,7 @@ FruitTreeScript_0x1a5bf4: fruittree FRUITTREE_ROUTE_39 Route39HiddenNugget: - hiddenitem EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET + hiddenitem NUGGET, EVENT_ROUTE_39_HIDDEN_NUGGET Route39MiltankText: text "MILTANK: Mooo!" @@ -344,33 +342,28 @@ Route39TrainerTipsText: done Route39_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 1, 3, 1, ROUTE_39_BARN - warp_def 5, 3, 1, ROUTE_39_FARMHOUSE - -.CoordEvents: - db 0 - -.BGEvents: - db 4 - bg_event 5, 31, BGEVENT_READ, Route39TrainerTips - bg_event 9, 5, BGEVENT_READ, MoomooFarmSign - bg_event 15, 7, BGEVENT_READ, Route39Sign - bg_event 5, 13, BGEVENT_ITEM, Route39HiddenNugget - -.ObjectEvents: - db 10 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 1, 3, ROUTE_39_BARN, 1 + warp_event 5, 3, ROUTE_39_FARMHOUSE, 1 + + db 0 ; coord events + + db 4 ; bg events + bg_event 5, 31, BGEVENT_READ, Route39TrainerTips + bg_event 9, 5, BGEVENT_READ, MoomooFarmSign + bg_event 15, 7, BGEVENT_READ, Route39Sign + bg_event 5, 13, BGEVENT_ITEM, Route39HiddenNugget + + db 10 ; object events object_event 13, 29, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1 object_event 10, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek, -1 object_event 11, 19, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanfRuth, -1 - object_event 3, 12, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 - object_event 6, 11, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 - object_event 4, 15, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 - object_event 8, 13, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 - object_event 13, 7, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1 - object_event 9, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1 - object_event 4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerPokefanfJaime, -1 + object_event 3, 12, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 + object_event 6, 11, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 + object_event 4, 15, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 + object_event 8, 13, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 + object_event 13, 7, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1 + object_event 9, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1 + object_event 4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerPokefanfJaime, -1 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 5cc21eab5..f1bbdcad4 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE39BARN_TWIN1 const ROUTE39BARN_TWIN2 const ROUTE39BARN_MOOMOO Route39Barn_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TwinScript_0x9cc76: faceplayer @@ -18,14 +16,14 @@ TwinScript_0x9cc76: writetext Text_MoomooIsSick waitbutton closetext - spriteface ROUTE39BARN_TWIN1, RIGHT + objectface ROUTE39BARN_TWIN1, RIGHT end .FeedingMooMoo: writetext Text_WereFeedingMoomoo waitbutton closetext - spriteface ROUTE39BARN_TWIN1, RIGHT + objectface ROUTE39BARN_TWIN1, RIGHT end TwinScript_0x9cc90: @@ -36,14 +34,14 @@ TwinScript_0x9cc90: writetext Text_MoomooIsSick waitbutton closetext - spriteface ROUTE39BARN_TWIN2, LEFT + objectface ROUTE39BARN_TWIN2, LEFT end .FeedingMooMoo: writetext Text_WereFeedingMoomoo waitbutton closetext - spriteface ROUTE39BARN_TWIN2, LEFT + objectface ROUTE39BARN_TWIN2, LEFT end MooMoo: @@ -52,7 +50,7 @@ MooMoo: iftrue .HappyCow writetext Text_WeakMoo writebyte MILTANK - special Special_PlaySlowCry + special PlaySlowCry buttonsound writetext Text_ItsCryIsWeak checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO @@ -72,9 +70,9 @@ MooMoo: copybytetovar wMooMooBerries addvar 1 copyvartobyte wMooMooBerries - if_equal 3, .ThreeBerries - if_equal 5, .FiveBerries - if_equal 7, .SevenBerries + ifequal 3, .ThreeBerries + ifequal 5, .FiveBerries + ifequal 7, .SevenBerries writetext Text_GaveBerry waitbutton closetext @@ -189,22 +187,17 @@ Text_RefusedToGiveBerry: done Route39Barn_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 7, 1, ROUTE_39 - warp_def 4, 7, 1, ROUTE_39 + db 2 ; warp events + warp_event 3, 7, ROUTE_39, 1 + warp_event 4, 7, ROUTE_39, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 2, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1 - object_event 4, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1 - object_event 3, 3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1 + db 3 ; object events + object_event 2, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1 + object_event 4, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1 + object_event 3, 3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 9f46263de..510d6e5d5 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE39FARMHOUSE_POKEFAN_M const ROUTE39FARMHOUSE_POKEFAN_F Route39Farmhouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks PokefanM_DairyFarmer: faceplayer @@ -24,15 +22,15 @@ FarmerMScript_SellMilk: checkitem MOOMOO_MILK iftrue FarmerMScript_Milking writetext FarmerMText_BuyMilk - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight yesorno iffalse FarmerMScript_NoSale checkmoney YOUR_MONEY, 500 - if_equal HAVE_LESS, FarmerMScript_NoMoney + ifequal HAVE_LESS, FarmerMScript_NoMoney giveitem MOOMOO_MILK iffalse FarmerMScript_NoRoom takemoney YOUR_MONEY, 500 - special Special_PlaceMoneyTopRight + special PlaceMoneyTopRight waitsfx playsound SFX_TRANSACTION writetext FarmerMText_GotMilk @@ -193,23 +191,18 @@ FarmerFText_SnoreSpeech: done Route39Farmhouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 2, ROUTE_39 - warp_def 3, 7, 2, ROUTE_39 - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, FarmhouseBookshelf - bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf - -.ObjectEvents: - db 2 - object_event 3, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1 - object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, ROUTE_39, 2 + warp_event 3, 7, ROUTE_39, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, FarmhouseBookshelf + bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf + + db 2 ; object events + object_event 3, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1 + object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1 diff --git a/maps/Route4.asm b/maps/Route4.asm index a0bf7c4bc..c7722e3a9 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -1,21 +1,19 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE4_YOUNGSTER const ROUTE4_LASS1 const ROUTE4_LASS2 const ROUTE4_POKE_BALL Route4_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperHank: - trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script + trainer BIRD_KEEPER, HANK, EVENT_BEAT_BIRD_KEEPER_HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperHankAfterBattleText waitbutton @@ -23,10 +21,10 @@ TrainerBirdKeeperHank: end TrainerPicnickerHope: - trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, .Script + trainer PICNICKER, HOPE, EVENT_BEAT_PICNICKER_HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PicnickerHopeAfterBattleText waitbutton @@ -34,10 +32,10 @@ TrainerPicnickerHope: end TrainerPicnickerSharon: - trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, .Script + trainer PICNICKER, SHARON, EVENT_BEAT_PICNICKER_SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PicnickerSharonAfterBattleText waitbutton @@ -51,7 +49,7 @@ Route4HPUp: itemball HP_UP Route4HiddenUltraBall: - hiddenitem EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem ULTRA_BALL, EVENT_ROUTE_4_HIDDEN_ULTRA_BALL BirdKeeperHankSeenText: text "I'm raising my" @@ -121,24 +119,19 @@ MtMoonSquareSignText: done Route4_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def 2, 5, 2, MOUNT_MOON - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 7, BGEVENT_READ, MtMoonSquareSign - bg_event 10, 3, BGEVENT_ITEM, Route4HiddenUltraBall - -.ObjectEvents: - db 4 - object_event 17, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1 - object_event 9, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1 - object_event 21, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 - object_event 26, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP + db 0, 0 ; filler + + db 1 ; warp events + warp_event 2, 5, MOUNT_MOON, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 7, BGEVENT_READ, MtMoonSquareSign + bg_event 10, 3, BGEVENT_ITEM, Route4HiddenUltraBall + + db 4 ; object events + object_event 17, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1 + object_event 9, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1 + object_event 21, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 + object_event 26, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP diff --git a/maps/Route40.asm b/maps/Route40.asm index 77f433c81..5e37a7bf5 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE40_OLIVINE_RIVAL1 const ROUTE40_OLIVINE_RIVAL2 const ROUTE40_SWIMMER_GIRL1 @@ -13,17 +13,15 @@ const_value set 2 const ROUTE40_STANDING_YOUNGSTER Route40_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .MonicaCallback .MonicaCallback: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR checkcode VAR_WEEKDAY - if_equal MONDAY, .MonicaAppears + ifequal MONDAY, .MonicaAppears disappear ROUTE40_MONICA return @@ -32,10 +30,10 @@ Route40_MapScripts: return TrainerSwimmerfElaine: - trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script + trainer SWIMMERF, ELAINE, EVENT_BEAT_SWIMMERF_ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfElaineAfterBattleText waitbutton @@ -43,10 +41,10 @@ TrainerSwimmerfElaine: end TrainerSwimmerfPaula: - trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, .Script + trainer SWIMMERF, PAULA, EVENT_BEAT_SWIMMERF_PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfPaulaAfterBattleText waitbutton @@ -54,10 +52,10 @@ TrainerSwimmerfPaula: end TrainerSwimmermSimon: - trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, .Script + trainer SWIMMERM, SIMON, EVENT_BEAT_SWIMMERM_SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermSimonAfterBattleText waitbutton @@ -65,10 +63,10 @@ TrainerSwimmermSimon: end TrainerSwimmermRandall: - trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, .Script + trainer SWIMMERM, RANDALL, EVENT_BEAT_SWIMMERM_RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermRandallAfterBattleText waitbutton @@ -79,7 +77,7 @@ Route40Lass1Script: jumptextfaceplayer Route40Lass1Text PokefanMScript_0x1a61c7: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x1a646a @@ -98,7 +96,7 @@ MonicaScript: checkevent EVENT_GOT_SHARP_BEAK_FROM_MONICA iftrue .Monday checkcode VAR_WEEKDAY - if_not_equal MONDAY, .NotMonday + ifnotequal MONDAY, .NotMonday checkevent EVENT_MET_MONICA_OF_MONDAY iftrue .MetMonica writetext MeetMonicaText @@ -135,7 +133,7 @@ Route40Rock: jumpstd smashrock Route40HiddenHyperPotion: - hiddenitem EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_ROUTE_40_HIDDEN_HYPER_POTION MovementData_0x1a621c: step RIGHT @@ -338,32 +336,27 @@ Route40SignText: done Route40_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 9, 5, 1, ROUTE_40_BATTLE_TOWER_GATE + db 1 ; warp events + warp_event 9, 5, ROUTE_40_BATTLE_TOWER_GATE, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 14, 10, BGEVENT_READ, Route40Sign - bg_event 7, 8, BGEVENT_ITEM, Route40HiddenHyperPotion + bg_event 7, 8, BGEVENT_ITEM, Route40HiddenHyperPotion -.ObjectEvents: - db 12 + db 12 ; object events object_event 14, 15, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSimon, -1 object_event 18, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerSwimmermRandall, -1 - object_event 3, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1 + object_event 3, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1 object_event 10, 25, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfPaula, -1 - object_event 7, 11, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 - object_event 6, 9, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 - object_event 7, 8, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 + object_event 7, 11, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 + object_event 6, 9, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 + object_event 7, 8, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 object_event 11, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Lass1Script, -1 - object_event 8, 10, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY - object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1 - object_event 13, 4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1 - object_event 16, 9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + object_event 8, 10, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY + object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1 + object_event 13, 4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1 + object_event 16, 9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index edd8fb7ff..9678e9aa3 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE40BATTLETOWERGATE_ROCKER const ROUTE40BATTLETOWERGATE_TWIN Route40BattleTowerGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .ShowSailor .ShowSailor: @@ -71,23 +69,18 @@ Route40BattleTowerGateTwinText: done Route40BattleTowerGate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 4, 7, 1, ROUTE_40 - warp_def 5, 7, 1, ROUTE_40 - warp_def 4, 0, 1, BATTLE_TOWER_OUTSIDE - warp_def 5, 0, 2, BATTLE_TOWER_OUTSIDE - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 2 - object_event 3, 3, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR - object_event 7, 5, SPRITE_TWIN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 4, 7, ROUTE_40, 1 + warp_event 5, 7, ROUTE_40, 1 + warp_event 4, 0, BATTLE_TOWER_OUTSIDE, 1 + warp_event 5, 0, BATTLE_TOWER_OUTSIDE, 2 + + db 0 ; coord events + + db 0 ; bg events + + db 2 ; object events + object_event 3, 3, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + object_event 7, 5, SPRITE_TWIN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1 diff --git a/maps/Route41.asm b/maps/Route41.asm index 4b66164dd..d851a41e5 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE41_OLIVINE_RIVAL1 const ROUTE41_OLIVINE_RIVAL2 const ROUTE41_OLIVINE_RIVAL3 @@ -11,17 +11,15 @@ const_value set 2 const ROUTE41_SWIMMER_GIRL5 Route41_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerSwimmerfKaylee: - trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script + trainer SWIMMERF, KAYLEE, EVENT_BEAT_SWIMMERF_KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfKayleeAfterBattleText waitbutton @@ -29,10 +27,10 @@ TrainerSwimmerfKaylee: end TrainerSwimmerfSusie: - trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, .Script + trainer SWIMMERF, SUSIE, EVENT_BEAT_SWIMMERF_SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfSusieAfterBattleText waitbutton @@ -40,10 +38,10 @@ TrainerSwimmerfSusie: end TrainerSwimmerfDenise: - trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, .Script + trainer SWIMMERF, DENISE, EVENT_BEAT_SWIMMERF_DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfDeniseAfterBattleText waitbutton @@ -51,10 +49,10 @@ TrainerSwimmerfDenise: end TrainerSwimmerfKara: - trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, .Script + trainer SWIMMERF, KARA, EVENT_BEAT_SWIMMERF_KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfKaraAfterBattleText waitbutton @@ -62,10 +60,10 @@ TrainerSwimmerfKara: end TrainerSwimmerfWendy: - trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, .Script + trainer SWIMMERF, WENDY, EVENT_BEAT_SWIMMERF_WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmerfWendyAfterBattleText waitbutton @@ -73,10 +71,10 @@ TrainerSwimmerfWendy: end TrainerSwimmermCharlie: - trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, .Script + trainer SWIMMERM, CHARLIE, EVENT_BEAT_SWIMMERM_CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermCharlieAfterBattleText waitbutton @@ -84,10 +82,10 @@ TrainerSwimmermCharlie: end TrainerSwimmermGeorge: - trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, .Script + trainer SWIMMERM, GEORGE, EVENT_BEAT_SWIMMERM_GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermGeorgeAfterBattleText waitbutton @@ -95,10 +93,10 @@ TrainerSwimmermGeorge: end TrainerSwimmermBerke: - trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, .Script + trainer SWIMMERM, BERKE, EVENT_BEAT_SWIMMERM_BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermBerkeAfterBattleText waitbutton @@ -106,10 +104,10 @@ TrainerSwimmermBerke: end TrainerSwimmermKirk: - trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, .Script + trainer SWIMMERM, KIRK, EVENT_BEAT_SWIMMERM_KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermKirkAfterBattleText waitbutton @@ -117,10 +115,10 @@ TrainerSwimmermKirk: end TrainerSwimmermMathew: - trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, .Script + trainer SWIMMERM, MATHEW, EVENT_BEAT_SWIMMERM_MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SwimmermMathewAfterBattleText waitbutton @@ -132,7 +130,7 @@ Route41Rock: jumpstd smashrock Route41HiddenMaxEther: - hiddenitem EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER + hiddenitem MAX_ETHER, EVENT_ROUTE_41_HIDDEN_MAX_ETHER SwimmermCharlieSeenText: text "The water's warm" @@ -342,32 +340,27 @@ SwimmerfWendyAfterBattleText: done Route41_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 12, 17, 1, WHIRL_ISLAND_NW - warp_def 36, 19, 1, WHIRL_ISLAND_NE - warp_def 12, 37, 1, WHIRL_ISLAND_SW - warp_def 36, 45, 1, WHIRL_ISLAND_SE - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 9, 35, BGEVENT_ITEM, Route41HiddenMaxEther - -.ObjectEvents: - db 10 - object_event 32, 6, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1 - object_event 46, 8, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 12, 17, WHIRL_ISLAND_NW, 1 + warp_event 36, 19, WHIRL_ISLAND_NE, 1 + warp_event 12, 37, WHIRL_ISLAND_SW, 1 + warp_event 36, 45, WHIRL_ISLAND_SE, 1 + + db 0 ; coord events + + db 1 ; bg events + bg_event 9, 35, BGEVENT_ITEM, Route41HiddenMaxEther + + db 10 ; object events + object_event 32, 6, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1 + object_event 46, 8, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1 object_event 20, 26, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermBerke, -1 object_event 32, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermKirk, -1 object_event 19, 46, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermMathew, -1 - object_event 17, 4, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1 + object_event 17, 4, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1 object_event 23, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfSusie, -1 object_event 27, 34, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDenise, -1 object_event 44, 28, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfKara, -1 - object_event 9, 50, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1 + object_event 9, 50, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1 diff --git a/maps/Route42.asm b/maps/Route42.asm index 47d45c140..b38bb0344 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE42_FISHER const ROUTE42_POKEFAN_M const ROUTE42_SUPER_NERD @@ -10,13 +10,11 @@ const_value set 2 const ROUTE42_SUICUNE Route42_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_ROUTE42_NOTHING + scene_script .DummyScene1 ; SCENE_ROUTE42_SUICUNE -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -31,17 +29,17 @@ Route42SuicuneScript: applymovement ROUTE42_SUICUNE, MovementData_0x1a9356 disappear ROUTE42_SUICUNE pause 10 - setscene 0 + setscene SCENE_ROUTE42_NOTHING clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36 - setmapscene ROUTE_36, 1 + setmapscene ROUTE_36, SCENE_ROUTE36_SUICUNE end TrainerFisherTully: - trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTullySeenText, FisherTullyBeatenText, 0, .Script + trainer FISHER, TULLY1, EVENT_BEAT_FISHER_TULLY, FisherTullySeenText, FisherTullyBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_FISHER_TULLY - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_TULLY iftrue .WantsBattle @@ -61,8 +59,8 @@ TrainerFisherTully: scall .AskNumber2 .AskForNumber: askforphonenumber PHONE_FISHER_TULLY - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext FISHER, TULLY1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -71,10 +69,10 @@ TrainerFisherTully: scall .Rematch winlosstext FisherTullyBeatenText, 0 copybytetovar wTullyFightCount - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight3: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight3 @@ -163,10 +161,10 @@ TrainerFisherTully: end TrainerPokemaniacShane: - trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script + trainer POKEMANIAC, SHANE, EVENT_BEAT_POKEMANIAC_SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokemaniacShaneAfterBattleText waitbutton @@ -174,10 +172,10 @@ TrainerPokemaniacShane: end TrainerHikerBenjamin: - trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script + trainer HIKER, BENJAMIN, EVENT_BEAT_HIKER_BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerBenjaminAfterBattleText waitbutton @@ -212,7 +210,7 @@ FruitTreeScript_0x1a9351: fruittree FRUITTREE_ROUTE_42_3 Route42HiddenMaxPotion: - hiddenitem EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_ROUTE_42_HIDDEN_MAX_POTION MovementData_0x1a9356: set_sliding @@ -319,37 +317,32 @@ Route42Sign2Text: done Route42_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 0, 8, 3, ROUTE_42_ECRUTEAK_GATE - warp_def 0, 9, 4, ROUTE_42_ECRUTEAK_GATE - warp_def 10, 5, 1, MOUNT_MORTAR_1F_OUTSIDE - warp_def 28, 9, 2, MOUNT_MORTAR_1F_OUTSIDE - warp_def 46, 7, 3, MOUNT_MORTAR_1F_OUTSIDE - -.CoordEvents: - db 1 - coord_event 24, 14, 1, Route42SuicuneScript - -.BGEvents: - db 5 - bg_event 4, 10, BGEVENT_READ, Route42Sign1 - bg_event 7, 5, BGEVENT_READ, MtMortarSign1 - bg_event 45, 9, BGEVENT_READ, MtMortarSign2 - bg_event 54, 8, BGEVENT_READ, Route42Sign2 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 0, 8, ROUTE_42_ECRUTEAK_GATE, 3 + warp_event 0, 9, ROUTE_42_ECRUTEAK_GATE, 4 + warp_event 10, 5, MOUNT_MORTAR_1F_OUTSIDE, 1 + warp_event 28, 9, MOUNT_MORTAR_1F_OUTSIDE, 2 + warp_event 46, 7, MOUNT_MORTAR_1F_OUTSIDE, 3 + + db 1 ; coord events + coord_event 24, 14, SCENE_ROUTE42_SUICUNE, Route42SuicuneScript + + db 5 ; bg events + bg_event 4, 10, BGEVENT_READ, Route42Sign1 + bg_event 7, 5, BGEVENT_READ, MtMortarSign1 + bg_event 45, 9, BGEVENT_READ, MtMortarSign2 + bg_event 54, 8, BGEVENT_READ, Route42Sign2 bg_event 16, 11, BGEVENT_ITEM, Route42HiddenMaxPotion -.ObjectEvents: - db 9 + db 9 ; object events object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully, -1 - object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 - object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 - object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 - object_event 28, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 - object_event 29, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 - object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL - object_event 33, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION - object_event 26, 16, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 + object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 + object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 + object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 + object_event 28, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 + object_event 29, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 + object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL + object_event 33, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION + object_event 26, 16, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index f873e7fed..c6f702452 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE42ECRUTEAKGATE_OFFICER Route42EcruteakGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route42EcruteakGateOfficerScript: jumptextfaceplayer Route42EcruteakGateOfficerText @@ -20,22 +18,17 @@ Route42EcruteakGateOfficerText: done Route42EcruteakGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 4, 1, ECRUTEAK_CITY - warp_def 0, 5, 2, ECRUTEAK_CITY - warp_def 9, 4, 1, ROUTE_42 - warp_def 9, 5, 2, ROUTE_42 + db 4 ; warp events + warp_event 0, 4, ECRUTEAK_CITY, 1 + warp_event 0, 5, ECRUTEAK_CITY, 2 + warp_event 9, 4, ROUTE_42, 1 + warp_event 9, 5, ROUTE_42, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1 + db 1 ; object events + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1 diff --git a/maps/Route43.asm b/maps/Route43.asm index c1caeeb4a..00be8c258 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE43_SUPER_NERD1 const ROUTE43_SUPER_NERD2 const ROUTE43_SUPER_NERD3 @@ -9,28 +9,26 @@ const_value set 2 const ROUTE43_POKE_BALL Route43_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .CheckIfRockets .CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .NoRockets - setmapscene ROUTE_43_GATE, 0 + setmapscene ROUTE_43_GATE, SCENE_DEFAULT return .NoRockets: - setmapscene ROUTE_43_GATE, 1 + setmapscene ROUTE_43_GATE, SCENE_FINISHED return TrainerCamperSpencer: - trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script + trainer CAMPER, SPENCER, EVENT_BEAT_CAMPER_SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CamperSpencerAfterBattleText waitbutton @@ -38,10 +36,10 @@ TrainerCamperSpencer: end TrainerPokemaniacBen: - trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, .Script + trainer POKEMANIAC, BEN, EVENT_BEAT_POKEMANIAC_BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokemaniacBenAfterBattleText waitbutton @@ -49,11 +47,11 @@ TrainerPokemaniacBen: end TrainerPokemaniacBrent: - trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrentSeenText, PokemaniacBrentBeatenText, 0, .Script + trainer POKEMANIAC, BRENT1, EVENT_BEAT_POKEMANIAC_BRENT, PokemaniacBrentSeenText, PokemaniacBrentBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_BRENT iftrue .WantsBattle @@ -71,8 +69,8 @@ TrainerPokemaniacBrent: scall .AskNumber2 .AskForNumber: askforphonenumber PHONE_POKEMANIAC_BRENT - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -81,10 +79,10 @@ TrainerPokemaniacBrent: scall .Rematch winlosstext PokemaniacBrentBeatenText, 0 copybytetovar wBrentFightCount - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight3: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight3 @@ -154,10 +152,10 @@ TrainerPokemaniacBrent: end TrainerPokemaniacRon: - trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, .Script + trainer POKEMANIAC, RON, EVENT_BEAT_POKEMANIAC_RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokemaniacRonAfterBattleText waitbutton @@ -165,10 +163,10 @@ TrainerPokemaniacRon: end TrainerFisherMarvin: - trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, .Script + trainer FISHER, MARVIN, EVENT_BEAT_FISHER_MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FisherMarvinAfterBattleText waitbutton @@ -176,11 +174,11 @@ TrainerFisherMarvin: end TrainerPicnickerTiffany: - trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffanySeenText, PicnickerTiffanyBeatenText, 0, .Script + trainer PICNICKER, TIFFANY3, EVENT_BEAT_PICNICKER_TIFFANY, PicnickerTiffanySeenText, PicnickerTiffanyBeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_TIFFANY iftrue .WantsBattle @@ -202,8 +200,8 @@ TrainerPicnickerTiffany: scall .AskNumber2 .AskForNumber: askforphonenumber PHONE_PICNICKER_TIFFANY - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -212,10 +210,10 @@ TrainerPicnickerTiffany: scall .Rematch winlosstext PicnickerTiffanyBeatenText, 0 copybytetovar wTiffanyFightCount - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight3: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight3 @@ -501,33 +499,28 @@ Route43TrainerTipsText: done Route43_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 9, 51, 1, ROUTE_43_MAHOGANY_GATE - warp_def 10, 51, 2, ROUTE_43_MAHOGANY_GATE - warp_def 17, 35, 3, ROUTE_43_GATE - warp_def 17, 31, 1, ROUTE_43_GATE - warp_def 18, 31, 2, ROUTE_43_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 13, 3, BGEVENT_READ, Route43Sign1 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 9, 51, ROUTE_43_MAHOGANY_GATE, 1 + warp_event 10, 51, ROUTE_43_MAHOGANY_GATE, 2 + warp_event 17, 35, ROUTE_43_GATE, 3 + warp_event 17, 31, ROUTE_43_GATE, 1 + warp_event 18, 31, ROUTE_43_GATE, 2 + + db 0 ; coord events + + db 3 ; bg events + bg_event 13, 3, BGEVENT_READ, Route43Sign1 bg_event 11, 49, BGEVENT_READ, Route43Sign2 bg_event 16, 38, BGEVENT_READ, Route43TrainerTips -.ObjectEvents: - db 8 - object_event 13, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1 + db 8 ; object events + object_event 13, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1 object_event 13, 20, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent, -1 - object_event 14, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1 - object_event 4, 16, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1 - object_event 9, 25, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany, -1 + object_event 14, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1 + object_event 4, 16, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1 + object_event 9, 25, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany, -1 object_event 13, 40, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperSpencer, -1 - object_event 1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1 - object_event 12, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER + object_event 1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1 + object_event 12, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 51d095e3c..9b24aaf25 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -1,18 +1,16 @@ ROUTE43GATE_TOLL EQU 1000 -const_value set 2 + const_def 2 ; object constants const ROUTE43GATE_OFFICER const ROUTE43GATE_ROCKET1 const ROUTE43GATE_ROCKET2 Route43Gate_MapScripts: -.SceneScripts: - db 2 - scene_script .RocketShakedown - scene_script .DummyScene + db 2 ; scene scripts + scene_script .RocketShakedown ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .CheckIfRockets .RocketShakedown: @@ -25,33 +23,33 @@ Route43Gate_MapScripts: .CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .NoRockets - setmapscene ROUTE_43, 0 + setmapscene ROUTE_43, 0 ; Route 43 does not have a scene variable return .NoRockets: - setmapscene ROUTE_43, 1 + setmapscene ROUTE_43, 1 ; Route 43 does not have a scene variable return .RocketTakeover: playmusic MUSIC_ROCKET_ENCOUNTER checkcode VAR_FACING - if_equal DOWN, RocketScript_Southbound - if_equal UP, RocketScript_Northbound - setscene 1 + ifequal DOWN, RocketScript_Southbound + ifequal UP, RocketScript_Northbound + setscene SCENE_FINISHED end RocketScript_Southbound: applymovement PLAYER, PlayerStepsIn showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15 applymovement ROUTE43GATE_ROCKET2, Rocket2Script_BlocksYouSouth - spriteface ROUTE43GATE_ROCKET1, UP + objectface ROUTE43GATE_ROCKET1, UP showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15 applymovement ROUTE43GATE_ROCKET1, Rocket1Script_BlocksYouSouth opentext writetext RocketText_TollFee buttonsound checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1 - if_equal HAVE_MORE, RocketScript_TollSouth + ifequal HAVE_MORE, RocketScript_TollSouth jump RocketScript_YoureBrokeSouth RocketScript_TollSouth: @@ -69,21 +67,21 @@ RocketScript_ShakeDownSouth: closetext applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth - setscene 1 + setscene SCENE_FINISHED special RestartMapMusic end RocketScript_Northbound: showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15 applymovement ROUTE43GATE_ROCKET1, Rocket1Script_BlocksYouNorth - spriteface ROUTE43GATE_ROCKET2, DOWN + objectface ROUTE43GATE_ROCKET2, DOWN showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15 applymovement ROUTE43GATE_ROCKET2, Rocket2Script_BlocksYouNorth opentext writetext RocketText_TollFee buttonsound checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1 - if_equal HAVE_MORE, RocketScript_TollNorth + ifequal HAVE_MORE, RocketScript_TollNorth jump RocketScript_YoureBrokeNorth RocketScript_TollNorth: @@ -101,7 +99,7 @@ RocketScript_ShakeDownNorth: closetext applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassNorth applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassNorth - setscene 1 + setscene SCENE_FINISHED special RestartMapMusic end @@ -248,24 +246,19 @@ OfficerText_AvoidGrass: done Route43Gate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 4, 0, 4, ROUTE_43 - warp_def 5, 0, 5, ROUTE_43 - warp_def 4, 7, 3, ROUTE_43 - warp_def 5, 7, 3, ROUTE_43 - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS - object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS - object_event 7, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS + db 0, 0 ; filler + + db 4 ; warp events + warp_event 4, 0, ROUTE_43, 4 + warp_event 5, 0, ROUTE_43, 5 + warp_event 4, 7, ROUTE_43, 3 + warp_event 5, 7, ROUTE_43, 3 + + db 0 ; coord events + + db 0 ; bg events + + db 3 ; object events + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS + object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS + object_event 7, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index d5c29c18a..6af688f1a 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE43MAHOGANYGATE_OFFICER Route43MahoganyGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route43MahoganyGateOfficer: faceplayer @@ -39,22 +37,17 @@ UnknownText_0x19ab65: done Route43MahoganyGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 1, ROUTE_43 - warp_def 5, 0, 2, ROUTE_43 - warp_def 4, 7, 5, MAHOGANY_TOWN - warp_def 5, 7, 5, MAHOGANY_TOWN + db 4 ; warp events + warp_event 4, 0, ROUTE_43, 1 + warp_event 5, 0, ROUTE_43, 2 + warp_event 4, 7, MAHOGANY_TOWN, 5 + warp_event 5, 7, MAHOGANY_TOWN, 5 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route43MahoganyGateOfficer, -1 + db 1 ; object events + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route43MahoganyGateOfficer, -1 diff --git a/maps/Route44.asm b/maps/Route44.asm index df755ae0d..6e8146bc3 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE44_FISHER1 const ROUTE44_FISHER2 const ROUTE44_YOUNGSTER1 @@ -12,18 +12,16 @@ const_value set 2 const ROUTE44_POKE_BALL3 Route44_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBirdKeeperVance1: - trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script + trainer BIRD_KEEPER, VANCE1, EVENT_BEAT_BIRD_KEEPER_VANCE, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_VANCE iftrue .WantsBattle @@ -41,8 +39,8 @@ TrainerBirdKeeperVance1: scall Route44AskNumber2M .AskForNumber: askforphonenumber PHONE_BIRDKEEPER_VANCE - if_equal PHONE_CONTACTS_FULL, Route44PhoneFullM - if_equal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM + ifequal PHONE_CONTACTS_FULL, Route44PhoneFullM + ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0 scall Route44RegisteredNumberM jump Route44NumberAcceptedM @@ -51,9 +49,9 @@ TrainerBirdKeeperVance1: scall Route44RematchM winlosstext BirdKeeperVance1BeatenText, 0 copybytetovar wVanceFightCount - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight2: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight2 @@ -150,10 +148,10 @@ Route44RematchGiftM: end TrainerPsychicPhil: - trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, .Script + trainer PSYCHIC_T, PHIL, EVENT_BEAT_PSYCHIC_PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PsychicPhilAfterBattleText waitbutton @@ -161,11 +159,11 @@ TrainerPsychicPhil: end TrainerFisherWilton1: - trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, 0, .Script + trainer FISHER, WILTON1, EVENT_BEAT_FISHER_WILTON, FisherWilton1SeenText, FisherWilton1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_FISHER_WILTON - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_WILTON iftrue .WantsBattle @@ -185,8 +183,8 @@ TrainerFisherWilton1: scall Route44AskNumber2M .AskForNumber: askforphonenumber PHONE_FISHER_WILTON - if_equal PHONE_CONTACTS_FULL, Route44PhoneFullM - if_equal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM + ifequal PHONE_CONTACTS_FULL, Route44PhoneFullM + ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM trainertotext FISHER, WILTON1, MEM_BUFFER_0 scall Route44RegisteredNumberM jump Route44NumberAcceptedM @@ -195,9 +193,9 @@ TrainerFisherWilton1: scall Route44RematchM winlosstext FisherWilton1BeatenText, 0 copybytetovar wWiltonFightCount - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight2: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight2 @@ -256,10 +254,10 @@ TrainerFisherWilton1: jump Route44PackFullM TrainerFisherEdgar: - trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script + trainer FISHER, EDGAR, EVENT_BEAT_FISHER_EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FisherEdgarAfterBattleText waitbutton @@ -267,10 +265,10 @@ TrainerFisherEdgar: end TrainerCooltrainerfCybil: - trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, .Script + trainer COOLTRAINERF, CYBIL, EVENT_BEAT_COOLTRAINERF_CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainerfCybilAfterBattleText waitbutton @@ -278,10 +276,10 @@ TrainerCooltrainerfCybil: end TrainerPokemaniacZach: - trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, .Script + trainer POKEMANIAC, ZACH, EVENT_BEAT_POKEMANIAC_ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokemaniacZachAfterBattleText waitbutton @@ -289,10 +287,10 @@ TrainerPokemaniacZach: end TrainerCooltrainermAllen: - trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, .Script + trainer COOLTRAINERM, ALLEN, EVENT_BEAT_COOLTRAINERM_ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainermAllenAfterBattleText waitbutton @@ -318,7 +316,7 @@ Route44MaxRepel: itemball MAX_REPEL Route44HiddenElixer: - hiddenitem EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER + hiddenitem ELIXER, EVENT_ROUTE_44_HIDDEN_ELIXER FisherWilton1SeenText: text "Aack! You made me" @@ -507,32 +505,27 @@ Route44Sign2Text: done Route44_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 56, 7, 1, ICE_PATH_1F + db 1 ; warp events + warp_event 56, 7, ICE_PATH_1F, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 - bg_event 53, 7, BGEVENT_READ, Route44Sign1 - bg_event 6, 10, BGEVENT_READ, Route44Sign2 - bg_event 32, 9, BGEVENT_ITEM, Route44HiddenElixer + db 3 ; bg events + bg_event 53, 7, BGEVENT_READ, Route44Sign1 + bg_event 6, 10, BGEVENT_READ, Route44Sign2 + bg_event 32, 9, BGEVENT_ITEM, Route44HiddenElixer -.ObjectEvents: - db 11 - object_event 35, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1 + db 11 ; object events + object_event 35, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1 object_event 19, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherEdgar, -1 - object_event 10, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1 - object_event 43, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacZach, -1 - object_event 51, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperVance1, -1 + object_event 10, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1 + object_event 43, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacZach, -1 + object_event 51, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperVance1, -1 object_event 41, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1 object_event 31, 14, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1 - object_event 9, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1 - object_event 30, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE - object_event 45, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL - object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL + object_event 9, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1 + object_event 30, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE + object_event 45, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL + object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL diff --git a/maps/Route45.asm b/maps/Route45.asm index 156d06957..73e392ea2 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE45_POKEFAN_M1 const ROUTE45_POKEFAN_M2 const ROUTE45_POKEFAN_M3 @@ -14,24 +14,22 @@ const_value set 2 const ROUTE45_YOUNGSTER Route45_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBlackbeltKenji: - trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script + trainer BLACKBELT_T, KENJI3, EVENT_BEAT_BLACKBELT_KENJI, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI - end_if_just_battled + endifjustbattled opentext checkcellnum PHONE_BLACKBELT_KENJI iftrue .Registered checkevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER iftrue .AskedAlready - special Special_SampleKenjiBreakCountdown + special SampleKenjiBreakCountdown writetext BlackbeltKenjiAfterBattleText waitbutton setevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER @@ -42,18 +40,18 @@ TrainerBlackbeltKenji: scall Route45AskNumber2M .AskForNumber: askforphonenumber PHONE_BLACKBELT_KENJI - if_equal PHONE_CONTACTS_FULL, Route45PhoneFullM - if_equal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM + ifequal PHONE_CONTACTS_FULL, Route45PhoneFullM + ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM trainertotext BLACKBELT_T, KENJI3, MEM_BUFFER_0 scall Route45RegisteredNumberM jump Route45NumberAcceptedM .Registered: checkcode VAR_KENJI_BREAK - if_not_equal 1, Route45NumberAcceptedM - checkmorn + ifnotequal 1, Route45NumberAcceptedM + checktime MORN iftrue .Morning - checknite + checktime NITE iftrue .Night checkevent EVENT_KENJI_ON_BREAK iffalse Route45NumberAcceptedM @@ -61,7 +59,7 @@ TrainerBlackbeltKenji: verbosegiveitem PP_UP iffalse .NoRoom clearevent EVENT_KENJI_ON_BREAK - special Special_SampleKenjiBreakCountdown + special SampleKenjiBreakCountdown jump Route45NumberAcceptedM .Morning: @@ -125,10 +123,10 @@ Route45RematchGiftM: end TrainerHikerErik: - trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, 0, .Script + trainer HIKER, ERIK, EVENT_BEAT_HIKER_ERIK, HikerErikSeenText, HikerErikBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerErikAfterBattleText waitbutton @@ -136,10 +134,10 @@ TrainerHikerErik: end TrainerHikerMichael: - trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, .Script + trainer HIKER, MICHAEL, EVENT_BEAT_HIKER_MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerMichaelAfterBattleText waitbutton @@ -147,11 +145,11 @@ TrainerHikerMichael: end TrainerHikerParry: - trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, 0, .Script + trainer HIKER, PARRY3, EVENT_BEAT_HIKER_PARRY, HikerParry3SeenText, HikerParry3BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_HIKER_PARRY - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_PARRY iftrue .WantsBattle @@ -169,8 +167,8 @@ TrainerHikerParry: scall Route45AskNumber2M .AskForNumber: askforphonenumber PHONE_HIKER_PARRY - if_equal PHONE_CONTACTS_FULL, Route45PhoneFullM - if_equal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM + ifequal PHONE_CONTACTS_FULL, Route45PhoneFullM + ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM trainertotext HIKER, PARRY1, MEM_BUFFER_0 scall Route45RegisteredNumberM jump Route45NumberAcceptedM @@ -179,9 +177,9 @@ TrainerHikerParry: scall Route45RematchM winlosstext HikerParry3BeatenText, 0 copybytetovar wParryFightCount - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight2: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight2 @@ -233,10 +231,10 @@ TrainerHikerParry: jump Route45NumberAcceptedM TrainerHikerTimothy: - trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script + trainer HIKER, TIMOTHY, EVENT_BEAT_HIKER_TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerTimothyAfterBattleText waitbutton @@ -244,10 +242,10 @@ TrainerHikerTimothy: end TrainerCooltrainermRyan: - trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, .Script + trainer COOLTRAINERM, RYAN, EVENT_BEAT_COOLTRAINERM_RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainermRyanAfterBattleText waitbutton @@ -255,10 +253,10 @@ TrainerCooltrainermRyan: end TrainerCooltrainerfKelly: - trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, .Script + trainer COOLTRAINERF, KELLY, EVENT_BEAT_COOLTRAINERF_KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainerfKellyAfterBattleText waitbutton @@ -312,7 +310,7 @@ Route45MaxPotion: itemball MAX_POTION Route45HiddenPpUp: - hiddenitem EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP + hiddenitem PP_UP, EVENT_ROUTE_45_HIDDEN_PP_UP HikerErikSeenText: text "Be prepared for" @@ -532,33 +530,28 @@ Route45SignText: done Route45_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 2, 5, 1, DARK_CAVE_BLACKTHORN_ENTRANCE + db 1 ; warp events + warp_event 2, 5, DARK_CAVE_BLACKTHORN_ENTRANCE, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 10, 4, BGEVENT_READ, Route45Sign + db 2 ; bg events + bg_event 10, 4, BGEVENT_READ, Route45Sign bg_event 13, 80, BGEVENT_ITEM, Route45HiddenPpUp -.ObjectEvents: - db 13 + db 13 ; object events object_event 10, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerErik, -1 object_event 15, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerMichael, -1 - object_event 5, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1 - object_event 9, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerTimothy, -1 + object_event 5, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1 + object_event 9, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerTimothy, -1 object_event 11, 50, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltKenji, -1 object_event 17, 18, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1 - object_event 5, 36, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1 - object_event 16, 82, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1 - object_event 6, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET - object_event 5, 66, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE - object_event 6, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER - object_event 7, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION - object_event 4, 70, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerCamperQuentin, -1 + object_event 5, 36, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1 + object_event 16, 82, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1 + object_event 6, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET + object_event 5, 66, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE + object_event 6, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER + object_event 7, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION + object_event 4, 70, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerCamperQuentin, -1 diff --git a/maps/Route46.asm b/maps/Route46.asm index c9e1b94e6..b11ee0b1a 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE46_POKEFAN_M const ROUTE46_YOUNGSTER const ROUTE46_LASS @@ -7,17 +7,15 @@ const_value set 2 const ROUTE46_POKE_BALL Route46_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerCamperTed: - trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script + trainer CAMPER, TED, EVENT_BEAT_CAMPER_TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CamperTedAfterBattleText waitbutton @@ -25,11 +23,11 @@ TrainerCamperTed: end TrainerPicnickerErin1: - trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, .Script + trainer PICNICKER, ERIN1, EVENT_BEAT_PICNICKER_ERIN, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_PICNICKER_ERIN - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_ERIN iftrue .WantsBattle @@ -47,8 +45,8 @@ TrainerPicnickerErin1: scall Route46AskNumber2F .AskForNumber: askforphonenumber PHONE_PICNICKER_ERIN - if_equal PHONE_CONTACTS_FULL, Route46PhoneFullF - if_equal PHONE_CONTACT_REFUSED, Route46NumberDeclinedF + ifequal PHONE_CONTACTS_FULL, Route46PhoneFullF + ifequal PHONE_CONTACT_REFUSED, Route46NumberDeclinedF trainertotext PICNICKER, ERIN1, MEM_BUFFER_0 scall Route46RegisteredNumberF jump Route46NumberAcceptedF @@ -57,9 +55,9 @@ TrainerPicnickerErin1: scall Route46RematchF winlosstext PicnickerErin1BeatenText, 0 copybytetovar wErinFightCount - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight2: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight2 @@ -148,10 +146,10 @@ Route46RematchGiftF: end TrainerHikerBailey: - trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, .Script + trainer HIKER, BAILEY, EVENT_BEAT_HIKER_BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerBaileyAfterBattleText waitbutton @@ -251,27 +249,22 @@ Route46SignText: done Route46_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 7, 33, 1, ROUTE_29_ROUTE_46_GATE - warp_def 8, 33, 2, ROUTE_29_ROUTE_46_GATE - warp_def 14, 5, 3, DARK_CAVE_VIOLET_ENTRANCE + db 3 ; warp events + warp_event 7, 33, ROUTE_29_ROUTE_46_GATE, 1 + warp_event 8, 33, ROUTE_29_ROUTE_46_GATE, 2 + warp_event 14, 5, DARK_CAVE_VIOLET_ENTRANCE, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 9, 27, BGEVENT_READ, Route46Sign + db 1 ; bg events + bg_event 9, 27, BGEVENT_READ, Route46Sign -.ObjectEvents: - db 6 + db 6 ; object events object_event 12, 19, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1 - object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1 - object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 - object_event 7, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1 - object_event 8, 6, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1 - object_event 1, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED + object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1 + object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 + object_event 7, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1 + object_event 8, 6, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1 + object_event 1, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED diff --git a/maps/Route5.asm b/maps/Route5.asm index 9bdf8a023..103c17d56 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE5_POKEFAN_M Route5_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route5PokefanMScript: jumptextfaceplayer Route5PokefanMText @@ -40,24 +38,19 @@ HouseForSaleSignText: done Route5_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE - warp_def 8, 17, 1, ROUTE_5_SAFFRON_GATE - warp_def 9, 17, 2, ROUTE_5_SAFFRON_GATE - warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE + db 4 ; warp events + warp_event 17, 15, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 1 + warp_event 8, 17, ROUTE_5_SAFFRON_GATE, 1 + warp_event 9, 17, ROUTE_5_SAFFRON_GATE, 2 + warp_event 10, 11, ROUTE_5_CLEANSE_TAG_HOUSE, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 17, 17, BGEVENT_READ, Route5UndergroundPathSign bg_event 10, 11, BGEVENT_READ, HouseForSaleSign -.ObjectEvents: - db 1 + db 1 ; object events object_event 17, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm new file mode 100644 index 000000000..4fc1d0446 --- /dev/null +++ b/maps/Route5CleanseTagHouse.asm @@ -0,0 +1,76 @@ + const_def 2 ; object constants + const ROUTE5CLEANSETAGHOUSE_GRANNY + const ROUTE5CLEANSETAGHOUSE_TEACHER + +Route5CleanseTagHouse_MapScripts: + db 0 ; scene scripts + + db 0 ; callbacks + +Route5CleanseTagHouseGrannyScript: + faceplayer + opentext + checkevent EVENT_GOT_CLEANSE_TAG + iftrue .GotCleanseTag + writetext Route5CleanseTagHouseGrannyText1 + buttonsound + verbosegiveitem CLEANSE_TAG + iffalse .NoRoom + setevent EVENT_GOT_CLEANSE_TAG +.GotCleanseTag: + writetext Route5CleanseTagHouseGrannyText2 + waitbutton +.NoRoom: + closetext + end + +Route5CleanseTagHouseTeacherScript: + jumptextfaceplayer Route5CleanseTagHouseTeacherText + +HouseForSaleBookshelf: + jumpstd difficultbookshelf + +Route5CleanseTagHouseGrannyText1: + text "Eeyaaaah!" + + para "I sense a sinister" + line "shadow hovering" + cont "over you." + + para "Take this to ward" + line "it off!" + done + +Route5CleanseTagHouseGrannyText2: + text "You were in mortal" + line "danger, but you" + cont "are protected now." + done + +Route5CleanseTagHouseTeacherText: + text "My grandma is into" + line "warding off what" + + para "she believes to be" + line "evil spirits." + + para "I'm sorry that she" + line "startled you." + done + +Route5CleanseTagHouse_MapEvents: + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, ROUTE_5, 4 + warp_event 3, 7, ROUTE_5, 4 + + db 0 ; coord events + + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, HouseForSaleBookshelf + bg_event 1, 1, BGEVENT_READ, HouseForSaleBookshelf + + db 2 ; object events + object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseGrannyScript, -1 + object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseTeacherScript, -1 diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm deleted file mode 100644 index d0223f2e1..000000000 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ /dev/null @@ -1,83 +0,0 @@ -const_value set 2 - const ROUTE5CLEANSETAGSPEECHHOUSE_GRANNY - const ROUTE5CLEANSETAGSPEECHHOUSE_TEACHER - -Route5CleanseTagSpeechHouse_MapScripts: -.SceneScripts: - db 0 - -.MapCallbacks: - db 0 - -Route5CleanseTagGrannyScript: - faceplayer - opentext - checkevent EVENT_GOT_CLEANSE_TAG - iftrue .GotCleanseTag - writetext Route5CleanseTagGrannySinisterShadowText - buttonsound - verbosegiveitem CLEANSE_TAG - iffalse .NoRoom - setevent EVENT_GOT_CLEANSE_TAG -.GotCleanseTag: - writetext Route5CleanseTagGrannyProtectedText - waitbutton -.NoRoom: - closetext - end - -Route5CleanseTagSpeechHouseTeacherScript: - jumptextfaceplayer Route5CleanseTagSpeechHouseTeacherText - -HouseForSaleBookshelf: - jumpstd difficultbookshelf - -Route5CleanseTagGrannySinisterShadowText: - text "Eeyaaaah!" - - para "I sense a sinister" - line "shadow hovering" - cont "over you." - - para "Take this to ward" - line "it off!" - done - -Route5CleanseTagGrannyProtectedText: - text "You were in mortal" - line "danger, but you" - cont "are protected now." - done - -Route5CleanseTagSpeechHouseTeacherText: - text "My grandma is into" - line "warding off what" - - para "she believes to be" - line "evil spirits." - - para "I'm sorry that she" - line "startled you." - done - -Route5CleanseTagSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 4, ROUTE_5 - warp_def 3, 7, 4, ROUTE_5 - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, HouseForSaleBookshelf - bg_event 1, 1, BGEVENT_READ, HouseForSaleBookshelf - -.ObjectEvents: - db 2 - object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagGrannyScript, -1 - object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagSpeechHouseTeacherScript, -1 diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm index 1f8bb9b94..3a0161af3 100644 --- a/maps/Route5SaffronGate.asm +++ b/maps/Route5SaffronGate.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE5SAFFRONGATE_OFFICER Route5SaffronGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route5SaffronGateOfficerScript: jumptextfaceplayer Route5SaffronGateOfficerText @@ -21,22 +19,17 @@ Route5SaffronGateOfficerText: done Route5SaffronGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 2, ROUTE_5 - warp_def 5, 0, 3, ROUTE_5 - warp_def 4, 7, 9, SAFFRON_CITY - warp_def 5, 7, 9, SAFFRON_CITY + db 4 ; warp events + warp_event 4, 0, ROUTE_5, 2 + warp_event 5, 0, ROUTE_5, 3 + warp_event 4, 7, SAFFRON_CITY, 9 + warp_event 5, 7, SAFFRON_CITY, 9 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronGateOfficerScript, -1 + db 1 ; object events + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronGateOfficerScript, -1 diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm index 2bdb75ca0..d62a042b9 100644 --- a/maps/Route5UndergroundPathEntrance.asm +++ b/maps/Route5UndergroundPathEntrance.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER Route5UndergroundPathEntrance_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route5UndergroundPathEntranceTeacherScript: jumptextfaceplayer Route5UndergroundPathEntranceTeacherText @@ -20,21 +18,16 @@ Route5UndergroundPathEntranceTeacherText: done Route5UndergroundPathEntrance_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 1, ROUTE_5 - warp_def 4, 7, 1, ROUTE_5 - warp_def 4, 3, 1, UNDERGROUND_PATH + db 3 ; warp events + warp_event 3, 7, ROUTE_5, 1 + warp_event 4, 7, ROUTE_5, 1 + warp_event 4, 3, UNDERGROUND_PATH, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 2, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1 + db 1 ; object events + object_event 2, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1 diff --git a/maps/Route6.asm b/maps/Route6.asm index 9a66c5844..8576e1b04 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -1,20 +1,18 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE6_POKEFAN_M1 const ROUTE6_POKEFAN_M2 const ROUTE6_POKEFAN_M3 Route6_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerPokefanmRex: - trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script + trainer POKEFANM, REX, EVENT_BEAT_POKEFANM_REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokefanmRexAfterBattleText waitbutton @@ -22,10 +20,10 @@ TrainerPokefanmRex: end TrainerPokefanmAllan: - trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, .Script + trainer POKEFANM, ALLAN, EVENT_BEAT_POKEFANM_ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokefanmAllanAfterBattleText waitbutton @@ -92,23 +90,18 @@ PokefanmAllanAfterBattleText: done Route6_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 17, 3, 1, ROUTE_6_UNDERGROUND_PATH_ENTRANCE - warp_def 6, 1, 3, ROUTE_6_SAFFRON_GATE + db 2 ; warp events + warp_event 17, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 1 + warp_event 6, 1, ROUTE_6_SAFFRON_GATE, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 19, 5, BGEVENT_READ, Route6UndergroundPathSign + db 1 ; bg events + bg_event 19, 5, BGEVENT_READ, Route6UndergroundPathSign -.ObjectEvents: - db 3 - object_event 17, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH - object_event 9, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1 + db 3 ; object events + object_event 17, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + object_event 9, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1 object_event 10, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmAllan, -1 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 569180738..c0de7ff54 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE6SAFFRONGATE_OFFICER Route6SaffronGate_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -58,22 +56,17 @@ Route6SaffronGuardMagnetTrainText: done Route6SaffronGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 12, SAFFRON_CITY - warp_def 5, 0, 13, SAFFRON_CITY - warp_def 4, 7, 2, ROUTE_6 - warp_def 5, 7, 2, ROUTE_6 + db 4 ; warp events + warp_event 4, 0, SAFFRON_CITY, 12 + warp_event 5, 0, SAFFRON_CITY, 13 + warp_event 4, 7, ROUTE_6, 2 + warp_event 5, 7, ROUTE_6, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route6SaffronGuardScript, -1 + db 1 ; object events + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route6SaffronGuardScript, -1 diff --git a/maps/Route6UndergroundPathEntrance.asm b/maps/Route6UndergroundPathEntrance.asm index aad70ec88..7e04b3fb1 100644 --- a/maps/Route6UndergroundPathEntrance.asm +++ b/maps/Route6UndergroundPathEntrance.asm @@ -1,25 +1,18 @@ Route6UndergroundPathEntrance_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route6UndergroundPathEntrance_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 1, ROUTE_6 - warp_def 4, 7, 1, ROUTE_6 - warp_def 4, 3, 2, UNDERGROUND_PATH + db 3 ; warp events + warp_event 3, 7, ROUTE_6, 1 + warp_event 4, 7, ROUTE_6, 1 + warp_event 4, 3, UNDERGROUND_PATH, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Route7.asm b/maps/Route7.asm index f10b33ccc..6f1c5251f 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -1,9 +1,7 @@ Route7_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route7UndergroundPathSign: jumptext Route7UndergroundPathSignText @@ -35,21 +33,16 @@ Route7LockedDoorText: done Route7_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 15, 6, 1, ROUTE_7_SAFFRON_GATE - warp_def 15, 7, 2, ROUTE_7_SAFFRON_GATE + db 2 ; warp events + warp_event 15, 6, ROUTE_7_SAFFRON_GATE, 1 + warp_event 15, 7, ROUTE_7_SAFFRON_GATE, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 5, 11, BGEVENT_READ, Route7UndergroundPathSign - bg_event 6, 9, BGEVENT_READ, Route7LockedDoor + db 2 ; bg events + bg_event 5, 11, BGEVENT_READ, Route7UndergroundPathSign + bg_event 6, 9, BGEVENT_READ, Route7LockedDoor -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 47e7e4042..67a8c6813 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE7SAFFRONGATE_OFFICER Route7SaffronGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route7SaffronGuardScript: faceplayer @@ -46,22 +44,17 @@ Route7SaffronGuardSeriousText: done Route7SaffronGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 4, 1, ROUTE_7 - warp_def 0, 5, 2, ROUTE_7 - warp_def 9, 4, 10, SAFFRON_CITY - warp_def 9, 5, 11, SAFFRON_CITY + db 4 ; warp events + warp_event 0, 4, ROUTE_7, 1 + warp_event 0, 5, ROUTE_7, 2 + warp_event 9, 4, SAFFRON_CITY, 10 + warp_event 9, 5, SAFFRON_CITY, 11 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route7SaffronGuardScript, -1 + db 1 ; object events + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route7SaffronGuardScript, -1 diff --git a/maps/Route8.asm b/maps/Route8.asm index 10df64842..7454c9604 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE8_BIKER1 const ROUTE8_BIKER2 const ROUTE8_BIKER3 @@ -7,17 +7,15 @@ const_value set 2 const ROUTE8_FRUIT_TREE Route8_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerBikerDwayne: - trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script + trainer BIKER, DWAYNE, EVENT_BEAT_BIKER_DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BikerDwayneAfterBattleText waitbutton @@ -25,10 +23,10 @@ TrainerBikerDwayne: end TrainerBikerHarris: - trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, .Script + trainer BIKER, HARRIS, EVENT_BEAT_BIKER_HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BikerHarrisAfterBattleText waitbutton @@ -36,10 +34,10 @@ TrainerBikerHarris: end TrainerBikerZeke: - trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, .Script + trainer BIKER, ZEKE, EVENT_BEAT_BIKER_ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BikerZekeAfterBattleText waitbutton @@ -47,10 +45,10 @@ TrainerBikerZeke: end TrainerSupernerdSam: - trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, .Script + trainer SUPER_NERD, SAM, EVENT_BEAT_SUPER_NERD_SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SupernerdSamAfterBattleText waitbutton @@ -58,10 +56,10 @@ TrainerSupernerdSam: end TrainerSupernerdTom: - trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, .Script + trainer SUPER_NERD, TOM, EVENT_BEAT_SUPER_NERD_TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SupernerdTomAfterBattleText waitbutton @@ -173,27 +171,22 @@ Route8UndergroundPathSignText: done Route8_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 4, 3, ROUTE_8_SAFFRON_GATE - warp_def 4, 5, 4, ROUTE_8_SAFFRON_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 11, 7, BGEVENT_READ, Route8UndergroundPathSign - bg_event 10, 5, BGEVENT_READ, Route8LockedDoor - -.ObjectEvents: - db 6 - object_event 10, 8, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1 - object_event 10, 9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 4, ROUTE_8_SAFFRON_GATE, 3 + warp_event 4, 5, ROUTE_8_SAFFRON_GATE, 4 + + db 0 ; coord events + + db 2 ; bg events + bg_event 11, 7, BGEVENT_READ, Route8UndergroundPathSign + bg_event 10, 5, BGEVENT_READ, Route8LockedDoor + + db 6 ; object events + object_event 10, 8, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1 + object_event 10, 9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1 object_event 10, 10, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1 - object_event 23, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1 + object_event 23, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1 object_event 31, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSupernerdTom, -1 - object_event 33, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1 + object_event 33, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index dc9968b1d..bcaf7f02c 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE8SAFFRONGATE_OFFICER Route8SaffronGate_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route8SaffronGateOfficerScript: jumptextfaceplayer Route8SaffronGateOfficerText @@ -20,22 +18,17 @@ Route8SaffronGateOfficerText: done Route8SaffronGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 0, 4, 14, SAFFRON_CITY - warp_def 0, 5, 15, SAFFRON_CITY - warp_def 9, 4, 1, ROUTE_8 - warp_def 9, 5, 2, ROUTE_8 + db 4 ; warp events + warp_event 0, 4, SAFFRON_CITY, 14 + warp_event 0, 5, SAFFRON_CITY, 15 + warp_event 9, 4, ROUTE_8, 1 + warp_event 9, 5, ROUTE_8, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1 + db 1 ; object events + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1 diff --git a/maps/Route9.asm b/maps/Route9.asm index cd1831f98..fa3d07313 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE9_YOUNGSTER1 const ROUTE9_LASS1 const ROUTE9_YOUNGSTER2 @@ -7,17 +7,15 @@ const_value set 2 const ROUTE9_POKEFAN_M2 Route9_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerCamperDean: - trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script + trainer CAMPER, DEAN, EVENT_BEAT_CAMPER_DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CamperDeanAfterBattleText waitbutton @@ -25,10 +23,10 @@ TrainerCamperDean: end TrainerPicnickerHeidi: - trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, .Script + trainer PICNICKER, HEIDI, EVENT_BEAT_PICNICKER_HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PicnickerHeidiAfterBattleText waitbutton @@ -36,10 +34,10 @@ TrainerPicnickerHeidi: end TrainerCamperSid: - trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, 0, .Script + trainer CAMPER, SID, EVENT_BEAT_CAMPER_SID, CamperSidSeenText, CamperSidBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CamperSidAfterBattleText waitbutton @@ -47,10 +45,10 @@ TrainerCamperSid: end TrainerPicnickerEdna: - trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, .Script + trainer PICNICKER, EDNA, EVENT_BEAT_PICNICKER_EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PicnickerEdnaAfterBattleText waitbutton @@ -58,10 +56,10 @@ TrainerPicnickerEdna: end TrainerHikerTim: - trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, 0, .Script + trainer HIKER, TIM, EVENT_BEAT_HIKER_TIM, HikerTimSeenText, HikerTimBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerTimAfterBattleText waitbutton @@ -69,10 +67,10 @@ TrainerHikerTim: end TrainerHikerSidney: - trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, .Script + trainer HIKER, SIDNEY, EVENT_BEAT_HIKER_SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerSidneyAfterBattleText waitbutton @@ -83,7 +81,7 @@ Route9Sign: jumptext Route9SignText Route9HiddenEther: - hiddenitem EVENT_ROUTE_9_HIDDEN_ETHER, ETHER + hiddenitem ETHER, EVENT_ROUTE_9_HIDDEN_ETHER CamperDeanSeenText: text "I came to explore" @@ -206,26 +204,21 @@ Route9SignText: done Route9_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 48, 15, 1, ROCK_TUNNEL_1F + db 1 ; warp events + warp_event 48, 15, ROCK_TUNNEL_1F, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 15, 7, BGEVENT_READ, Route9Sign + db 2 ; bg events + bg_event 15, 7, BGEVENT_READ, Route9Sign bg_event 41, 15, BGEVENT_ITEM, Route9HiddenEther -.ObjectEvents: - db 6 + db 6 ; object events object_event 23, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperDean, -1 - object_event 39, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1 - object_event 11, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1 + object_event 39, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1 + object_event 11, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1 object_event 12, 15, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerEdna, -1 - object_event 28, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerTim, -1 + object_event 28, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerTim, -1 object_event 36, 15, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerHikerSidney, -1 diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 91f2967a3..747c2d40d 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -1,11 +1,9 @@ RuinsOfAlphAerodactylChamber_MapScripts: -.SceneScripts: - db 2 - scene_script .CheckWall - scene_script .DummyScene + db 2 ; scene scripts + scene_script .CheckWall ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: @@ -43,14 +41,14 @@ RuinsOfAlphAerodactylChamber_MapScripts: changeblock 4, 0, $30 ; open wall reloadmappart earthquake 50 - setscene 1 + setscene SCENE_FINISHED closetext end MapRuinsOfAlphAerodactylChamberSignpost2Script: refreshscreen writebyte UNOWNPUZZLE_AERODACTYL - special Special_UnownPuzzle + special UnownPuzzle closetext iftrue UnknownScript_0x58df7 end @@ -58,8 +56,8 @@ MapRuinsOfAlphAerodactylChamberSignpost2Script: UnknownScript_0x58df7: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_AERODACTYL_PUZZLE - setflag ENGINE_UNLOCKED_UNOWNS_3 - setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 + setflag ENGINE_UNLOCKED_UNOWNS_S_TO_W + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 changeblock 2, 2, $18 ; left hole @@ -84,7 +82,7 @@ MapRuinsOfAlphAerodactylChamberSignpost4Script: opentext writetext UnknownText_0x58e4f writebyte UNOWNWORDS_LIGHT - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -94,7 +92,7 @@ MapRuinsOfAlphAerodactylChamberSignpost5Script: opentext writetext UnknownText_0x58e81 writebyte UNOWNWORDS_LIGHT - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -144,28 +142,23 @@ UnknownText_0x58ee7: done RuinsOfAlphAerodactylChamber_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 3, 9, 4, RUINS_OF_ALPH_OUTSIDE - warp_def 4, 9, 4, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 3, 8, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 3, 9, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 0, 1, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 6 - bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script - bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script - bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script - bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost3Script - bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script - bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script - -.ObjectEvents: - db 0 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 4 + warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 4 + warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 8 + warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 9 + warp_event 4, 0, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 1 + + db 0 ; coord events + + db 6 ; bg events + bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script + bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script + bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script + bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost3Script + bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script + bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script + + db 0 ; object events diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm index 8be5e878b..5e323f795 100644 --- a/maps/RuinsOfAlphAerodactylItemRoom.asm +++ b/maps/RuinsOfAlphAerodactylItemRoom.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL1 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL2 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4 RuinsOfAlphAerodactylItemRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphAerodactylItemRoomGoldBerry: itemball GOLD_BERRY @@ -33,27 +31,22 @@ UnknownText_0x59ac1: done RuinsOfAlphAerodactylItemRoom_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 3, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def 4, 9, 5, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def 3, 1, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM - warp_def 4, 1, 2, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script - bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script - -.ObjectEvents: - db 4 - object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM - object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM - object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM - object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM + db 0, 0 ; filler + + db 4 ; warp events + warp_event 3, 9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5 + warp_event 4, 9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5 + warp_event 3, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 1 + warp_event 4, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script + bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script + + db 4 ; object events + object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM + object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM + object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM + object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM diff --git a/maps/RuinsOfAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm index d991d80bc..96dc3eaef 100644 --- a/maps/RuinsOfAlphAerodactylWordRoom.asm +++ b/maps/RuinsOfAlphAerodactylWordRoom.asm @@ -1,25 +1,18 @@ RuinsOfAlphAerodactylWordRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphAerodactylWordRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 9, 5, 3, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM - warp_def 10, 5, 4, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM - warp_def 17, 11, 8, RUINS_OF_ALPH_INNER_CHAMBER + db 3 ; warp events + warp_event 9, 5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 3 + warp_event 10, 5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 4 + warp_event 17, 11, RUINS_OF_ALPH_INNER_CHAMBER, 8 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 173f35e39..e4df9dbe0 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -1,15 +1,13 @@ RuinsOfAlphHoOhChamber_MapScripts: -.SceneScripts: - db 2 - scene_script .CheckWall - scene_script .DummyScene + db 2 ; scene scripts + scene_script .CheckWall ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: - special Special_HoOhChamber + special HoOhChamber checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue .OpenWall end @@ -44,14 +42,14 @@ RuinsOfAlphHoOhChamber_MapScripts: changeblock 4, 0, $30 ; open wall reloadmappart earthquake 50 - setscene 1 + setscene SCENE_FINISHED closetext end MapRuinsOfAlphHoOhChamberSignpost2Script: refreshscreen writebyte UNOWNPUZZLE_HO_OH - special Special_UnownPuzzle + special UnownPuzzle closetext iftrue UnknownScript_0x585ba end @@ -59,8 +57,8 @@ MapRuinsOfAlphHoOhChamberSignpost2Script: UnknownScript_0x585ba: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_HO_OH_PUZZLE - setflag ENGINE_UNLOCKED_UNOWNS_4 - setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 + setflag ENGINE_UNLOCKED_UNOWNS_X_TO_Z + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 changeblock 2, 2, $18 ; left hole @@ -85,7 +83,7 @@ MapRuinsOfAlphHoOhChamberSignpost4Script: opentext writetext UnknownText_0x58612 writebyte UNOWNWORDS_HO_OH - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -95,7 +93,7 @@ MapRuinsOfAlphHoOhChamberSignpost5Script: opentext writetext UnknownText_0x58644 writebyte UNOWNWORDS_HO_OH - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -145,28 +143,23 @@ UnknownText_0x586aa: done RuinsOfAlphHoOhChamber_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 3, 9, 1, RUINS_OF_ALPH_OUTSIDE - warp_def 4, 9, 1, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 3, 2, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 3, 3, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 0, 1, RUINS_OF_ALPH_HO_OH_ITEM_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 6 - bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script - bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script - bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script - bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost3Script - bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script - bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script - -.ObjectEvents: - db 0 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 1 + warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 1 + warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 2 + warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 3 + warp_event 4, 0, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 1 + + db 0 ; coord events + + db 6 ; bg events + bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script + bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script + bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script + bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost3Script + bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script + bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script + + db 0 ; object events diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm index e8ad02a27..1c70076f6 100644 --- a/maps/RuinsOfAlphHoOhItemRoom.asm +++ b/maps/RuinsOfAlphHoOhItemRoom.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const RUINSOFALPHHOOHITEMROOM_POKE_BALL1 const RUINSOFALPHHOOHITEMROOM_POKE_BALL2 const RUINSOFALPHHOOHITEMROOM_POKE_BALL3 const RUINSOFALPHHOOHITEMROOM_POKE_BALL4 RuinsOfAlphHoOhItemRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphHoOhItemRoomGoldBerry: itemball GOLD_BERRY @@ -33,27 +31,22 @@ UnknownText_0x59923: done RuinsOfAlphHoOhItemRoom_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 3, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 4, 9, 5, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 3, 1, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM - warp_def 4, 1, 2, RUINS_OF_ALPH_HO_OH_WORD_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script - bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script - -.ObjectEvents: - db 4 - object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM - object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM - object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM - object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM + db 0, 0 ; filler + + db 4 ; warp events + warp_event 3, 9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5 + warp_event 4, 9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5 + warp_event 3, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 1 + warp_event 4, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script + bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script + + db 4 ; object events + object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM + object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM + object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM + object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM diff --git a/maps/RuinsOfAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm index a9b3be9cd..d5492dbf9 100644 --- a/maps/RuinsOfAlphHoOhWordRoom.asm +++ b/maps/RuinsOfAlphHoOhWordRoom.asm @@ -1,25 +1,18 @@ RuinsOfAlphHoOhWordRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphHoOhWordRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 9, 9, 3, RUINS_OF_ALPH_HO_OH_ITEM_ROOM - warp_def 10, 9, 4, RUINS_OF_ALPH_HO_OH_ITEM_ROOM - warp_def 17, 21, 2, RUINS_OF_ALPH_INNER_CHAMBER + db 3 ; warp events + warp_event 9, 9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 3 + warp_event 10, 9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 4 + warp_event 17, 21, RUINS_OF_ALPH_INNER_CHAMBER, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index 27e696a85..7f5348633 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -1,16 +1,14 @@ -const_value set 2 + const_def 2 ; object constants const RUINSOFALPHINNERCHAMBER_FISHER const RUINSOFALPHINNERCHAMBER_TEACHER const RUINSOFALPHINNERCHAMBER_GRAMPS RuinsOfAlphInnerChamber_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .UnownAppear + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_RUINSOFALPHINNERCHAMBER_NOTHING + scene_script .UnownAppear ; SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -24,7 +22,7 @@ RuinsOfAlphInnerChamber_MapScripts: writetext RuinsOfAlphStrangePresenceText waitbutton closetext - setscene 0 + setscene SCENE_RUINSOFALPHINNERCHAMBER_NOTHING setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER end @@ -77,55 +75,50 @@ RuinsOfAlphInnerChamberStatueText: done RuinsOfAlphInnerChamber_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 10, 13, 5, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 15, 3, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 4, 15, 4, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 15, 3, 3, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 16, 3, 4, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 3, 21, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 4, 21, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 15, 24, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def 16, 24, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER - -.CoordEvents: - db 0 - -.BGEvents: - db 26 - bg_event 2, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 5, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 8, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 11, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 14, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 17, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 2, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 5, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 8, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 11, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 14, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 17, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 2, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + db 0, 0 ; filler + + db 9 ; warp events + warp_event 10, 13, RUINS_OF_ALPH_OUTSIDE, 5 + warp_event 3, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 3 + warp_event 4, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 4 + warp_event 15, 3, RUINS_OF_ALPH_KABUTO_CHAMBER, 3 + warp_event 16, 3, RUINS_OF_ALPH_KABUTO_CHAMBER, 4 + warp_event 3, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 3 + warp_event 4, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 4 + warp_event 15, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 3 + warp_event 16, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 4 + + db 0 ; coord events + + db 26 ; bg events + bg_event 2, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 5, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 11, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 14, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 17, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 2, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 5, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 11, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 14, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 17, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 2, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 17, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 2, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 5, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 8, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 2, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 5, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 11, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 14, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 17, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 2, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 5, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 8, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 2, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 5, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 11, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 14, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 17, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue -.ObjectEvents: - db 3 - object_event 3, 7, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + db 3 ; object events + object_event 3, 7, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS object_event 14, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS object_event 11, 19, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index df4bcb881..fed2ca1f5 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST const RUINSOFALPHKABUTOCHAMBER_SCIENTIST RuinsOfAlphKabutoChamber_MapScripts: -.SceneScripts: - db 2 - scene_script .CheckWall - scene_script .DummyScene + db 2 ; scene scripts + scene_script .CheckWall ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: @@ -47,7 +45,7 @@ RuinsOfAlphKabutoChamber_MapScripts: changeblock 4, 0, $30 ; open wall reloadmappart earthquake 50 - setscene 1 + setscene SCENE_FINISHED closetext end @@ -57,7 +55,7 @@ RuinsOfAlphKabutoChamberReceptionistScript: MapRuinsOfAlphKabutoChamberSignpost2Script: refreshscreen writebyte UNOWNPUZZLE_KABUTO - special Special_UnownPuzzle + special UnownPuzzle closetext iftrue UnknownScript_0x58778 end @@ -65,9 +63,9 @@ MapRuinsOfAlphKabutoChamberSignpost2Script: UnknownScript_0x58778: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_KABUTO_PUZZLE - setflag ENGINE_UNLOCKED_UNOWNS_1 + setflag ENGINE_UNLOCKED_UNOWNS_A_TO_K setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST - setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 changeblock 2, 2, $18 ; left hole @@ -86,7 +84,7 @@ ScientistScript_0x587a8: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x587cf + ifequal NUM_UNOWN, UnknownScript_0x587cf checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x587c9 checkevent EVENT_SOLVED_KABUTO_PUZZLE @@ -97,7 +95,7 @@ UnknownScript_0x587c0: writetext UnknownText_0x588f5 waitbutton closetext - spriteface RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP + objectface RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP end UnknownScript_0x587c9: @@ -122,7 +120,7 @@ MapRuinsOfAlphKabutoChamberSignpost4Script: opentext writetext UnknownText_0x58aa7 writebyte UNOWNWORDS_ESCAPE - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -132,7 +130,7 @@ MapRuinsOfAlphKabutoChamberSignpost5Script: opentext writetext UnknownText_0x58ad9 writebyte UNOWNWORDS_ESCAPE - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -256,30 +254,25 @@ UnknownText_0x58b3f: done RuinsOfAlphKabutoChamber_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 3, 9, 2, RUINS_OF_ALPH_OUTSIDE - warp_def 4, 9, 2, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 3, 4, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 3, 5, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 0, 1, RUINS_OF_ALPH_KABUTO_ITEM_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 6 - bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script - bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script - bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost2Script - bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost3Script - bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost4Script - bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost5Script - -.ObjectEvents: - db 2 - object_event 5, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST - object_event 3, 1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 2 + warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 2 + warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 4 + warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 5 + warp_event 4, 0, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 1 + + db 0 ; coord events + + db 6 ; bg events + bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script + bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script + bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost2Script + bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost3Script + bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost4Script + bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost5Script + + db 2 ; object events + object_event 5, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST + object_event 3, 1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1 diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm index 3e5d41515..d40e1dcf2 100644 --- a/maps/RuinsOfAlphKabutoItemRoom.asm +++ b/maps/RuinsOfAlphKabutoItemRoom.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const RUINSOFALPHKABUTOITEMROOM_POKE_BALL1 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL2 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL4 RuinsOfAlphKabutoItemRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphKabutoItemRoomBerry: itemball BERRY @@ -33,27 +31,22 @@ UnknownText_0x599ad: done RuinsOfAlphKabutoItemRoom_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 3, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 4, 9, 5, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 3, 1, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM - warp_def 4, 1, 2, RUINS_OF_ALPH_KABUTO_WORD_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script - bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script - -.ObjectEvents: - db 4 - object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM - object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM - object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM - object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM + db 0, 0 ; filler + + db 4 ; warp events + warp_event 3, 9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5 + warp_event 4, 9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5 + warp_event 3, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 1 + warp_event 4, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script + bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script + + db 4 ; object events + object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM + object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM + object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM + object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM diff --git a/maps/RuinsOfAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm index ad29b5760..086ae4c2d 100644 --- a/maps/RuinsOfAlphKabutoWordRoom.asm +++ b/maps/RuinsOfAlphKabutoWordRoom.asm @@ -1,25 +1,18 @@ RuinsOfAlphKabutoWordRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphKabutoWordRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 9, 5, 3, RUINS_OF_ALPH_KABUTO_ITEM_ROOM - warp_def 10, 5, 4, RUINS_OF_ALPH_KABUTO_ITEM_ROOM - warp_def 17, 11, 4, RUINS_OF_ALPH_INNER_CHAMBER + db 3 ; warp events + warp_event 9, 5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 3 + warp_event 10, 5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 4 + warp_event 17, 11, RUINS_OF_ALPH_INNER_CHAMBER, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index e9c937526..6f166a416 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -1,15 +1,13 @@ RuinsOfAlphOmanyteChamber_MapScripts: -.SceneScripts: - db 2 - scene_script .CheckWall - scene_script .DummyScene + db 2 ; scene scripts + scene_script .CheckWall ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .HiddenDoors .CheckWall: - special Special_OmanyteChamber + special OmanyteChamber checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue .OpenWall end @@ -44,14 +42,14 @@ RuinsOfAlphOmanyteChamber_MapScripts: changeblock 4, 0, $30 ; open wall reloadmappart earthquake 50 - setscene 1 + setscene SCENE_FINISHED closetext end MapRuinsOfAlphOmanyteChamberSignpost2Script: refreshscreen writebyte UNOWNPUZZLE_OMANYTE - special Special_UnownPuzzle + special UnownPuzzle closetext iftrue UnknownScript_0x58c36 end @@ -59,8 +57,8 @@ MapRuinsOfAlphOmanyteChamberSignpost2Script: UnknownScript_0x58c36: setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_SOLVED_OMANYTE_PUZZLE - setflag ENGINE_UNLOCKED_UNOWNS_2 - setmapscene RUINS_OF_ALPH_INNER_CHAMBER, 1 + setflag ENGINE_UNLOCKED_UNOWNS_L_TO_R + setmapscene RUINS_OF_ALPH_INNER_CHAMBER, SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE earthquake 30 showemote EMOTE_SHOCK, PLAYER, 15 changeblock 2, 2, $18 ; left hole @@ -85,7 +83,7 @@ MapRuinsOfAlphOmanyteChamberSignpost4Script: opentext writetext UnknownText_0x58c8e writebyte UNOWNWORDS_WATER - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -95,7 +93,7 @@ MapRuinsOfAlphOmanyteChamberSignpost5Script: opentext writetext UnknownText_0x58cc0 writebyte UNOWNWORDS_WATER - special Special_DisplayUnownWords + special DisplayUnownWords closetext end @@ -145,28 +143,23 @@ UnknownText_0x58d26: done RuinsOfAlphOmanyteChamber_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 3, 9, 3, RUINS_OF_ALPH_OUTSIDE - warp_def 4, 9, 3, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 3, 6, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 3, 7, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 4, 0, 1, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 6 - bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script - bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script - bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script - bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost3Script - bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script - bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script - -.ObjectEvents: - db 0 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 3 + warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 3 + warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 6 + warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 7 + warp_event 4, 0, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 1 + + db 0 ; coord events + + db 6 ; bg events + bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script + bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script + bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script + bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost3Script + bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script + bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script + + db 0 ; object events diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm index 3f4570b2b..4013ed19d 100644 --- a/maps/RuinsOfAlphOmanyteItemRoom.asm +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL1 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL2 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4 RuinsOfAlphOmanyteItemRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphOmanyteItemRoomMysteryberry: itemball MYSTERYBERRY @@ -33,27 +31,22 @@ UnknownText_0x59a37: done RuinsOfAlphOmanyteItemRoom_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 3, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 4, 9, 5, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 3, 1, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM - warp_def 4, 1, 2, RUINS_OF_ALPH_OMANYTE_WORD_ROOM - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script - bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script - -.ObjectEvents: - db 4 - object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM - object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM - object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM - object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM + db 0, 0 ; filler + + db 4 ; warp events + warp_event 3, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5 + warp_event 4, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5 + warp_event 3, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 1 + warp_event 4, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script + bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script + + db 4 ; object events + object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM + object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM + object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM + object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM diff --git a/maps/RuinsOfAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm index b2f68e0a3..b5e0f4d2e 100644 --- a/maps/RuinsOfAlphOmanyteWordRoom.asm +++ b/maps/RuinsOfAlphOmanyteWordRoom.asm @@ -1,25 +1,18 @@ RuinsOfAlphOmanyteWordRoom_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks RuinsOfAlphOmanyteWordRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 9, 7, 3, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM - warp_def 10, 7, 4, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM - warp_def 17, 13, 6, RUINS_OF_ALPH_INNER_CHAMBER + db 3 ; warp events + warp_event 9, 7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 3 + warp_event 10, 7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 4 + warp_event 17, 13, RUINS_OF_ALPH_INNER_CHAMBER, 6 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 3c674d8c8..9c6c3da41 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const RUINSOFALPHOUTSIDE_YOUNGSTER1 const RUINSOFALPHOUTSIDE_SCIENTIST const RUINSOFALPHOUTSIDE_FISHER @@ -6,13 +6,11 @@ const_value set 2 const RUINSOFALPHOUTSIDE_YOUNGSTER3 RuinsOfAlphOutside_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_RUINSOFALPHOUTSIDE_NOTHING + scene_script .DummyScene1 ; SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .ScientistCallback .DummyScene0: @@ -30,27 +28,27 @@ RuinsOfAlphOutside_MapScripts: .MaybeScientist: checkcode VAR_UNOWNCOUNT - if_greater_than 2, .YesScientist + ifgreater 2, .YesScientist jump .NoScientist .YesScientist: appear RUINSOFALPHOUTSIDE_SCIENTIST - setscene 1 + setscene SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX return .NoScientist: disappear RUINSOFALPHOUTSIDE_SCIENTIST - setscene 0 + setscene SCENE_RUINSOFALPHOUTSIDE_NOTHING return RuinsOfAlphOutsideScientistScene1: - spriteface RUINSOFALPHOUTSIDE_SCIENTIST, UP - spriteface PLAYER, DOWN + objectface RUINSOFALPHOUTSIDE_SCIENTIST, UP + objectface PLAYER, DOWN jump UnknownScript_0x58044 RuinsOfAlphOutsideScientistScene2: - spriteface RUINSOFALPHOUTSIDE_SCIENTIST, LEFT - spriteface PLAYER, RIGHT + objectface RUINSOFALPHOUTSIDE_SCIENTIST, LEFT + objectface PLAYER, RIGHT jump UnknownScript_0x58044 ScientistScript_0x58043: @@ -66,7 +64,7 @@ UnknownScript_0x58044: disappear RUINSOFALPHOUTSIDE_SCIENTIST stopfollow applymovement PLAYER, MovementData_0x580c5 - setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, 1 + setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX warpcheck end @@ -98,14 +96,14 @@ YoungsterScript_0x5807e: writetext UnknownText_0x5848e waitbutton closetext - spriteface RUINSOFALPHOUTSIDE_YOUNGSTER3, UP + objectface RUINSOFALPHOUTSIDE_YOUNGSTER3, UP end TrainerPsychicNathan: - trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, .Script + trainer PSYCHIC_T, NATHAN, EVENT_BEAT_PSYCHIC_NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PsychicNathanAfterBattleText waitbutton @@ -113,10 +111,10 @@ TrainerPsychicNathan: end TrainerSuperNerdStan: - trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script + trainer SUPER_NERD, STAN, EVENT_BEAT_SUPER_NERD_STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SuperNerdStanAfterBattleText waitbutton @@ -281,38 +279,33 @@ UnknownText_0x5848e: done RuinsOfAlphOutside_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 11 - warp_def 2, 17, 1, RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def 14, 7, 1, RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def 2, 29, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def 16, 33, 1, RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def 10, 13, 1, RUINS_OF_ALPH_INNER_CHAMBER - warp_def 17, 11, 1, RUINS_OF_ALPH_RESEARCH_CENTER - warp_def 6, 19, 1, UNION_CAVE_B1F - warp_def 6, 27, 2, UNION_CAVE_B1F - warp_def 7, 5, 3, ROUTE_36_RUINS_OF_ALPH_GATE - warp_def 13, 20, 1, ROUTE_32_RUINS_OF_ALPH_GATE - warp_def 13, 21, 2, ROUTE_32_RUINS_OF_ALPH_GATE - -.CoordEvents: - db 2 - coord_event 11, 14, 1, RuinsOfAlphOutsideScientistScene1 - coord_event 10, 15, 1, RuinsOfAlphOutsideScientistScene2 - -.BGEvents: - db 3 - bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script + db 0, 0 ; filler + + db 11 ; warp events + warp_event 2, 17, RUINS_OF_ALPH_HO_OH_CHAMBER, 1 + warp_event 14, 7, RUINS_OF_ALPH_KABUTO_CHAMBER, 1 + warp_event 2, 29, RUINS_OF_ALPH_OMANYTE_CHAMBER, 1 + warp_event 16, 33, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 1 + warp_event 10, 13, RUINS_OF_ALPH_INNER_CHAMBER, 1 + warp_event 17, 11, RUINS_OF_ALPH_RESEARCH_CENTER, 1 + warp_event 6, 19, UNION_CAVE_B1F, 1 + warp_event 6, 27, UNION_CAVE_B1F, 2 + warp_event 7, 5, ROUTE_36_RUINS_OF_ALPH_GATE, 3 + warp_event 13, 20, ROUTE_32_RUINS_OF_ALPH_GATE, 1 + warp_event 13, 21, ROUTE_32_RUINS_OF_ALPH_GATE, 2 + + db 2 ; coord events + coord_event 11, 14, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX, RuinsOfAlphOutsideScientistScene1 + coord_event 10, 15, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX, RuinsOfAlphOutsideScientistScene2 + + db 3 ; bg events + bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script bg_event 12, 16, BGEVENT_READ, RuinsOfAlphOutsideSignpost1Script bg_event 18, 12, BGEVENT_READ, RuinsOfAlphOutsideSignpost2Script -.ObjectEvents: - db 5 - object_event 4, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1 + db 5 ; object events + object_event 4, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1 object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST object_event 13, 17, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER object_event 14, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS - object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 1595ce59a..0b136853f 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -1,16 +1,14 @@ -const_value set 2 + const_def 2 ; object constants const RUINSOFALPHRESEARCHCENTER_SCIENTIST1 const RUINSOFALPHRESEARCHCENTER_SCIENTIST2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 RuinsOfAlphResearchCenter_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .GetUnownDex + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING + scene_script .GetUnownDex ; SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .ScientistCallback .DummyScene0: @@ -22,7 +20,7 @@ RuinsOfAlphResearchCenter_MapScripts: .ScientistCallback: checkscene - if_equal 1, .ShowScientist + ifequal SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX, .ShowScientist return .ShowScientist: @@ -40,7 +38,7 @@ RuinsOfAlphResearchCenter_MapScripts: pause 30 playsound SFX_TRANSACTION pause 30 - spriteface RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN + objectface RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN opentext writetext UnknownText_0x59278 waitbutton @@ -55,7 +53,7 @@ RuinsOfAlphResearchCenter_MapScripts: waitbutton closetext applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59276 - setscene 0 + setscene SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING special RestartMapMusic end @@ -63,7 +61,7 @@ ScientistScript_0x591d1: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x591df + ifequal NUM_UNOWN, UnknownScript_0x591df writetext UnknownText_0x59311 waitbutton closetext @@ -79,7 +77,7 @@ ScientistScript_0x591e5: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x5920b + ifequal NUM_UNOWN, UnknownScript_0x5920b checkflag ENGINE_UNOWN_DEX iftrue UnknownScript_0x59205 checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS @@ -112,7 +110,7 @@ ScientistScript_0x59214: faceplayer opentext checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x5922e + ifequal NUM_UNOWN, UnknownScript_0x5922e checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x59228 writetext UnknownText_0x5954f @@ -137,7 +135,7 @@ MapRuinsOfAlphResearchCenterSignpost1Script: checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x59241 checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x59247 + ifequal NUM_UNOWN, UnknownScript_0x59247 UnknownScript_0x59241: writetext UnknownText_0x597b6 waitbutton @@ -155,7 +153,7 @@ MapRuinsOfAlphResearchCenterSignpost2Script: checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x5925a checkcode VAR_UNOWNCOUNT - if_equal NUM_UNOWN, UnknownScript_0x59260 + ifequal NUM_UNOWN, UnknownScript_0x59260 UnknownScript_0x5925a: writetext UnknownText_0x5980e waitbutton @@ -165,7 +163,7 @@ UnknownScript_0x5925a: UnknownScript_0x59260: writetext UnknownText_0x5982d waitbutton - special Special_UnownPrinter + special UnownPrinter closetext end @@ -393,25 +391,20 @@ UnknownText_0x59886: done RuinsOfAlphResearchCenter_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 6, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 7, 6, RUINS_OF_ALPH_OUTSIDE - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 6, 5, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script - bg_event 3, 4, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script - bg_event 7, 1, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script - -.ObjectEvents: - db 3 - object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1 - object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1 - object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, RUINS_OF_ALPH_OUTSIDE, 6 + warp_event 3, 7, RUINS_OF_ALPH_OUTSIDE, 6 + + db 0 ; coord events + + db 3 ; bg events + bg_event 6, 5, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script + bg_event 3, 4, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script + bg_event 7, 1, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script + + db 3 ; object events + object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1 + object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1 + object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index a96f55dea..32627af69 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -1,24 +1,17 @@ SafariZoneBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SafariZoneBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 9, 23, 1, SAFARI_ZONE_FUCHSIA_GATE_BETA - warp_def 10, 23, 2, SAFARI_ZONE_FUCHSIA_GATE_BETA + db 2 ; warp events + warp_event 9, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 1 + warp_event 10, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index 562775013..547ed5bd2 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -1,26 +1,19 @@ SafariZoneFuchsiaGateBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SafariZoneFuchsiaGateBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 1, SAFARI_ZONE_BETA - warp_def 5, 0, 2, SAFARI_ZONE_BETA - warp_def 4, 7, 7, FUCHSIA_CITY - warp_def 5, 7, 7, FUCHSIA_CITY + db 4 ; warp events + warp_event 4, 0, SAFARI_ZONE_BETA, 1 + warp_event 5, 0, SAFARI_ZONE_BETA, 2 + warp_event 4, 7, FUCHSIA_CITY, 7 + warp_event 5, 7, FUCHSIA_CITY, 7 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index 1ee13106f..270fc0267 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -1,24 +1,17 @@ SafariZoneMainOffice_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SafariZoneMainOffice_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 2, FUCHSIA_CITY - warp_def 3, 7, 2, FUCHSIA_CITY + db 2 ; warp events + warp_event 2, 7, FUCHSIA_CITY, 2 + warp_event 3, 7, FUCHSIA_CITY, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index e7295d594..41a2db11d 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const SAFARIZONEWARDENSHOME_LASS SafariZoneWardensHome_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WardensGranddaughter: faceplayer @@ -77,24 +75,19 @@ SafariZonePhotoText: done SafariZoneWardensHome_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 6, FUCHSIA_CITY - warp_def 3, 7, 6, FUCHSIA_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 4 - bg_event 0, 1, BGEVENT_READ, WardensHomeBookshelf - bg_event 1, 1, BGEVENT_READ, WardensHomeBookshelf - bg_event 7, 0, BGEVENT_READ, WardenPhoto - bg_event 9, 0, BGEVENT_READ, SafariZonePhoto - -.ObjectEvents: - db 1 - object_event 2, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, FUCHSIA_CITY, 6 + warp_event 3, 7, FUCHSIA_CITY, 6 + + db 0 ; coord events + + db 4 ; bg events + bg_event 0, 1, BGEVENT_READ, WardensHomeBookshelf + bg_event 1, 1, BGEVENT_READ, WardensHomeBookshelf + bg_event 7, 0, BGEVENT_READ, WardenPhoto + bg_event 9, 0, BGEVENT_READ, SafariZonePhoto + + db 1 ; object events + object_event 2, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index d4c470571..6d1ddbebc 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const SAFFRONCITY_LASS1 const SAFFRONCITY_POKEFAN_M const SAFFRONCITY_COOLTRAINER_M @@ -9,11 +9,9 @@ const_value set 2 const SAFFRONCITY_LASS2 SaffronCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -266,48 +264,43 @@ SaffronCityMagnetTrainStationSignText: done SaffronCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 15 - warp_def 26, 3, 1, FIGHTING_DOJO - warp_def 34, 3, 1, SAFFRON_GYM - warp_def 25, 11, 2, SAFFRON_MART - warp_def 9, 29, 1, SAFFRON_POKECENTER_1F - warp_def 27, 29, 1, MR_PSYCHICS_HOUSE - warp_def 8, 3, 2, SAFFRON_MAGNET_TRAIN_STATION - warp_def 18, 21, 1, SILPH_CO_1F - warp_def 9, 11, 1, COPYCATS_HOUSE_1F - warp_def 18, 3, 3, ROUTE_5_SAFFRON_GATE - warp_def 0, 24, 3, ROUTE_7_SAFFRON_GATE - warp_def 0, 25, 4, ROUTE_7_SAFFRON_GATE - warp_def 16, 33, 1, ROUTE_6_SAFFRON_GATE - warp_def 17, 33, 2, ROUTE_6_SAFFRON_GATE - warp_def 39, 22, 1, ROUTE_8_SAFFRON_GATE - warp_def 39, 23, 2, ROUTE_8_SAFFRON_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 8 - bg_event 21, 5, BGEVENT_READ, SaffronCitySign - bg_event 33, 5, BGEVENT_READ, SaffronGymSign - bg_event 25, 5, BGEVENT_READ, FightingDojoSign + db 0, 0 ; filler + + db 15 ; warp events + warp_event 26, 3, FIGHTING_DOJO, 1 + warp_event 34, 3, SAFFRON_GYM, 1 + warp_event 25, 11, SAFFRON_MART, 2 + warp_event 9, 29, SAFFRON_POKECENTER_1F, 1 + warp_event 27, 29, MR_PSYCHICS_HOUSE, 1 + warp_event 8, 3, SAFFRON_MAGNET_TRAIN_STATION, 2 + warp_event 18, 21, SILPH_CO_1F, 1 + warp_event 9, 11, COPYCATS_HOUSE_1F, 1 + warp_event 18, 3, ROUTE_5_SAFFRON_GATE, 3 + warp_event 0, 24, ROUTE_7_SAFFRON_GATE, 3 + warp_event 0, 25, ROUTE_7_SAFFRON_GATE, 4 + warp_event 16, 33, ROUTE_6_SAFFRON_GATE, 1 + warp_event 17, 33, ROUTE_6_SAFFRON_GATE, 2 + warp_event 39, 22, ROUTE_8_SAFFRON_GATE, 1 + warp_event 39, 23, ROUTE_8_SAFFRON_GATE, 2 + + db 0 ; coord events + + db 8 ; bg events + bg_event 21, 5, BGEVENT_READ, SaffronCitySign + bg_event 33, 5, BGEVENT_READ, SaffronGymSign + bg_event 25, 5, BGEVENT_READ, FightingDojoSign bg_event 15, 21, BGEVENT_READ, SilphCoSign bg_event 25, 29, BGEVENT_READ, MrPsychicsHouseSign - bg_event 11, 5, BGEVENT_READ, SaffronCityMagnetTrainStationSign + bg_event 11, 5, BGEVENT_READ, SaffronCityMagnetTrainStationSign bg_event 10, 29, BGEVENT_READ, SaffronCityPokecenterSign bg_event 26, 11, BGEVENT_READ, SaffronCityMartSign -.ObjectEvents: - db 8 - object_event 7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LassScript_0x19932a, -1 + db 8 ; object events + object_event 7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LassScript_0x19932a, -1 object_event 19, 30, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1 - object_event 32, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1 + object_event 32, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1 object_event 20, 24, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerFScript, -1 object_event 27, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x199358, -1 object_event 15, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster1Script, -1 object_event 35, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster2Script, -1 - object_event 19, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityLassScript, -1 + object_event 19, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityLassScript, -1 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index a2ba7497d..5f70785d2 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const SAFFRONGYM_SABRINA const SAFFRONGYM_GRANNY1 const SAFFRONGYM_YOUNGSTER1 @@ -7,11 +7,9 @@ const_value set 2 const SAFFRONGYM_GYM_GUY SaffronGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SabrinaScript_0x189c2e: faceplayer @@ -47,10 +45,10 @@ SabrinaScript_0x189c2e: end TrainerMediumRebecca: - trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script + trainer MEDIUM, REBECCA, EVENT_BEAT_MEDIUM_REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext MediumRebeccaAfterBattleText waitbutton @@ -58,10 +56,10 @@ TrainerMediumRebecca: end TrainerPsychicFranklin: - trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script + trainer PSYCHIC_T, FRANKLIN, EVENT_BEAT_PSYCHIC_FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PsychicFranklinAfterBattleText waitbutton @@ -69,10 +67,10 @@ TrainerPsychicFranklin: end TrainerMediumDoris: - trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script + trainer MEDIUM, DORIS, EVENT_BEAT_MEDIUM_DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext MediumDorisAfterBattleText waitbutton @@ -80,10 +78,10 @@ TrainerMediumDoris: end TrainerPsychicJared: - trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script + trainer PSYCHIC_T, JARED, EVENT_BEAT_PSYCHIC_JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PsychicJaredAfterBattleText waitbutton @@ -291,56 +289,51 @@ SaffronGymGuyWinText: done SaffronGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 32 - warp_def 8, 17, 2, SAFFRON_CITY - warp_def 9, 17, 2, SAFFRON_CITY - warp_def 11, 15, 18, SAFFRON_GYM - warp_def 19, 15, 19, SAFFRON_GYM - warp_def 19, 11, 20, SAFFRON_GYM - warp_def 1, 11, 21, SAFFRON_GYM - warp_def 5, 3, 22, SAFFRON_GYM - warp_def 11, 5, 23, SAFFRON_GYM - warp_def 1, 15, 24, SAFFRON_GYM - warp_def 19, 3, 25, SAFFRON_GYM - warp_def 15, 17, 26, SAFFRON_GYM - warp_def 5, 17, 27, SAFFRON_GYM - warp_def 5, 9, 28, SAFFRON_GYM - warp_def 9, 3, 29, SAFFRON_GYM - warp_def 15, 9, 30, SAFFRON_GYM - warp_def 15, 5, 31, SAFFRON_GYM - warp_def 1, 5, 32, SAFFRON_GYM - warp_def 19, 17, 3, SAFFRON_GYM - warp_def 19, 9, 4, SAFFRON_GYM - warp_def 1, 9, 5, SAFFRON_GYM - warp_def 5, 5, 6, SAFFRON_GYM - warp_def 11, 3, 7, SAFFRON_GYM - warp_def 1, 17, 8, SAFFRON_GYM - warp_def 19, 5, 9, SAFFRON_GYM - warp_def 15, 15, 10, SAFFRON_GYM - warp_def 5, 15, 11, SAFFRON_GYM - warp_def 5, 11, 12, SAFFRON_GYM - warp_def 9, 5, 13, SAFFRON_GYM - warp_def 15, 11, 14, SAFFRON_GYM - warp_def 15, 3, 15, SAFFRON_GYM - warp_def 1, 3, 16, SAFFRON_GYM - warp_def 11, 9, 17, SAFFRON_GYM - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 8, 15, BGEVENT_READ, SaffronGymStatue - -.ObjectEvents: - db 6 - object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1 + db 0, 0 ; filler + + db 32 ; warp events + warp_event 8, 17, SAFFRON_CITY, 2 + warp_event 9, 17, SAFFRON_CITY, 2 + warp_event 11, 15, SAFFRON_GYM, 18 + warp_event 19, 15, SAFFRON_GYM, 19 + warp_event 19, 11, SAFFRON_GYM, 20 + warp_event 1, 11, SAFFRON_GYM, 21 + warp_event 5, 3, SAFFRON_GYM, 22 + warp_event 11, 5, SAFFRON_GYM, 23 + warp_event 1, 15, SAFFRON_GYM, 24 + warp_event 19, 3, SAFFRON_GYM, 25 + warp_event 15, 17, SAFFRON_GYM, 26 + warp_event 5, 17, SAFFRON_GYM, 27 + warp_event 5, 9, SAFFRON_GYM, 28 + warp_event 9, 3, SAFFRON_GYM, 29 + warp_event 15, 9, SAFFRON_GYM, 30 + warp_event 15, 5, SAFFRON_GYM, 31 + warp_event 1, 5, SAFFRON_GYM, 32 + warp_event 19, 17, SAFFRON_GYM, 3 + warp_event 19, 9, SAFFRON_GYM, 4 + warp_event 1, 9, SAFFRON_GYM, 5 + warp_event 5, 5, SAFFRON_GYM, 6 + warp_event 11, 3, SAFFRON_GYM, 7 + warp_event 1, 17, SAFFRON_GYM, 8 + warp_event 19, 5, SAFFRON_GYM, 9 + warp_event 15, 15, SAFFRON_GYM, 10 + warp_event 5, 15, SAFFRON_GYM, 11 + warp_event 5, 11, SAFFRON_GYM, 12 + warp_event 9, 5, SAFFRON_GYM, 13 + warp_event 15, 11, SAFFRON_GYM, 14 + warp_event 15, 3, SAFFRON_GYM, 15 + warp_event 1, 3, SAFFRON_GYM, 16 + warp_event 11, 9, SAFFRON_GYM, 17 + + db 0 ; coord events + + db 1 ; bg events + bg_event 8, 15, BGEVENT_READ, SaffronGymStatue + + db 6 ; object events + object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1 object_event 17, 16, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1 - object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1 - object_event 3, 4, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1 - object_event 17, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicJared, -1 - object_event 9, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuyScript, -1 + object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1 + object_event 3, 4, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1 + object_event 17, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicJared, -1 + object_event 9, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuyScript, -1 diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index 0d69d2017..c6e6d2645 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -1,16 +1,14 @@ -const_value set 2 + const_def 2 ; object constants const SAFFRONMAGNETTRAINSTATION_OFFICER const SAFFRONMAGNETTRAINSTATION_GYM_GUY const SAFFRONMAGNETTRAINSTATION_TEACHER const SAFFRONMAGNETTRAINSTATION_LASS SaffronMagnetTrainStation_MapScripts: -.SceneScripts: - db 1 - scene_script .DummyScene + db 1 ; scene scripts + scene_script .DummyScene ; SCENE_DEFAULT -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -37,7 +35,7 @@ OfficerScript_0x18a81e: applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f applymovement PLAYER, MovementData_0x18a898 writebyte TRUE - special Special_MagnetTrain + special MagnetTrain warpcheck newloadmap MAPSETUP_TRAIN applymovement PLAYER, .MovementBoardTheTrain @@ -216,26 +214,21 @@ SaffronMagnetTrainStationLassText: done SaffronMagnetTrainStation_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 8, 17, 6, SAFFRON_CITY - warp_def 9, 17, 6, SAFFRON_CITY - warp_def 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION - warp_def 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION - -.CoordEvents: - db 1 - coord_event 11, 6, 0, Script_ArriveFromGoldenrod - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 8, 17, SAFFRON_CITY, 6 + warp_event 9, 17, SAFFRON_CITY, 6 + warp_event 6, 5, GOLDENROD_MAGNET_TRAIN_STATION, 4 + warp_event 11, 5, GOLDENROD_MAGNET_TRAIN_STATION, 3 + + db 1 ; coord events + coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromGoldenrod + + db 0 ; bg events + + db 4 ; object events + object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1 object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1 - object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION - object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION + object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION + object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index d7619320c..b86655188 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const SAFFRONMART_CLERK const SAFFRONMART_COOLTRAINER_M const SAFFRONMART_COOLTRAINER_F SaffronMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x18a3bf: opentext @@ -38,22 +36,17 @@ SaffronMartCooltrainerFText: done SaffronMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, SAFFRON_CITY - warp_def 3, 7, 3, SAFFRON_CITY + db 2 ; warp events + warp_event 2, 7, SAFFRON_CITY, 3 + warp_event 3, 7, SAFFRON_CITY, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1 - object_event 7, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1 - object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1 + object_event 7, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1 + object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1 diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index d53fdb684..91f2f9ba1 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -1,21 +1,19 @@ -const_value set 2 + const_def 2 ; object constants const SAFFRONPOKECENTER1F_NURSE const SAFFRONPOKECENTER1F_TEACHER const SAFFRONPOKECENTER1F_FISHER const SAFFRONPOKECENTER1F_YOUNGSTER SaffronPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x18a47d: jumpstd pokecenternurse TeacherScript_0x18a480: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x18a4a3 @@ -112,24 +110,19 @@ SaffronPokecenter1FYoungsterText: done SaffronPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 4, SAFFRON_CITY - warp_def 4, 7, 4, SAFFRON_CITY - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1 - object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1 - object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1 - object_event 1, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, SAFFRON_CITY, 4 + warp_event 4, 7, SAFFRON_CITY, 4 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1 + object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1 + object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1 + object_event 1, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1 diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm index ebc2bb6c8..912f1281a 100644 --- a/maps/SaffronPokecenter2FBeta.asm +++ b/maps/SaffronPokecenter2FBeta.asm @@ -1,23 +1,16 @@ SaffronPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SaffronPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, SAFFRON_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, SAFFRON_POKECENTER_1F, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 885d04c60..4a912f39f 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const SEAFOAMGYM_BLAINE const SEAFOAMGYM_GYM_GUY SeafoamGym_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -158,20 +156,15 @@ SeafoamGymGuyWinText2: done SeafoamGym_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 5, 5, 1, ROUTE_20 + db 1 ; warp events + warp_event 5, 5, ROUTE_20, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 - object_event 5, 2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1 - object_event 6, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY + db 2 ; object events + object_event 5, 2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1 + object_event 6, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 83c75ef6c..662084b25 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const SILPHCO1F_RECEPTIONIST const SILPHCO1F_OFFICER SilphCo1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SilphCoReceptionist: jumptextfaceplayer SilphCoReceptionistText @@ -56,21 +54,16 @@ UnknownText_0x18aca8: done SilphCo1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 7, SAFFRON_CITY - warp_def 3, 7, 7, SAFFRON_CITY + db 2 ; warp events + warp_event 2, 7, SAFFRON_CITY, 7 + warp_event 3, 7, SAFFRON_CITY, 7 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 - object_event 4, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionist, -1 - object_event 13, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1 + db 2 ; object events + object_event 4, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionist, -1 + object_event 13, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1 diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index d218da44c..e2f48638d 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const SILVERCAVEITEMROOMS_POKE_BALL1 const SILVERCAVEITEMROOMS_POKE_BALL2 SilverCaveItemRooms_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SilverCaveItemRoomsMaxRevive: itemball MAX_REVIVE @@ -16,21 +14,16 @@ SilverCaveItemRoomsFullRestore: itemball FULL_RESTORE SilverCaveItemRooms_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 13, 3, 3, SILVER_CAVE_ROOM_2 - warp_def 7, 15, 4, SILVER_CAVE_ROOM_2 + db 2 ; warp events + warp_event 13, 3, SILVER_CAVE_ROOM_2, 3 + warp_event 7, 15, SILVER_CAVE_ROOM_2, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 - object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE - object_event 15, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE + db 2 ; object events + object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE + object_event 15, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 3e51cf7b2..fea256208 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -1,9 +1,7 @@ SilverCaveOutside_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -17,29 +15,24 @@ MtSilverSign: jumptext MtSilverSignText SilverCaveOutsideHiddenFullRestore: - hiddenitem EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE MtSilverSignText: text "MT.SILVER" done SilverCaveOutside_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 23, 19, 1, SILVER_CAVE_POKECENTER_1F - warp_def 18, 11, 1, SILVER_CAVE_ROOM_1 + db 2 ; warp events + warp_event 23, 19, SILVER_CAVE_POKECENTER_1F, 1 + warp_event 18, 11, SILVER_CAVE_ROOM_1, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 3 + db 3 ; bg events bg_event 24, 19, BGEVENT_READ, MtSilverPokecenterSign bg_event 17, 13, BGEVENT_READ, MtSilverSign - bg_event 9, 25, BGEVENT_ITEM, SilverCaveOutsideHiddenFullRestore + bg_event 9, 25, BGEVENT_ITEM, SilverCaveOutsideHiddenFullRestore -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index 76b1e744f..de066c65e 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const SILVERCAVEPOKECENTER1F_NURSE const SILVERCAVEPOKECENTER1F_GRANNY SilverCavePokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x1ae59a: jumpstd pokecenternurse @@ -30,22 +28,17 @@ SilverCavePokecenter1FGrannyText: done SilverCavePokecenter1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 7, 1, SILVER_CAVE_OUTSIDE - warp_def 4, 7, 1, SILVER_CAVE_OUTSIDE - warp_def 0, 7, 1, POKECENTER_2F + db 3 ; warp events + warp_event 3, 7, SILVER_CAVE_OUTSIDE, 1 + warp_event 4, 7, SILVER_CAVE_OUTSIDE, 1 + warp_event 0, 7, POKECENTER_2F, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1 - object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1 + db 2 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1 + object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index fd04a1a6d..1fe5df55d 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const SILVERCAVEROOM1_POKE_BALL1 const SILVERCAVEROOM1_POKE_BALL2 const SILVERCAVEROOM1_POKE_BALL3 const SILVERCAVEROOM1_POKE_BALL4 SilverCaveRoom1_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SilverCaveRoom1MaxElixer: itemball MAX_ELIXER @@ -24,31 +22,26 @@ SilverCaveRoom1UltraBall: itemball ULTRA_BALL SilverCaveRoom1HiddenDireHit: - hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT + hiddenitem DIRE_HIT, EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT SilverCaveRoom1HiddenUltraBall: - hiddenitem EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem ULTRA_BALL, EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL SilverCaveRoom1_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 9, 33, 2, SILVER_CAVE_OUTSIDE - warp_def 15, 1, 1, SILVER_CAVE_ROOM_2 + db 2 ; warp events + warp_event 9, 33, SILVER_CAVE_OUTSIDE, 2 + warp_event 15, 1, SILVER_CAVE_ROOM_2, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 16, 23, BGEVENT_ITEM, SilverCaveRoom1HiddenDireHit bg_event 17, 12, BGEVENT_ITEM, SilverCaveRoom1HiddenUltraBall -.ObjectEvents: - db 4 - object_event 4, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER - object_event 15, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN - object_event 5, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE - object_event 7, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL + db 4 ; object events + object_event 4, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER + object_event 15, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN + object_event 5, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE + object_event 7, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index eb6b9fd69..7a7f9250d 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const SILVERCAVEROOM2_POKE_BALL1 const SILVERCAVEROOM2_POKE_BALL2 const SILVERCAVEROOM2_POKE_BALL3 SilverCaveRoom2_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SilverCaveRoom2Calcium: itemball CALCIUM @@ -20,28 +18,23 @@ SilverCaveRoom2PPUp: itemball PP_UP SilverCaveRoom2HiddenMaxPotion: - hiddenitem EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION SilverCaveRoom2_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 17, 31, 2, SILVER_CAVE_ROOM_1 - warp_def 11, 5, 1, SILVER_CAVE_ROOM_3 - warp_def 13, 21, 1, SILVER_CAVE_ITEM_ROOMS - warp_def 23, 3, 2, SILVER_CAVE_ITEM_ROOMS + db 4 ; warp events + warp_event 17, 31, SILVER_CAVE_ROOM_1, 2 + warp_event 11, 5, SILVER_CAVE_ROOM_3, 1 + warp_event 13, 21, SILVER_CAVE_ITEM_ROOMS, 1 + warp_event 23, 3, SILVER_CAVE_ITEM_ROOMS, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 14, 31, BGEVENT_ITEM, SilverCaveRoom2HiddenMaxPotion -.ObjectEvents: - db 3 - object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM - object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL - object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP + db 3 ; object events + object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM + object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL + object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 705ca0cc1..3efd76434 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const SILVERCAVEROOM3_RED SilverCaveRoom3_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Red: - special Special_FadeOutMusic + special FadeOutMusic faceplayer opentext writetext .Text1 @@ -20,16 +18,16 @@ Red: startbattle dontrestartmapmusic reloadmapafterbattle - special Special_FadeOutMusic + special FadeOutMusic opentext writetext .Text3 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear SILVERCAVEROOM3_RED pause 15 - special Special_FadeInQuickly + special FadeInQuickly pause 30 special HealParty refreshscreen @@ -51,19 +49,14 @@ Red: done SilverCaveRoom3_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 9, 33, 2, SILVER_CAVE_ROOM_2 + db 1 ; warp events + warp_event 9, 33, SILVER_CAVE_ROOM_2, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 9, 10, SPRITE_RED, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER + db 1 ; object events + object_event 9, 10, SPRITE_RED, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 4937a259f..d5ad15387 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const SLOWPOKEWELLB1F_ROCKET1 const SLOWPOKEWELLB1F_ROCKET2 const SLOWPOKEWELLB1F_ROCKET3 @@ -10,20 +10,18 @@ const_value set 2 const SLOWPOKEWELLB1F_POKE_BALL SlowpokeWellB1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SlowpokeWellB1FKurtScript: jumptextfaceplayer SlowpokeWellB1FKurtText TrainerGruntM29: - trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_29, EVENT_BEAT_ROCKET_GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM29AfterBattleText waitbutton @@ -31,33 +29,33 @@ TrainerGruntM29: end TrainerGruntM1: - trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_1, EVENT_BEAT_ROCKET_GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, .Script .Script: opentext writetext TrainerGruntM1WhenTalkText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear SLOWPOKEWELLB1F_ROCKET1 disappear SLOWPOKEWELLB1F_ROCKET2 disappear SLOWPOKEWELLB1F_ROCKET3 disappear SLOWPOKEWELLB1F_ROCKET_GIRL pause 15 - special Special_FadeInQuickly + special FadeInQuickly disappear SLOWPOKEWELLB1F_KURT moveobject SLOWPOKEWELLB1F_KURT, 11, 6 appear SLOWPOKEWELLB1F_KURT applymovement SLOWPOKEWELLB1F_KURT, KurtSlowpokeWellVictoryMovementData - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT opentext writetext KurtLeaveSlowpokeWellText waitbutton closetext setevent EVENT_CLEARED_SLOWPOKE_WELL variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER - setmapscene AZALEA_TOWN, 1 + setmapscene AZALEA_TOWN, SCENE_AZALEATOWN_RIVAL_BATTLE clearevent EVENT_ILEX_FOREST_APPRENTICE clearevent EVENT_ILEX_FOREST_FARFETCHD setevent EVENT_CHARCOAL_KILN_FARFETCH_D @@ -67,17 +65,17 @@ TrainerGruntM1: clearevent EVENT_AZALEA_TOWN_SLOWPOKES clearevent EVENT_KURTS_HOUSE_SLOWPOKE clearevent EVENT_KURTS_HOUSE_KURT_1 - special Special_FadeOutPalettes + special FadeOutPalettes special HealParty pause 15 warp KURTS_HOUSE, 3, 3 end TrainerGruntM2: - trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_2, EVENT_BEAT_ROCKET_GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM2AfterBattleText waitbutton @@ -85,10 +83,10 @@ TrainerGruntM2: end TrainerGruntF1: - trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, .Script + trainer GRUNTF, GRUNTF_1, EVENT_BEAT_ROCKET_GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntF1AfterBattleText waitbutton @@ -321,28 +319,23 @@ SlowpokeWellB1FTaillessSlowpokeText: done SlowpokeWellB1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 17, 15, 6, AZALEA_TOWN - warp_def 7, 11, 1, SLOWPOKE_WELL_B2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 9 - object_event 15, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS - object_event 5, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS - object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS - object_event 10, 4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS - object_event 7, 4, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FSlowpokeWithMailScript, EVENT_SLOWPOKE_WELL_SLOWPOKES - object_event 6, 2, SPRITE_SLOWPOKE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FTaillessSlowpokeScript, EVENT_SLOWPOKE_WELL_SLOWPOKES + db 0, 0 ; filler + + db 2 ; warp events + warp_event 17, 15, AZALEA_TOWN, 6 + warp_event 7, 11, SLOWPOKE_WELL_B2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 9 ; object events + object_event 15, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS + object_event 5, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS + object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS + object_event 10, 4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS + object_event 7, 4, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FSlowpokeWithMailScript, EVENT_SLOWPOKE_WELL_SLOWPOKES + object_event 6, 2, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FTaillessSlowpokeScript, EVENT_SLOWPOKE_WELL_SLOWPOKES object_event 16, 14, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FKurtScript, EVENT_SLOWPOKE_WELL_KURT - object_event 3, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1 - object_event 10, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION + object_event 3, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1 + object_event 10, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index c8559cc9c..21a8f73e4 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const SLOWPOKEWELLB2F_GYM_GUY const SLOWPOKEWELLB2F_POKE_BALL SlowpokeWellB2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GymGuyScript_0x5ad0b: faceplayer @@ -62,20 +60,15 @@ UnknownText_0x5adf2: done SlowpokeWellB2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 9, 11, 2, SLOWPOKE_WELL_B1F + db 1 ; warp events + warp_event 9, 11, SLOWPOKE_WELL_B1F, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 - object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1 - object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE + db 2 ; object events + object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1 + object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 15ac8e2b3..8c6a86128 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const SOULHOUSE_MRFUJI const SOULHOUSE_TEACHER const SOULHOUSE_LASS const SOULHOUSE_GRANNY SoulHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MrFuji: jumptextfaceplayer MrFujiText @@ -73,23 +71,18 @@ SoulHouseGrannyText: done SoulHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 7, 6, LAVENDER_TOWN - warp_def 5, 7, 6, LAVENDER_TOWN - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 4, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1 - object_event 7, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1 - object_event 2, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1 - object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 7, LAVENDER_TOWN, 6 + warp_event 5, 7, LAVENDER_TOWN, 6 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 4, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1 + object_event 7, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1 + object_event 2, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1 + object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 3f9887fe2..42a2c74ea 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const SPROUTTOWER1F_SAGE1 const SPROUTTOWER1F_SAGE2 const SPROUTTOWER1F_GRANNY @@ -7,11 +7,9 @@ const_value set 2 const SPROUTTOWER1F_POKE_BALL SproutTower1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SproutTower1FSage1Script: jumptextfaceplayer SproutTower1FSage1Text @@ -26,10 +24,10 @@ SproutTower1FTeacherScript: jumptextfaceplayer SproutTower1FTeacherText TrainerSageChow: - trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, 0, .Script + trainer SAGE, CHOW, EVENT_BEAT_SAGE_CHOW, SageChowSeenText, SageChowBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SageChowAfterBattleText waitbutton @@ -103,30 +101,25 @@ UnknownText_0x1846d6: done SproutTower1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 9, 15, 7, VIOLET_CITY - warp_def 10, 15, 7, VIOLET_CITY - warp_def 6, 4, 1, SPROUT_TOWER_2F - warp_def 2, 6, 2, SPROUT_TOWER_2F - warp_def 17, 3, 3, SPROUT_TOWER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 7, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script + db 0, 0 ; filler + + db 5 ; warp events + warp_event 9, 15, VIOLET_CITY, 7 + warp_event 10, 15, VIOLET_CITY, 7 + warp_event 6, 4, SPROUT_TOWER_2F, 1 + warp_event 2, 6, SPROUT_TOWER_2F, 2 + warp_event 17, 3, SPROUT_TOWER_2F, 3 + + db 0 ; coord events + + db 2 ; bg events + bg_event 7, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script bg_event 12, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script -.ObjectEvents: - db 6 - object_event 7, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1 - object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1 + db 6 ; object events + object_event 7, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1 + object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1 object_event 11, 12, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1 - object_event 9, 9, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1 - object_event 3, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageChow, -1 - object_event 16, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL + object_event 9, 9, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1 + object_event 3, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageChow, -1 + object_event 16, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index cd0c46fd7..7606c3227 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -1,20 +1,18 @@ -const_value set 2 + const_def 2 ; object constants const SPROUTTOWER2F_SAGE1 const SPROUTTOWER2F_SAGE2 const SPROUTTOWER2F_POKE_BALL SproutTower2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerSageNico: - trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script + trainer SAGE, NICO, EVENT_BEAT_SAGE_NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SageNicoAfterBattleText waitbutton @@ -22,10 +20,10 @@ TrainerSageNico: end TrainerSageEdmond: - trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, .Script + trainer SAGE, EDMOND, EVENT_BEAT_SAGE_EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SageEdmondAfterBattleText waitbutton @@ -85,25 +83,20 @@ UnknownText_0x1848c8: done SproutTower2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 6, 4, 3, SPROUT_TOWER_1F - warp_def 2, 6, 4, SPROUT_TOWER_1F - warp_def 17, 3, 5, SPROUT_TOWER_1F - warp_def 10, 14, 1, SPROUT_TOWER_3F + db 4 ; warp events + warp_event 6, 4, SPROUT_TOWER_1F, 3 + warp_event 2, 6, SPROUT_TOWER_1F, 4 + warp_event 17, 3, SPROUT_TOWER_1F, 5 + warp_event 10, 14, SPROUT_TOWER_3F, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 12, 15, BGEVENT_READ, MapSproutTower2FSignpost0Script -.ObjectEvents: - db 3 - object_event 12, 3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1 - object_event 9, 14, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1 - object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY + db 3 ; object events + object_event 12, 3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1 + object_event 9, 14, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1 + object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 2b459c55d..78c58eca0 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const SPROUTTOWER3F_SAGE1 const SPROUTTOWER3F_SAGE2 const SPROUTTOWER3F_SAGE3 @@ -8,13 +8,11 @@ const_value set 2 const SPROUTTOWER3F_SILVER SproutTower3F_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -23,9 +21,9 @@ SproutTower3F_MapScripts: end UnknownScript_0x184947: - spriteface PLAYER, UP + objectface PLAYER, UP showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic playsound SFX_TACKLE playsound SFX_ELEVATOR earthquake 79 @@ -40,7 +38,7 @@ UnknownScript_0x184947: waitbutton closetext showemote EMOTE_SHOCK, SPROUTTOWER3F_SILVER, 15 - spriteface SPROUTTOWER3F_SILVER, DOWN + objectface SPROUTTOWER3F_SILVER, DOWN pause 15 applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a24 playmusic MUSIC_RIVAL_ENCOUNTER @@ -48,18 +46,18 @@ UnknownScript_0x184947: writetext UnknownText_0x184aec waitbutton closetext - spriteface SPROUTTOWER3F_SILVER, UP + objectface SPROUTTOWER3F_SILVER, UP opentext writetext UnknownText_0x184bc8 pause 15 closetext playsound SFX_WARP_TO - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear SPROUTTOWER3F_SILVER waitsfx - special Special_FadeInQuickly - setscene 1 + special FadeInQuickly + setscene SCENE_FINISHED special RestartMapMusic end @@ -93,10 +91,10 @@ UnknownScript_0x1849d1: end TrainerSageJin: - trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, .Script + trainer SAGE, JIN, EVENT_BEAT_SAGE_JIN, SageJinSeenText, SageJinBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SageJinAfterBattleText waitbutton @@ -104,10 +102,10 @@ TrainerSageJin: end TrainerSageTroy: - trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, .Script + trainer SAGE, TROY, EVENT_BEAT_SAGE_TROY, SageTroySeenText, SageTroyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SageTroyAfterBattleText waitbutton @@ -115,10 +113,10 @@ TrainerSageTroy: end TrainerSageNeal: - trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, .Script + trainer SAGE, NEAL, EVENT_BEAT_SAGE_NEAL, SageNealSeenText, SageNealBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SageNealAfterBattleText waitbutton @@ -330,32 +328,27 @@ UnknownText_0x184f61: done SproutTower3F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def 10, 14, 4, SPROUT_TOWER_2F - -.CoordEvents: - db 1 - coord_event 11, 9, 0, UnknownScript_0x184947 - -.BGEvents: - db 6 - bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script - bg_event 11, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script - bg_event 9, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script - bg_event 10, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script - bg_event 5, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script + db 0, 0 ; filler + + db 1 ; warp events + warp_event 10, 14, SPROUT_TOWER_2F, 4 + + db 1 ; coord events + coord_event 11, 9, SCENE_DEFAULT, UnknownScript_0x184947 + + db 6 ; bg events + bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 11, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 9, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script + bg_event 10, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script + bg_event 5, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script bg_event 14, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script -.ObjectEvents: - db 7 - object_event 8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1 - object_event 8, 8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1 - object_event 10, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1 + db 7 ; object events + object_event 8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1 + object_event 8, 8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1 + object_event 10, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1 object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageNeal, -1 - object_event 6, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION - object_event 14, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE - object_event 10, 4, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER + object_event 6, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION + object_event 14, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE + object_event 10, 4, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 7ecb7b71a..4aad71817 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const TEAMROCKETBASEB1F_ROCKET1 const TEAMROCKETBASEB1F_ROCKET2 const TEAMROCKETBASEB1F_SCIENTIST @@ -7,12 +7,10 @@ const_value set 2 const TEAMROCKETBASEB1F_POKE_BALL3 TeamRocketBaseB1F_MapScripts: -.SceneScripts: - db 1 - scene_script .DummyScene + db 1 ; scene scripts + scene_script .DummyScene ; SCENE_DEFAULT -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt .DummyScene: @@ -32,10 +30,10 @@ SecurityCamera1a: playmusic MUSIC_ROCKET_ENCOUNTER moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 2 appear TEAMROCKETBASEB1F_ROCKET1 - spriteface PLAYER, LEFT + objectface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 - if_equal TRUE, NoSecurityCamera + ifequal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -43,7 +41,7 @@ SecurityCamera1a: appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt2 - if_equal TRUE, NoSecurityCamera + ifequal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_1 end @@ -57,10 +55,10 @@ SecurityCamera1b: playmusic MUSIC_ROCKET_ENCOUNTER moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 3 appear TEAMROCKETBASEB1F_ROCKET1 - spriteface PLAYER, LEFT + objectface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 - if_equal TRUE, NoSecurityCamera + ifequal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -68,7 +66,7 @@ SecurityCamera1b: appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt2 - if_equal TRUE, NoSecurityCamera + ifequal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_1 end @@ -82,19 +80,19 @@ SecurityCamera2a: playmusic MUSIC_ROCKET_ENCOUNTER moveobject TEAMROCKETBASEB1F_ROCKET1, 4, 7 appear TEAMROCKETBASEB1F_ROCKET1 - spriteface PLAYER, LEFT + objectface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement2 scall TrainerCameraGrunt1 - if_equal TRUE, NoSecurityCamera + ifequal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT moveobject TEAMROCKETBASEB1F_ROCKET1, 12, 5 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement3 scall TrainerCameraGrunt2 - if_equal TRUE, NoSecurityCamera + ifequal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_2 end @@ -108,19 +106,19 @@ SecurityCamera2b: playmusic MUSIC_ROCKET_ENCOUNTER moveobject TEAMROCKETBASEB1F_ROCKET1, 4, 8 appear TEAMROCKETBASEB1F_ROCKET1 - spriteface PLAYER, LEFT + objectface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement4 scall TrainerCameraGrunt1 - if_equal TRUE, NoSecurityCamera + ifequal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT moveobject TEAMROCKETBASEB1F_ROCKET1, 12, 5 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement5 scall TrainerCameraGrunt2 - if_equal TRUE, NoSecurityCamera + ifequal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_2 end @@ -134,19 +132,19 @@ SecurityCamera3a: playmusic MUSIC_ROCKET_ENCOUNTER moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 6 appear TEAMROCKETBASEB1F_ROCKET1 - spriteface PLAYER, LEFT + objectface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 - if_equal TRUE, NoSecurityCamera + ifequal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 11 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement6 scall TrainerCameraGrunt2 - if_equal TRUE, NoSecurityCamera + ifequal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_3 end @@ -160,19 +158,19 @@ SecurityCamera3b: playmusic MUSIC_ROCKET_ENCOUNTER moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 7 appear TEAMROCKETBASEB1F_ROCKET1 - spriteface PLAYER, LEFT + objectface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 - if_equal TRUE, NoSecurityCamera + ifequal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 12 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement7 scall TrainerCameraGrunt2 - if_equal TRUE, NoSecurityCamera + ifequal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_3 end @@ -186,19 +184,19 @@ SecurityCamera4: playmusic MUSIC_ROCKET_ENCOUNTER moveobject TEAMROCKETBASEB1F_ROCKET1, 17, 16 appear TEAMROCKETBASEB1F_ROCKET1 - spriteface PLAYER, LEFT + objectface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 - if_equal TRUE, NoSecurityCamera + ifequal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 11 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement8 scall TrainerCameraGrunt2 - if_equal TRUE, NoSecurityCamera + ifequal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_4 end @@ -212,19 +210,19 @@ SecurityCamera5: playmusic MUSIC_ROCKET_ENCOUNTER moveobject TEAMROCKETBASEB1F_ROCKET1, 3, 16 appear TEAMROCKETBASEB1F_ROCKET1 - spriteface PLAYER, LEFT + objectface PLAYER, LEFT applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 - if_equal TRUE, NoSecurityCamera + ifequal TRUE, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT moveobject TEAMROCKETBASEB1F_ROCKET1, 14, 16 appear TEAMROCKETBASEB1F_ROCKET1 applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement9 scall TrainerCameraGrunt2 - if_equal TRUE, NoSecurityCamera + ifequal TRUE, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_5 end @@ -448,9 +446,9 @@ ExplodingTrap22: end VoltorbExplodingTrap: - special Special_FadeOutPalettes + special FadeOutPalettes cry VOLTORB - special Special_FadeInPalettes + special FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon VOLTORB, 23 @@ -458,9 +456,9 @@ VoltorbExplodingTrap: end GeodudeExplodingTrap: - special Special_FadeOutPalettes + special FadeOutPalettes cry GEODUDE - special Special_FadeInPalettes + special FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon GEODUDE, 21 @@ -468,9 +466,9 @@ GeodudeExplodingTrap: end KoffingExplodingTrap: - special Special_FadeOutPalettes + special FadeOutPalettes cry KOFFING - special Special_FadeInPalettes + special FadeInPalettes setlasttalked -1 writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadwildmon KOFFING, 21 @@ -481,10 +479,10 @@ NoExplodingTrap: end TrainerScientistJed: - trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, 0, .Script + trainer SCIENTIST, JED, EVENT_BEAT_SCIENTIST_JED, ScientistJedSeenText, ScientistJedBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext ScientistJedAfterBattleText waitbutton @@ -492,10 +490,10 @@ TrainerScientistJed: end TrainerGruntM16: - trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_16, EVENT_BEAT_ROCKET_GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM16AfterBattleText waitbutton @@ -540,7 +538,7 @@ TeamRocketBaseB1FGuardSpec: itemball GUARD_SPEC TeamRocketBaseB1FHiddenRevive: - hiddenitem EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE + hiddenitem REVIVE, EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE SecurityCameraMovement1: big_step RIGHT @@ -727,70 +725,65 @@ UnknownText_0x6cdd0: done TeamRocketBaseB1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 27, 2, 3, MAHOGANY_MART_1F - warp_def 3, 14, 1, TEAM_ROCKET_BASE_B2F - warp_def 5, 15, 4, TEAM_ROCKET_BASE_B1F - warp_def 25, 2, 3, TEAM_ROCKET_BASE_B1F - -.CoordEvents: - db 30 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 27, 2, MAHOGANY_MART_1F, 3 + warp_event 3, 14, TEAM_ROCKET_BASE_B2F, 1 + warp_event 5, 15, TEAM_ROCKET_BASE_B1F, 4 + warp_event 25, 2, TEAM_ROCKET_BASE_B1F, 3 + + db 30 ; coord events ; There are five security cameras in the base. ; Walking in front of one triggers two Rocket Grunts. - coord_event 24, 2, 0, SecurityCamera1a - coord_event 24, 3, 0, SecurityCamera1b - coord_event 6, 2, 0, SecurityCamera2a - coord_event 6, 3, 0, SecurityCamera2b - coord_event 24, 6, 0, SecurityCamera3a - coord_event 24, 7, 0, SecurityCamera3b - coord_event 22, 16, 0, SecurityCamera4 - coord_event 8, 16, 0, SecurityCamera5 + coord_event 24, 2, SCENE_DEFAULT, SecurityCamera1a + coord_event 24, 3, SCENE_DEFAULT, SecurityCamera1b + coord_event 6, 2, SCENE_DEFAULT, SecurityCamera2a + coord_event 6, 3, SCENE_DEFAULT, SecurityCamera2b + coord_event 24, 6, SCENE_DEFAULT, SecurityCamera3a + coord_event 24, 7, SCENE_DEFAULT, SecurityCamera3b + coord_event 22, 16, SCENE_DEFAULT, SecurityCamera4 + coord_event 8, 16, SCENE_DEFAULT, SecurityCamera5 ; There are spots on the floor that trigger a Pokémon battle. ; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct. - coord_event 2, 7, 0, ExplodingTrap1 - coord_event 3, 7, 0, ExplodingTrap2 - coord_event 4, 7, 0, ExplodingTrap3 - coord_event 1, 8, 0, ExplodingTrap4 - coord_event 3, 8, 0, ExplodingTrap5 - coord_event 5, 8, 0, ExplodingTrap6 - coord_event 3, 9, 0, ExplodingTrap7 - coord_event 4, 9, 0, ExplodingTrap8 - coord_event 1, 10, 0, ExplodingTrap9 - coord_event 2, 10, 0, ExplodingTrap10 - coord_event 3, 10, 0, ExplodingTrap11 - coord_event 5, 10, 0, ExplodingTrap12 - coord_event 2, 11, 0, ExplodingTrap13 - coord_event 4, 11, 0, ExplodingTrap14 - coord_event 1, 12, 0, ExplodingTrap15 - coord_event 2, 12, 0, ExplodingTrap16 - coord_event 4, 12, 0, ExplodingTrap17 - coord_event 5, 12, 0, ExplodingTrap18 - coord_event 1, 13, 0, ExplodingTrap19 - coord_event 3, 13, 0, ExplodingTrap20 - coord_event 4, 13, 0, ExplodingTrap21 - coord_event 5, 13, 0, ExplodingTrap22 - -.BGEvents: - db 9 + coord_event 2, 7, SCENE_DEFAULT, ExplodingTrap1 + coord_event 3, 7, SCENE_DEFAULT, ExplodingTrap2 + coord_event 4, 7, SCENE_DEFAULT, ExplodingTrap3 + coord_event 1, 8, SCENE_DEFAULT, ExplodingTrap4 + coord_event 3, 8, SCENE_DEFAULT, ExplodingTrap5 + coord_event 5, 8, SCENE_DEFAULT, ExplodingTrap6 + coord_event 3, 9, SCENE_DEFAULT, ExplodingTrap7 + coord_event 4, 9, SCENE_DEFAULT, ExplodingTrap8 + coord_event 1, 10, SCENE_DEFAULT, ExplodingTrap9 + coord_event 2, 10, SCENE_DEFAULT, ExplodingTrap10 + coord_event 3, 10, SCENE_DEFAULT, ExplodingTrap11 + coord_event 5, 10, SCENE_DEFAULT, ExplodingTrap12 + coord_event 2, 11, SCENE_DEFAULT, ExplodingTrap13 + coord_event 4, 11, SCENE_DEFAULT, ExplodingTrap14 + coord_event 1, 12, SCENE_DEFAULT, ExplodingTrap15 + coord_event 2, 12, SCENE_DEFAULT, ExplodingTrap16 + coord_event 4, 12, SCENE_DEFAULT, ExplodingTrap17 + coord_event 5, 12, SCENE_DEFAULT, ExplodingTrap18 + coord_event 1, 13, SCENE_DEFAULT, ExplodingTrap19 + coord_event 3, 13, SCENE_DEFAULT, ExplodingTrap20 + coord_event 4, 13, SCENE_DEFAULT, ExplodingTrap21 + coord_event 5, 13, SCENE_DEFAULT, ExplodingTrap22 + + db 9 ; bg events bg_event 19, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script - bg_event 24, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script - bg_event 6, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script - bg_event 8, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 24, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 6, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 8, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script bg_event 22, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script - bg_event 24, 5, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 24, 5, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script bg_event 20, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script bg_event 21, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script - bg_event 3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive + bg_event 3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive -.ObjectEvents: - db 6 - object_event 0, 0, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS - object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION + db 6 ; object events + object_event 0, 0, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS + object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 18, 12, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 27, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION - object_event 14, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET - object_event 21, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC + object_event 27, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION + object_event 14, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET + object_event 21, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index f31110476..511a79bd8 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const TEAMROCKETBASEB2F_ROCKET1 const TEAMROCKETBASEB2F_ROCKET_GIRL const TEAMROCKETBASEB2F_LANCE @@ -15,15 +15,13 @@ const_value set 2 const TEAMROCKETBASEB2F_POKE_BALL TeamRocketBaseB2F_MapScripts: -.SceneScripts: - db 4 - scene_script .DummyScene0 - scene_script .DummyScene1 - scene_script .DummyScene2 - scene_script .DummyScene3 - -.MapCallbacks: - db 1 + db 4 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS + scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB2F_ELECTRODES + scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB2F_NOTHING + + db 1 ; callbacks callback MAPCALLBACK_TILES, .TransmitterDoorCallback .DummyScene0: @@ -63,20 +61,20 @@ UnknownScript_0x6cfac: writetext UnknownText_0x6d2ad waitbutton closetext - spriteface PLAYER, DOWN + objectface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 applymovement PLAYER, MovementData_0x6d21f playmusic MUSIC_ROCKET_ENCOUNTER applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d224 - spriteface PLAYER, UP + objectface PLAYER, UP applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d22f opentext writetext UnknownText_0x6d2c3 waitbutton closetext cry DRAGONITE - spriteface TEAMROCKETBASEB2F_ROCKET_GIRL, LEFT - spriteface PLAYER, LEFT + objectface TEAMROCKETBASEB2F_ROCKET_GIRL, LEFT + objectface PLAYER, LEFT appear TEAMROCKETBASEB2F_DRAGON applymovement TEAMROCKETBASEB2F_DRAGON, MovementData_0x6d236 applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d23b @@ -87,7 +85,7 @@ UnknownScript_0x6cfac: writetext UnknownText_0x6d38c waitbutton closetext - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d241 opentext writetext UnknownText_0x6d3bd @@ -109,7 +107,7 @@ UnknownScript_0x6cfac: writetext UnknownText_0x6d4c6 waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear TEAMROCKETBASEB2F_ROCKET1 disappear TEAMROCKETBASEB2F_ROCKET_GIRL @@ -117,16 +115,16 @@ UnknownScript_0x6cfac: disappear TEAMROCKETBASEB2F_ROCKET3 disappear TEAMROCKETBASEB2F_ROCKET4 pause 15 - special Special_FadeInQuickly - setscene 2 + special FadeInQuickly + setscene SCENE_TEAMROCKETBASEB2F_ELECTRODES clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE - spriteface TEAMROCKETBASEB2F_LANCE, DOWN + objectface TEAMROCKETBASEB2F_LANCE, DOWN opentext writetext UnknownText_0x6d5d8 waitbutton closetext applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d250 - spriteface PLAYER, UP + objectface PLAYER, UP opentext writetext UnknownText_0x6d64e waitbutton @@ -155,30 +153,30 @@ UnknownScript_0x6d07a: end LanceHealsScript1: - spriteface PLAYER, UP + objectface PLAYER, UP jump LanceHealsCommon LanceHealsScript2: - spriteface PLAYER, RIGHT - spriteface TEAMROCKETBASEB2F_LANCE, LEFT + objectface PLAYER, RIGHT + objectface TEAMROCKETBASEB2F_LANCE, LEFT LanceHealsCommon: opentext writetext LanceHealsText1 waitbutton closetext - special Special_FadeOutPalettes - special Special_StubbedTrainerRankings_Healings + special FadeOutPalettes + special StubbedTrainerRankings_Healings playsound SFX_FULL_HEAL special HealParty - special Special_FadeInPalettes + special FadeInPalettes opentext writetext LanceHealsText2 waitbutton closetext - setscene 1 + setscene SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE checkcode VAR_FACING - if_equal RIGHT, .FacingRight + ifequal RIGHT, .FacingRight applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d212 disappear TEAMROCKETBASEB2F_LANCE end @@ -189,10 +187,10 @@ LanceHealsCommon: end TrainerGruntM17: - trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_17, EVENT_BEAT_ROCKET_GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM17AfterBattleText waitbutton @@ -200,10 +198,10 @@ TrainerGruntM17: end TrainerGruntM18: - trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_18, EVENT_BEAT_ROCKET_GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM18AfterBattleText waitbutton @@ -211,10 +209,10 @@ TrainerGruntM18: end TrainerGruntM19: - trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, .Script + trainer GRUNTM, GRUNTM_19, EVENT_BEAT_ROCKET_GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM19AfterBattleText waitbutton @@ -283,7 +281,7 @@ UnknownScript_0x6d184: moveobject TEAMROCKETBASEB2F_LANCE, 18, 6 appear TEAMROCKETBASEB2F_LANCE applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT opentext writetext UnknownText_0x6d809 buttonsound @@ -292,19 +290,19 @@ UnknownScript_0x6d184: writetext UnknownText_0x6d8f8 waitbutton closetext - spriteface TEAMROCKETBASEB2F_LANCE, DOWN + objectface TEAMROCKETBASEB2F_LANCE, DOWN opentext writetext UnknownText_0x6d994 waitbutton closetext - spriteface PLAYER, DOWN + objectface PLAYER, DOWN 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 setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM - setscene 3 + setscene SCENE_TEAMROCKETBASEB2F_NOTHING clearevent EVENT_LAKE_OF_RAGE_CIVILIANS setevent EVENT_TURNED_OFF_SECURITY_CAMERAS setevent EVENT_SECURITY_CAMERA_1 @@ -356,7 +354,7 @@ TeamRocketBaseB2FTMThief: itemball TM_THIEF TeamRocketBaseB2FHiddenFullHeal: - hiddenitem EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL MovementData_0x6d212: step RIGHT @@ -909,68 +907,63 @@ UnknownText_0x6de03: done TeamRocketBaseB2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 3, 14, 2, TEAM_ROCKET_BASE_B1F - warp_def 3, 2, 1, TEAM_ROCKET_BASE_B3F - warp_def 27, 2, 2, TEAM_ROCKET_BASE_B3F - warp_def 3, 6, 3, TEAM_ROCKET_BASE_B3F - warp_def 27, 14, 4, TEAM_ROCKET_BASE_B3F - -.CoordEvents: - db 9 - coord_event 5, 14, 0, LanceHealsScript1 - coord_event 4, 13, 0, LanceHealsScript2 - coord_event 14, 11, 1, UnknownScript_0x6cf95 - coord_event 15, 11, 1, UnknownScript_0x6cf9c - coord_event 14, 12, 2, UnknownScript_0x6d075 - coord_event 15, 12, 2, UnknownScript_0x6d075 - coord_event 12, 3, 2, UnknownScript_0x6d07a - coord_event 12, 10, 2, UnknownScript_0x6d07a - coord_event 12, 11, 2, UnknownScript_0x6d07a - -.BGEvents: - db 23 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 3, 14, TEAM_ROCKET_BASE_B1F, 2 + warp_event 3, 2, TEAM_ROCKET_BASE_B3F, 1 + warp_event 27, 2, TEAM_ROCKET_BASE_B3F, 2 + warp_event 3, 6, TEAM_ROCKET_BASE_B3F, 3 + warp_event 27, 14, TEAM_ROCKET_BASE_B3F, 4 + + db 9 ; coord events + coord_event 5, 14, SCENE_DEFAULT, LanceHealsScript1 + coord_event 4, 13, SCENE_DEFAULT, LanceHealsScript2 + coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, UnknownScript_0x6cf95 + coord_event 15, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, UnknownScript_0x6cf9c + coord_event 14, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d075 + coord_event 15, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d075 + coord_event 12, 3, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a + coord_event 12, 10, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a + coord_event 12, 11, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a + + db 23 ; bg events bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor bg_event 15, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor - bg_event 17, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 16, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 15, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 14, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 13, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 12, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 12, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 12, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 12, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 12, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 12, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 13, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 14, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 15, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 16, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 17, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 17, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 17, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 17, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 17, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 26, 7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal - -.ObjectEvents: - db 14 + bg_event 17, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 16, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 15, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 14, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 13, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 12, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 12, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 12, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 12, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 12, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 12, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 13, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 14, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 15, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 16, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 17, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 17, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 17, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 17, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 17, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 26, 7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal + + db 14 ; object events object_event 20, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE object_event 20, 16, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE - object_event 5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE - object_event 9, 13, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE - object_event 7, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 - object_event 7, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 - object_event 7, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 - object_event 22, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 - object_event 22, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 - object_event 22, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + object_event 5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE + object_event 9, 13, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE + object_event 7, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + object_event 7, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + object_event 7, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + object_event 22, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + object_event 22, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + object_event 22, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 object_event 25, 13, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 21, 14, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 3, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF + object_event 3, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 3f7fe5d39..db2b7dcf8 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const TEAMROCKETBASEB3F_LANCE const TEAMROCKETBASEB3F_ROCKET1 const TEAMROCKETBASEB3F_MOLTRES @@ -15,15 +15,13 @@ const_value set 2 const TEAMROCKETBASEB3F_POKE_BALL5 TeamRocketBaseB3F_MapScripts: -.SceneScripts: - db 4 - scene_script .LanceGetsPassword - scene_script .DummyScene1 - scene_script .DummyScene2 - scene_script .DummyScene3 - -.MapCallbacks: - db 1 + db 4 ; scene scripts + scene_script .LanceGetsPassword ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER + scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS + scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB3F_NOTHING + + db 1 ; callbacks callback MAPCALLBACK_TILES, .CheckGiovanniDoor .LanceGetsPassword: @@ -49,9 +47,9 @@ TeamRocketBaseB3F_MapScripts: return LanceGetPasswordScript: - spriteface PLAYER, LEFT + objectface PLAYER, LEFT pause 5 - spriteface TEAMROCKETBASEB3F_MOLTRES, RIGHT + objectface TEAMROCKETBASEB3F_MOLTRES, RIGHT pause 20 applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12a opentext @@ -60,16 +58,16 @@ LanceGetPasswordScript: closetext applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c disappear TEAMROCKETBASEB3F_LANCE - setscene 1 + setscene SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER end RocketBaseRival: - spriteface PLAYER, LEFT + objectface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic appear TEAMROCKETBASEB3F_SILVER applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalEnterMovement - spriteface PLAYER, LEFT + objectface PLAYER, LEFT playmusic MUSIC_RIVAL_ENCOUNTER opentext writetext RocketBaseRivalText @@ -79,7 +77,7 @@ RocketBaseRival: applymovement PLAYER, RocketBaseRivalShovesPlayerMovement applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalLeaveMovement disappear TEAMROCKETBASEB3F_SILVER - setscene 2 + setscene SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS special RestartMapMusic end @@ -96,7 +94,7 @@ UnknownScript_0x6e056: pause 30 showemote EMOTE_SHOCK, TEAMROCKETBASEB3F_ROCKET1, 15 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface TEAMROCKETBASEB3F_ROCKET1, DOWN + objectface TEAMROCKETBASEB3F_ROCKET1, DOWN opentext writetext UnknownText_0x6e400 waitbutton @@ -116,7 +114,7 @@ UnknownScript_0x6e056: playsound SFX_TACKLE applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147 disappear TEAMROCKETBASEB3F_ROCKET1 - setscene 3 + setscene SCENE_TEAMROCKETBASEB3F_NOTHING end RocketBaseMurkrow: @@ -128,10 +126,10 @@ RocketBaseMurkrow: end SlowpokeTailGrunt: - trainer EVENT_BEAT_ROCKET_GRUNTF_5, GRUNTF, GRUNTF_5, GruntF5SeenText, GruntF5BeatenText, 0, GruntF5Script + trainer GRUNTF, GRUNTF_5, EVENT_BEAT_ROCKET_GRUNTF_5, GruntF5SeenText, GruntF5BeatenText, 0, GruntF5Script GruntF5Script: - end_if_just_battled + endifjustbattled opentext writetext GruntF5AfterBattleText waitbutton @@ -140,10 +138,10 @@ GruntF5Script: end RaticateTailGrunt: - trainer EVENT_BEAT_ROCKET_GRUNTM_28, GRUNTM, GRUNTM_28, GruntM28SeenText, GruntM28BeatenText, 0, GruntM28Script + trainer GRUNTM, GRUNTM_28, EVENT_BEAT_ROCKET_GRUNTM_28, GruntM28SeenText, GruntM28BeatenText, 0, GruntM28Script GruntM28Script: - end_if_just_battled + endifjustbattled opentext writetext GruntM28AfterBattleText waitbutton @@ -152,10 +150,10 @@ GruntM28Script: end TrainerScientistRoss: - trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, .Script + trainer SCIENTIST, ROSS, EVENT_BEAT_SCIENTIST_ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext ScientistRossAfterBattleText waitbutton @@ -163,10 +161,10 @@ TrainerScientistRoss: end TrainerScientistMitch: - trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, .Script + trainer SCIENTIST, MITCH, EVENT_BEAT_SCIENTIST_MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext ScientistMitchAfterBattleText waitbutton @@ -566,48 +564,43 @@ UnknownText_0x6e9a3: done TeamRocketBaseB3F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 3, 2, 2, TEAM_ROCKET_BASE_B2F - warp_def 27, 2, 3, TEAM_ROCKET_BASE_B2F - warp_def 3, 6, 4, TEAM_ROCKET_BASE_B2F - warp_def 27, 14, 5, TEAM_ROCKET_BASE_B2F - -.CoordEvents: - db 3 - coord_event 10, 8, 2, UnknownScript_0x6e04b - coord_event 11, 8, 2, UnknownScript_0x6e052 - coord_event 8, 10, 1, RocketBaseRival - -.BGEvents: - db 10 - bg_event 10, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor - bg_event 11, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor - bg_event 10, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript - bg_event 11, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript - bg_event 12, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript - bg_event 13, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript - bg_event 4, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript - bg_event 5, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript - bg_event 6, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript - bg_event 7, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript - -.ObjectEvents: - db 14 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 3, 2, TEAM_ROCKET_BASE_B2F, 2 + warp_event 27, 2, TEAM_ROCKET_BASE_B2F, 3 + warp_event 3, 6, TEAM_ROCKET_BASE_B2F, 4 + warp_event 27, 14, TEAM_ROCKET_BASE_B2F, 5 + + db 3 ; coord events + coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e04b + coord_event 11, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e052 + coord_event 8, 10, SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER, RocketBaseRival + + db 10 ; bg events + bg_event 10, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor + bg_event 11, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor + bg_event 10, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 11, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 12, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 13, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 4, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 5, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 6, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 7, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript + + db 14 ; object events object_event 25, 14, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceGetPasswordScript, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS - object_event 8, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE - object_event 7, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 21, 7, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 5, 14, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 8, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE + object_event 7, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 21, 7, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 5, 14, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 23, 11, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 24, 14, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeamRocketBaseB3FRocketScript, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 4, 5, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE - object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN - object_event 3, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL - object_event 28, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL - object_event 17, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL - object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL + object_event 4, 5, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE + object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN + object_event 3, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL + object_event 28, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL + object_event 17, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL + object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index cb3d5f3a8..c346ab10a 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const TIMECAPSULE_CHRIS1 const TIMECAPSULE_CHRIS2 TimeCapsule_MapScripts: -.SceneScripts: - db 2 - scene_script .InitializeTimeCapsule - scene_script .DummyScene + db 2 ; scene scripts + scene_script .InitializeTimeCapsule ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTimeCapsule: @@ -20,7 +18,7 @@ TimeCapsule_MapScripts: end .SetWhichChris: - special Special_CableClubCheckWhichChris + special CableClubCheckWhichChris iffalse .Chris2 disappear TIMECAPSULE_CHRIS2 appear TIMECAPSULE_CHRIS1 @@ -32,12 +30,12 @@ TimeCapsule_MapScripts: return .InitializeAndPreparePokecenter2F: - setscene 1 - setmapscene POKECENTER_2F, 3 + setscene SCENE_FINISHED + setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE end MapTimeCapsuleSignpost1Script: - special Special_TimeCapsule + special TimeCapsule newloadmap MAPSETUP_LINKRETURN end @@ -54,23 +52,18 @@ UnknownText_0x193521: done TimeCapsule_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 7, 4, POKECENTER_2F - warp_def 5, 7, 4, POKECENTER_2F + db 2 ; warp events + warp_event 4, 7, POKECENTER_2F, 4 + warp_event 5, 7, POKECENTER_2F, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 4, 4, BGEVENT_RIGHT, MapTimeCapsuleSignpost1Script - bg_event 5, 4, BGEVENT_LEFT, MapTimeCapsuleSignpost1Script + db 2 ; bg events + bg_event 4, 4, BGEVENT_RIGHT, MapTimeCapsuleSignpost1Script + bg_event 5, 4, BGEVENT_LEFT, MapTimeCapsuleSignpost1Script -.ObjectEvents: - db 2 - object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS - object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT + db 2 ; object events + object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index cd20d59b2..77fa5b83e 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const TINTOWER1F_SUICUNE const TINTOWER1F_RAIKOU const TINTOWER1F_ENTEI @@ -11,13 +11,11 @@ const_value set 2 const TINTOWER1F_SAGE6 TinTower1F_MapScripts: -.SceneScripts: - db 2 - scene_script .FaceSuicune - scene_script .DummyScene + db 2 ; scene scripts + scene_script .FaceSuicune ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 2 + db 2 ; callbacks callback MAPCALLBACK_OBJECTS, .NPCsCallback callback MAPCALLBACK_TILES, .StairsCallback @@ -33,7 +31,7 @@ TinTower1F_MapScripts: iftrue .GotRainbowWing checkevent EVENT_BEAT_ELITE_FOUR iffalse .FaceBeasts - special Special_BeastsCheck + special BeastsCheck iffalse .FaceBeasts clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 @@ -49,7 +47,7 @@ TinTower1F_MapScripts: iftrue .FoughtSuicune appear TINTOWER1F_SUICUNE writebyte RAIKOU - special Special_MonCheck + special MonCheck iftrue .NoRaikou appear TINTOWER1F_RAIKOU jump .CheckEntei @@ -58,7 +56,7 @@ TinTower1F_MapScripts: disappear TINTOWER1F_RAIKOU .CheckEntei: writebyte ENTEI - special Special_MonCheck + special MonCheck iftrue .NoEntei appear TINTOWER1F_ENTEI jump .BeastsDone @@ -87,10 +85,10 @@ TinTower1F_MapScripts: applymovement PLAYER, TinTowerPlayerMovement1 pause 15 writebyte RAIKOU - special Special_MonCheck + special MonCheck iftrue .Next1 ; if player caught Raikou, he doesn't appear in Tin Tower applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1 - spriteface PLAYER, LEFT + objectface PLAYER, LEFT cry RAIKOU pause 10 playsound SFX_WARP_FROM @@ -100,10 +98,10 @@ TinTower1F_MapScripts: waitsfx .Next1: writebyte ENTEI - special Special_MonCheck + special MonCheck iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1 - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT cry ENTEI pause 10 playsound SFX_WARP_FROM @@ -112,7 +110,7 @@ TinTower1F_MapScripts: playsound SFX_EXIT_BUILDING waitsfx .Next2: - spriteface PLAYER, UP + objectface PLAYER, UP pause 10 applymovement PLAYER, TinTowerPlayerMovement2 applymovement TINTOWER1F_SUICUNE, TinTowerSuicuneMovement @@ -125,16 +123,16 @@ TinTower1F_MapScripts: disappear TINTOWER1F_SUICUNE setevent EVENT_FOUGHT_SUICUNE setevent EVENT_SAW_SUICUNE_ON_ROUTE_42 - setmapscene ROUTE_42, 0 + setmapscene ROUTE_42, SCENE_ROUTE42_NOTHING setevent EVENT_SAW_SUICUNE_ON_ROUTE_36 - setmapscene ROUTE_36, 0 + setmapscene ROUTE_36, SCENE_ROUTE36_NOTHING setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - setmapscene CIANWOOD_CITY, 0 - setscene 1 + setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_NOTHING + setscene SCENE_FINISHED clearevent EVENT_SET_WHEN_FOUGHT_HO_OH reloadmapafterbattle pause 20 - spriteface PLAYER, DOWN + objectface PLAYER, DOWN playmusic MUSIC_MYSTICALMAN_ENCOUNTER playsound SFX_ENTER_DOOR moveobject TINTOWER1F_EUSINE, 10, 15 @@ -155,7 +153,7 @@ TinTower1F_MapScripts: moveobject TINTOWER1F_SAGE1, 7, 13 moveobject TINTOWER1F_SAGE2, 9, 13 moveobject TINTOWER1F_SAGE3, 11, 13 - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT opentext writetext TinTowerEusineSuicuneText waitbutton @@ -164,7 +162,7 @@ TinTower1F_MapScripts: playsound SFX_EXIT_BUILDING disappear TINTOWER1F_EUSINE waitsfx - special Special_FadeOutMusic + special FadeOutMusic pause 20 playmapmusic end @@ -523,30 +521,25 @@ TinTower1FSage6Text2: done TinTower1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 9, 15, 12, ECRUTEAK_CITY - warp_def 10, 15, 12, ECRUTEAK_CITY - warp_def 10, 2, 2, TIN_TOWER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 10 - object_event 9, 9, SPRITE_SUICUNE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE - object_event 7, 9, SPRITE_RAIKOU, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU - object_event 12, 9, SPRITE_ENTEI, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI - object_event 8, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE - object_event 5, 9, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 9, 15, ECRUTEAK_CITY, 12 + warp_event 10, 15, ECRUTEAK_CITY, 12 + warp_event 10, 2, TIN_TOWER_2F, 2 + + db 0 ; coord events + + db 0 ; bg events + + db 10 ; object events + object_event 9, 9, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE + object_event 7, 9, SPRITE_RAIKOU, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU + object_event 12, 9, SPRITE_ENTEI, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI + object_event 8, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE + object_event 5, 9, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage2Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 - object_event 14, 6, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 - object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage4Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 - object_event 9, 1, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage5Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 - object_event 14, 2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage6Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + object_event 14, 6, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage4Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + object_event 9, 1, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage5Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + object_event 14, 2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage6Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index 02012d6f8..280ab059c 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -1,24 +1,17 @@ TinTower2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 10, 14, 1, TIN_TOWER_3F - warp_def 10, 2, 3, TIN_TOWER_1F + db 2 ; warp events + warp_event 10, 14, TIN_TOWER_3F, 1 + warp_event 10, 2, TIN_TOWER_1F, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 505073594..c089d8124 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -1,31 +1,24 @@ -const_value set 2 + const_def 2 ; object constants const TINTOWER3F_POKE_BALL TinTower3F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower3FFullHeal: itemball FULL_HEAL TinTower3F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 10, 14, 1, TIN_TOWER_2F - warp_def 16, 2, 2, TIN_TOWER_4F + db 2 ; warp events + warp_event 10, 14, TIN_TOWER_2F, 1 + warp_event 16, 2, TIN_TOWER_4F, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 3, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL + db 1 ; object events + object_event 3, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 67fd4fda6..c36365543 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const TINTOWER4F_POKE_BALL1 const TINTOWER4F_POKE_BALL2 const TINTOWER4F_POKE_BALL3 TinTower4F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower4FUltraBall: itemball ULTRA_BALL @@ -20,28 +18,23 @@ TinTower4FEscapeRope: itemball ESCAPE_ROPE TinTower4FHiddenMaxPotion: - hiddenitem EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION TinTower4F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 2, 4, 2, TIN_TOWER_5F - warp_def 16, 2, 2, TIN_TOWER_3F - warp_def 2, 14, 3, TIN_TOWER_5F - warp_def 17, 15, 4, TIN_TOWER_5F - -.CoordEvents: - db 0 - -.BGEvents: - db 1 - bg_event 11, 6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion - -.ObjectEvents: - db 3 - object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL - object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP - object_event 2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE + db 0, 0 ; filler + + db 4 ; warp events + warp_event 2, 4, TIN_TOWER_5F, 2 + warp_event 16, 2, TIN_TOWER_3F, 2 + warp_event 2, 14, TIN_TOWER_5F, 3 + warp_event 17, 15, TIN_TOWER_5F, 4 + + db 0 ; coord events + + db 1 ; bg events + bg_event 11, 6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion + + db 3 ; object events + object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL + object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP + object_event 2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index ee2980b33..cff375b3d 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -1,41 +1,34 @@ -const_value set 2 + const_def 2 ; object constants const TINTOWER5F_POKE_BALL TinTower5F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower5FRareCandy: itemball RARE_CANDY TinTower5FHiddenFullRestore: - hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE TinTower5FHiddenCarbos: - hiddenitem EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS + hiddenitem CARBOS, EVENT_TIN_TOWER_5F_HIDDEN_CARBOS TinTower5F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 11, 15, 2, TIN_TOWER_6F - warp_def 2, 4, 1, TIN_TOWER_4F - warp_def 2, 14, 3, TIN_TOWER_4F - warp_def 17, 15, 4, TIN_TOWER_4F + db 4 ; warp events + warp_event 11, 15, TIN_TOWER_6F, 2 + warp_event 2, 4, TIN_TOWER_4F, 1 + warp_event 2, 14, TIN_TOWER_4F, 3 + warp_event 17, 15, TIN_TOWER_4F, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 16, 14, BGEVENT_ITEM, TinTower5FHiddenFullRestore - bg_event 3, 15, BGEVENT_ITEM, TinTower5FHiddenCarbos + bg_event 3, 15, BGEVENT_ITEM, TinTower5FHiddenCarbos -.ObjectEvents: - db 1 - object_event 9, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY + db 1 ; object events + object_event 9, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 5d587373d..9fa17a0a2 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -1,31 +1,24 @@ -const_value set 2 + const_def 2 ; object constants const TINTOWER6F_POKE_BALL TinTower6F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower6FMaxPotion: itemball MAX_POTION TinTower6F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 9, 1, TIN_TOWER_7F - warp_def 11, 15, 1, TIN_TOWER_5F + db 2 ; warp events + warp_event 3, 9, TIN_TOWER_7F, 1 + warp_event 11, 15, TIN_TOWER_5F, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 8, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION + db 1 ; object events + object_event 8, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index ab10bf4c2..5025fbbe9 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -1,34 +1,27 @@ -const_value set 2 + const_def 2 ; object constants const TINTOWER7F_POKE_BALL TinTower7F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower7FMaxRevive: itemball MAX_REVIVE TinTower7F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 3, 9, 1, TIN_TOWER_6F - warp_def 10, 15, 1, TIN_TOWER_8F - warp_def 12, 7, 4, TIN_TOWER_7F - warp_def 8, 3, 3, TIN_TOWER_7F - warp_def 6, 9, 5, TIN_TOWER_9F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 16, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE + db 0, 0 ; filler + + db 5 ; warp events + warp_event 3, 9, TIN_TOWER_6F, 1 + warp_event 10, 15, TIN_TOWER_8F, 1 + warp_event 12, 7, TIN_TOWER_7F, 4 + warp_event 8, 3, TIN_TOWER_7F, 3 + warp_event 6, 9, TIN_TOWER_9F, 5 + + db 0 ; coord events + + db 0 ; bg events + + db 1 ; object events + object_event 16, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 4e10ac13f..c39f118eb 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const TINTOWER8F_POKE_BALL1 const TINTOWER8F_POKE_BALL2 const TINTOWER8F_POKE_BALL3 TinTower8F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower8FNugget: itemball NUGGET @@ -20,26 +18,21 @@ TinTower8FFullRestore: itemball FULL_RESTORE TinTower8F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 6 - warp_def 2, 5, 2, TIN_TOWER_7F - warp_def 2, 11, 1, TIN_TOWER_9F - warp_def 16, 7, 2, TIN_TOWER_9F - warp_def 10, 3, 3, TIN_TOWER_9F - warp_def 14, 15, 6, TIN_TOWER_9F - warp_def 6, 9, 7, TIN_TOWER_9F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 - object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET - object_event 11, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER - object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE + db 0, 0 ; filler + + db 6 ; warp events + warp_event 2, 5, TIN_TOWER_7F, 2 + warp_event 2, 11, TIN_TOWER_9F, 1 + warp_event 16, 7, TIN_TOWER_9F, 2 + warp_event 10, 3, TIN_TOWER_9F, 3 + warp_event 14, 15, TIN_TOWER_9F, 6 + warp_event 6, 9, TIN_TOWER_9F, 7 + + db 0 ; coord events + + db 0 ; bg events + + db 3 ; object events + object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET + object_event 11, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER + object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index a540b891f..9de6a607d 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const TINTOWER9F_POKE_BALL TinTower9F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TinTower9FHPUp: itemball HP_UP @@ -22,25 +20,20 @@ TinTower9FUnusedLugiaText: done TinTower9F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 7 - warp_def 12, 3, 2, TIN_TOWER_8F - warp_def 2, 5, 3, TIN_TOWER_8F - warp_def 12, 7, 4, TIN_TOWER_8F - warp_def 7, 9, 1, TIN_TOWER_ROOF - warp_def 16, 7, 5, TIN_TOWER_7F - warp_def 6, 13, 5, TIN_TOWER_8F - warp_def 8, 13, 6, TIN_TOWER_8F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 9, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP + db 0, 0 ; filler + + db 7 ; warp events + warp_event 12, 3, TIN_TOWER_8F, 2 + warp_event 2, 5, TIN_TOWER_8F, 3 + warp_event 12, 7, TIN_TOWER_8F, 4 + warp_event 7, 9, TIN_TOWER_ROOF, 1 + warp_event 16, 7, TIN_TOWER_7F, 5 + warp_event 6, 13, TIN_TOWER_8F, 5 + warp_event 8, 13, TIN_TOWER_8F, 6 + + db 0 ; coord events + + db 0 ; bg events + + db 1 ; object events + object_event 9, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 3cfca7cf9..33971dd1d 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const TINTOWERROOF_HO_OH TinTowerRoof_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .HoOh .HoOh: @@ -45,19 +43,14 @@ HoOhText: done TinTowerRoof_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 9, 13, 4, TIN_TOWER_9F + db 1 ; warp events + warp_event 9, 13, TIN_TOWER_9F, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 9, 5, SPRITE_HO_OH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH + db 1 ; object events + object_event 9, 5, SPRITE_HO_OH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index c9982b094..4a57e3d2a 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -1,31 +1,24 @@ -const_value set 2 + const_def 2 ; object constants const TOHJOFALLS_POKE_BALL TohjoFalls_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TohjoFallsMoonStone: itemball MOON_STONE TohjoFalls_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 13, 15, 2, ROUTE_27 - warp_def 25, 15, 3, ROUTE_27 + db 2 ; warp events + warp_event 13, 15, ROUTE_27, 2 + warp_event 25, 15, ROUTE_27, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE + db 1 ; object events + object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 62232df4f..eff2e414a 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const TRADECENTER_CHRIS1 const TRADECENTER_CHRIS2 TradeCenter_MapScripts: -.SceneScripts: - db 2 - scene_script .InitializeTradeCenter - scene_script .DummyScene + db 2 ; scene scripts + scene_script .InitializeTradeCenter ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTradeCenter: @@ -20,7 +18,7 @@ TradeCenter_MapScripts: end .SetWhichChris: - special Special_CableClubCheckWhichChris + special CableClubCheckWhichChris iffalse .Chris2 disappear TRADECENTER_CHRIS2 appear TRADECENTER_CHRIS1 @@ -32,12 +30,12 @@ TradeCenter_MapScripts: return .InitializeAndPreparePokecenter2F: - setscene 1 - setmapscene POKECENTER_2F, 1 + setscene SCENE_FINISHED + setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TRADE_CENTER end MapTradeCenterSignpost1Script: - special Special_TradeCenter + special TradeCenter newloadmap MAPSETUP_LINKRETURN end @@ -54,23 +52,18 @@ ChrisScript_0x19340b: done TradeCenter_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 7, 2, POKECENTER_2F - warp_def 5, 7, 2, POKECENTER_2F + db 2 ; warp events + warp_event 4, 7, POKECENTER_2F, 2 + warp_event 5, 7, POKECENTER_2F, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script - bg_event 5, 4, BGEVENT_LEFT, MapTradeCenterSignpost1Script + db 2 ; bg events + bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script + bg_event 5, 4, BGEVENT_LEFT, MapTradeCenterSignpost1Script -.ObjectEvents: - db 2 - object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS - object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT + db 2 ; object events + object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index d3fcfca04..93aa852a4 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const TRAINERHOUSE1F_RECEPTIONIST const TRAINERHOUSE1F_COOLTRAINER_M const TRAINERHOUSE1F_COOLTRAINER_F @@ -6,11 +6,9 @@ const_value set 2 const TRAINERHOUSE1F_GENTLEMAN TrainerHouse1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerHouse1FReceptionistScript: jumptextfaceplayer TrainerHouse1FReceptionistText @@ -138,28 +136,23 @@ UnknownText_0x9b2c1: done TrainerHouse1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 2, 13, 3, VIRIDIAN_CITY - warp_def 3, 13, 3, VIRIDIAN_CITY - warp_def 8, 2, 1, TRAINER_HOUSE_B1F - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 5, 0, BGEVENT_READ, MapTrainerHouse1FSignpost0Script - bg_event 7, 0, BGEVENT_READ, MapTrainerHouse1FSignpost1Script - bg_event 7, 10, BGEVENT_READ, MapTrainerHouse1FSignpost2Script - -.ObjectEvents: - db 5 - object_event 0, 11, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1 - object_event 7, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1 - object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1 - object_event 4, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FYoungsterScript, -1 - object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FGentlemanScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 2, 13, VIRIDIAN_CITY, 3 + warp_event 3, 13, VIRIDIAN_CITY, 3 + warp_event 8, 2, TRAINER_HOUSE_B1F, 1 + + db 0 ; coord events + + db 3 ; bg events + bg_event 5, 0, BGEVENT_READ, MapTrainerHouse1FSignpost0Script + bg_event 7, 0, BGEVENT_READ, MapTrainerHouse1FSignpost1Script + bg_event 7, 10, BGEVENT_READ, MapTrainerHouse1FSignpost2Script + + db 5 ; object events + object_event 0, 11, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1 + object_event 7, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1 + object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1 + object_event 4, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FYoungsterScript, -1 + object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FGentlemanScript, -1 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index bab0a5b66..6ed62935d 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -1,26 +1,24 @@ -const_value set 2 + const_def 2 ; object constants const TRAINERHOUSEB1F_RECEPTIONIST const TRAINERHOUSEB1F_CHRIS TrainerHouseB1F_MapScripts: -.SceneScripts: - db 1 - scene_script .DummyScene + db 1 ; scene scripts + scene_script .DummyScene ; SCENE_DEFAULT -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end TrainerHouseReceptionistScript: - spriteface PLAYER, UP + objectface PLAYER, UP opentext checkflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY iftrue .FoughtTooManyTimes writetext TrainerHouseB1FIntroText buttonsound - special Special_TrainerHouse + special TrainerHouse iffalse .GetCal3Name trainertotext CAL, CAL2, MEM_BUFFER_0 jump .GotName @@ -42,7 +40,7 @@ TrainerHouseReceptionistScript: writetext TrainerHouseB1FCalBeforeText waitbutton closetext - special Special_TrainerHouse + special TrainerHouse iffalse .NoSpecialBattle winlosstext TrainerHouseB1FCalBeatenText, 0 setlasttalked TRAINERHOUSEB1F_CHRIS @@ -170,21 +168,16 @@ TrainerHouseB1FCalBeforeText: done TrainerHouseB1F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 9, 4, 3, TRAINER_HOUSE_1F + db 1 ; warp events + warp_event 9, 4, TRAINER_HOUSE_1F, 3 -.CoordEvents: - db 1 - coord_event 7, 3, 0, TrainerHouseReceptionistScript + db 1 ; coord events + coord_event 7, 3, SCENE_DEFAULT, TrainerHouseReceptionistScript -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 - object_event 7, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 - object_event 6, 11, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 + db 2 ; object events + object_event 7, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event 6, 11, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm index 6834c043e..72e8cd749 100644 --- a/maps/UndergroundPath.asm +++ b/maps/UndergroundPath.asm @@ -1,32 +1,25 @@ UndergroundPath_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks UndergroundPathHiddenFullRestore: - hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE UndergroundPathHiddenXSpecial: - hiddenitem EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL, X_SPECIAL + hiddenitem X_SPECIAL, EVENT_UNDERGROUND_PATH_HIDDEN_X_SPECIAL UndergroundPath_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 2, 3, ROUTE_5_UNDERGROUND_PATH_ENTRANCE - warp_def 3, 24, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE + db 2 ; warp events + warp_event 3, 2, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 3 + warp_event 3, 24, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 3, 9, BGEVENT_ITEM, UndergroundPathHiddenFullRestore - bg_event 1, 19, BGEVENT_ITEM, UndergroundPathHiddenXSpecial + db 2 ; bg events + bg_event 3, 9, BGEVENT_ITEM, UndergroundPathHiddenFullRestore + bg_event 1, 19, BGEVENT_ITEM, UndergroundPathHiddenXSpecial -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 77ed8bbb6..bd11dd551 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const UNIONCAVE1F_POKEFAN_M1 const UNIONCAVE1F_SUPER_NERD const UNIONCAVE1F_POKEFAN_M2 @@ -10,17 +10,15 @@ const_value set 2 const UNIONCAVE1F_POKE_BALL4 UnionCave1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerPokemaniacLarry: - trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script + trainer POKEMANIAC, LARRY, EVENT_BEAT_POKEMANIAC_LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokemaniacLarryAfterBattleText waitbutton @@ -28,10 +26,10 @@ TrainerPokemaniacLarry: end TrainerHikerRussell: - trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, .Script + trainer HIKER, RUSSELL, EVENT_BEAT_HIKER_RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerRussellAfterBattleText waitbutton @@ -39,10 +37,10 @@ TrainerHikerRussell: end TrainerHikerDaniel: - trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, .Script + trainer HIKER, DANIEL, EVENT_BEAT_HIKER_DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerDanielAfterBattleText waitbutton @@ -50,10 +48,10 @@ TrainerHikerDaniel: end TrainerFirebreatherBill: - trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, .Script + trainer FIREBREATHER, BILL, EVENT_BEAT_FIREBREATHER_BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FirebreatherBillAfterBattleText waitbutton @@ -61,10 +59,10 @@ TrainerFirebreatherBill: end TrainerFirebreatherRay: - trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, .Script + trainer FIREBREATHER, RAY, EVENT_BEAT_FIREBREATHER_RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext FirebreatherRayAfterBattleText waitbutton @@ -200,30 +198,25 @@ UnknownText_0x59f29: done UnionCave1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 5, 19, 3, UNION_CAVE_B1F - warp_def 3, 33, 4, UNION_CAVE_B1F - warp_def 17, 31, 1, ROUTE_33 - warp_def 17, 3, 4, ROUTE_32 - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 9 - object_event 3, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerDaniel, -1 - object_event 4, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1 - object_event 11, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 5, 19, UNION_CAVE_B1F, 3 + warp_event 3, 33, UNION_CAVE_B1F, 4 + warp_event 17, 31, ROUTE_33, 1 + warp_event 17, 3, ROUTE_32, 4 + + db 0 ; coord events + + db 0 ; bg events + + db 9 ; object events + object_event 3, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerDaniel, -1 + object_event 4, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1 + object_event 11, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1 object_event 15, 27, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherRay, -1 object_event 14, 19, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherBill, -1 - object_event 17, 21, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL - object_event 4, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK - object_event 4, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION - object_event 12, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING + object_event 17, 21, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL + object_event 4, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK + object_event 4, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION + object_event 12, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 980855221..10ed31e30 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const UNIONCAVEB1F_POKEFAN_M1 const UNIONCAVEB1F_POKEFAN_M2 const UNIONCAVEB1F_SUPER_NERD1 @@ -8,17 +8,15 @@ const_value set 2 const UNIONCAVEB1F_POKE_BALL2 UnionCaveB1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerPokemaniacAndrew: - trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script + trainer POKEMANIAC, ANDREW, EVENT_BEAT_POKEMANIAC_ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokemaniacAndrewAfterBattleText waitbutton @@ -26,10 +24,10 @@ TrainerPokemaniacAndrew: end TrainerPokemaniacCalvin: - trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, .Script + trainer POKEMANIAC, CALVIN, EVENT_BEAT_POKEMANIAC_CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokemaniacCalvinAfterBattleText waitbutton @@ -37,10 +35,10 @@ TrainerPokemaniacCalvin: end TrainerHikerPhillip: - trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, .Script + trainer HIKER, PHILLIP, EVENT_BEAT_HIKER_PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerPhillipAfterBattleText waitbutton @@ -48,10 +46,10 @@ TrainerHikerPhillip: end TrainerHikerLeonard: - trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, .Script + trainer HIKER, LEONARD, EVENT_BEAT_HIKER_LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerLeonardAfterBattleText waitbutton @@ -153,29 +151,24 @@ PokemaniacCalvinAfterBattleText: done UnionCaveB1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 3, 3, 7, RUINS_OF_ALPH_OUTSIDE - warp_def 3, 11, 8, RUINS_OF_ALPH_OUTSIDE - warp_def 7, 19, 1, UNION_CAVE_1F - warp_def 3, 33, 2, UNION_CAVE_1F - warp_def 17, 31, 1, UNION_CAVE_B2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 7 - object_event 9, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerPhillip, -1 - object_event 16, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1 - object_event 5, 32, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 3, 3, RUINS_OF_ALPH_OUTSIDE, 7 + warp_event 3, 11, RUINS_OF_ALPH_OUTSIDE, 8 + warp_event 7, 19, UNION_CAVE_1F, 1 + warp_event 3, 33, UNION_CAVE_1F, 2 + warp_event 17, 31, UNION_CAVE_B2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 7 ; object events + object_event 9, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerPhillip, -1 + object_event 16, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerLeonard, -1 + object_event 5, 32, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1 object_event 17, 30, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacCalvin, -1 - object_event 2, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT - object_event 7, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1 - object_event 17, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FXDefend, EVENT_UNION_CAVE_B1F_X_DEFEND + object_event 2, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT + object_event 7, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1 + object_event 17, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB1FXDefend, EVENT_UNION_CAVE_B1F_X_DEFEND diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 5f2baabf2..2c3b63973 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const UNIONCAVEB2F_ROCKER const UNIONCAVEB2F_COOLTRAINER_F1 const UNIONCAVEB2F_COOLTRAINER_F2 @@ -7,18 +7,16 @@ const_value set 2 const UNIONCAVEB2F_LAPRAS UnionCaveB2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .Lapras .Lapras: checkflag ENGINE_UNION_CAVE_LAPRAS iftrue .NoAppear checkcode VAR_WEEKDAY - if_equal FRIDAY, .Appear + ifequal FRIDAY, .Appear .NoAppear: disappear UNIONCAVEB2F_LAPRAS return @@ -38,10 +36,10 @@ UnionCaveLapras: end TrainerCooltrainermNick: - trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, .Script + trainer COOLTRAINERM, NICK, EVENT_BEAT_COOLTRAINERM_NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainermNickAfterBattleText waitbutton @@ -49,10 +47,10 @@ TrainerCooltrainermNick: end TrainerCooltrainerfGwen: - trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, .Script + trainer COOLTRAINERF, GWEN, EVENT_BEAT_COOLTRAINERF_GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainerfGwenAfterBattleText waitbutton @@ -60,10 +58,10 @@ TrainerCooltrainerfGwen: end TrainerCooltrainerfEmma: - trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, .Script + trainer COOLTRAINERF, EMMA, EVENT_BEAT_COOLTRAINERF_EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext CooltrainerfEmmaAfterBattleText waitbutton @@ -142,24 +140,19 @@ CooltrainerfEmmaAfterBattleText: done UnionCaveB2F_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 5, 3, 5, UNION_CAVE_B1F + db 1 ; warp events + warp_event 5, 3, UNION_CAVE_B1F, 5 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 6 + db 6 ; object events object_event 15, 19, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermNick, -1 - object_event 5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 - object_event 3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 - object_event 16, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER - object_event 12, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION - object_event 11, 31, SPRITE_SURF, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS + object_event 5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 + object_event 3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 + object_event 16, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER + object_event 12, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION + object_event 11, 31, SPRITE_SURF, SPRITEMOVEDATA_SWIM_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 2430b97d3..ecbbf2f1e 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const VERMILIONCITY_TEACHER const VERMILIONCITY_GRAMPS const VERMILIONCITY_MACHOP @@ -7,11 +7,9 @@ const_value set 2 const VERMILIONCITY_POKEFAN_M VermilionCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -42,7 +40,7 @@ VermilionCitySuperNerdScript: VermilionSnorlax: opentext - special Special_SnorlaxAwake + special SnorlaxAwake iftrue UnknownScript_0x1aa9ab writetext UnknownText_0x1aab64 waitbutton @@ -68,9 +66,9 @@ VermilionGymBadgeGuy: checkevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY iftrue .AlreadyGotItem checkcode VAR_BADGES - if_equal NUM_BADGES, .AllBadges - if_greater_than 13, .MostBadges - if_greater_than 9, .SomeBadges + ifequal NUM_BADGES, .AllBadges + ifgreater 13, .MostBadges + ifgreater 9, .SomeBadges writetext UnknownText_0x1aabc8 waitbutton closetext @@ -123,7 +121,7 @@ VermilionCityMartSign: jumpstd martsign VermilionCityHiddenFullHeal: - hiddenitem EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL VermilionCityTeacherText: text "VERMILION PORT is" @@ -268,41 +266,36 @@ VermilionCityPortSignText: done VermilionCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 10 - warp_def 5, 5, 1, VERMILION_HOUSE_FISHING_SPEECH_HOUSE - warp_def 9, 5, 1, VERMILION_POKECENTER_1F - warp_def 7, 13, 1, POKEMON_FAN_CLUB - warp_def 13, 13, 1, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE - warp_def 21, 13, 2, VERMILION_MART - warp_def 21, 17, 1, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE - warp_def 10, 19, 1, VERMILION_GYM - warp_def 19, 31, 1, VERMILION_PORT_PASSAGE - warp_def 20, 31, 2, VERMILION_PORT_PASSAGE - warp_def 34, 7, 1, DIGLETTS_CAVE - -.CoordEvents: - db 0 - -.BGEvents: - db 8 - bg_event 25, 3, BGEVENT_READ, VermilionCitySign - bg_event 5, 19, BGEVENT_READ, VermilionGymSign - bg_event 5, 13, BGEVENT_READ, PokemonFanClubSign - bg_event 33, 9, BGEVENT_READ, VermilionCityDiglettsCaveSign + db 0, 0 ; filler + + db 10 ; warp events + warp_event 5, 5, VERMILION_FISHING_SPEECH_HOUSE, 1 + warp_event 9, 5, VERMILION_POKECENTER_1F, 1 + warp_event 7, 13, POKEMON_FAN_CLUB, 1 + warp_event 13, 13, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 1 + warp_event 21, 13, VERMILION_MART, 2 + warp_event 21, 17, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, 1 + warp_event 10, 19, VERMILION_GYM, 1 + warp_event 19, 31, VERMILION_PORT_PASSAGE, 1 + warp_event 20, 31, VERMILION_PORT_PASSAGE, 2 + warp_event 34, 7, DIGLETTS_CAVE, 1 + + db 0 ; coord events + + db 8 ; bg events + bg_event 25, 3, BGEVENT_READ, VermilionCitySign + bg_event 5, 19, BGEVENT_READ, VermilionGymSign + bg_event 5, 13, BGEVENT_READ, PokemonFanClubSign + bg_event 33, 9, BGEVENT_READ, VermilionCityDiglettsCaveSign bg_event 27, 15, BGEVENT_READ, VermilionCityPortSign - bg_event 10, 5, BGEVENT_READ, VermilionCityPokecenterSign + bg_event 10, 5, BGEVENT_READ, VermilionCityPokecenterSign bg_event 22, 13, BGEVENT_READ, VermilionCityMartSign bg_event 12, 19, BGEVENT_ITEM, VermilionCityHiddenFullHeal -.ObjectEvents: - db 6 - object_event 18, 9, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1 - object_event 23, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1 - object_event 26, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1 + db 6 ; object events + object_event 18, 9, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1 + object_event 23, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1 + object_event 26, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1 object_event 14, 16, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionCitySuperNerdScript, -1 - object_event 34, 8, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_SNORLAX, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX + object_event 34, 8, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_BIGDOLLSYM, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX object_event 31, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1 diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm new file mode 100644 index 000000000..e6225afa5 --- /dev/null +++ b/maps/VermilionDiglettsCaveSpeechHouse.asm @@ -0,0 +1,33 @@ + const_def 2 ; object constants + const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN + +VermilionDiglettsCaveSpeechHouse_MapScripts: + db 0 ; scene scripts + + db 0 ; callbacks + +VermilionDiglettsCaveSpeechHouseGentlemanScript: + jumptextfaceplayer VermilionDiglettsCaveSpeechHouseGentlemanText + +VermilionDiglettsCaveSpeechHouseGentlemanText: + text "Over many years," + line "DIGLETT dug a" + cont "large tunnel." + + para "That tunnel goes" + line "to a distant town." + done + +VermilionDiglettsCaveSpeechHouse_MapEvents: + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, VERMILION_CITY, 6 + warp_event 3, 7, VERMILION_CITY, 6 + + db 0 ; coord events + + db 0 ; bg events + + db 1 ; object events + object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionDiglettsCaveSpeechHouseGentlemanScript, -1 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm index 72ed1ba4a..dd333af75 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionFishingSpeechHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 - const VERMILIONHOUSEFISHINGSPEECHHOUSE_FISHING_GURU + const_def 2 ; object constants + const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU -VermilionHouseFishingSpeechHouse_MapScripts: -.SceneScripts: - db 0 +VermilionFishingSpeechHouse_MapScripts: + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FishingDude: jumptextfaceplayer FishingDudeText @@ -50,22 +48,17 @@ FishingDudesHousePhotoText: line "great time…" done -VermilionHouseFishingSpeechHouse_MapEvents: - ; filler - db 0, 0 +VermilionFishingSpeechHouse_MapEvents: + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, VERMILION_CITY - warp_def 3, 7, 1, VERMILION_CITY + db 2 ; warp events + warp_event 2, 7, VERMILION_CITY, 1 + warp_event 3, 7, VERMILION_CITY, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 3, 0, BGEVENT_READ, FishingDudesHousePhoto + db 1 ; bg events + bg_event 3, 0, BGEVENT_READ, FishingDudesHousePhoto -.ObjectEvents: - db 1 - object_event 2, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1 + db 1 ; object events + object_event 2, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 31f19615d..42622e2a8 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const VERMILIONGYM_SURGE const VERMILIONGYM_GENTLEMAN const VERMILIONGYM_ROCKER @@ -6,11 +6,9 @@ const_value set 2 const VERMILIONGYM_GYM_GUY VermilionGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SurgeScript_0x1920a5: faceplayer @@ -45,10 +43,10 @@ SurgeScript_0x1920a5: end TrainerGentlemanGregory: - trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, .Script + trainer GENTLEMAN, GREGORY, EVENT_BEAT_GENTLEMAN_GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GentlemanGregoryAfterBattleText waitbutton @@ -56,10 +54,10 @@ TrainerGentlemanGregory: end TrainerGuitaristVincent: - trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, .Script + trainer GUITARIST, VINCENT, EVENT_BEAT_GUITARIST_VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext GuitaristVincentAfterBattleText waitbutton @@ -67,10 +65,10 @@ TrainerGuitaristVincent: end TrainerJugglerHorton: - trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, .Script + trainer JUGGLER, HORTON, EVENT_BEAT_JUGGLER_HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext JugglerHortonAfterBattleText waitbutton @@ -261,41 +259,36 @@ UnknownText_0x19261e: done VermilionGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 17, 7, VERMILION_CITY - warp_def 5, 17, 7, VERMILION_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 17 - bg_event 1, 7, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 3, 7, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 5, 7, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 7, 7, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 9, 7, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 1, 9, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 3, 9, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 5, 9, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 7, 9, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 9, 9, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 1, 11, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 3, 11, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 5, 11, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 7, 11, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 9, 11, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 3, 15, BGEVENT_READ, VermilionGymStatue - bg_event 6, 15, BGEVENT_READ, VermilionGymStatue - -.ObjectEvents: - db 5 - object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1 - object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 - object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 - object_event 0, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1 - object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuyScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 17, VERMILION_CITY, 7 + warp_event 5, 17, VERMILION_CITY, 7 + + db 0 ; coord events + + db 17 ; bg events + bg_event 1, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 3, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 5, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 1, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 3, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 5, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 1, 11, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 3, 11, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 5, 11, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 11, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 11, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 3, 15, BGEVENT_READ, VermilionGymStatue + bg_event 6, 15, BGEVENT_READ, VermilionGymStatue + + db 5 ; object events + object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1 + object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 + object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 + object_event 0, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1 + object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuyScript, -1 diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm deleted file mode 100644 index 718d5e005..000000000 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ /dev/null @@ -1,40 +0,0 @@ -const_value set 2 - const VERMILIONHOUSEDIGLETTSCAVESPEECHHOUSE_GENTLEMAN - -VermilionHouseDiglettsCaveSpeechHouse_MapScripts: -.SceneScripts: - db 0 - -.MapCallbacks: - db 0 - -VermilionHouseDiglettsCaveSpeechHouseGentlemanScript: - jumptextfaceplayer VermilionHouseDiglettsCaveSpeechHouseGentlemanText - -VermilionHouseDiglettsCaveSpeechHouseGentlemanText: - text "Over many years," - line "DIGLETT dug a" - cont "large tunnel." - - para "That tunnel goes" - line "to a distant town." - done - -VermilionHouseDiglettsCaveSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 6, VERMILION_CITY - warp_def 3, 7, 6, VERMILION_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionHouseDiglettsCaveSpeechHouseGentlemanScript, -1 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index e2ba0b77c..db7f34db7 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const VERMILIONMAGNETTRAINSPEECHHOUSE_POKEFAN_F const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER VermilionMagnetTrainSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VermilionMagnetTrainSpeechHousePokefanFScript: jumptextfaceplayer VermilionMagnetTrainSpeechHousePokefanFText @@ -34,23 +32,18 @@ VermilionMagnetTrainSpeechHouseYoungsterText: done VermilionMagnetTrainSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 4, VERMILION_CITY - warp_def 3, 7, 4, VERMILION_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf - -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1 - object_event 0, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, VERMILION_CITY, 4 + warp_event 3, 7, VERMILION_CITY, 4 + + db 0 ; coord events + + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf + + db 2 ; object events + object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1 + object_event 0, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index b72ea6aec..16a20d380 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const VERMILIONMART_CLERK const VERMILIONMART_SUPER_NERD const VERMILIONMART_BUENA VermilionMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x191f7e: opentext @@ -37,22 +35,17 @@ VermilionMartBuenaText: done VermilionMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 5, VERMILION_CITY - warp_def 3, 7, 5, VERMILION_CITY + db 2 ; warp events + warp_event 2, 7, VERMILION_CITY, 5 + warp_event 3, 7, VERMILION_CITY, 5 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1 - object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1 - object_event 8, 6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1 + object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1 + object_event 8, 6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1 diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index 43821efdc..a157028c0 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const VERMILIONPOKECENTER1F_NURSE const VERMILIONPOKECENTER1F_FISHING_GURU const VERMILIONPOKECENTER1F_SAILOR const VERMILIONPOKECENTER1F_BUG_CATCHER VermilionPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x191603: jumpstd pokecenternurse @@ -77,24 +75,19 @@ VermilionPokecenter1FBugCatcherText: done VermilionPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 2, VERMILION_CITY - warp_def 4, 7, 2, VERMILION_CITY - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x191603, -1 - object_event 7, 2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1 - object_event 6, 5, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1 - object_event 1, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, VERMILION_CITY, 2 + warp_event 4, 7, VERMILION_CITY, 2 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x191603, -1 + object_event 7, 2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1 + object_event 6, 5, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1 + object_event 1, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1 diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm index a82bd9e48..6bca09fd0 100644 --- a/maps/VermilionPokecenter2FBeta.asm +++ b/maps/VermilionPokecenter2FBeta.asm @@ -1,23 +1,16 @@ VermilionPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VermilionPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, VERMILION_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, VERMILION_POKECENTER_1F, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index f698ef9ea..2a7d6a5f9 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -1,16 +1,14 @@ -const_value set 2 + const_def 2 ; object constants const VERMILIONPORT_SAILOR1 const VERMILIONPORT_SAILOR2 const VERMILIONPORT_SUPER_NERD VermilionPort_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .LeaveFastShip + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .LeaveFastShip ; SCENE_VERMILIONPORT_LEAVE_SHIP -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -27,32 +25,32 @@ VermilionPort_MapScripts: .LeaveFastShipScript: applymovement PLAYER, MovementData_0x74ef3 appear VERMILIONPORT_SAILOR1 - setscene 0 + setscene SCENE_DEFAULT setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP clearevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M setevent EVENT_FAST_SHIP_FIRST_TIME - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 blackoutmod VERMILION_CITY end SailorScript_0x74dc4: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74e1a writetext UnknownText_0x74f06 waitbutton closetext - spriteface VERMILIONPORT_SAILOR1, DOWN + objectface VERMILIONPORT_SAILOR1, DOWN pause 10 playsound SFX_EXIT_BUILDING disappear VERMILIONPORT_SAILOR1 waitsfx applymovement PLAYER, MovementData_0x74ef1 playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND @@ -68,7 +66,7 @@ SailorScript_0x74dc4: clearevent EVENT_BEAT_SCHOOLBOY_RICKY setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear VERMILIONPORT_SAILOR1 - setmapscene FAST_SHIP_1F, 1 + setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_ENTER_SHIP warp FAST_SHIP_1F, 25, 1 end @@ -79,19 +77,19 @@ UnknownScript_0x74e1a: end UnknownScript_0x74e20: - spriteface VERMILIONPORT_SAILOR2, RIGHT - checkevent EVENT_GAVE_KURT_APRICORNS + objectface VERMILIONPORT_SAILOR2, RIGHT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74e86 - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue UnknownScript_0x74e86 - spriteface PLAYER, LEFT + objectface PLAYER, LEFT opentext checkcode VAR_WEEKDAY - if_equal MONDAY, UnknownScript_0x74e72 - if_equal TUESDAY, UnknownScript_0x74e72 - if_equal THURSDAY, UnknownScript_0x74e7c - if_equal FRIDAY, UnknownScript_0x74e7c - if_equal SATURDAY, UnknownScript_0x74e7c + ifequal MONDAY, UnknownScript_0x74e72 + ifequal TUESDAY, UnknownScript_0x74e72 + ifequal THURSDAY, UnknownScript_0x74e7c + ifequal FRIDAY, UnknownScript_0x74e7c + ifequal SATURDAY, UnknownScript_0x74e7c writetext UnknownText_0x74f4d yesorno iffalse UnknownScript_0x74e8d @@ -102,7 +100,7 @@ UnknownScript_0x74e20: writetext UnknownText_0x74fc2 waitbutton closetext - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 applymovement PLAYER, MovementData_0x74ef8 jump SailorScript_0x74dc4 @@ -146,14 +144,14 @@ UnknownScript_0x74e8d: SailorScript_0x74e97: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74e1a checkcode VAR_WEEKDAY - if_equal MONDAY, .NextShipWednesday - if_equal TUESDAY, .NextShipWednesday - if_equal THURSDAY, .NextShipSunday - if_equal FRIDAY, .NextShipSunday - if_equal SATURDAY, .NextShipSunday + ifequal MONDAY, .NextShipWednesday + ifequal TUESDAY, .NextShipWednesday + ifequal THURSDAY, .NextShipSunday + ifequal FRIDAY, .NextShipSunday + ifequal SATURDAY, .NextShipSunday writetext UnknownText_0x74f4d yesorno iffalse UnknownScript_0x74e87 @@ -164,7 +162,7 @@ SailorScript_0x74e97: writetext UnknownText_0x74fc2 waitbutton closetext - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 applymovement PLAYER, MovementData_0x74efe jump SailorScript_0x74dc4 @@ -195,7 +193,7 @@ SuperNerdScript_0x74ee6: end VermilionPortHiddenIron: - hiddenitem EVENT_VERMILION_PORT_HIDDEN_IRON, IRON + hiddenitem IRON, EVENT_VERMILION_PORT_HIDDEN_IRON MovementData_0x74ef1: step DOWN @@ -299,24 +297,19 @@ UnknownText_0x750a6: done VermilionPort_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 9, 5, 5, VERMILION_PORT_PASSAGE - warp_def 7, 17, 1, FAST_SHIP_1F + db 2 ; warp events + warp_event 9, 5, VERMILION_PORT_PASSAGE, 5 + warp_event 7, 17, FAST_SHIP_1F, 1 -.CoordEvents: - db 1 - coord_event 7, 11, 0, UnknownScript_0x74e20 + db 1 ; coord events + coord_event 7, 11, SCENE_DEFAULT, UnknownScript_0x74e20 -.BGEvents: - db 1 + db 1 ; bg events bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron -.ObjectEvents: - db 3 - object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1 + db 3 ; object events + object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY + object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1 object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 1e078e525..1ea12457a 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const VERMILIONPORTPASSAGE_TEACHER VermilionPortPassage_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VermilionPortPassageTeacherScript: jumptextfaceplayer VermilionPortPassageTeacherText @@ -19,23 +17,18 @@ VermilionPortPassageTeacherText: done VermilionPortPassage_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 15, 0, 8, VERMILION_CITY - warp_def 16, 0, 9, VERMILION_CITY - warp_def 15, 4, 4, VERMILION_PORT_PASSAGE - warp_def 3, 2, 3, VERMILION_PORT_PASSAGE - warp_def 3, 14, 1, VERMILION_PORT - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 17, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 15, 0, VERMILION_CITY, 8 + warp_event 16, 0, VERMILION_CITY, 9 + warp_event 15, 4, VERMILION_PORT_PASSAGE, 4 + warp_event 3, 2, VERMILION_PORT_PASSAGE, 3 + warp_event 3, 14, VERMILION_PORT, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 1 ; object events + object_event 17, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index e0389faeb..46fb6d892 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const VICTORYROAD_SILVER const VICTORYROAD_POKE_BALL1 const VICTORYROAD_POKE_BALL2 @@ -7,13 +7,11 @@ const_value set 2 const VICTORYROAD_POKE_BALL5 VictoryRoad_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -23,35 +21,35 @@ VictoryRoad_MapScripts: UnknownScript_0x74492: moveobject VICTORYROAD_SILVER, 18, 11 - spriteface PLAYER, DOWN + objectface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear VICTORYROAD_SILVER applymovement VICTORYROAD_SILVER, MovementData_0x74539 scall UnknownScript_0x744d4 applymovement VICTORYROAD_SILVER, MovementData_0x7454c disappear VICTORYROAD_SILVER - setscene 1 + setscene SCENE_FINISHED playmapmusic end UnknownScript_0x744b5: - spriteface PLAYER, DOWN + objectface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic pause 15 appear VICTORYROAD_SILVER applymovement VICTORYROAD_SILVER, MovementData_0x74542 scall UnknownScript_0x744d4 applymovement VICTORYROAD_SILVER, MovementData_0x74555 disappear VICTORYROAD_SILVER - setscene 1 + setscene SCENE_FINISHED playmapmusic end UnknownScript_0x744d4: - spriteface PLAYER, DOWN + objectface PLAYER, DOWN playmusic MUSIC_RIVAL_ENCOUNTER opentext writetext UnknownText_0x7455f @@ -112,10 +110,10 @@ VictoryRoadHPUp: itemball HP_UP VictoryRoadHiddenMaxPotion: - hiddenitem EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION + hiddenitem MAX_POTION, EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION VictoryRoadHiddenFullHeal: - hiddenitem EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL + hiddenitem FULL_HEAL, EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL MovementData_0x74539: step LEFT @@ -239,37 +237,32 @@ UnknownText_0x747aa: done VictoryRoad_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 10 - warp_def 9, 67, 5, VICTORY_ROAD_GATE - warp_def 1, 49, 3, VICTORY_ROAD - warp_def 1, 35, 2, VICTORY_ROAD - warp_def 13, 31, 5, VICTORY_ROAD - warp_def 13, 17, 4, VICTORY_ROAD - warp_def 17, 33, 7, VICTORY_ROAD - warp_def 17, 19, 6, VICTORY_ROAD - warp_def 0, 11, 9, VICTORY_ROAD - warp_def 0, 27, 8, VICTORY_ROAD - warp_def 13, 5, 3, ROUTE_23 - -.CoordEvents: - db 2 - coord_event 12, 8, 0, UnknownScript_0x74492 - coord_event 13, 8, 0, UnknownScript_0x744b5 - -.BGEvents: - db 2 - bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion - bg_event 3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal - -.ObjectEvents: - db 6 + db 0, 0 ; filler + + db 10 ; warp events + warp_event 9, 67, VICTORY_ROAD_GATE, 5 + warp_event 1, 49, VICTORY_ROAD, 3 + warp_event 1, 35, VICTORY_ROAD, 2 + warp_event 13, 31, VICTORY_ROAD, 5 + warp_event 13, 17, VICTORY_ROAD, 4 + warp_event 17, 33, VICTORY_ROAD, 7 + warp_event 17, 19, VICTORY_ROAD, 6 + warp_event 0, 11, VICTORY_ROAD, 9 + warp_event 0, 27, VICTORY_ROAD, 8 + warp_event 13, 5, ROUTE_23, 3 + + db 2 ; coord events + coord_event 12, 8, SCENE_DEFAULT, UnknownScript_0x74492 + coord_event 13, 8, SCENE_DEFAULT, UnknownScript_0x744b5 + + db 2 ; bg events + bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion + bg_event 3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal + + db 6 ; object events object_event 18, 13, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD - object_event 3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE - object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE - object_event 18, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE - object_event 15, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL - object_event 7, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP + object_event 3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE + object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE + object_event 18, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE + object_event 15, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL + object_event 7, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index b466a32b6..124905729 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -1,16 +1,14 @@ -const_value set 2 + const_def 2 ; object constants const VICTORYROADGATE_OFFICER const VICTORYROADGATE_BLACK_BELT1 const VICTORYROADGATE_BLACK_BELT2 VictoryRoadGate_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -19,7 +17,7 @@ VictoryRoadGate_MapScripts: end VictoryRoadGateBadgeCheckScene: - spriteface PLAYER, LEFT + objectface PLAYER, LEFT jump VictoryRoadGateBadgeCheckScript VictoryRoadGateOfficerScript: @@ -29,7 +27,7 @@ VictoryRoadGateBadgeCheckScript: writetext VictoryRoadGateOfficerText buttonsound checkcode VAR_BADGES - if_greater_than NUM_JOHTO_BADGES - 1, .AllEightBadges + ifgreater NUM_JOHTO_BADGES - 1, .AllEightBadges writetext VictoryRoadGateNotEnoughBadgesText waitbutton closetext @@ -40,7 +38,7 @@ VictoryRoadGateBadgeCheckScript: writetext VictoryRoadGateEightBadgesText waitbutton closetext - setscene 1 + setscene SCENE_FINISHED end VictoryRoadGateLeftBlackBeltScript: @@ -98,29 +96,24 @@ VictoryRoadGateRightBlackBeltText: done VictoryRoadGate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 8 - warp_def 17, 7, 1, ROUTE_22 - warp_def 18, 7, 1, ROUTE_22 - warp_def 9, 17, 1, ROUTE_26 - warp_def 10, 17, 1, ROUTE_26 - warp_def 9, 0, 1, VICTORY_ROAD - warp_def 10, 0, 1, VICTORY_ROAD - warp_def 1, 7, 2, ROUTE_28 - warp_def 2, 7, 2, ROUTE_28 - -.CoordEvents: - db 1 - coord_event 10, 11, 0, VictoryRoadGateBadgeCheckScene - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 - object_event 8, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1 - object_event 7, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER - object_event 12, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX + db 0, 0 ; filler + + db 8 ; warp events + warp_event 17, 7, ROUTE_22, 1 + warp_event 18, 7, ROUTE_22, 1 + warp_event 9, 17, ROUTE_26, 1 + warp_event 10, 17, ROUTE_26, 1 + warp_event 9, 0, VICTORY_ROAD, 1 + warp_event 10, 0, VICTORY_ROAD, 1 + warp_event 1, 7, ROUTE_28, 2 + warp_event 2, 7, ROUTE_28, 2 + + db 1 ; coord events + coord_event 10, 11, SCENE_DEFAULT, VictoryRoadGateBadgeCheckScene + + db 0 ; bg events + + db 3 ; object events + object_event 8, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1 + object_event 7, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER + object_event 12, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 6890ffa8a..d4ece46fb 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const VIOLETCITY_EARL const VIOLETCITY_LASS const VIOLETCITY_SUPER_NERD @@ -9,11 +9,9 @@ const_value set 2 const VIOLETCITY_POKE_BALL2 VioletCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -42,7 +40,7 @@ VioletCityEarlScript: playmusic MUSIC_SHOW_ME_AROUND follow VIOLETCITY_EARL, PLAYER applymovement VIOLETCITY_EARL, VioletCityFollowEarl_MovementData - spriteface PLAYER, UP + objectface PLAYER, UP applymovement VIOLETCITY_EARL, VioletCitySpinningEarl_MovementData stopfollow special RestartMapMusic @@ -98,7 +96,7 @@ VioletCityFruitTreeScript: fruittree FRUITTREE_VIOLET_CITY VioletCityHiddenHyperPotion: - hiddenitem EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION VioletCityFollowEarl_MovementData: big_step DOWN @@ -279,41 +277,36 @@ EarlsPokemonAcademySignText: done VioletCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 9, 17, 2, VIOLET_MART - warp_def 18, 17, 1, VIOLET_GYM - warp_def 30, 17, 1, EARLS_POKEMON_ACADEMY - warp_def 3, 15, 1, VIOLET_NICKNAME_SPEECH_HOUSE - warp_def 31, 25, 1, VIOLET_POKECENTER_1F - warp_def 21, 29, 1, VIOLET_KYLES_HOUSE - warp_def 23, 5, 1, SPROUT_TOWER_1F - warp_def 39, 24, 1, ROUTE_31_VIOLET_GATE - warp_def 39, 25, 2, ROUTE_31_VIOLET_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 7 + db 0, 0 ; filler + + db 9 ; warp events + warp_event 9, 17, VIOLET_MART, 2 + warp_event 18, 17, VIOLET_GYM, 1 + warp_event 30, 17, EARLS_POKEMON_ACADEMY, 1 + warp_event 3, 15, VIOLET_NICKNAME_SPEECH_HOUSE, 1 + warp_event 31, 25, VIOLET_POKECENTER_1F, 1 + warp_event 21, 29, VIOLET_KYLES_HOUSE, 1 + warp_event 23, 5, SPROUT_TOWER_1F, 1 + warp_event 39, 24, ROUTE_31_VIOLET_GATE, 1 + warp_event 39, 25, ROUTE_31_VIOLET_GATE, 2 + + db 0 ; coord events + + db 7 ; bg events bg_event 24, 20, BGEVENT_READ, VioletCitySign bg_event 15, 17, BGEVENT_READ, VioletGymSign - bg_event 24, 8, BGEVENT_READ, SproutTowerSign + bg_event 24, 8, BGEVENT_READ, SproutTowerSign bg_event 27, 17, BGEVENT_READ, EarlsPokemonAcademySign bg_event 32, 25, BGEVENT_READ, VioletCityPokecenterSign bg_event 10, 17, BGEVENT_READ, VioletCityMartSign bg_event 37, 14, BGEVENT_ITEM, VioletCityHiddenHyperPotion -.ObjectEvents: - db 8 + db 8 ; object events object_event 13, 16, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL object_event 28, 28, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityLassScript, -1 object_event 24, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1 object_event 17, 20, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityGrampsScript, -1 - object_event 5, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1 - object_event 14, 29, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1 - object_event 4, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP - object_event 35, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY + object_event 5, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1 + object_event 14, 29, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1 + object_event 4, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP + object_event 35, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 12480e21f..1e32e338a 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const VIOLETGYM_FALKNER const VIOLETGYM_YOUNGSTER1 const VIOLETGYM_YOUNGSTER2 const VIOLETGYM_GYM_GUY VioletGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FalknerScript_0x683c2: faceplayer @@ -36,7 +34,7 @@ FalknerScript_0x683c2: iftrue .SpeechAfterTM setevent EVENT_BEAT_BIRD_KEEPER_ROD setevent EVENT_BEAT_BIRD_KEEPER_ABE - setmapscene ELMS_LAB, 2 + setmapscene ELMS_LAB, SCENE_ELMSLAB_NOTHING specialphonecall SPECIALCALL_ASSISTANT writetext UnknownText_0x685c8 buttonsound @@ -56,8 +54,8 @@ FalknerScript_0x683c2: end VioletGymActivateRockets: - if_equal 7, .RadioTowerRockets - if_equal 6, .GoldenrodRockets + ifequal 7, .RadioTowerRockets + ifequal 6, .GoldenrodRockets end .GoldenrodRockets: @@ -67,10 +65,10 @@ VioletGymActivateRockets: jumpstd radiotowerrockets TrainerBirdKeeperRod: - trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, BirdKeeperRodSeenText, BirdKeeperRodBeatenText, 0, .Script + trainer BIRD_KEEPER, ROD, EVENT_BEAT_BIRD_KEEPER_ROD, BirdKeeperRodSeenText, BirdKeeperRodBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperRodAfterBattleText waitbutton @@ -78,10 +76,10 @@ TrainerBirdKeeperRod: end TrainerBirdKeeperAbe: - trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, BirdKeeperAbeSeenText, BirdKeeperAbeBeatenText, 0, .Script + trainer BIRD_KEEPER, ABE, EVENT_BEAT_BIRD_KEEPER_ABE, BirdKeeperAbeSeenText, BirdKeeperAbeBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext BirdKeeperAbeAfterBattleText waitbutton @@ -282,25 +280,20 @@ VioletGymGuyWinText: done VioletGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 15, 2, VIOLET_CITY - warp_def 5, 15, 2, VIOLET_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 13, BGEVENT_READ, VioletGymStatue - bg_event 6, 13, BGEVENT_READ, VioletGymStatue - -.ObjectEvents: - db 4 - object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 - object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1 - object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1 - object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 15, VIOLET_CITY, 2 + warp_event 5, 15, VIOLET_CITY, 2 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 13, BGEVENT_READ, VioletGymStatue + bg_event 6, 13, BGEVENT_READ, VioletGymStatue + + db 4 ; object events + object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 + object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1 + object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1 + object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1 diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index 4d903cb70..eb9062708 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const VIOLETKYLESHOUSE_POKEFAN_M const VIOLETKYLESHOUSE_KYLE VioletKylesHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VioletKylesHousePokefanMScript: jumptextfaceplayer VioletKylesHousePokefanMText @@ -15,7 +13,7 @@ VioletKylesHousePokefanMScript: Kyle: faceplayer opentext - trade NPCTRADE_KYLE + trade NPC_TRADE_KYLE waitbutton closetext end @@ -33,21 +31,16 @@ VioletKylesHousePokefanMText: done VioletKylesHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 7, 6, VIOLET_CITY - warp_def 4, 7, 6, VIOLET_CITY + db 2 ; warp events + warp_event 3, 7, VIOLET_CITY, 6 + warp_event 4, 7, VIOLET_CITY, 6 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 2 - object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1 - object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1 + db 2 ; object events + object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1 + object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index e1a86e0c7..80b7507c8 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const VIOLETMART_CLERK const VIOLETMART_GRANNY const VIOLETMART_COOLTRAINER_M VioletMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x68295: opentext @@ -49,22 +47,17 @@ VioletMartCooltrainerMText: done VioletMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 1, VIOLET_CITY - warp_def 3, 7, 1, VIOLET_CITY + db 2 ; warp events + warp_event 2, 7, VIOLET_CITY, 1 + warp_event 3, 7, VIOLET_CITY, 1 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1 - object_event 7, 6, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1 - object_event 5, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1 + object_event 7, 6, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1 + object_event 5, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 7ec074324..2054d9da3 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const VIOLETNICKNAMESPEECHHOUSE_TEACHER const VIOLETNICKNAMESPEECHHOUSE_LASS const VIOLETNICKNAMESPEECHHOUSE_BIRD VioletNicknameSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VioletNicknameSpeechHouseTeacherScript: jumptextfaceplayer VioletNicknameSpeechHouseTeacherText @@ -45,22 +43,17 @@ UnknownText_0x6947c: done VioletNicknameSpeechHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 3, 7, 4, VIOLET_CITY - warp_def 4, 7, 4, VIOLET_CITY + db 2 ; warp events + warp_event 3, 7, VIOLET_CITY, 4 + warp_event 4, 7, VIOLET_CITY, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1 - object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1 - object_event 5, 2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BirdScript_0x693ef, -1 + db 3 ; object events + object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1 + object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1 + object_event 5, 2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BirdScript_0x693ef, -1 diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 9413849b8..5795f1591 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const VIOLETPOKECENTER1F_NURSE const VIOLETPOKECENTER1F_GAMEBOY_KID const VIOLETPOKECENTER1F_GENTLEMAN @@ -6,11 +6,9 @@ const_value set 2 const VIOLETPOKECENTER1F_SCIENTIST VioletPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VioletPokecenterNurse: jumpstd pokecenternurse @@ -25,20 +23,20 @@ VioletPokecenter1F_ElmsAideScript: yesorno iffalse .RefusedEgg checkcode VAR_PARTYCOUNT - if_equal PARTY_LENGTH, .PartyFull + ifequal PARTY_LENGTH, .PartyFull giveegg TOGEPI, 5 stringtotext .eggname, MEM_BUFFER_1 scall .AideGivesEgg setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE clearevent EVENT_ELMS_AIDE_IN_LAB clearevent EVENT_TOGEPI_HATCHED - setmapscene ROUTE_32, 1 + setmapscene ROUTE_32, SCENE_ROUTE32_OFFER_SLOWPOKETAIL writetext UnknownText_0x695c5 waitbutton closetext checkcode VAR_FACING - if_equal UP, .AideWalksAroundPlayer - spriteface PLAYER, DOWN + ifequal UP, .AideWalksAroundPlayer + objectface PLAYER, DOWN applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksStraightOutOfPokecenter playsound SFX_EXIT_BUILDING disappear VIOLETPOKECENTER1F_SCIENTIST @@ -47,7 +45,7 @@ VioletPokecenter1F_ElmsAideScript: .AideWalksAroundPlayer: applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksLeftToExitPokecenter - spriteface PLAYER, DOWN + objectface PLAYER, DOWN applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideFinishesLeavingPokecenter playsound SFX_EXIT_BUILDING disappear VIOLETPOKECENTER1F_SCIENTIST @@ -216,25 +214,20 @@ VioletPokecenter1FYoungsterText: done VioletPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 5, VIOLET_CITY - warp_def 4, 7, 5, VIOLET_CITY - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 5 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1 - object_event 7, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1 - object_event 1, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1 - object_event 8, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1 - object_event 4, 3, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, VIOLET_CITY, 5 + warp_event 4, 7, VIOLET_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 5 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1 + object_event 7, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1 + object_event 1, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1 + object_event 8, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1 + object_event 4, 3, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 54899e2a4..70c0b8ced 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const VIRIDIANCITY_GRAMPS1 const VIRIDIANCITY_GRAMPS2 const VIRIDIANCITY_FISHER const VIRIDIANCITY_YOUNGSTER ViridianCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -216,32 +214,27 @@ TrainerHouseSignText: done ViridianCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 32, 7, 1, VIRIDIAN_GYM - warp_def 21, 9, 1, VIRIDIAN_NICKNAME_SPEECH_HOUSE - warp_def 23, 15, 1, TRAINER_HOUSE_1F - warp_def 29, 19, 2, VIRIDIAN_MART - warp_def 23, 25, 1, VIRIDIAN_POKECENTER_1F - -.CoordEvents: - db 0 - -.BGEvents: - db 6 + db 0, 0 ; filler + + db 5 ; warp events + warp_event 32, 7, VIRIDIAN_GYM, 1 + warp_event 21, 9, VIRIDIAN_NICKNAME_SPEECH_HOUSE, 1 + warp_event 23, 15, TRAINER_HOUSE_1F, 1 + warp_event 29, 19, VIRIDIAN_MART, 2 + warp_event 23, 25, VIRIDIAN_POKECENTER_1F, 1 + + db 0 ; coord events + + db 6 ; bg events bg_event 17, 17, BGEVENT_READ, ViridianCitySign - bg_event 27, 7, BGEVENT_READ, ViridianGymSign - bg_event 19, 1, BGEVENT_READ, ViridianCityWelcomeSign + bg_event 27, 7, BGEVENT_READ, ViridianGymSign + bg_event 19, 1, BGEVENT_READ, ViridianCityWelcomeSign bg_event 21, 15, BGEVENT_READ, TrainerHouseSign bg_event 24, 25, BGEVENT_READ, ViridianCityPokecenterSign bg_event 30, 19, BGEVENT_READ, ViridianCityMartSign -.ObjectEvents: - db 4 - object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianCityCoffeeGramps, -1 - object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianCityGrampsNearGym, -1 - object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianCityDreamEaterFisher, -1 + db 4 ; object events + object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianCityCoffeeGramps, -1 + object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianCityGrampsNearGym, -1 + object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianCityDreamEaterFisher, -1 object_event 17, 21, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianCityYoungsterScript, -1 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index ed47a099e..ac0003fd5 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const VIRIDIANGYM_BLUE const VIRIDIANGYM_GYM_GUY ViridianGym_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ViridianGymBlueScript: faceplayer @@ -170,23 +168,18 @@ ViridianGymGuyWinText: done ViridianGym_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 17, 1, VIRIDIAN_CITY - warp_def 5, 17, 1, VIRIDIAN_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 3, 13, BGEVENT_READ, ViridianGymStatue - bg_event 6, 13, BGEVENT_READ, ViridianGymStatue - -.ObjectEvents: - db 2 - object_event 5, 3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE - object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 17, VIRIDIAN_CITY, 1 + warp_event 5, 17, VIRIDIAN_CITY, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 3, 13, BGEVENT_READ, ViridianGymStatue + bg_event 6, 13, BGEVENT_READ, ViridianGymStatue + + db 2 ; object events + object_event 5, 3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE + object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 275b57e2d..29c73dbaf 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const VIRIDIANMART_CLERK const VIRIDIANMART_LASS const VIRIDIANMART_COOLTRAINER_M ViridianMart_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ClerkScript_0x9b5e7: opentext @@ -37,22 +35,17 @@ ViridianMartCooltrainerMText: done ViridianMart_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, VIRIDIAN_CITY - warp_def 3, 7, 4, VIRIDIAN_CITY + db 2 ; warp events + warp_event 2, 7, VIRIDIAN_CITY, 4 + warp_event 3, 7, VIRIDIAN_CITY, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 3 - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1 - object_event 7, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1 - object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1 + db 3 ; object events + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1 + object_event 7, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1 + object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 10d2c52e5..8fd12eb25 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const VIRIDIANNICKNAMESPEECHHOUSE_POKEFAN_M const VIRIDIANNICKNAMESPEECHHOUSE_LASS const VIRIDIANNICKNAMESPEECHHOUSE_SPEARY const VIRIDIANNICKNAMESPEECHHOUSE_RATTEY ViridianNicknameSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ViridianNicknameSpeechHousePokefanMScript: jumptextfaceplayer ViridianNicknameSpeechHousePokefanMText @@ -62,23 +60,18 @@ RatteyText: done ViridianNicknameSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 2, VIRIDIAN_CITY - warp_def 3, 7, 2, VIRIDIAN_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 2, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1 - object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1 - object_event 5, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1 - object_event 6, 3, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Rattey, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, VIRIDIAN_CITY, 2 + warp_event 3, 7, VIRIDIAN_CITY, 2 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 2, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1 + object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1 + object_event 5, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1 + object_event 6, 3, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Rattey, -1 diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index 86f767a5f..de6288ed3 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const VIRIDIANPOKECENTER1F_NURSE const VIRIDIANPOKECENTER1F_COOLTRAINER_M const VIRIDIANPOKECENTER1F_COOLTRAINER_F const VIRIDIANPOKECENTER1F_BUG_CATCHER ViridianPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x9b690: jumpstd pokecenternurse @@ -72,24 +70,19 @@ ViridianPokecenter1FBugCatcherText: done ViridianPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 5, VIRIDIAN_CITY - warp_def 4, 7, 5, VIRIDIAN_CITY - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9b690, -1 - object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1 - object_event 5, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1 - object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, VIRIDIAN_CITY, 5 + warp_event 4, 7, VIRIDIAN_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9b690, -1 + object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1 + object_event 5, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1 + object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1 diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm index 3a00d3be1..1c22d7dd1 100644 --- a/maps/ViridianPokecenter2FBeta.asm +++ b/maps/ViridianPokecenter2FBeta.asm @@ -1,23 +1,16 @@ ViridianPokecenter2FBeta_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ViridianPokecenter2FBeta_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 0, 7, 3, VIRIDIAN_POKECENTER_1F + db 1 ; warp events + warp_event 0, 7, VIRIDIAN_POKECENTER_1F, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 8b816062f..a38e53a1d 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const WHIRLISLANDB1F_POKE_BALL1 const WHIRLISLANDB1F_POKE_BALL2 const WHIRLISLANDB1F_POKE_BALL3 @@ -7,11 +7,9 @@ const_value set 2 const WHIRLISLANDB1F_BOULDER WhirlIslandB1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WhirlIslandB1FFullRestore: itemball FULL_RESTORE @@ -32,44 +30,39 @@ WhirlIslandB1FBoulder: jumpstd strengthboulder WhirlIslandB1FHiddenRareCandy: - hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY + hiddenitem RARE_CANDY, EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY WhirlIslandB1FHiddenUltraBall: - hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL + hiddenitem ULTRA_BALL, EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL WhirlIslandB1FHiddenFullRestore: - hiddenitem EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE + hiddenitem FULL_RESTORE, EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE WhirlIslandB1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 9 - warp_def 5, 5, 2, WHIRL_ISLAND_NW - warp_def 35, 3, 2, WHIRL_ISLAND_NE - warp_def 29, 9, 3, WHIRL_ISLAND_NE - warp_def 9, 31, 3, WHIRL_ISLAND_SW - warp_def 23, 31, 2, WHIRL_ISLAND_SW - warp_def 31, 29, 2, WHIRL_ISLAND_SE - warp_def 25, 21, 1, WHIRL_ISLAND_B2F - warp_def 13, 27, 2, WHIRL_ISLAND_B2F - warp_def 17, 21, 1, WHIRL_ISLAND_CAVE - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 30, 4, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy + db 0, 0 ; filler + + db 9 ; warp events + warp_event 5, 5, WHIRL_ISLAND_NW, 2 + warp_event 35, 3, WHIRL_ISLAND_NE, 2 + warp_event 29, 9, WHIRL_ISLAND_NE, 3 + warp_event 9, 31, WHIRL_ISLAND_SW, 3 + warp_event 23, 31, WHIRL_ISLAND_SW, 2 + warp_event 31, 29, WHIRL_ISLAND_SE, 2 + warp_event 25, 21, WHIRL_ISLAND_B2F, 1 + warp_event 13, 27, WHIRL_ISLAND_B2F, 2 + warp_event 17, 21, WHIRL_ISLAND_CAVE, 1 + + db 0 ; coord events + + db 3 ; bg events + bg_event 30, 4, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy bg_event 36, 18, BGEVENT_ITEM, WhirlIslandB1FHiddenUltraBall - bg_event 2, 23, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore - -.ObjectEvents: - db 6 - object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE - object_event 2, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS - object_event 33, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM - object_event 17, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET - object_event 19, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE + bg_event 2, 23, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore + + db 6 ; object events + object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE + object_event 2, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS + object_event 33, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM + object_event 17, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET + object_event 19, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE object_event 23, 26, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index d589b7d05..acee9670a 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const WHIRLISLANDB2F_POKE_BALL1 const WHIRLISLANDB2F_POKE_BALL2 const WHIRLISLANDB2F_POKE_BALL3 WhirlIslandB2F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WhirlIslandB2FFullRestore: itemball FULL_RESTORE @@ -20,24 +18,19 @@ WhirlIslandB2FMaxElixer: itemball MAX_ELIXER WhirlIslandB2F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 11, 5, 7, WHIRL_ISLAND_B1F - warp_def 7, 11, 8, WHIRL_ISLAND_B1F - warp_def 7, 25, 1, WHIRL_ISLAND_LUGIA_CHAMBER - warp_def 13, 31, 5, WHIRL_ISLAND_SW - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 - object_event 10, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE - object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE - object_event 5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER + db 0, 0 ; filler + + db 4 ; warp events + warp_event 11, 5, WHIRL_ISLAND_B1F, 7 + warp_event 7, 11, WHIRL_ISLAND_B1F, 8 + warp_event 7, 25, WHIRL_ISLAND_LUGIA_CHAMBER, 1 + warp_event 13, 31, WHIRL_ISLAND_SW, 5 + + db 0 ; coord events + + db 0 ; bg events + + db 3 ; object events + object_event 10, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE + object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE + object_event 5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 29c8500bb..35e726b5c 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -1,24 +1,17 @@ WhirlIslandCave_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WhirlIslandCave_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 7, 5, 9, WHIRL_ISLAND_B1F - warp_def 3, 13, 4, WHIRL_ISLAND_NW + db 2 ; warp events + warp_event 7, 5, WHIRL_ISLAND_B1F, 9 + warp_event 3, 13, WHIRL_ISLAND_NW, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index aa0a15c1e..4381a3636 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const WHIRLISLANDLUGIACHAMBER_LUGIA WhirlIslandLugiaChamber_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .Lugia .Lugia: @@ -44,19 +42,14 @@ LugiaText: done WhirlIslandLugiaChamber_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 9, 13, 3, WHIRL_ISLAND_B2F + db 1 ; warp events + warp_event 9, 13, WHIRL_ISLAND_B2F, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 9, 5, SPRITE_LUGIA, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA + db 1 ; object events + object_event 9, 5, SPRITE_LUGIA, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index b022a4c72..c13cd7a93 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -1,32 +1,25 @@ -const_value set 2 + const_def 2 ; object constants const WHIRLISLANDNE_POKE_BALL WhirlIslandNE_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WhirlIslandNEUltraBall: itemball ULTRA_BALL WhirlIslandNE_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 3, 13, 2, ROUTE_41 - warp_def 17, 3, 2, WHIRL_ISLAND_B1F - warp_def 13, 11, 3, WHIRL_ISLAND_B1F + db 3 ; warp events + warp_event 3, 13, ROUTE_41, 2 + warp_event 17, 3, WHIRL_ISLAND_B1F, 2 + warp_event 13, 11, WHIRL_ISLAND_B1F, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 11, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL + db 1 ; object events + object_event 11, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandNEUltraBall, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index e8475c19b..55e4f2d0b 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -1,26 +1,19 @@ WhirlIslandNW_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WhirlIslandNW_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 5, 7, 1, ROUTE_41 - warp_def 5, 3, 1, WHIRL_ISLAND_B1F - warp_def 3, 15, 4, WHIRL_ISLAND_SW - warp_def 7, 15, 2, WHIRL_ISLAND_CAVE + db 4 ; warp events + warp_event 5, 7, ROUTE_41, 1 + warp_event 5, 3, WHIRL_ISLAND_B1F, 1 + warp_event 3, 15, WHIRL_ISLAND_SW, 4 + warp_event 7, 15, WHIRL_ISLAND_CAVE, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index 3e7edc484..be43871ce 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -1,24 +1,17 @@ WhirlIslandSE_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WhirlIslandSE_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 5, 13, 4, ROUTE_41 - warp_def 5, 3, 6, WHIRL_ISLAND_B1F + db 2 ; warp events + warp_event 5, 13, ROUTE_41, 4 + warp_event 5, 3, WHIRL_ISLAND_B1F, 6 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 0 + db 0 ; object events diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index b80b00b6a..66c3fff23 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -1,34 +1,27 @@ -const_value set 2 + const_def 2 ; object constants const WHIRLISLANDSW_POKE_BALL WhirlIslandSW_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WhirlIslandSWUltraBall: itemball ULTRA_BALL WhirlIslandSW_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 5, 7, 3, ROUTE_41 - warp_def 17, 3, 5, WHIRL_ISLAND_B1F - warp_def 3, 3, 4, WHIRL_ISLAND_B1F - warp_def 3, 15, 3, WHIRL_ISLAND_NW - warp_def 17, 15, 4, WHIRL_ISLAND_B2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL + db 0, 0 ; filler + + db 5 ; warp events + warp_event 5, 7, ROUTE_41, 3 + warp_event 17, 3, WHIRL_ISLAND_B1F, 5 + warp_event 3, 3, WHIRL_ISLAND_B1F, 4 + warp_event 3, 15, WHIRL_ISLAND_NW, 3 + warp_event 17, 15, WHIRL_ISLAND_B2F, 4 + + db 0 ; coord events + + db 0 ; bg events + + db 1 ; object events + object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 1b0522ce9..af3c5091f 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const WILLSROOM_WILL WillsRoom_MapScripts: -.SceneScripts: - db 2 - scene_script .LockDoor - scene_script .DummyScene + db 2 ; scene scripts + scene_script .LockDoor ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_TILES, .WillsRoomDoors .LockDoor: @@ -37,7 +35,7 @@ WillsRoom_MapScripts: changeblock 4, 14, $2a ; wall reloadmappart closetext - setscene 1 + setscene SCENE_FINISHED setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED waitsfx end @@ -129,21 +127,16 @@ WillScript_WillDefeatText: done WillsRoom_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 5, 17, 4, INDIGO_PLATEAU_POKECENTER_1F - warp_def 4, 2, 1, KOGAS_ROOM - warp_def 5, 2, 2, KOGAS_ROOM + db 3 ; warp events + warp_event 5, 17, INDIGO_PLATEAU_POKECENTER_1F, 4 + warp_event 4, 2, KOGAS_ROOM, 1 + warp_event 5, 2, KOGAS_ROOM, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 5, 7, SPRITE_WILL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1 + db 1 ; object events + object_event 5, 7, SPRITE_WILL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index ef30655c2..46dc964f2 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const WISETRIOSROOM_SAGE1 const WISETRIOSROOM_SAGE2 const WISETRIOSROOM_SAGE3 @@ -7,13 +7,11 @@ const_value set 2 const WISETRIOSROOM_SAGE6 WiseTriosRoom_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .WiseTrioCallback .DummyScene0: @@ -53,23 +51,23 @@ WiseTriosRoomSage3Script: jumptextfaceplayer WiseTriosRoomSage3Text UnknownScript_0x985a3: - spriteface WISETRIOSROOM_SAGE3, UP - spriteface PLAYER, DOWN + objectface WISETRIOSROOM_SAGE3, UP + objectface PLAYER, DOWN showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE3, 20 follow PLAYER, WISETRIOSROOM_SAGE3 applymovement PLAYER, MovementData_0x98622 stopfollow - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT opentext writetext UnknownText_0x98712 waitbutton closetext applymovement WISETRIOSROOM_SAGE3, MovementData_0x98625 - spriteface WISETRIOSROOM_SAGE3, LEFT + objectface WISETRIOSROOM_SAGE3, LEFT end TrainerSageGaku: - trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, 0, .Script + trainer SAGE, GAKU, EVENT_BEAT_SAGE_GAKU, SageGakuSeenText, SageGakuBeatenText, 0, .Script .Script: opentext @@ -79,7 +77,7 @@ TrainerSageGaku: end TrainerSageMasa: - trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, 0, .Script + trainer SAGE, MASA, EVENT_BEAT_SAGE_MASA, SageMasaSeenText, SageMasaBeatenText, 0, .Script .Script: opentext @@ -89,7 +87,7 @@ TrainerSageMasa: end TrainerSageKoji: - trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, 0, .Script + trainer SAGE, KOJI, EVENT_BEAT_SAGE_KOJI, SageKojiSeenText, SageKojiBeatenText, 0, .Script .Script: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER @@ -103,9 +101,9 @@ TrainerSageKoji: waitbutton closetext applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628 - spriteface WISETRIOSROOM_SAGE6, UP + objectface WISETRIOSROOM_SAGE6, UP setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - setscene 1 + setscene SCENE_FINISHED end UnknownScript_0x9861b: @@ -345,27 +343,22 @@ UnknownText_0x98db5: done WiseTriosRoom_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 7, 4, 4, ECRUTEAK_CITY - warp_def 7, 5, 5, ECRUTEAK_CITY - warp_def 1, 4, 5, ECRUTEAK_HOUSE - -.CoordEvents: - db 1 - coord_event 7, 4, 0, UnknownScript_0x985a3 - -.BGEvents: - db 0 - -.ObjectEvents: - db 6 - object_event 6, 2, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - object_event 7, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 - object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 - object_event 6, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 7, 4, ECRUTEAK_CITY, 4 + warp_event 7, 5, ECRUTEAK_CITY, 5 + warp_event 1, 4, ECRUTEAK_TIN_TOWER_ENTRANCE, 5 + + db 1 ; coord events + coord_event 7, 4, SCENE_DEFAULT, UnknownScript_0x985a3 + + db 0 ; bg events + + db 6 ; object events + object_event 6, 2, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + object_event 7, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + object_event 6, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 |