diff options
Diffstat (limited to 'maps/DragonsDenB1F.asm')
| -rw-r--r-- | maps/DragonsDenB1F.asm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 74a803768..918e82904 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -125,10 +125,9 @@ TrainerTwinsLeaandpia2: 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 @@ -151,7 +150,7 @@ PokeBallScript_0x18c95a: closetext end -SilverScript_0x18c97e: +DragonsDenB1FSilverScript: playmusic MUSIC_RIVAL_ENCOUNTER faceplayer opentext @@ -171,7 +170,7 @@ SilverScript_0x18c97e: special RestartMapMusic end -MapDragonsDenB1FSignpost0Script: +DragonShrineSignpost: jumptext DragonShrineSignpostText DragonsDenB1FCalcium: @@ -415,15 +414,15 @@ DragonsDenB1F_MapEvents: coord_event 19, 30, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM, DragonsDenB1F_ClairScene db 4 ; bg events - bg_event 18, 24, BGEVENT_READ, MapDragonsDenB1FSignpost0Script + 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 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 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, 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 |