diff options
Diffstat (limited to 'maps/BlackthornCity.asm')
| -rw-r--r-- | maps/BlackthornCity.asm | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index d0a52c88c..c5cd10235 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -318,36 +318,36 @@ BlackthornCity_MapEventHeader: .Warps: db 8 - warp_def $b, $12, 1, BLACKTHORN_GYM_1F - warp_def $15, $d, 1, BLACKTHORN_DRAGON_SPEECH_HOUSE - warp_def $17, $1d, 1, BLACKTHORN_EMYS_HOUSE - warp_def $1d, $f, 2, BLACKTHORN_MART - warp_def $1d, $15, 1, BLACKTHORN_POKECENTER_1F - warp_def $1f, $9, 1, MOVE_DELETERS_HOUSE - warp_def $9, $24, 2, ICE_PATH_1F - warp_def $1, $14, 1, DRAGONS_DEN_1F + 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 - bg_event 24, 34, BGEVENT_READ, BlackthornCitySign - bg_event 13, 17, BGEVENT_READ, BlackthornGymSign - bg_event 31, 7, BGEVENT_READ, MoveDeletersHouseSign - bg_event 3, 21, BGEVENT_READ, DragonDensSign - bg_event 25, 5, BGEVENT_READ, BlackthornCityTrainerTips - bg_event 29, 16, BGEVENT_READ, BlackthornCityMartSign - bg_event 29, 22, BGEVENT_READ, BlackthornCityPokecenterSign + 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 16, 29, BGEVENT_READ, BlackthornCityMartSign + bg_event 22, 29, BGEVENT_READ, BlackthornCityPokecenterSign .ObjectEvents: db 9 - object_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM - object_event SPRITE_SUPER_NERD, 12, 19, 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 SPRITE_GRAMPS, 2, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN - object_event SPRITE_GRAMPS, 2, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN - object_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1 - object_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1 - object_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1 - object_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY - object_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1 + 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 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 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 |