diff options
Diffstat (limited to 'maps/UnionCaveB1F.asm')
| -rw-r--r-- | maps/UnionCaveB1F.asm | 69 |
1 files changed, 31 insertions, 38 deletions
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 |