diff options
Diffstat (limited to 'maps/DragonsDenB1F.asm')
| -rw-r--r-- | maps/DragonsDenB1F.asm | 98 |
1 files changed, 45 insertions, 53 deletions
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 172619fb6..918e82904 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 + turnobject 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,20 +115,19 @@ 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 closetext end -PokeBallScript_0x18c95a: -; This whole script is written out rather than as an -; item fragment because it's left over from the GS -; event. +DragonsDenB1FDragonFangScript: +; This whole script is written out rather than as an itemball +; because it's left over from the GS event. giveitem DRAGON_FANG iffalse .BagFull disappear DRAGONSDENB1F_POKE_BALL1 @@ -153,16 +150,16 @@ PokeBallScript_0x18c95a: closetext end -SilverScript_0x18c97e: +DragonsDenB1FSilverScript: 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 @@ -173,7 +170,7 @@ SilverScript_0x18c97e: special RestartMapMusic end -MapDragonsDenB1FSignpost0Script: +DragonShrineSignpost: jumptext DragonShrineSignpostText DragonsDenB1FCalcium: @@ -183,13 +180,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 +404,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 - bg_event 18, 24, BGEVENT_READ, MapDragonsDenB1FSignpost0Script + db 4 ; bg events + bg_event 18, 24, BGEVENT_READ, DragonShrineSignpost 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, DragonsDenB1FDragonFangScript, 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, 23, SPRITE_SILVER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonsDenB1FSilverScript, 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_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 |