diff options
Diffstat (limited to 'maps/BlackthornCity.asm')
| -rw-r--r-- | maps/BlackthornCity.asm | 61 |
1 files changed, 27 insertions, 34 deletions
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 |