diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 3d0ab665b..54fbfcea6 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -363,20 +363,20 @@ AzaleaGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 15, AZALEA_TOWN, 5 - warp_event 5, 15, AZALEA_TOWN, 5 + warp_event 4, 15, AZALEA_TOWN, 5 + warp_event 5, 15, AZALEA_TOWN, 5 db 0 ; coord events db 2 ; bg events - bg_event 3, 13, BGEVENT_READ, AzaleaGymStatue - bg_event 6, 13, BGEVENT_READ, AzaleaGymStatue + bg_event 3, 13, BGEVENT_READ, AzaleaGymStatue + bg_event 6, 13, BGEVENT_READ, AzaleaGymStatue db 7 ; object events - object_event 5, 7, SPRITE_BUGSY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1 - object_event 5, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1 - object_event 8, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1 - object_event 0, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherJosh, -1 - object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1 - object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1 - object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1 + object_event 5, 7, SPRITE_BUGSY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1 + object_event 5, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherBenny, -1 + object_event 8, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1 + object_event 0, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherJosh, -1 + object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1 + object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1 + object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 4100363d9..c98ff31ac 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -47,14 +47,14 @@ AzaleaMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, AZALEA_TOWN, 3 - warp_event 3, 7, AZALEA_TOWN, 3 + warp_event 2, 7, AZALEA_TOWN, 3 + warp_event 3, 7, AZALEA_TOWN, 3 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1 - object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1 - object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1 + object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1 + object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1 diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index 64ceb7cd4..85725aeba 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -78,16 +78,16 @@ AzaleaPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, AZALEA_TOWN, 1 - warp_event 4, 7, AZALEA_TOWN, 1 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, AZALEA_TOWN, 1 + warp_event 4, 7, AZALEA_TOWN, 1 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1 - object_event 9, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1 - object_event 6, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1 - object_event 1, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1 + object_event 9, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1 + object_event 6, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1 + object_event 1, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 61dd4acff..5bb751a7f 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -457,41 +457,41 @@ AzaleaTown_MapEvents: db 0, 0 ; filler db 8 ; warp events - warp_event 15, 9, AZALEA_POKECENTER_1F, 1 + warp_event 15, 9, AZALEA_POKECENTER_1F, 1 warp_event 21, 13, CHARCOAL_KILN, 1 - warp_event 21, 5, AZALEA_MART, 2 - warp_event 9, 5, KURTS_HOUSE, 1 + warp_event 21, 5, AZALEA_MART, 2 + warp_event 9, 5, KURTS_HOUSE, 1 warp_event 10, 15, AZALEA_GYM, 1 - warp_event 31, 7, SLOWPOKE_WELL_B1F, 1 - warp_event 2, 10, ILEX_FOREST_AZALEA_GATE, 3 - warp_event 2, 11, ILEX_FOREST_AZALEA_GATE, 4 + warp_event 31, 7, SLOWPOKE_WELL_B1F, 1 + warp_event 2, 10, ILEX_FOREST_AZALEA_GATE, 3 + warp_event 2, 11, ILEX_FOREST_AZALEA_GATE, 4 db 3 ; coord events - coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1 - coord_event 5, 11, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene2 - coord_event 9, 6, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL, AzaleaTownCelebiScene + coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1 + coord_event 5, 11, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene2 + coord_event 9, 6, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL, AzaleaTownCelebiScene db 9 ; bg events - bg_event 19, 9, BGEVENT_READ, AzaleaTownSign - bg_event 10, 9, BGEVENT_READ, KurtsHouseSign + bg_event 19, 9, BGEVENT_READ, AzaleaTownSign + bg_event 10, 9, BGEVENT_READ, KurtsHouseSign bg_event 14, 15, BGEVENT_READ, AzaleaGymSign - bg_event 29, 7, BGEVENT_READ, SlowpokeWellSign + bg_event 29, 7, BGEVENT_READ, SlowpokeWellSign bg_event 19, 13, BGEVENT_READ, CharcoalKilnSign - bg_event 16, 9, BGEVENT_READ, AzaleaTownPokecenterSign - bg_event 22, 5, BGEVENT_READ, AzaleaTownMartSign - bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign - bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal + bg_event 16, 9, BGEVENT_READ, AzaleaTownPokecenterSign + bg_event 22, 5, BGEVENT_READ, AzaleaTownMartSign + bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign + bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal db 12 ; object events - object_event 31, 9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET - object_event 21, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 + object_event 31, 9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET + object_event 21, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 object_event 15, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1 - object_event 7, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1 - object_event 8, 17, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - object_event 18, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - object_event 29, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event 7, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1 + object_event 8, 17, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event 18, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event 29, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES object_event 15, 15, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - object_event 8, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1 + object_event 8, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1 object_event 11, 10, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN object_event 10, 16, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS - object_event 6, 5, SPRITE_KURT_OUTSIDE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT + object_event 6, 5, SPRITE_KURT_OUTSIDE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 9c1357646..71415b5d6 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -795,18 +795,18 @@ BattleTower1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 7, 9, BATTLE_TOWER_OUTSIDE, 3 - warp_event 8, 9, BATTLE_TOWER_OUTSIDE, 4 - warp_event 7, 0, BATTLE_TOWER_ELEVATOR, 1 + warp_event 7, 9, BATTLE_TOWER_OUTSIDE, 3 + warp_event 8, 9, BATTLE_TOWER_OUTSIDE, 4 + warp_event 7, 0, BATTLE_TOWER_ELEVATOR, 1 db 0 ; coord events db 1 ; bg events - bg_event 6, 6, BGEVENT_READ, MapBattleTower1FSignpost0Script + bg_event 6, 6, BGEVENT_READ, MapBattleTower1FSignpost0Script db 5 ; object events - object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1 - object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1 - object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1 - object_event 1, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1 - object_event 14, 3, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1 + object_event 7, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1 + object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1 + object_event 4, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1 + object_event 1, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1 + object_event 14, 3, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 2d65c076e..dc291855a 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -140,13 +140,13 @@ BattleTowerBattleRoom_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 7, BATTLE_TOWER_HALLWAY, 4 - warp_event 4, 7, BATTLE_TOWER_HALLWAY, 4 + warp_event 3, 7, BATTLE_TOWER_HALLWAY, 4 + warp_event 4, 7, BATTLE_TOWER_HALLWAY, 4 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 4, 0, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER - object_event 1, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event 4, 0, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER + object_event 1, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 439233867..f2b3621ba 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -45,12 +45,12 @@ BattleTowerElevator_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 1, 3, BATTLE_TOWER_HALLWAY, 1 - warp_event 2, 3, BATTLE_TOWER_HALLWAY, 1 + warp_event 1, 3, BATTLE_TOWER_HALLWAY, 1 + warp_event 2, 3, BATTLE_TOWER_HALLWAY, 1 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 1, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 + object_event 1, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 3f046f21d..8cf22e2f4 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -78,16 +78,16 @@ BattleTowerHallway_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 11, 1, BATTLE_TOWER_ELEVATOR, 1 - warp_event 5, 0, BATTLE_TOWER_BATTLE_ROOM, 1 - warp_event 7, 0, BATTLE_TOWER_BATTLE_ROOM, 1 - warp_event 9, 0, BATTLE_TOWER_BATTLE_ROOM, 1 - warp_event 13, 0, BATTLE_TOWER_BATTLE_ROOM, 1 - warp_event 15, 0, BATTLE_TOWER_BATTLE_ROOM, 1 + warp_event 11, 1, BATTLE_TOWER_ELEVATOR, 1 + warp_event 5, 0, BATTLE_TOWER_BATTLE_ROOM, 1 + warp_event 7, 0, BATTLE_TOWER_BATTLE_ROOM, 1 + warp_event 9, 0, BATTLE_TOWER_BATTLE_ROOM, 1 + warp_event 13, 0, BATTLE_TOWER_BATTLE_ROOM, 1 + warp_event 15, 0, BATTLE_TOWER_BATTLE_ROOM, 1 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1 + object_event 11, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEvents, -1 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 4e2a719e2..6f3e6674c 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -128,10 +128,10 @@ BattleTowerOutside_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 8, 21, ROUTE_40_BATTLE_TOWER_GATE, 3 - warp_event 9, 21, ROUTE_40_BATTLE_TOWER_GATE, 4 - warp_event 8, 9, BATTLE_TOWER_1F, 1 - warp_event 9, 9, BATTLE_TOWER_1F, 2 + warp_event 8, 21, ROUTE_40_BATTLE_TOWER_GATE, 3 + warp_event 9, 21, ROUTE_40_BATTLE_TOWER_GATE, 4 + warp_event 8, 9, BATTLE_TOWER_1F, 1 + warp_event 9, 9, BATTLE_TOWER_1F, 2 db 0 ; coord events @@ -139,7 +139,7 @@ BattleTowerOutside_MapEvents: bg_event 10, 10, BGEVENT_READ, MapBattleTowerOutsideSignpost0Script db 4 ; object events - object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 + object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 object_event 13, 11, SPRITE_BUENA, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1 object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR object_event 12, 24, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm index e2681c979..e669586e0 100644 --- a/maps/BillsBrothersHouse.asm +++ b/maps/BillsBrothersHouse.asm @@ -29,13 +29,13 @@ BillsBrothersHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, FUCHSIA_CITY, 4 - warp_event 3, 7, FUCHSIA_CITY, 4 + warp_event 2, 7, FUCHSIA_CITY, 4 + warp_event 3, 7, FUCHSIA_CITY, 4 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsBrotherScript, -1 - object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsBrothersHouseYoungsterScript, -1 + object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BillsBrotherScript, -1 + object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsBrothersHouseYoungsterScript, -1 diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index 6357b69de..5060cc5a0 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -244,17 +244,17 @@ BillsFamilysHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, GOLDENROD_CITY, 4 - warp_event 3, 7, GOLDENROD_CITY, 4 + warp_event 2, 7, GOLDENROD_CITY, 4 + warp_event 3, 7, GOLDENROD_CITY, 4 db 0 ; coord events db 3 ; bg events - bg_event 0, 1, BGEVENT_READ, BillsHouseBookshelf2 - bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1 - bg_event 7, 1, BGEVENT_READ, BillsHouseRadio + bg_event 0, 1, BGEVENT_READ, BillsHouseBookshelf2 + bg_event 1, 1, BGEVENT_READ, BillsHouseBookshelf1 + bg_event 7, 1, BGEVENT_READ, BillsHouseRadio db 3 ; object events - object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillScript, EVENT_MET_BILL - object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMomScript, -1 - object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSisterScript, -1 + object_event 2, 3, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillScript, EVENT_MET_BILL + object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BillsMomScript, -1 + object_event 5, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BillsSisterScript, -1 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 6ce1cbcd2..53a803642 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -355,12 +355,12 @@ BillsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, ROUTE_25, 1 - warp_event 3, 7, ROUTE_25, 1 + warp_event 2, 7, ROUTE_25, 1 + warp_event 3, 7, ROUTE_25, 1 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1 + object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 3d9dd2a41..6add75d58 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -319,28 +319,28 @@ BlackthornCity_MapEvents: 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 + 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 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 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 530421296..8b4575611 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -49,13 +49,13 @@ BlackthornDragonSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, BLACKTHORN_CITY, 2 - warp_event 3, 7, BLACKTHORN_CITY, 2 + warp_event 2, 7, BLACKTHORN_CITY, 2 + warp_event 3, 7, BLACKTHORN_CITY, 2 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1 - object_event 5, 5, SPRITE_EKANS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1 + object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1 + object_event 5, 5, SPRITE_EKANS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1 diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index 2e8853727..01fffb4de 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -21,14 +21,14 @@ BlackthornEmysHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, BLACKTHORN_CITY, 3 - warp_event 3, 7, BLACKTHORN_CITY, 3 + warp_event 2, 7, BLACKTHORN_CITY, 3 + warp_event 3, 7, BLACKTHORN_CITY, 3 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, EmysHouseBookshelf - bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf + bg_event 0, 1, BGEVENT_READ, EmysHouseBookshelf + bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf db 1 ; object events - object_event 2, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1 + object_event 2, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 07af82bcf..fd4d241a2 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -388,23 +388,23 @@ BlackthornGym1F_MapEvents: db 0, 0 ; filler db 7 ; warp events - warp_event 4, 17, BLACKTHORN_CITY, 1 - warp_event 5, 17, BLACKTHORN_CITY, 1 - warp_event 1, 7, BLACKTHORN_GYM_2F, 1 - warp_event 7, 9, BLACKTHORN_GYM_2F, 2 - warp_event 2, 6, BLACKTHORN_GYM_2F, 3 - warp_event 7, 7, BLACKTHORN_GYM_2F, 4 - warp_event 7, 6, BLACKTHORN_GYM_2F, 5 + warp_event 4, 17, BLACKTHORN_CITY, 1 + warp_event 5, 17, BLACKTHORN_CITY, 1 + warp_event 1, 7, BLACKTHORN_GYM_2F, 1 + warp_event 7, 9, BLACKTHORN_GYM_2F, 2 + warp_event 2, 6, BLACKTHORN_GYM_2F, 3 + warp_event 7, 7, BLACKTHORN_GYM_2F, 4 + warp_event 7, 6, BLACKTHORN_GYM_2F, 5 db 0 ; coord events db 2 ; bg events - bg_event 3, 15, BGEVENT_READ, BlackthornGymStatue - bg_event 6, 15, BGEVENT_READ, BlackthornGymStatue + bg_event 3, 15, BGEVENT_READ, BlackthornGymStatue + bg_event 6, 15, BGEVENT_READ, BlackthornGymStatue db 5 ; object events - object_event 5, 3, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1 - object_event 6, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1 - object_event 1, 14, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1 - object_event 9, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1 - object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1 + object_event 5, 3, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1 + object_event 6, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1 + object_event 1, 14, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1 + object_event 9, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1 + object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 2b41c2775..ede7029cb 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -127,22 +127,22 @@ BlackthornGym2F_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 1, 7, BLACKTHORN_GYM_1F, 3 - warp_event 7, 9, BLACKTHORN_GYM_1F, 4 - warp_event 2, 5, BLACKTHORN_GYM_1F, 5 ; hole - warp_event 8, 7, BLACKTHORN_GYM_1F, 6 ; hole - warp_event 8, 3, BLACKTHORN_GYM_1F, 7 ; hole + warp_event 1, 7, BLACKTHORN_GYM_1F, 3 + warp_event 7, 9, BLACKTHORN_GYM_1F, 4 + warp_event 2, 5, BLACKTHORN_GYM_1F, 5 ; hole + warp_event 8, 7, BLACKTHORN_GYM_1F, 6 ; hole + warp_event 8, 3, BLACKTHORN_GYM_1F, 7 ; hole db 0 ; coord events db 0 ; bg events db 8 ; object events - object_event 4, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1 - object_event 4, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1 - object_event 8, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 - object_event 2, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 - object_event 6, 16, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 - object_event 3, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 - object_event 6, 1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 - object_event 8, 14, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 + object_event 4, 1, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1 + object_event 4, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1 + object_event 8, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 + object_event 2, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 + object_event 6, 16, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 + object_event 3, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 + object_event 6, 1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 + object_event 8, 14, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index cdc9ec50f..c7a61af05 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -48,14 +48,14 @@ BlackthornMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, BLACKTHORN_CITY, 4 - warp_event 3, 7, BLACKTHORN_CITY, 4 + warp_event 2, 7, BLACKTHORN_CITY, 4 + warp_event 3, 7, BLACKTHORN_CITY, 4 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1 - object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1 - object_event 5, 2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1 + object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1 + object_event 5, 2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1 diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index 77c47f364..a6e44a881 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -51,16 +51,16 @@ BlackthornPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, BLACKTHORN_CITY, 5 - warp_event 4, 7, BLACKTHORN_CITY, 5 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, BLACKTHORN_CITY, 5 + warp_event 4, 7, BLACKTHORN_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1 - object_event 5, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1 - object_event 1, 4, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1 - object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1 + object_event 5, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1 + object_event 1, 4, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1 + object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index e27c9923f..47bf02719 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -146,12 +146,12 @@ BluesHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, PALLET_TOWN, 2 - warp_event 3, 7, PALLET_TOWN, 2 + warp_event 2, 7, PALLET_TOWN, 2 + warp_event 3, 7, PALLET_TOWN, 2 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 2, 3, SPRITE_DAISY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1 + object_event 2, 3, SPRITE_DAISY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index bd4fada98..5e7c4e247 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -126,14 +126,14 @@ BrunosRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 17, KOGAS_ROOM, 3 - warp_event 5, 17, KOGAS_ROOM, 4 - warp_event 4, 2, KARENS_ROOM, 1 - warp_event 5, 2, KARENS_ROOM, 2 + warp_event 4, 17, KOGAS_ROOM, 3 + warp_event 5, 17, KOGAS_ROOM, 4 + warp_event 4, 2, KARENS_ROOM, 1 + warp_event 5, 2, KARENS_ROOM, 2 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 5, 7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1 + object_event 5, 7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 71bab1aa6..9aea9e81f 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -279,31 +279,31 @@ BurnedTower1F_MapEvents: db 0, 0 ; filler db 14 ; warp events - warp_event 9, 15, ECRUTEAK_CITY, 13 + warp_event 9, 15, ECRUTEAK_CITY, 13 warp_event 10, 15, ECRUTEAK_CITY, 13 - warp_event 10, 9, BURNED_TOWER_B1F, 1 - warp_event 5, 5, BURNED_TOWER_B1F, 1 - warp_event 5, 6, BURNED_TOWER_B1F, 1 - warp_event 4, 6, BURNED_TOWER_B1F, 1 - warp_event 15, 4, BURNED_TOWER_B1F, 2 - warp_event 15, 5, BURNED_TOWER_B1F, 2 - warp_event 10, 7, BURNED_TOWER_B1F, 3 - warp_event 5, 14, BURNED_TOWER_B1F, 4 - warp_event 4, 14, BURNED_TOWER_B1F, 4 - warp_event 14, 14, BURNED_TOWER_B1F, 5 - warp_event 15, 14, BURNED_TOWER_B1F, 5 - warp_event 7, 15, BURNED_TOWER_B1F, 6 + warp_event 10, 9, BURNED_TOWER_B1F, 1 + warp_event 5, 5, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S + warp_event 5, 6, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S + warp_event 4, 6, BURNED_TOWER_B1F, 1 ; inaccessible, left over from G/S + warp_event 15, 4, BURNED_TOWER_B1F, 2 ; inaccessible, left over from G/S + warp_event 15, 5, BURNED_TOWER_B1F, 2 ; inaccessible, left over from G/S + warp_event 10, 7, BURNED_TOWER_B1F, 3 ; inaccessible, left over from G/S + warp_event 5, 14, BURNED_TOWER_B1F, 4 ; inaccessible, left over from G/S + warp_event 4, 14, BURNED_TOWER_B1F, 4 ; inaccessible, left over from G/S + warp_event 14, 14, BURNED_TOWER_B1F, 5 ; inaccessible, left over from G/S + warp_event 15, 14, BURNED_TOWER_B1F, 5 ; inaccessible, left over from G/S + warp_event 7, 15, BURNED_TOWER_B1F, 6 ; inaccessible, left over from G/S db 1 ; coord events - coord_event 11, 9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript + coord_event 11, 9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript db 2 ; bg events - bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther + bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther bg_event 13, 11, BGEVENT_ITEM, BurnedTower1FHiddenUltraBall db 5 ; object events - object_event 15, 4, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1 + object_event 15, 4, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1 object_event 12, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE - object_event 8, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER + object_event 8, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER object_event 14, 14, SPRITE_MORTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY - object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP + object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index f83d4cbdb..afccf06c9 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -237,25 +237,25 @@ BurnedTowerB1F_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 10, 9, BURNED_TOWER_1F, 3 - warp_event 17, 7, BURNED_TOWER_1F, 7 - warp_event 10, 8, BURNED_TOWER_1F, 9 - warp_event 3, 13, BURNED_TOWER_1F, 10 + warp_event 10, 9, BURNED_TOWER_1F, 3 + warp_event 17, 7, BURNED_TOWER_1F, 7 + warp_event 10, 8, BURNED_TOWER_1F, 9 + warp_event 3, 13, BURNED_TOWER_1F, 10 warp_event 17, 14, BURNED_TOWER_1F, 12 - warp_event 7, 15, BURNED_TOWER_1F, 14 + warp_event 7, 15, BURNED_TOWER_1F, 14 db 1 ; coord events - coord_event 10, 6, SCENE_DEFAULT, ReleaseTheBeasts + coord_event 10, 6, SCENE_DEFAULT, ReleaseTheBeasts db 0 ; bg events db 9 ; object events - object_event 17, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1 - object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 - object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 - object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 - object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - object_event 16, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE + object_event 17, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1 + object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + object_event 7, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + object_event 12, 3, SPRITE_ENTEI, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + object_event 10, 4, SPRITE_SUICUNE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + object_event 16, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE object_event 10, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index c4337f9cf..b7a6356dc 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -209,18 +209,18 @@ CeladonCafe_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 6, 7, CELADON_CITY, 9 - warp_event 7, 7, CELADON_CITY, 9 + warp_event 6, 7, CELADON_CITY, 9 + warp_event 7, 7, CELADON_CITY, 9 db 0 ; coord events db 2 ; bg events - bg_event 5, 0, BGEVENT_READ, EatathonContestPoster - bg_event 7, 1, BGEVENT_READ, CeladonCafeTrashcan + bg_event 5, 0, BGEVENT_READ, EatathonContestPoster + bg_event 7, 1, BGEVENT_READ, CeladonCafeTrashcan db 5 ; object events - object_event 9, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1 - object_event 4, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1 - object_event 1, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1 - object_event 1, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher3, -1 - object_event 4, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeTeacher, -1 + object_event 9, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1 + object_event 4, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1 + object_event 1, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1 + object_event 1, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher3, -1 + object_event 4, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeTeacher, -1 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 52695628b..16409b219 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -236,11 +236,11 @@ CeladonCity_MapEvents: db 0, 0 ; filler db 9 ; warp events - warp_event 4, 9, CELADON_DEPT_STORE_1F, 1 - warp_event 16, 9, CELADON_MANSION_1F, 1 - warp_event 16, 3, CELADON_MANSION_1F, 3 - warp_event 17, 3, CELADON_MANSION_1F, 3 - warp_event 29, 9, CELADON_POKECENTER_1F, 1 + warp_event 4, 9, CELADON_DEPT_STORE_1F, 1 + warp_event 16, 9, CELADON_MANSION_1F, 1 + warp_event 16, 3, CELADON_MANSION_1F, 3 + warp_event 17, 3, CELADON_MANSION_1F, 3 + warp_event 29, 9, CELADON_POKECENTER_1F, 1 warp_event 18, 19, CELADON_GAME_CORNER, 1 warp_event 23, 19, CELADON_GAME_CORNER_PRIZE_ROOM, 1 warp_event 10, 29, CELADON_GYM, 1 @@ -251,11 +251,11 @@ CeladonCity_MapEvents: db 8 ; bg events bg_event 23, 21, BGEVENT_READ, CeladonCitySign bg_event 11, 31, BGEVENT_READ, CeladonGymSign - bg_event 6, 9, BGEVENT_READ, CeladonCityDeptStoreSign - bg_event 13, 9, BGEVENT_READ, CeladonCityMansionSign + bg_event 6, 9, BGEVENT_READ, CeladonCityDeptStoreSign + bg_event 13, 9, BGEVENT_READ, CeladonCityMansionSign bg_event 19, 21, BGEVENT_READ, CeladonCityGameCornerSign bg_event 29, 21, BGEVENT_READ, CeladonCityTrainerTips - bg_event 30, 9, BGEVENT_READ, CeladonCityPokecenterSign + bg_event 30, 9, BGEVENT_READ, CeladonCityPokecenterSign bg_event 37, 21, BGEVENT_ITEM, CeladonCityHiddenPpUp db 9 ; object events @@ -263,8 +263,8 @@ CeladonCity_MapEvents: object_event 27, 11, SPRITE_POLIWAG, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1 object_event 20, 24, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1 object_event 14, 16, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps1Script, -1 - object_event 8, 31, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1 + object_event 8, 31, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1 object_event 18, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster1Script, -1 object_event 24, 33, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster2Script, -1 - object_event 6, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1 - object_event 7, 22, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassScript, -1 + object_event 6, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1 + object_event 7, 22, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassScript, -1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 5aab57ddb..ba347458a 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -75,18 +75,18 @@ CeladonDeptStore1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 7, 7, CELADON_CITY, 1 - warp_event 8, 7, CELADON_CITY, 1 - warp_event 15, 0, CELADON_DEPT_STORE_2F, 2 - warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 + warp_event 7, 7, CELADON_CITY, 1 + warp_event 8, 7, CELADON_CITY, 1 + warp_event 15, 0, CELADON_DEPT_STORE_2F, 2 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events db 2 ; bg events - bg_event 14, 0, BGEVENT_READ, CeladonDeptStore1FDirectory - bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton + bg_event 14, 0, BGEVENT_READ, CeladonDeptStore1FDirectory + bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton db 3 ; object events - object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1 - object_event 11, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1 - object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1 + object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1 + object_event 11, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1 + object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index 09df8440c..39b452fe7 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -70,18 +70,18 @@ CeladonDeptStore2F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 12, 0, CELADON_DEPT_STORE_3F, 1 - warp_event 15, 0, CELADON_DEPT_STORE_1F, 3 - warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 + warp_event 12, 0, CELADON_DEPT_STORE_3F, 1 + warp_event 15, 0, CELADON_DEPT_STORE_1F, 3 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events db 2 ; bg events - bg_event 14, 0, BGEVENT_READ, CeladonDeptStore2FDirectory - bg_event 3, 0, BGEVENT_READ, CeladonDeptStore2FElevatorButton + bg_event 14, 0, BGEVENT_READ, CeladonDeptStore2FDirectory + bg_event 3, 0, BGEVENT_READ, CeladonDeptStore2FElevatorButton db 4 ; object events - object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1 - object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1 - object_event 5, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1 - object_event 6, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1 + object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1 + object_event 14, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1 + object_event 5, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1 + object_event 6, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 733100ab2..119bfcf91 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -96,19 +96,19 @@ CeladonDeptStore3F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 12, 0, CELADON_DEPT_STORE_2F, 1 - warp_event 15, 0, CELADON_DEPT_STORE_4F, 2 - warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 + warp_event 12, 0, CELADON_DEPT_STORE_2F, 1 + warp_event 15, 0, CELADON_DEPT_STORE_4F, 2 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events db 2 ; bg events - bg_event 14, 0, BGEVENT_READ, CeladonDeptStore3FDirectory - bg_event 3, 0, BGEVENT_READ, CeladonDeptStore3FElevatorButton + bg_event 14, 0, BGEVENT_READ, CeladonDeptStore3FDirectory + bg_event 3, 0, BGEVENT_READ, CeladonDeptStore3FElevatorButton db 5 ; object events - object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1 - object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1 - object_event 9, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1 - object_event 10, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1 - object_event 13, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1 + object_event 7, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1 + object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1 + object_event 9, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1 + object_event 10, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1 + object_event 13, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 4241a3595..f619e49d8 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -52,17 +52,17 @@ CeladonDeptStore4F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 12, 0, CELADON_DEPT_STORE_5F, 1 - warp_event 15, 0, CELADON_DEPT_STORE_3F, 2 - warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 + warp_event 12, 0, CELADON_DEPT_STORE_5F, 1 + warp_event 15, 0, CELADON_DEPT_STORE_3F, 2 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events db 2 ; bg events - bg_event 14, 0, BGEVENT_READ, CeladonDeptStore4FDirectory - bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton + bg_event 14, 0, BGEVENT_READ, CeladonDeptStore4FDirectory + bg_event 3, 0, BGEVENT_READ, CeladonDeptStore4FElevatorButton db 3 ; object events - object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1 - object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1 - object_event 8, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1 + object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1 + object_event 7, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1 + object_event 8, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index ddac9b490..c276e1dad 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -73,19 +73,19 @@ CeladonDeptStore5F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 12, 0, CELADON_DEPT_STORE_4F, 1 - warp_event 15, 0, CELADON_DEPT_STORE_6F, 1 - warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 + warp_event 12, 0, CELADON_DEPT_STORE_4F, 1 + warp_event 15, 0, CELADON_DEPT_STORE_6F, 1 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events db 2 ; bg events - bg_event 14, 0, BGEVENT_READ, CeladonDeptStore5FDirectory - bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton + bg_event 14, 0, BGEVENT_READ, CeladonDeptStore5FDirectory + bg_event 3, 0, BGEVENT_READ, CeladonDeptStore5FElevatorButton db 5 ; object events - object_event 7, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1 - object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1 - object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1 - object_event 3, 4, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1 - object_event 1, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1 + object_event 7, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1 + object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1 + object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1 + object_event 3, 4, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1 + object_event 1, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 6bbff6bf2..a42318c2e 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -147,19 +147,19 @@ CeladonDeptStore6F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 15, 0, CELADON_DEPT_STORE_5F, 2 - warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 + warp_event 15, 0, CELADON_DEPT_STORE_5F, 2 + warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events db 6 ; bg events - bg_event 14, 0, BGEVENT_READ, CeladonDeptStore6FDirectory - bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton - bg_event 8, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine - bg_event 9, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine - bg_event 10, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine - bg_event 11, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine + bg_event 14, 0, BGEVENT_READ, CeladonDeptStore6FDirectory + bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton + bg_event 8, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine + bg_event 9, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine + bg_event 10, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine + bg_event 11, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine db 2 ; object events - object_event 9, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1 - object_event 12, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1 + object_event 9, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1 + object_event 12, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1 diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index eaa5c927a..d89efe8ee 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -29,12 +29,12 @@ CeladonDeptStoreElevator_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 1, 3, CELADON_DEPT_STORE_1F, -1 - warp_event 2, 3, CELADON_DEPT_STORE_1F, -1 + warp_event 1, 3, CELADON_DEPT_STORE_1F, -1 + warp_event 2, 3, CELADON_DEPT_STORE_1F, -1 db 0 ; coord events db 1 ; bg events - bg_event 3, 0, BGEVENT_READ, CeladonDeptStoreElevatorScript + bg_event 3, 0, BGEVENT_READ, CeladonDeptStoreElevatorScript db 0 ; object events diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 30268f9c7..89f8f6e84 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -289,52 +289,52 @@ CeladonGameCorner_MapEvents: db 0 ; coord events db 38 ; bg events - bg_event 1, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 1, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 1, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 1, 9, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 1, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 1, 11, BGEVENT_LEFT, CeladonGameCornerCardFlipScript - bg_event 6, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 6, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 6, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 6, 9, BGEVENT_READ, MapCeladonGameCornerSignpost9Script - bg_event 6, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript - bg_event 6, 11, BGEVENT_RIGHT, CeladonGameCornerCardFlipScript - bg_event 7, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 7, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 7, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 7, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 7, 10, BGEVENT_READ, CeladonGameCornerSlotMachineScript - bg_event 7, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript - bg_event 12, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 12, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 12, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 12, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 1, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 1, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 1, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 1, 9, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 1, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 1, 11, BGEVENT_LEFT, CeladonGameCornerCardFlipScript + bg_event 6, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 6, 7, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 6, 8, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 6, 9, BGEVENT_READ, MapCeladonGameCornerSignpost9Script + bg_event 6, 10, BGEVENT_READ, CeladonGameCornerCardFlipScript + bg_event 6, 11, BGEVENT_RIGHT, CeladonGameCornerCardFlipScript + bg_event 7, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 7, 10, BGEVENT_READ, CeladonGameCornerSlotMachineScript + bg_event 7, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript + bg_event 12, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 12, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 12, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 12, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 12, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 12, 11, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript - bg_event 13, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 13, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 13, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 13, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 13, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 13, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 13, 8, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 13, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 13, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 13, 11, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript - bg_event 18, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 18, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript - bg_event 18, 8, BGEVENT_READ, CeladonGameCornerLighterScript - bg_event 18, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 18, 6, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 18, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript + bg_event 18, 8, BGEVENT_READ, CeladonGameCornerLighterScript + bg_event 18, 9, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 18, 10, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript bg_event 18, 11, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript - bg_event 15, 0, BGEVENT_READ, CeladonGameCornerPoster1Script - bg_event 9, 0, BGEVENT_READ, CeladonGameCornerPoster2Script + bg_event 15, 0, BGEVENT_READ, CeladonGameCornerPoster1Script + bg_event 9, 0, BGEVENT_READ, CeladonGameCornerPoster2Script db 9 ; object events - object_event 5, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1 - object_event 3, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1 + object_event 5, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1 + object_event 3, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1 object_event 14, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1 - object_event 17, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1 - object_event 11, 7, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1 - object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 - object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 - object_event 11, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 - object_event 2, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1 + object_event 17, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1 + object_event 11, 7, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1 + object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 + object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1 + object_event 11, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 + object_event 2, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 24384a6bf..4f2750d54 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -265,15 +265,15 @@ CeladonGameCornerPrizeRoom_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 5, CELADON_CITY, 7 - warp_event 3, 5, CELADON_CITY, 7 + warp_event 2, 5, CELADON_CITY, 7 + warp_event 3, 5, CELADON_CITY, 7 db 0 ; coord events db 2 ; bg events - bg_event 2, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor - bg_event 4, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor + bg_event 2, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomTMVendor + bg_event 4, 1, BGEVENT_READ, CeladonGameCornerPrizeRoomPokemonVendor db 2 ; object events - object_event 0, 2, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1 - object_event 4, 4, SPRITE_PHARMACIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1 + object_event 0, 2, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1 + object_event 4, 4, SPRITE_PHARMACIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 7b3c96781..3d495e622 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -269,19 +269,19 @@ CeladonGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 17, CELADON_CITY, 8 - warp_event 5, 17, CELADON_CITY, 8 + warp_event 4, 17, CELADON_CITY, 8 + warp_event 5, 17, CELADON_CITY, 8 db 0 ; coord events db 2 ; bg events - bg_event 3, 15, BGEVENT_READ, CeladonGymStatue - bg_event 6, 15, BGEVENT_READ, CeladonGymStatue + bg_event 3, 15, BGEVENT_READ, CeladonGymStatue + bg_event 6, 15, BGEVENT_READ, CeladonGymStatue db 6 ; object events - object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1 - object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1 - object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 - object_event 3, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1 - object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1 - object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1 + object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1 + object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1 + object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 + object_event 3, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1 + object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1 + object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 1746ce937..2e856fd79 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -76,21 +76,21 @@ CeladonMansion1F_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 6, 9, CELADON_CITY, 2 - warp_event 7, 9, CELADON_CITY, 2 - warp_event 3, 0, CELADON_CITY, 3 - warp_event 0, 0, CELADON_MANSION_2F, 1 - warp_event 7, 0, CELADON_MANSION_2F, 4 + warp_event 6, 9, CELADON_CITY, 2 + warp_event 7, 9, CELADON_CITY, 2 + warp_event 3, 0, CELADON_CITY, 3 + warp_event 0, 0, CELADON_MANSION_2F, 1 + warp_event 7, 0, CELADON_MANSION_2F, 4 db 0 ; coord events db 3 ; bg events - bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign - bg_event 0, 3, BGEVENT_READ, CeladonMansion1fBookshelf - bg_event 2, 3, BGEVENT_READ, CeladonMansion1fBookshelf + bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign + bg_event 0, 3, BGEVENT_READ, CeladonMansion1fBookshelf + bg_event 2, 3, BGEVENT_READ, CeladonMansion1fBookshelf db 4 ; object events - object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1 - object_event 2, 6, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1 - object_event 3, 4, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1 - object_event 4, 4, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1 + object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1 + object_event 2, 6, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1 + object_event 3, 4, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1 + object_event 4, 4, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1 diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index cc32da5e5..f230404de 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -51,16 +51,16 @@ CeladonMansion2F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 0, CELADON_MANSION_1F, 4 - warp_event 1, 0, CELADON_MANSION_3F, 2 - warp_event 6, 0, CELADON_MANSION_3F, 3 - warp_event 7, 0, CELADON_MANSION_1F, 5 + warp_event 0, 0, CELADON_MANSION_1F, 4 + warp_event 1, 0, CELADON_MANSION_3F, 2 + warp_event 6, 0, CELADON_MANSION_3F, 3 + warp_event 7, 0, CELADON_MANSION_1F, 5 db 0 ; coord events db 3 ; bg events - bg_event 0, 3, BGEVENT_READ, CeladonMansion2FComputer - bg_event 5, 8, BGEVENT_UP, CeladonMansion2FSign - bg_event 2, 3, BGEVENT_READ, CeladonMansion2FBookshelf + bg_event 0, 3, BGEVENT_READ, CeladonMansion2FComputer + bg_event 5, 8, BGEVENT_UP, CeladonMansion2FSign + bg_event 2, 3, BGEVENT_READ, CeladonMansion2FBookshelf db 0 ; object events diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 5d014f28b..3f6b24bea 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -191,21 +191,21 @@ CeladonMansion3F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 0, CELADON_MANSION_ROOF, 1 - warp_event 1, 0, CELADON_MANSION_2F, 2 - warp_event 6, 0, CELADON_MANSION_2F, 3 - warp_event 7, 0, CELADON_MANSION_ROOF, 2 + warp_event 0, 0, CELADON_MANSION_ROOF, 1 + warp_event 1, 0, CELADON_MANSION_2F, 2 + warp_event 6, 0, CELADON_MANSION_2F, 3 + warp_event 7, 0, CELADON_MANSION_ROOF, 2 db 0 ; coord events db 4 ; bg events - bg_event 5, 8, BGEVENT_UP, MapCeladonMansion3FSignpost0Script - bg_event 4, 3, BGEVENT_UP, MapCeladonMansion3FSignpost1Script - bg_event 1, 6, BGEVENT_UP, MapCeladonMansion3FSignpost2Script - bg_event 1, 3, BGEVENT_UP, MapCeladonMansion3FSignpost3Script + bg_event 5, 8, BGEVENT_UP, MapCeladonMansion3FSignpost0Script + bg_event 4, 3, BGEVENT_UP, MapCeladonMansion3FSignpost1Script + bg_event 1, 6, BGEVENT_UP, MapCeladonMansion3FSignpost2Script + bg_event 1, 3, BGEVENT_UP, MapCeladonMansion3FSignpost3Script db 4 ; object events - object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1 - object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1 - object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1 - object_event 0, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1 + object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1 + object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1 + object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1 + object_event 0, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 4af0fa1ab..7c040bdad 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -35,14 +35,14 @@ CeladonMansionRoof_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 1, 1, CELADON_MANSION_3F, 1 - warp_event 6, 1, CELADON_MANSION_3F, 4 - warp_event 2, 5, CELADON_MANSION_ROOF_HOUSE, 1 + warp_event 1, 1, CELADON_MANSION_3F, 1 + warp_event 6, 1, CELADON_MANSION_3F, 4 + warp_event 2, 5, CELADON_MANSION_ROOF_HOUSE, 1 db 0 ; coord events db 1 ; bg events - bg_event 6, 1, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script + bg_event 6, 1, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script db 1 ; object events - object_event 7, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1 + object_event 7, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 56e46634b..3a8bce8d8 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -118,12 +118,12 @@ CeladonMansionRoofHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, CELADON_MANSION_ROOF, 3 - warp_event 3, 7, CELADON_MANSION_ROOF, 3 + warp_event 2, 7, CELADON_MANSION_ROOF, 3 + warp_event 3, 7, CELADON_MANSION_ROOF, 3 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1 + object_event 3, 2, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1 diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index b333618df..4a61137e3 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -147,17 +147,17 @@ CeladonPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, CELADON_CITY, 5 - warp_event 4, 7, CELADON_CITY, 5 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, CELADON_CITY, 5 + warp_event 4, 7, CELADON_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 5 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1 - object_event 1, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1 - object_event 0, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1 - object_event 8, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1 - object_event 4, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1 + object_event 1, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1 + object_event 0, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1 + object_event 8, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1 + object_event 4, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm index 34391e66d..aec478102 100644 --- a/maps/CeladonPokecenter2FBeta.asm +++ b/maps/CeladonPokecenter2FBeta.asm @@ -7,7 +7,7 @@ CeladonPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, CELADON_POKECENTER_1F, 3 + warp_event 0, 7, CELADON_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 3fb95bfca..314d8f56f 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -277,7 +277,7 @@ CeruleanCity_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 7, 15, CERULEAN_GYM_BADGE_SPEECH_HOUSE, 1 + warp_event 7, 15, CERULEAN_GYM_BADGE_SPEECH_HOUSE, 1 warp_event 28, 17, CERULEAN_POLICE_STATION, 1 warp_event 13, 19, CERULEAN_TRADE_SPEECH_HOUSE, 1 warp_event 19, 21, CERULEAN_POKECENTER_1F, 1 @@ -291,11 +291,11 @@ CeruleanCity_MapEvents: bg_event 27, 25, BGEVENT_READ, CeruleanGymSign bg_event 11, 29, BGEVENT_READ, CeruleanBikeShopSign bg_event 25, 17, BGEVENT_READ, CeruleanPoliceSign - bg_event 23, 7, BGEVENT_READ, CeruleanCapeSign + bg_event 23, 7, BGEVENT_READ, CeruleanCapeSign bg_event 14, 29, BGEVENT_READ, CeruleanLockedDoor bg_event 20, 21, BGEVENT_READ, CeruleanCityPokecenterSign bg_event 26, 29, BGEVENT_READ, CeruleanCityMartSign - bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene + bg_event 2, 12, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene db 6 ; object events object_event 15, 23, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1 @@ -303,4 +303,4 @@ CeruleanCity_MapEvents: object_event 20, 24, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1 object_event 21, 24, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerFScript, -1 object_event 30, 26, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityFisherScript, -1 - object_event 6, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1 + object_event 6, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 7349fb346..f99369393 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -364,20 +364,20 @@ CeruleanGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 15, CERULEAN_CITY, 5 - warp_event 5, 15, CERULEAN_CITY, 5 + warp_event 4, 15, CERULEAN_CITY, 5 + warp_event 5, 15, CERULEAN_CITY, 5 db 0 ; coord events db 3 ; bg events - bg_event 3, 8, BGEVENT_ITEM, CeruleanGymHiddenMachinePart - bg_event 2, 13, BGEVENT_READ, CeruleanGymStatue1 - bg_event 6, 13, BGEVENT_READ, CeruleanGymStatue2 + bg_event 3, 8, BGEVENT_ITEM, CeruleanGymHiddenMachinePart + bg_event 2, 13, BGEVENT_READ, CeruleanGymStatue1 + bg_event 6, 13, BGEVENT_READ, CeruleanGymStatue2 db 6 ; object events - object_event 4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET - object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM - object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM - object_event 1, 9, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM - object_event 8, 9, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM - object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event 4, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET + object_event 5, 3, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event 1, 9, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event 8, 9, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM + object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 5bb9100f5..6d94bae06 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -18,12 +18,12 @@ CeruleanGymBadgeSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, CERULEAN_CITY, 1 - warp_event 3, 7, CERULEAN_CITY, 1 + warp_event 2, 7, CERULEAN_CITY, 1 + warp_event 3, 7, CERULEAN_CITY, 1 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1 + object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index c72fe7cd7..6fd5c9b87 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -47,14 +47,14 @@ CeruleanMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, CERULEAN_CITY, 6 - warp_event 3, 7, CERULEAN_CITY, 6 + warp_event 2, 7, CERULEAN_CITY, 6 + warp_event 3, 7, CERULEAN_CITY, 6 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1 - object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1 - object_event 7, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1 + object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1 + object_event 7, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1 diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 0894c9297..d8cfde177 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -64,15 +64,15 @@ CeruleanPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, CERULEAN_CITY, 4 - warp_event 4, 7, CERULEAN_CITY, 4 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, CERULEAN_CITY, 4 + warp_event 4, 7, CERULEAN_CITY, 4 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1 - object_event 8, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1 - object_event 1, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1 + object_event 8, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1 + object_event 1, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1 diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm index d07b136c8..135d49d36 100644 --- a/maps/CeruleanPokecenter2FBeta.asm +++ b/maps/CeruleanPokecenter2FBeta.asm @@ -7,7 +7,7 @@ CeruleanPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, CERULEAN_POKECENTER_1F, 1 + warp_event 0, 7, CERULEAN_POKECENTER_1F, 1 db 0 ; coord events diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 0e9503786..1c97dc0e5 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -45,14 +45,14 @@ CeruleanPoliceStation_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, CERULEAN_CITY, 2 - warp_event 3, 7, CERULEAN_CITY, 2 + warp_event 2, 7, CERULEAN_CITY, 2 + warp_event 3, 7, CERULEAN_CITY, 2 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 5, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1 - object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1 - object_event 3, 5, SPRITE_DIGLETT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1 + object_event 5, 1, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1 + object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1 + object_event 3, 5, SPRITE_DIGLETT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 766cbb061..3181409f4 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -55,15 +55,15 @@ CeruleanTradeSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, CERULEAN_CITY, 3 - warp_event 3, 7, CERULEAN_CITY, 3 + warp_event 2, 7, CERULEAN_CITY, 3 + warp_event 3, 7, CERULEAN_CITY, 3 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1 - object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1 - object_event 5, 2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1 - object_event 5, 6, SPRITE_ZUBAT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ZubatScript_0x188143, -1 + object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1 + object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1 + object_event 5, 2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1 + object_event 5, 6, SPRITE_ZUBAT, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ZubatScript_0x188143, -1 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index b7407116d..dda289377 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -150,17 +150,17 @@ CharcoalKiln_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, AZALEA_TOWN, 2 - warp_event 3, 7, AZALEA_TOWN, 2 + warp_event 2, 7, AZALEA_TOWN, 2 + warp_event 3, 7, AZALEA_TOWN, 2 db 0 ; coord events db 3 ; bg events - bg_event 0, 1, BGEVENT_READ, CharcoalKilnBookshelf - bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf - bg_event 7, 1, BGEVENT_READ, CharcoalKilnRadio + bg_event 0, 1, BGEVENT_READ, CharcoalKilnBookshelf + bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf + bg_event 7, 1, BGEVENT_READ, CharcoalKilnRadio db 3 ; object events - object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS - object_event 5, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE - object_event 5, 6, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D + object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS + object_event 5, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE + object_event 5, 6, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 6a403c099..6e2254979 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -548,25 +548,25 @@ CherrygroveCity_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 23, 3, CHERRYGROVE_MART, 2 - warp_event 29, 3, CHERRYGROVE_POKECENTER_1F, 1 - warp_event 17, 7, CHERRYGROVE_GYM_SPEECH_HOUSE, 1 - warp_event 25, 9, GUIDE_GENTS_HOUSE, 1 + warp_event 23, 3, CHERRYGROVE_MART, 2 + warp_event 29, 3, CHERRYGROVE_POKECENTER_1F, 1 + warp_event 17, 7, CHERRYGROVE_GYM_SPEECH_HOUSE, 1 + warp_event 25, 9, GUIDE_GENTS_HOUSE, 1 warp_event 31, 11, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 1 db 2 ; coord events - coord_event 33, 6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneNorth - coord_event 33, 7, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneSouth + coord_event 33, 6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneNorth + coord_event 33, 7, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneSouth db 4 ; bg events - bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign - bg_event 23, 9, BGEVENT_READ, GuideGentsHouseSign - bg_event 24, 3, BGEVENT_READ, CherrygroveCityMartSign - bg_event 30, 3, BGEVENT_READ, CherrygroveCityPokecenterSign + bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign + bg_event 23, 9, BGEVENT_READ, GuideGentsHouseSign + bg_event 24, 3, BGEVENT_READ, CherrygroveCityMartSign + bg_event 30, 3, BGEVENT_READ, CherrygroveCityPokecenterSign db 5 ; object events - object_event 32, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE - object_event 39, 6, SPRITE_SILVER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY + object_event 32, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE + object_event 39, 6, SPRITE_SILVER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY object_event 27, 12, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1 - object_event 23, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1 - object_event 7, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MysticWaterGuy, -1 + object_event 23, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1 + object_event 7, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MysticWaterGuy, -1 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index 842d125f3..f2f1f69b8 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -43,15 +43,15 @@ CherrygroveEvolutionSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, CHERRYGROVE_CITY, 5 - warp_event 3, 7, CHERRYGROVE_CITY, 5 + warp_event 2, 7, CHERRYGROVE_CITY, 5 + warp_event 3, 7, CHERRYGROVE_CITY, 5 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf + bg_event 0, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf db 2 ; object events - object_event 3, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1 - object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1 + object_event 3, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1 + object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 3f99a45d7..95aa6c91a 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -46,15 +46,15 @@ CherrygroveGymSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, CHERRYGROVE_CITY, 3 - warp_event 3, 7, CHERRYGROVE_CITY, 3 + warp_event 2, 7, CHERRYGROVE_CITY, 3 + warp_event 3, 7, CHERRYGROVE_CITY, 3 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf + bg_event 0, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf db 2 ; object events - object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1 - object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1 + object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1 + object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index a4c7421f4..94177e6c8 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -73,14 +73,14 @@ CherrygroveMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, CHERRYGROVE_CITY, 1 - warp_event 3, 7, CHERRYGROVE_CITY, 1 + warp_event 2, 7, CHERRYGROVE_CITY, 1 + warp_event 3, 7, CHERRYGROVE_CITY, 1 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1 - object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1 - object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1 + object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1 + object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1 diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index 84ff082b3..979f79361 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -70,16 +70,16 @@ CherrygrovePokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, CHERRYGROVE_CITY, 2 - warp_event 4, 7, CHERRYGROVE_CITY, 2 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, CHERRYGROVE_CITY, 2 + warp_event 4, 7, CHERRYGROVE_CITY, 2 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19696d, -1 - object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1 - object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1 - object_event 1, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x196976, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19696d, -1 + object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1 + object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1 + object_event 1, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x196976, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 4b5c9a380..4e1d1d4d5 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -383,36 +383,36 @@ CianwoodCity_MapEvents: db 7 ; warp events warp_event 17, 41, MANIAS_HOUSE, 1 - warp_event 8, 43, CIANWOOD_GYM, 1 + warp_event 8, 43, CIANWOOD_GYM, 1 warp_event 23, 43, CIANWOOD_POKECENTER_1F, 1 warp_event 15, 47, CIANWOOD_PHARMACY, 1 - warp_event 9, 31, CIANWOOD_PHOTO_STUDIO, 1 + warp_event 9, 31, CIANWOOD_PHOTO_STUDIO, 1 warp_event 15, 37, CIANWOOD_LUGIA_SPEECH_HOUSE, 1 - warp_event 5, 17, POKE_SEERS_HOUSE, 1 + warp_event 5, 17, POKE_SEERS_HOUSE, 1 db 1 ; coord events coord_event 11, 16, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE, CianwoodCitySuicuneAndEusine db 8 ; bg events bg_event 20, 34, BGEVENT_READ, CianwoodCitySign - bg_event 7, 45, BGEVENT_READ, CianwoodGymSign + bg_event 7, 45, BGEVENT_READ, CianwoodGymSign bg_event 24, 43, BGEVENT_READ, CianwoodPokecenterSign bg_event 19, 47, BGEVENT_READ, CianwoodPharmacySign - bg_event 8, 32, BGEVENT_READ, CianwoodPhotoStudioSign - bg_event 8, 24, BGEVENT_READ, CianwoodPokeSeerSign - bg_event 4, 19, BGEVENT_ITEM, CianwoodCityHiddenRevive - bg_event 5, 29, BGEVENT_ITEM, CianwoodCityHiddenMaxEther + bg_event 8, 32, BGEVENT_READ, CianwoodPhotoStudioSign + bg_event 8, 24, BGEVENT_READ, CianwoodPokeSeerSign + bg_event 4, 19, BGEVENT_ITEM, CianwoodCityHiddenRevive + bg_event 5, 29, BGEVENT_ITEM, CianwoodCityHiddenMaxEther db 12 ; object events object_event 21, 37, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodCityYoungster, -1 object_event 17, 33, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1 object_event 14, 42, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityLass, -1 - object_event 8, 16, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 - object_event 9, 17, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 - object_event 4, 25, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 - object_event 5, 29, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event 8, 16, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event 9, 17, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event 4, 25, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event 5, 29, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 object_event 10, 27, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 - object_event 4, 19, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event 4, 19, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 object_event 10, 46, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityChucksWife, -1 object_event 11, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE object_event 10, 14, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 0cb7a3356..ca03da0b1 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -307,22 +307,22 @@ CianwoodGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 17, CIANWOOD_CITY, 2 - warp_event 5, 17, CIANWOOD_CITY, 2 + warp_event 4, 17, CIANWOOD_CITY, 2 + warp_event 5, 17, CIANWOOD_CITY, 2 db 0 ; coord events db 2 ; bg events - bg_event 3, 15, BGEVENT_READ, CianwoodGymStatue - bg_event 6, 15, BGEVENT_READ, CianwoodGymStatue + bg_event 3, 15, BGEVENT_READ, CianwoodGymStatue + bg_event 6, 15, BGEVENT_READ, CianwoodGymStatue db 9 ; object events - object_event 4, 1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1 - object_event 2, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1 - object_event 7, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1 - object_event 3, 9, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltNob, -1 - object_event 5, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBlackbeltLung, -1 - object_event 5, 1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 - object_event 3, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 - object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 - object_event 5, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 + object_event 4, 1, SPRITE_CHUCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1 + object_event 2, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1 + object_event 7, 12, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1 + object_event 3, 9, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltNob, -1 + object_event 5, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBlackbeltLung, -1 + object_event 5, 1, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 + object_event 3, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 + object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 + object_event 5, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 712c50c29..8eb9bffaf 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -63,16 +63,16 @@ CianwoodLugiaSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, CIANWOOD_CITY, 6 - warp_event 3, 7, CIANWOOD_CITY, 6 + warp_event 2, 7, CIANWOOD_CITY, 6 + warp_event 3, 7, CIANWOOD_CITY, 6 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf + bg_event 0, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf db 3 ; object events - object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1 - object_event 6, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1 - object_event 0, 2, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1 + object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1 + object_event 6, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1 + object_event 0, 2, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 7a41ce835..ef00ba49d 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -74,14 +74,14 @@ CianwoodPharmacy_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, CIANWOOD_CITY, 4 - warp_event 3, 7, CIANWOOD_CITY, 4 + warp_event 2, 7, CIANWOOD_CITY, 4 + warp_event 3, 7, CIANWOOD_CITY, 4 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, CianwoodPharmacyBookshelf - bg_event 1, 1, BGEVENT_READ, CianwoodPharmacyBookshelf + bg_event 0, 1, BGEVENT_READ, CianwoodPharmacyBookshelf + bg_event 1, 1, BGEVENT_READ, CianwoodPharmacyBookshelf db 1 ; object events - object_event 2, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1 + object_event 2, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1 diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index 76ba8055c..7c8bfcbbb 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -50,12 +50,12 @@ CianwoodPhotoStudio_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, CIANWOOD_CITY, 5 - warp_event 3, 7, CIANWOOD_CITY, 5 + warp_event 2, 7, CIANWOOD_CITY, 5 + warp_event 3, 7, CIANWOOD_CITY, 5 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1 + object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1 diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index 0c327e687..52a7e8a7b 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -133,16 +133,16 @@ CianwoodPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, CIANWOOD_CITY, 3 - warp_event 4, 7, CIANWOOD_CITY, 3 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, CIANWOOD_CITY, 3 + warp_event 4, 7, CIANWOOD_CITY, 3 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1 - object_event 1, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1 - object_event 5, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1 - object_event 8, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1 + object_event 1, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1 + object_event 5, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1 + object_event 8, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index ef00047e5..54656768b 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -135,9 +135,9 @@ CinnabarIsland_MapEvents: db 4 ; bg events bg_event 12, 11, BGEVENT_READ, CinnabarIslandPokecenterSign - bg_event 9, 11, BGEVENT_READ, CinnabarIslandGymSign - bg_event 7, 7, BGEVENT_READ, CinnabarIslandSign - bg_event 9, 1, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy + bg_event 9, 11, BGEVENT_READ, CinnabarIslandGymSign + bg_event 7, 7, BGEVENT_READ, CinnabarIslandSign + bg_event 9, 1, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy db 1 ; object events - object_event 9, 6, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR + object_event 9, 6, SPRITE_BLUE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index 8811a1ae4..16cfb0c51 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -36,15 +36,15 @@ CinnabarPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, CINNABAR_ISLAND, 1 - warp_event 4, 7, CINNABAR_ISLAND, 1 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, CINNABAR_ISLAND, 1 + warp_event 4, 7, CINNABAR_ISLAND, 1 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1 - object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1 - object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1 + object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1 + object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1 diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm index 0c459ccae..cf100a4a8 100644 --- a/maps/CinnabarPokecenter2FBeta.asm +++ b/maps/CinnabarPokecenter2FBeta.asm @@ -7,7 +7,7 @@ CinnabarPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, CINNABAR_POKECENTER_1F, 3 + warp_event 0, 7, CINNABAR_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 75cd8ec11..edaa5e0ad 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -64,15 +64,15 @@ Colosseum_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 7, POKECENTER_2F, 3 - warp_event 5, 7, POKECENTER_2F, 3 + warp_event 4, 7, POKECENTER_2F, 3 + warp_event 5, 7, POKECENTER_2F, 3 db 0 ; coord events db 2 ; bg events - bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script - bg_event 5, 4, BGEVENT_LEFT, MapColosseumSignpost1Script + bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script + bg_event 5, 4, BGEVENT_LEFT, MapColosseumSignpost1Script db 2 ; object events - object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 - object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index e111ae677..7bc264807 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -74,15 +74,15 @@ CopycatsHouse1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 2, 7, SAFFRON_CITY, 8 - warp_event 3, 7, SAFFRON_CITY, 8 - warp_event 2, 0, COPYCATS_HOUSE_2F, 1 + warp_event 2, 7, SAFFRON_CITY, 8 + warp_event 3, 7, SAFFRON_CITY, 8 + warp_event 2, 0, COPYCATS_HOUSE_2F, 1 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1 - object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1 - object_event 6, 6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1 + object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1 + object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1 + object_event 6, 6, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index d3b360d8d..9d0bbfe65 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -362,18 +362,18 @@ CopycatsHouse2F_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 3, 0, COPYCATS_HOUSE_1F, 3 + warp_event 3, 0, COPYCATS_HOUSE_1F, 3 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, CopycatsHouse2FBookshelf - bg_event 1, 1, BGEVENT_READ, CopycatsHouse2FBookshelf + bg_event 0, 1, BGEVENT_READ, CopycatsHouse2FBookshelf + bg_event 1, 1, BGEVENT_READ, CopycatsHouse2FBookshelf db 6 ; object events - object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1 - object_event 6, 4, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1 - object_event 6, 1, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL - object_event 2, 1, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 - object_event 7, 1, SPRITE_BIRD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 - object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2 + object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1 + object_event 6, 4, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1 + object_event 6, 1, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL + object_event 2, 1, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 + object_event 7, 1, SPRITE_BIRD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 + object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index feb460bb5..e4257922f 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -339,22 +339,22 @@ DanceTheatre_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 5, 13, ECRUTEAK_CITY, 8 - warp_event 6, 13, ECRUTEAK_CITY, 8 + warp_event 5, 13, ECRUTEAK_CITY, 8 + warp_event 6, 13, ECRUTEAK_CITY, 8 db 0 ; coord events db 2 ; bg events - bg_event 5, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script - bg_event 6, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script + bg_event 5, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script + bg_event 6, 6, BGEVENT_UP, MapDanceTheatreSignpost1Script db 9 ; object events - object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1 - object_event 2, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1 - object_event 6, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1 - object_event 9, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlKuni, -1 - object_event 11, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlMiki, -1 - object_event 7, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterSurfGuy, -1 - object_event 6, 8, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, DanceTheaterRhydon, -1 + object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1 + object_event 2, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1 + object_event 6, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1 + object_event 9, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlKuni, -1 + object_event 11, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlMiki, -1 + object_event 7, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterSurfGuy, -1 + object_event 6, 8, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, DanceTheaterRhydon, -1 object_event 10, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DanceTheatreCooltrainerMScript, -1 - object_event 3, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1 + object_event 3, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 1380daa84..84daa17de 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -63,14 +63,14 @@ DarkCaveBlackthornEntrance_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 23, 3, ROUTE_45, 1 - warp_event 3, 25, DARK_CAVE_VIOLET_ENTRANCE, 2 + warp_event 23, 3, ROUTE_45, 1 + warp_event 3, 25, DARK_CAVE_VIOLET_ENTRANCE, 2 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 7, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1 + object_event 7, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1 object_event 21, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE - object_event 7, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE + object_event 7, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 84a368188..10bbfb607 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -35,21 +35,21 @@ DarkCaveVioletEntrance_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 15, ROUTE_31, 3 - warp_event 17, 1, DARK_CAVE_BLACKTHORN_ENTRANCE, 2 + warp_event 3, 15, ROUTE_31, 3 + warp_event 17, 1, DARK_CAVE_BLACKTHORN_ENTRANCE, 2 warp_event 35, 33, ROUTE_46, 3 db 0 ; coord events db 1 ; bg events - bg_event 26, 3, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer + bg_event 26, 3, BGEVENT_ITEM, DarkCaveVioletEntranceHiddenElixer db 8 ; object events - object_event 6, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION + object_event 6, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntrancePotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION object_event 16, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 - object_event 27, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 - object_event 7, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 + object_event 27, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 + object_event 7, 14, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 object_event 36, 31, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DarkCaveVioletEntranceRock, -1 object_event 36, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceFullHeal, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL - object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION + object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceHyperPotion, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION object_event 30, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DarkCaveVioletEntranceDireHit, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT diff --git a/maps/DayCare.asm b/maps/DayCare.asm index fbf05fb9b..d14bdc24f 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -157,17 +157,17 @@ DayCare_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 5, ROUTE_34, 3 - warp_event 0, 6, ROUTE_34, 4 - warp_event 2, 7, ROUTE_34, 5 - warp_event 3, 7, ROUTE_34, 5 + warp_event 0, 5, ROUTE_34, 3 + warp_event 0, 6, ROUTE_34, 4 + warp_event 2, 7, ROUTE_34, 5 + warp_event 3, 7, ROUTE_34, 5 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, DayCareBookshelf - bg_event 1, 1, BGEVENT_READ, DayCareBookshelf + bg_event 0, 1, BGEVENT_READ, DayCareBookshelf + bg_event 1, 1, BGEVENT_READ, DayCareBookshelf db 2 ; object events - object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE - object_event 5, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1 + object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE + object_event 5, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DayCareLadyScript, -1 diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm index ba2c89015..403e2f165 100644 --- a/maps/DayOfWeekSiblingsHouse.asm +++ b/maps/DayOfWeekSiblingsHouse.asm @@ -72,12 +72,12 @@ DayOfWeekSiblingsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, ROUTE_26, 3 - warp_event 3, 7, ROUTE_26, 3 + warp_event 2, 7, ROUTE_26, 3 + warp_event 3, 7, ROUTE_26, 3 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1 + object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokedexScript_0x7b1e4, -1 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index e3d0c4501..8475c1411 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -24,17 +24,17 @@ DiglettsCave_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 3, 33, VERMILION_CITY, 10 - warp_event 5, 31, DIGLETTS_CAVE, 5 - warp_event 15, 5, ROUTE_2, 5 - warp_event 17, 3, DIGLETTS_CAVE, 6 + warp_event 3, 33, VERMILION_CITY, 10 + warp_event 5, 31, DIGLETTS_CAVE, 5 + warp_event 15, 5, ROUTE_2, 5 + warp_event 17, 3, DIGLETTS_CAVE, 6 warp_event 17, 33, DIGLETTS_CAVE, 2 - warp_event 3, 3, DIGLETTS_CAVE, 4 + warp_event 3, 3, DIGLETTS_CAVE, 4 db 0 ; coord events db 1 ; bg events - bg_event 6, 11, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive + bg_event 6, 11, BGEVENT_ITEM, DiglettsCaveHiddenMaxRevive db 1 ; object events - object_event 3, 31, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1 + object_event 3, 31, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DiglettsCavePokefanMScript, -1 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index d4a2aa8ba..9a45e1482 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -659,15 +659,15 @@ DragonShrine_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 9, DRAGONS_DEN_B1F, 2 - warp_event 5, 9, DRAGONS_DEN_B1F, 2 + warp_event 4, 9, DRAGONS_DEN_B1F, 2 + warp_event 5, 9, DRAGONS_DEN_B1F, 2 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 - object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 - object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 - object_event 4, 8, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR + object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 4, 8, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index 4f7a947a1..2fbc62dfe 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -7,10 +7,10 @@ DragonsDen1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 5, BLACKTHORN_CITY, 8 - warp_event 3, 3, DRAGONS_DEN_1F, 4 - warp_event 5, 15, DRAGONS_DEN_B1F, 1 - warp_event 5, 13, DRAGONS_DEN_1F, 2 + warp_event 3, 5, BLACKTHORN_CITY, 8 + warp_event 3, 3, DRAGONS_DEN_1F, 4 + warp_event 5, 15, DRAGONS_DEN_B1F, 1 + warp_event 5, 13, DRAGONS_DEN_1F, 2 db 0 ; coord events diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 51f37da71..a194a397e 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -408,7 +408,7 @@ DragonsDenB1F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 20, 3, DRAGONS_DEN_1F, 3 + warp_event 20, 3, DRAGONS_DEN_1F, 3 warp_event 19, 29, DRAGON_SHRINE, 1 db 1 ; coord events @@ -424,9 +424,9 @@ DragonsDenB1F_MapEvents: 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 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_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 + 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 diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index f4f17ea9a..84dafb3f2 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -413,21 +413,21 @@ EarlsPokemonAcademy_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 15, VIOLET_CITY, 3 - warp_event 4, 15, VIOLET_CITY, 3 + warp_event 3, 15, VIOLET_CITY, 3 + warp_event 4, 15, VIOLET_CITY, 3 db 0 ; coord events db 4 ; bg events - bg_event 0, 1, BGEVENT_READ, AcademyBookshelf - bg_event 1, 1, BGEVENT_READ, AcademyBookshelf - bg_event 3, 0, BGEVENT_READ, AcademyBlackboard - bg_event 4, 0, BGEVENT_READ, AcademyBlackboard + bg_event 0, 1, BGEVENT_READ, AcademyBookshelf + bg_event 1, 1, BGEVENT_READ, AcademyBookshelf + bg_event 3, 0, BGEVENT_READ, AcademyBlackboard + bg_event 4, 0, BGEVENT_READ, AcademyBlackboard db 6 ; object events - object_event 4, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL - object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1 - object_event 3, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1 - object_event 4, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1 - object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1 - object_event 2, 4, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AcademyNotebook, -1 + object_event 4, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL + object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1 + object_event 3, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1 + object_event 4, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1 + object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1 + object_event 2, 4, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AcademyNotebook, -1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 6a454bb83..c8bb4af5f 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -264,27 +264,27 @@ EcruteakCity_MapEvents: warp_event 35, 26, ROUTE_42_ECRUTEAK_GATE, 1 warp_event 35, 27, ROUTE_42_ECRUTEAK_GATE, 2 warp_event 18, 11, ECRUTEAK_TIN_TOWER_ENTRANCE, 1 - warp_event 20, 2, WISE_TRIOS_ROOM, 1 - warp_event 20, 3, WISE_TRIOS_ROOM, 2 + warp_event 20, 2, WISE_TRIOS_ROOM, 1 + warp_event 20, 3, WISE_TRIOS_ROOM, 2 warp_event 23, 27, ECRUTEAK_POKECENTER_1F, 1 - warp_event 5, 21, ECRUTEAK_LUGIA_SPEECH_HOUSE, 1 + warp_event 5, 21, ECRUTEAK_LUGIA_SPEECH_HOUSE, 1 warp_event 23, 21, DANCE_THEATRE, 1 warp_event 29, 21, ECRUTEAK_MART, 2 - warp_event 6, 27, ECRUTEAK_GYM, 1 + warp_event 6, 27, ECRUTEAK_GYM, 1 warp_event 13, 27, ECRUTEAK_ITEMFINDER_HOUSE, 1 - warp_event 37, 7, TIN_TOWER_1F, 1 - warp_event 5, 5, BURNED_TOWER_1F, 1 - warp_event 0, 18, ROUTE_38_ECRUTEAK_GATE, 3 - warp_event 0, 19, ROUTE_38_ECRUTEAK_GATE, 4 + warp_event 37, 7, TIN_TOWER_1F, 1 + warp_event 5, 5, BURNED_TOWER_1F, 1 + warp_event 0, 18, ROUTE_38_ECRUTEAK_GATE, 3 + warp_event 0, 19, ROUTE_38_ECRUTEAK_GATE, 4 db 0 ; coord events db 8 ; bg events bg_event 15, 21, BGEVENT_READ, EcruteakCitySign bg_event 38, 10, BGEVENT_READ, TinTowerSign - bg_event 8, 28, BGEVENT_READ, EcruteakGymSign + bg_event 8, 28, BGEVENT_READ, EcruteakGymSign bg_event 21, 21, BGEVENT_READ, EcruteakDanceTheaterSign - bg_event 2, 10, BGEVENT_READ, BurnedTowerSign + bg_event 2, 10, BGEVENT_READ, BurnedTowerSign bg_event 24, 27, BGEVENT_READ, EcruteakCityPokecenterSign bg_event 30, 21, BGEVENT_READ, EcruteakCityMartSign bg_event 23, 14, BGEVENT_ITEM, EcruteakCityHiddenHyperPotion @@ -293,7 +293,7 @@ EcruteakCity_MapEvents: object_event 18, 15, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1 object_event 20, 21, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1 object_event 21, 29, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLassScript, -1 - object_event 3, 9, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1a4015, -1 - object_event 9, 22, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1 + object_event 3, 9, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1a4015, -1 + object_event 9, 22, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1 object_event 10, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakCityYoungsterScript, -1 - object_event 3, 7, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS + object_event 3, 7, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index fc9e03020..09dfaa5e2 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -388,51 +388,51 @@ EcruteakGym_MapEvents: db 0, 0 ; filler db 33 ; warp events - warp_event 4, 17, ECRUTEAK_CITY, 10 - warp_event 5, 17, ECRUTEAK_CITY, 10 - warp_event 4, 14, ECRUTEAK_GYM, 4 - warp_event 2, 4, ECRUTEAK_GYM, 3 - warp_event 3, 4, ECRUTEAK_GYM, 3 - warp_event 4, 4, ECRUTEAK_GYM, 3 - warp_event 4, 5, ECRUTEAK_GYM, 3 - warp_event 6, 7, ECRUTEAK_GYM, 3 - warp_event 7, 4, ECRUTEAK_GYM, 3 - warp_event 2, 6, ECRUTEAK_GYM, 3 - warp_event 3, 6, ECRUTEAK_GYM, 3 - warp_event 4, 6, ECRUTEAK_GYM, 3 - warp_event 5, 6, ECRUTEAK_GYM, 3 - warp_event 7, 6, ECRUTEAK_GYM, 3 - warp_event 7, 7, ECRUTEAK_GYM, 3 - warp_event 4, 8, ECRUTEAK_GYM, 3 - warp_event 5, 8, ECRUTEAK_GYM, 3 - warp_event 6, 8, ECRUTEAK_GYM, 3 - warp_event 7, 8, ECRUTEAK_GYM, 3 - warp_event 2, 8, ECRUTEAK_GYM, 3 - warp_event 2, 9, ECRUTEAK_GYM, 3 - warp_event 2, 10, ECRUTEAK_GYM, 3 - warp_event 2, 11, ECRUTEAK_GYM, 3 - warp_event 4, 10, ECRUTEAK_GYM, 3 - warp_event 5, 10, ECRUTEAK_GYM, 3 - warp_event 2, 12, ECRUTEAK_GYM, 3 - warp_event 3, 12, ECRUTEAK_GYM, 3 - warp_event 4, 12, ECRUTEAK_GYM, 3 - warp_event 5, 12, ECRUTEAK_GYM, 3 - warp_event 7, 10, ECRUTEAK_GYM, 3 - warp_event 7, 11, ECRUTEAK_GYM, 3 - warp_event 7, 12, ECRUTEAK_GYM, 3 - warp_event 7, 13, ECRUTEAK_GYM, 3 + warp_event 4, 17, ECRUTEAK_CITY, 10 + warp_event 5, 17, ECRUTEAK_CITY, 10 + warp_event 4, 14, ECRUTEAK_GYM, 4 + warp_event 2, 4, ECRUTEAK_GYM, 3 + warp_event 3, 4, ECRUTEAK_GYM, 3 + warp_event 4, 4, ECRUTEAK_GYM, 3 + warp_event 4, 5, ECRUTEAK_GYM, 3 + warp_event 6, 7, ECRUTEAK_GYM, 3 + warp_event 7, 4, ECRUTEAK_GYM, 3 + warp_event 2, 6, ECRUTEAK_GYM, 3 + warp_event 3, 6, ECRUTEAK_GYM, 3 + warp_event 4, 6, ECRUTEAK_GYM, 3 + warp_event 5, 6, ECRUTEAK_GYM, 3 + warp_event 7, 6, ECRUTEAK_GYM, 3 + warp_event 7, 7, ECRUTEAK_GYM, 3 + warp_event 4, 8, ECRUTEAK_GYM, 3 + warp_event 5, 8, ECRUTEAK_GYM, 3 + warp_event 6, 8, ECRUTEAK_GYM, 3 + warp_event 7, 8, ECRUTEAK_GYM, 3 + warp_event 2, 8, ECRUTEAK_GYM, 3 + warp_event 2, 9, ECRUTEAK_GYM, 3 + warp_event 2, 10, ECRUTEAK_GYM, 3 + warp_event 2, 11, ECRUTEAK_GYM, 3 + warp_event 4, 10, ECRUTEAK_GYM, 3 + warp_event 5, 10, ECRUTEAK_GYM, 3 + warp_event 2, 12, ECRUTEAK_GYM, 3 + warp_event 3, 12, ECRUTEAK_GYM, 3 + warp_event 4, 12, ECRUTEAK_GYM, 3 + warp_event 5, 12, ECRUTEAK_GYM, 3 + warp_event 7, 10, ECRUTEAK_GYM, 3 + warp_event 7, 11, ECRUTEAK_GYM, 3 + warp_event 7, 12, ECRUTEAK_GYM, 3 + warp_event 7, 13, ECRUTEAK_GYM, 3 db 0 ; coord events db 2 ; bg events - bg_event 3, 15, BGEVENT_READ, EcruteakGymStatue - bg_event 6, 15, BGEVENT_READ, EcruteakGymStatue + bg_event 3, 15, BGEVENT_READ, EcruteakGymStatue + bg_event 6, 15, BGEVENT_READ, EcruteakGymStatue db 7 ; object events - object_event 5, 1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1 - object_event 2, 7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1 - object_event 3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1 - object_event 7, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1 - object_event 7, 9, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1 - object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1 - object_event 4, 14, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS + object_event 5, 1, SPRITE_MORTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MortyScript_0x99d58, -1 + object_event 2, 7, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSageJeffrey, -1 + object_event 3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1 + object_event 7, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1 + object_event 7, 9, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1 + object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1 + object_event 4, 14, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index f058a6ec9..0ae99bd65 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -164,14 +164,14 @@ EcruteakItemfinderHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 7, ECRUTEAK_CITY, 11 - warp_event 4, 7, ECRUTEAK_CITY, 11 + warp_event 3, 7, ECRUTEAK_CITY, 11 + warp_event 4, 7, ECRUTEAK_CITY, 11 db 0 ; coord events db 1 ; bg events - bg_event 2, 1, BGEVENT_READ, ItemFinderHouseRadio + bg_event 2, 1, BGEVENT_READ, ItemFinderHouseRadio db 2 ; object events - object_event 2, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakItemfinderGuy, -1 - object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1 + object_event 2, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakItemfinderGuy, -1 + object_event 3, 3, SPRITE_POKEDEX, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakHistoryBook, -1 diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 4df1e5430..8b02bd15c 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -46,14 +46,14 @@ EcruteakLugiaSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 7, ECRUTEAK_CITY, 7 - warp_event 4, 7, ECRUTEAK_CITY, 7 + warp_event 3, 7, ECRUTEAK_CITY, 7 + warp_event 4, 7, ECRUTEAK_CITY, 7 db 0 ; coord events db 1 ; bg events - bg_event 2, 1, BGEVENT_READ, LugiaSpeechHouseRadio + bg_event 2, 1, BGEVENT_READ, LugiaSpeechHouseRadio db 2 ; object events - object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1 - object_event 5, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1 + object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseGrampsScript, -1 + object_event 5, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakLugiaSpeechHouseYoungsterScript, -1 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 9587e331b..2ea3cd494 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -47,14 +47,14 @@ EcruteakMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, ECRUTEAK_CITY, 9 - warp_event 3, 7, ECRUTEAK_CITY, 9 + warp_event 2, 7, ECRUTEAK_CITY, 9 + warp_event 3, 7, ECRUTEAK_CITY, 9 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1 - object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1 - object_event 6, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1 + object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakMartSuperNerdScript, -1 + object_event 6, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakMartGrannyScript, -1 diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index a51602588..e8b12466c 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -208,17 +208,17 @@ EcruteakPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, ECRUTEAK_CITY, 6 - warp_event 4, 7, ECRUTEAK_CITY, 6 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, ECRUTEAK_CITY, 6 + warp_event 4, 7, ECRUTEAK_CITY, 6 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 5 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1 - object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1 - object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1 - object_event 7, 1, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuyScript, -1 - object_event 0, 7, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1 + object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1 + object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1 + object_event 7, 1, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuyScript, -1 + object_event 0, 7, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index 2a0ebbcbc..552dbc2a1 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -279,20 +279,20 @@ EcruteakTinTowerEntrance_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 4, 17, ECRUTEAK_CITY, 3 - warp_event 5, 17, ECRUTEAK_CITY, 3 - warp_event 5, 3, ECRUTEAK_TIN_TOWER_ENTRANCE, 4 + warp_event 4, 17, ECRUTEAK_CITY, 3 + warp_event 5, 17, ECRUTEAK_CITY, 3 + warp_event 5, 3, ECRUTEAK_TIN_TOWER_ENTRANCE, 4 warp_event 17, 15, ECRUTEAK_TIN_TOWER_ENTRANCE, 3 - warp_event 17, 3, WISE_TRIOS_ROOM, 3 + warp_event 17, 3, WISE_TRIOS_ROOM, 3 db 2 ; coord events - coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1 - coord_event 5, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent2 + coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1 + coord_event 5, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent2 db 0 ; bg events db 4 ; object events - object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 - object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 - object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE - object_event 3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceGrampsScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE + object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 + object_event 5, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 + object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SageScript_0x980b0, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE + object_event 3, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakTinTowerEntranceGrampsScript, EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 5064bb44f..544de62fb 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -85,16 +85,16 @@ ElmsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, NEW_BARK_TOWN, 4 - warp_event 3, 7, NEW_BARK_TOWN, 4 + warp_event 2, 7, NEW_BARK_TOWN, 4 + warp_event 3, 7, NEW_BARK_TOWN, 4 db 0 ; coord events db 3 ; bg events - bg_event 0, 1, BGEVENT_READ, ElmsHousePC - bg_event 6, 1, BGEVENT_READ, ElmsHouseBookshelf - bg_event 7, 1, BGEVENT_READ, ElmsHouseBookshelf + bg_event 0, 1, BGEVENT_READ, ElmsHousePC + bg_event 6, 1, BGEVENT_READ, ElmsHouseBookshelf + bg_event 7, 1, BGEVENT_READ, ElmsHouseBookshelf db 2 ; object events - object_event 1, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1 - object_event 5, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1 + object_event 1, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1 + object_event 5, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index d9ab8f320..7fac1ff13 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1372,41 +1372,41 @@ ElmsLab_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 11, NEW_BARK_TOWN, 1 - warp_event 5, 11, NEW_BARK_TOWN, 1 + warp_event 4, 11, NEW_BARK_TOWN, 1 + warp_event 5, 11, NEW_BARK_TOWN, 1 db 8 ; coord events - coord_event 4, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript - coord_event 5, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript - coord_event 4, 5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript - coord_event 5, 5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript2 - coord_event 4, 8, SCENE_ELMSLAB_AIDE_GIVES_POTION, AideScript_WalkPotion1 - coord_event 5, 8, SCENE_ELMSLAB_AIDE_GIVES_POTION, AideScript_WalkPotion2 - coord_event 4, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls1 - coord_event 5, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls2 + coord_event 4, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript + coord_event 5, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript + coord_event 4, 5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript + coord_event 5, 5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript2 + coord_event 4, 8, SCENE_ELMSLAB_AIDE_GIVES_POTION, AideScript_WalkPotion1 + coord_event 5, 8, SCENE_ELMSLAB_AIDE_GIVES_POTION, AideScript_WalkPotion2 + coord_event 4, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls1 + coord_event 5, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls2 db 16 ; bg events - bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine - bg_event 6, 1, BGEVENT_READ, ElmsLabBookshelf - bg_event 7, 1, BGEVENT_READ, ElmsLabBookshelf - bg_event 8, 1, BGEVENT_READ, ElmsLabBookshelf - bg_event 9, 1, BGEVENT_READ, ElmsLabBookshelf - bg_event 0, 7, BGEVENT_READ, ElmsLabTravelTip1 - bg_event 1, 7, BGEVENT_READ, ElmsLabTravelTip2 - bg_event 2, 7, BGEVENT_READ, ElmsLabTravelTip3 - bg_event 3, 7, BGEVENT_READ, ElmsLabTravelTip4 - bg_event 6, 7, BGEVENT_READ, ElmsLabBookshelf - bg_event 7, 7, BGEVENT_READ, ElmsLabBookshelf - bg_event 8, 7, BGEVENT_READ, ElmsLabBookshelf - bg_event 9, 7, BGEVENT_READ, ElmsLabBookshelf - bg_event 9, 3, BGEVENT_READ, ElmsLabTrashcan - bg_event 5, 0, BGEVENT_READ, ElmsLabWindow - bg_event 3, 5, BGEVENT_DOWN, ElmsLabPC + bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine + bg_event 6, 1, BGEVENT_READ, ElmsLabBookshelf + bg_event 7, 1, BGEVENT_READ, ElmsLabBookshelf + bg_event 8, 1, BGEVENT_READ, ElmsLabBookshelf + bg_event 9, 1, BGEVENT_READ, ElmsLabBookshelf + bg_event 0, 7, BGEVENT_READ, ElmsLabTravelTip1 + bg_event 1, 7, BGEVENT_READ, ElmsLabTravelTip2 + bg_event 2, 7, BGEVENT_READ, ElmsLabTravelTip3 + bg_event 3, 7, BGEVENT_READ, ElmsLabTravelTip4 + bg_event 6, 7, BGEVENT_READ, ElmsLabBookshelf + bg_event 7, 7, BGEVENT_READ, ElmsLabBookshelf + bg_event 8, 7, BGEVENT_READ, ElmsLabBookshelf + bg_event 9, 7, BGEVENT_READ, ElmsLabBookshelf + bg_event 9, 3, BGEVENT_READ, ElmsLabTrashcan + bg_event 5, 0, BGEVENT_READ, ElmsLabWindow + bg_event 3, 5, BGEVENT_DOWN, ElmsLabPC db 6 ; object events - object_event 5, 2, SPRITE_ELM, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1 - object_event 2, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB - object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB - object_event 7, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB - object_event 8, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB - object_event 5, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB + object_event 5, 2, SPRITE_ELM, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1 + object_event 2, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB + object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB + object_event 7, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB + object_event 8, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB + object_event 5, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 405cb8caf..ccd11693e 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -287,27 +287,27 @@ FastShip1F_MapEvents: db 0, 0 ; filler db 12 ; warp events - warp_event 25, 1, FAST_SHIP_1F, -1 - warp_event 27, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 1 - warp_event 23, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 2 - warp_event 19, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 3 - warp_event 15, 8, FAST_SHIP_CABINS_SW_SSW_NW, 1 + warp_event 25, 1, FAST_SHIP_1F, -1 + warp_event 27, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 1 + warp_event 23, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 2 + warp_event 19, 8, FAST_SHIP_CABINS_NNW_NNE_NE, 3 + warp_event 15, 8, FAST_SHIP_CABINS_SW_SSW_NW, 1 warp_event 15, 15, FAST_SHIP_CABINS_SW_SSW_NW, 2 warp_event 19, 15, FAST_SHIP_CABINS_SW_SSW_NW, 4 warp_event 23, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 1 warp_event 27, 15, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 3 - warp_event 3, 13, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 5 - warp_event 6, 12, FAST_SHIP_B1F, 1 + warp_event 3, 13, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 5 + warp_event 6, 12, FAST_SHIP_B1F, 1 warp_event 30, 14, FAST_SHIP_B1F, 2 db 2 ; coord events - coord_event 24, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneLeft - coord_event 25, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneRight + coord_event 24, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneLeft + coord_event 25, 6, SCENE_FASTSHIP1F_MEET_GRANDPA, WorriedGrandpaSceneRight db 0 ; bg events db 4 ; object events - object_event 25, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1 - object_event 14, 7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1 + object_event 25, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x75160, -1 + object_event 14, 7, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x751d0, -1 object_event 22, 17, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FastShip1FSailorScript, -1 - object_event 19, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN + object_event 19, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 3051ff20d..5737b62b4 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -450,26 +450,26 @@ FastShipB1F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 5, 11, FAST_SHIP_1F, 11 + warp_event 5, 11, FAST_SHIP_1F, 11 warp_event 31, 13, FAST_SHIP_1F, 12 db 2 ; coord events - coord_event 30, 7, SCENE_DEFAULT, UnknownScript_0x7673c - coord_event 31, 7, SCENE_DEFAULT, UnknownScript_0x76751 + coord_event 30, 7, SCENE_DEFAULT, UnknownScript_0x7673c + coord_event 31, 7, SCENE_DEFAULT, UnknownScript_0x76751 db 1 ; bg events - bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan + bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan db 12 ; object events - object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT - object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT - object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 26, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 17, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - object_event 25, 8, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT + object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT + object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 26, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 17, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event 25, 8, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND object_event 15, 11, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - object_event 23, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - object_event 9, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 23, 4, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 9, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 14, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND object_event 14, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index cbacb9b74..39cfa0367 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -268,22 +268,22 @@ FastShipCabins_NNW_NNE_NE_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 2, 0, FAST_SHIP_1F, 2 - warp_event 2, 12, FAST_SHIP_1F, 3 - warp_event 2, 24, FAST_SHIP_1F, 4 + warp_event 2, 0, FAST_SHIP_1F, 2 + warp_event 2, 12, FAST_SHIP_1F, 3 + warp_event 2, 24, FAST_SHIP_1F, 4 db 0 ; coord events db 3 ; bg events - bg_event 6, 13, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan - bg_event 7, 19, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan - bg_event 7, 31, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan + bg_event 6, 13, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan + bg_event 7, 19, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan + bg_event 7, 31, BGEVENT_READ, FastShipCabins_NNW_NNE_NETrashcan db 7 ; object events - object_event 4, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - object_event 1, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - object_event 4, 17, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 4, 26, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR - object_event 7, 30, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - object_event 2, 30, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 4, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event 1, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 4, 17, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 4, 26, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR + object_event 7, 30, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event 2, 30, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index a1db95fa9..ece89c3ec 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -464,27 +464,27 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 2, 7, FAST_SHIP_1F, 8 - warp_event 3, 7, FAST_SHIP_1F, 8 - warp_event 2, 19, FAST_SHIP_1F, 9 - warp_event 3, 19, FAST_SHIP_1F, 9 - warp_event 2, 33, FAST_SHIP_1F, 10 - warp_event 3, 33, FAST_SHIP_1F, 10 + warp_event 2, 7, FAST_SHIP_1F, 8 + warp_event 3, 7, FAST_SHIP_1F, 8 + warp_event 2, 19, FAST_SHIP_1F, 9 + warp_event 3, 19, FAST_SHIP_1F, 9 + warp_event 2, 33, FAST_SHIP_1F, 10 + warp_event 3, 33, FAST_SHIP_1F, 10 db 0 ; coord events db 1 ; bg events - bg_event 4, 25, BGEVENT_READ, FastShipCaptainsCabinTrashcan + bg_event 4, 25, BGEVENT_READ, FastShipCaptainsCabinTrashcan db 11 ; object events - object_event 3, 25, SPRITE_CAPTAIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1 - object_event 2, 17, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN - object_event 3, 17, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 - object_event 2, 25, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterBefore, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 - object_event 5, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 2, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 5, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - object_event 5, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - object_event 1, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event 3, 25, SPRITE_CAPTAIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaCaptain, -1 + object_event 2, 17, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SSAquaGrandpa, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN + object_event 3, 17, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterAfter, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 + object_event 2, 25, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SSAquaGranddaughterBefore, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 + object_event 5, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 2, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 5, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 5, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 1, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 15200b33c..275fb5db7 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -224,21 +224,21 @@ FastShipCabins_SW_SSW_NW_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 2, 0, FAST_SHIP_1F, 5 - warp_event 2, 19, FAST_SHIP_1F, 6 - warp_event 3, 19, FAST_SHIP_1F, 6 - warp_event 2, 31, FAST_SHIP_1F, 7 - warp_event 3, 31, FAST_SHIP_1F, 7 + warp_event 2, 0, FAST_SHIP_1F, 5 + warp_event 2, 19, FAST_SHIP_1F, 6 + warp_event 3, 19, FAST_SHIP_1F, 6 + warp_event 2, 31, FAST_SHIP_1F, 7 + warp_event 3, 31, FAST_SHIP_1F, 7 db 0 ; coord events db 3 ; bg events - bg_event 7, 1, BGEVENT_READ, FastShipBed - bg_event 7, 2, BGEVENT_READ, FastShipBed - bg_event 7, 7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan + bg_event 7, 1, BGEVENT_READ, FastShipBed + bg_event 7, 2, BGEVENT_READ, FastShipBed + bg_event 7, 7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan db 4 ; object events - object_event 1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - object_event 1, 26, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - object_event 3, 28, SPRITE_ROCKER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 1, 26, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event 3, 28, SPRITE_ROCKER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 0a30bdf3c..dde645d75 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -44,15 +44,15 @@ FightingDojo_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 11, SAFFRON_CITY, 1 - warp_event 5, 11, SAFFRON_CITY, 1 + warp_event 4, 11, SAFFRON_CITY, 1 + warp_event 5, 11, SAFFRON_CITY, 1 db 0 ; coord events db 2 ; bg events - bg_event 4, 0, BGEVENT_READ, MapFightingDojoSignpost0Script - bg_event 5, 0, BGEVENT_READ, MapFightingDojoSignpost1Script + bg_event 4, 0, BGEVENT_READ, MapFightingDojoSignpost0Script + bg_event 5, 0, BGEVENT_READ, MapFightingDojoSignpost1Script db 2 ; object events - object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 - object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND + object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 + object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 5fd606422..0d44b0e8f 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -126,32 +126,32 @@ FuchsiaCity_MapEvents: db 0, 0 ; filler db 11 ; warp events - warp_event 5, 13, FUCHSIA_MART, 2 + warp_event 5, 13, FUCHSIA_MART, 2 warp_event 22, 13, SAFARI_ZONE_MAIN_OFFICE, 1 - warp_event 8, 27, FUCHSIA_GYM, 1 + warp_event 8, 27, FUCHSIA_GYM, 1 warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1 warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1 warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1 - warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 + warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; inaccessible warp_event 37, 22, ROUTE_15_FUCHSIA_GATE, 1 warp_event 37, 23, ROUTE_15_FUCHSIA_GATE, 2 - warp_event 7, 35, ROUTE_19_FUCHSIA_GATE, 1 - warp_event 8, 35, ROUTE_19_FUCHSIA_GATE, 2 + warp_event 7, 35, ROUTE_19_FUCHSIA_GATE, 1 + warp_event 8, 35, ROUTE_19_FUCHSIA_GATE, 2 db 0 ; coord events db 8 ; bg events bg_event 21, 15, BGEVENT_READ, FuchsiaCitySign - bg_event 5, 29, BGEVENT_READ, FuchsiaGymSign + bg_event 5, 29, BGEVENT_READ, FuchsiaGymSign bg_event 25, 15, BGEVENT_READ, SafariZoneOfficeSign bg_event 27, 29, BGEVENT_READ, WardensHomeSign - bg_event 17, 5, BGEVENT_READ, SafariZoneClosedSign + bg_event 17, 5, BGEVENT_READ, SafariZoneClosedSign bg_event 13, 15, BGEVENT_READ, NoLitteringSign bg_event 20, 27, BGEVENT_READ, FuchsiaCityPokecenterSign - bg_event 6, 13, BGEVENT_READ, FuchsiaCityMartSign + bg_event 6, 13, BGEVENT_READ, FuchsiaCityMartSign db 4 ; object events object_event 23, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1 - object_event 13, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 + object_event 13, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 object_event 16, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1 - object_event 8, 1, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1 + object_event 8, 1, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 0ffcdd0e3..715e6b907 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -382,19 +382,19 @@ FuchsiaGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 17, FUCHSIA_CITY, 3 - warp_event 5, 17, FUCHSIA_CITY, 3 + warp_event 4, 17, FUCHSIA_CITY, 3 + warp_event 5, 17, FUCHSIA_CITY, 3 db 0 ; coord events db 2 ; bg events - bg_event 3, 15, BGEVENT_READ, FuchsiaGymStatue - bg_event 6, 15, BGEVENT_READ, FuchsiaGymStatue + bg_event 3, 15, BGEVENT_READ, FuchsiaGymStatue + bg_event 6, 15, BGEVENT_READ, FuchsiaGymStatue db 6 ; object events - object_event 1, 10, SPRITE_JANINE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1 - object_event 5, 7, SPRITE_FUCHSIA_GYM_1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassAliceScript, -1 - object_event 5, 11, SPRITE_FUCHSIA_GYM_2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1 - object_event 9, 4, SPRITE_FUCHSIA_GYM_3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PicnickerCindyScript, -1 - object_event 4, 2, SPRITE_FUCHSIA_GYM_4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CamperBarryScript, -1 - object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1 + object_event 1, 10, SPRITE_JANINE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1 + object_event 5, 7, SPRITE_FUCHSIA_GYM_1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassAliceScript, -1 + object_event 5, 11, SPRITE_FUCHSIA_GYM_2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1 + object_event 9, 4, SPRITE_FUCHSIA_GYM_3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PicnickerCindyScript, -1 + object_event 4, 2, SPRITE_FUCHSIA_GYM_4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CamperBarryScript, -1 + object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 9bc34b006..b2e819917 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -39,14 +39,14 @@ FuchsiaMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, FUCHSIA_CITY, 1 - warp_event 3, 7, FUCHSIA_CITY, 1 + warp_event 2, 7, FUCHSIA_CITY, 1 + warp_event 3, 7, FUCHSIA_CITY, 1 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 - object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1 - object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 + object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1 + object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1 diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index 418266485..3e05aa719 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -90,16 +90,16 @@ FuchsiaPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, FUCHSIA_CITY, 5 - warp_event 4, 7, FUCHSIA_CITY, 5 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, FUCHSIA_CITY, 5 + warp_event 4, 7, FUCHSIA_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1 - object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1 - object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1 - object_event 5, 3, SPRITE_JANINE_IMPERSONATOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1 + object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1 + object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1 + object_event 5, 3, SPRITE_JANINE_IMPERSONATOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1 diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm index f26304a3e..bfa6be81e 100644 --- a/maps/FuchsiaPokecenter2FBeta.asm +++ b/maps/FuchsiaPokecenter2FBeta.asm @@ -7,7 +7,7 @@ FuchsiaPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, FUCHSIA_POKECENTER_1F, 3 + warp_event 0, 7, FUCHSIA_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 05bcf0de7..e4bb27a4a 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -104,21 +104,21 @@ GoldenrodBikeShop_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, GOLDENROD_CITY, 2 - warp_event 3, 7, GOLDENROD_CITY, 2 + warp_event 2, 7, GOLDENROD_CITY, 2 + warp_event 3, 7, GOLDENROD_CITY, 2 db 0 ; coord events db 9 ; bg events - bg_event 1, 2, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - bg_event 0, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - bg_event 1, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - bg_event 0, 5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - bg_event 1, 5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - bg_event 0, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - bg_event 1, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - bg_event 6, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script - bg_event 7, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 1, 2, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 0, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 1, 3, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 0, 5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 1, 5, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 0, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 1, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 6, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script + bg_event 7, 6, BGEVENT_READ, MapGoldenrodBikeShopSignpost8Script db 1 ; object events - object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1 + object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 1f30a0015..642d3143b 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -553,19 +553,19 @@ GoldenrodCity_MapEvents: db 0, 0 ; filler db 15 ; warp events - warp_event 24, 7, GOLDENROD_GYM, 1 + warp_event 24, 7, GOLDENROD_GYM, 1 warp_event 29, 29, GOLDENROD_BIKE_SHOP, 1 warp_event 31, 21, GOLDENROD_HAPPINESS_RATER, 1 - warp_event 5, 25, BILLS_FAMILYS_HOUSE, 1 - warp_event 9, 13, GOLDENROD_MAGNET_TRAIN_STATION, 2 - warp_event 29, 5, GOLDENROD_FLOWER_SHOP, 1 - warp_event 33, 9, GOLDENROD_PP_SPEECH_HOUSE, 1 - warp_event 15, 7, GOLDENROD_NAME_RATER, 1 + warp_event 5, 25, BILLS_FAMILYS_HOUSE, 1 + warp_event 9, 13, GOLDENROD_MAGNET_TRAIN_STATION, 2 + warp_event 29, 5, GOLDENROD_FLOWER_SHOP, 1 + warp_event 33, 9, GOLDENROD_PP_SPEECH_HOUSE, 1 + warp_event 15, 7, GOLDENROD_NAME_RATER, 1 warp_event 24, 27, GOLDENROD_DEPT_STORE_1F, 1 warp_event 14, 21, GOLDENROD_GAME_CORNER, 1 - warp_event 5, 15, RADIO_TOWER_1F, 1 - warp_event 19, 1, ROUTE_35_GOLDENROD_GATE, 3 - warp_event 9, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 8 + warp_event 5, 15, RADIO_TOWER_1F, 1 + warp_event 19, 1, ROUTE_35_GOLDENROD_GATE, 3 + warp_event 9, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 8 warp_event 11, 29, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 5 warp_event 15, 27, GOLDENROD_POKECENTER_1F, 1 @@ -573,31 +573,31 @@ GoldenrodCity_MapEvents: db 12 ; bg events bg_event 10, 14, BGEVENT_READ, GoldenrodCityStationSign - bg_event 4, 17, BGEVENT_READ, GoldenrodCityRadioTowerSign + bg_event 4, 17, BGEVENT_READ, GoldenrodCityRadioTowerSign bg_event 26, 27, BGEVENT_READ, GoldenrodDeptStoreSign - bg_event 26, 9, BGEVENT_READ, GoldenrodGymSign + bg_event 26, 9, BGEVENT_READ, GoldenrodGymSign bg_event 22, 18, BGEVENT_READ, GoldenrodCitySign bg_event 28, 30, BGEVENT_READ, GoldenrodCityBikeShopSign bg_event 16, 22, BGEVENT_READ, GoldenrodCityGameCornerSign - bg_event 12, 7, BGEVENT_READ, GoldenrodCityNameRaterSign - bg_event 8, 6, BGEVENT_READ, GoldenrodCityUndergroundSignNorth + bg_event 12, 7, BGEVENT_READ, GoldenrodCityNameRaterSign + bg_event 8, 6, BGEVENT_READ, GoldenrodCityUndergroundSignNorth bg_event 12, 30, BGEVENT_READ, GoldenrodCityUndergroundSignSouth bg_event 16, 27, BGEVENT_UP, GoldenrodCityPokecenterSign - bg_event 30, 6, BGEVENT_READ, GoldenrodCityFlowerShopSign + bg_event 30, 6, BGEVENT_READ, GoldenrodCityFlowerShopSign db 15 ; object events - object_event 7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event 7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS object_event 30, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS object_event 12, 16, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS object_event 20, 26, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS object_event 19, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster2Script, EVENT_GOLDENROD_CITY_CIVILIANS object_event 17, 10, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityLassScript, EVENT_GOLDENROD_CITY_CIVILIANS object_event 11, 27, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityGrampsScript, EVENT_GOLDENROD_CITY_CIVILIANS - object_event 4, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT + object_event 4, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT object_event 28, 20, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket1Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER - object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER object_event 16, 23, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket3Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 29, 20, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 29, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 29, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 31, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 12, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutorScript, EVENT_GOLDENROD_CITY_MOVE_TUTOR diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 0a527369c..5877484be 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -80,19 +80,19 @@ GoldenrodDeptStore1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 7, 7, GOLDENROD_CITY, 9 - warp_event 8, 7, GOLDENROD_CITY, 9 - warp_event 15, 0, GOLDENROD_DEPT_STORE_2F, 2 - warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + warp_event 7, 7, GOLDENROD_CITY, 9 + warp_event 8, 7, GOLDENROD_CITY, 9 + warp_event 15, 0, GOLDENROD_DEPT_STORE_2F, 2 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events db 2 ; bg events - bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore1FDirectory - bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton + bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore1FDirectory + bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore1FElevatorButton db 4 ; object events - object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1 - object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1 - object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1 - object_event 11, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1 + object_event 10, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FReceptionistScript, -1 + object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FPokefanFScript, -1 + object_event 5, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FBugCatcherScript, -1 + object_event 11, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore1FGentlemanScript, -1 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index a759e6559..f28ffc240 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -102,19 +102,19 @@ GoldenrodDeptStore2F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 12, 0, GOLDENROD_DEPT_STORE_3F, 1 - warp_event 15, 0, GOLDENROD_DEPT_STORE_1F, 3 - warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + warp_event 12, 0, GOLDENROD_DEPT_STORE_3F, 1 + warp_event 15, 0, GOLDENROD_DEPT_STORE_1F, 3 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events db 2 ; bg events - bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore2FDirectory - bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton + bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore2FDirectory + bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore2FElevatorButton db 5 ; object events - object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1 - object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1 - object_event 9, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1 - object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1 - object_event 2, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1 + object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1 + object_event 13, 6, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1 + object_event 9, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FYoungsterScript, -1 + object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FCooltrainerFScript, -1 + object_event 2, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore2FGentlemanScript, -1 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index ddd5dcacf..0be5d0a47 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -58,17 +58,17 @@ GoldenrodDeptStore3F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 12, 0, GOLDENROD_DEPT_STORE_2F, 1 - warp_event 15, 0, GOLDENROD_DEPT_STORE_4F, 2 - warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + warp_event 12, 0, GOLDENROD_DEPT_STORE_2F, 1 + warp_event 15, 0, GOLDENROD_DEPT_STORE_4F, 2 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events db 2 ; bg events - bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore3FDirectory - bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton + bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore3FDirectory + bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore3FElevatorButton db 3 ; object events - object_event 6, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1 - object_event 12, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1 - object_event 2, 5, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1 + object_event 6, 1, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1 + object_event 12, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FSuperNerdScript, -1 + object_event 2, 5, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore3FRockerScript, -1 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index c408120ed..2ee5f805d 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -79,18 +79,18 @@ GoldenrodDeptStore4F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 12, 0, GOLDENROD_DEPT_STORE_5F, 1 - warp_event 15, 0, GOLDENROD_DEPT_STORE_3F, 2 - warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + warp_event 12, 0, GOLDENROD_DEPT_STORE_5F, 1 + warp_event 15, 0, GOLDENROD_DEPT_STORE_3F, 2 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events db 2 ; bg events - bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore4FDirectory - bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton + bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore4FDirectory + bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore4FElevatorButton db 4 ; object events - object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1 - object_event 11, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1 - object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1 - object_event 5, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1 + object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x55ee9, -1 + object_event 11, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1 + object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1 + object_event 5, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 3d69348f0..a69e87f64 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -219,20 +219,20 @@ GoldenrodDeptStore5F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 12, 0, GOLDENROD_DEPT_STORE_4F, 1 - warp_event 15, 0, GOLDENROD_DEPT_STORE_6F, 1 - warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + warp_event 12, 0, GOLDENROD_DEPT_STORE_4F, 1 + warp_event 15, 0, GOLDENROD_DEPT_STORE_6F, 1 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 db 0 ; coord events db 2 ; bg events - bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore5FDirectory - bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton + bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore5FDirectory + bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore5FElevatorButton db 6 ; object events - object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1 - object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1 - object_event 6, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1 - object_event 13, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1 - object_event 9, 1, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Carrie, -1 - object_event 7, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY + object_event 8, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5609c, -1 + object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FLassScript, -1 + object_event 6, 3, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Mike, -1 + object_event 13, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore5FPokefanMScript, -1 + object_event 9, 1, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Carrie, -1 + object_event 7, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 2703f0405..37e66862a 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -149,20 +149,20 @@ GoldenrodDeptStore6F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 15, 0, GOLDENROD_DEPT_STORE_5F, 2 - warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 - warp_event 13, 0, GOLDENROD_DEPT_STORE_ROOF, 1 + warp_event 15, 0, GOLDENROD_DEPT_STORE_5F, 2 + warp_event 2, 0, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + warp_event 13, 0, GOLDENROD_DEPT_STORE_ROOF, 1 db 0 ; coord events db 6 ; bg events - bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore6FDirectory - bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore6FElevatorButton - bg_event 8, 1, BGEVENT_UP, GoldenrodVendingMachine - bg_event 9, 1, BGEVENT_UP, GoldenrodVendingMachine - bg_event 10, 1, BGEVENT_UP, GoldenrodVendingMachine - bg_event 11, 1, BGEVENT_UP, GoldenrodVendingMachine + bg_event 14, 0, BGEVENT_READ, GoldenrodDeptStore6FDirectory + bg_event 3, 0, BGEVENT_READ, GoldenrodDeptStore6FElevatorButton + bg_event 8, 1, BGEVENT_UP, GoldenrodVendingMachine + bg_event 9, 1, BGEVENT_UP, GoldenrodVendingMachine + bg_event 10, 1, BGEVENT_UP, GoldenrodVendingMachine + bg_event 11, 1, BGEVENT_UP, GoldenrodVendingMachine db 2 ; object events - object_event 10, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1 - object_event 8, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1 + object_event 10, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FLassScript, -1 + object_event 8, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore6FSuperNerdScript, -1 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 1b887fbef..3aa8b50c8 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -111,9 +111,9 @@ GoldenrodDeptStoreB1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 17, 2, GOLDENROD_UNDERGROUND_WAREHOUSE, 3 - warp_event 9, 4, GOLDENROD_DEPT_STORE_ELEVATOR, 1 - warp_event 10, 4, GOLDENROD_DEPT_STORE_ELEVATOR, 2 + warp_event 17, 2, GOLDENROD_UNDERGROUND_WAREHOUSE, 3 + warp_event 9, 4, GOLDENROD_DEPT_STORE_ELEVATOR, 1 + warp_event 10, 4, GOLDENROD_DEPT_STORE_ELEVATOR, 2 db 0 ; coord events @@ -121,10 +121,10 @@ GoldenrodDeptStoreB1F_MapEvents: db 8 ; object events object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER - object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN - object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL + object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN + object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL object_event 15, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL - object_event 9, 10, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1 - object_event 4, 8, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1 - object_event 6, 13, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1 - object_event 7, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1 + object_event 9, 10, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt1Script, -1 + object_event 4, 8, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt2Script, -1 + object_event 6, 13, SPRITE_BLACK_BELT, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreB1FBlackBelt3Script, -1 + object_event 7, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1 diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index e7a48865c..80931d9ec 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -56,12 +56,12 @@ GoldenrodDeptStoreElevator_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 1, 3, GOLDENROD_DEPT_STORE_1F, -1 - warp_event 2, 3, GOLDENROD_DEPT_STORE_1F, -1 + warp_event 1, 3, GOLDENROD_DEPT_STORE_1F, -1 + warp_event 2, 3, GOLDENROD_DEPT_STORE_1F, -1 db 0 ; coord events db 1 ; bg events - bg_event 3, 0, BGEVENT_READ, MapGoldenrodDeptStoreElevatorSignpost0Script + bg_event 3, 0, BGEVENT_READ, MapGoldenrodDeptStoreElevatorSignpost0Script db 0 ; object events diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 30812c3fb..a3ffb2b1f 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -213,22 +213,22 @@ GoldenrodDeptStoreRoof_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 13, 1, GOLDENROD_DEPT_STORE_6F, 3 + warp_event 13, 1, GOLDENROD_DEPT_STORE_6F, 3 db 0 ; coord events db 4 ; bg events - bg_event 15, 3, BGEVENT_RIGHT, Binoculars1 - bg_event 15, 5, BGEVENT_RIGHT, Binoculars2 - bg_event 15, 6, BGEVENT_RIGHT, Binoculars3 - bg_event 3, 0, BGEVENT_UP, PokeDollVendingMachine + bg_event 15, 3, BGEVENT_RIGHT, Binoculars1 + bg_event 15, 5, BGEVENT_RIGHT, Binoculars2 + bg_event 15, 6, BGEVENT_RIGHT, Binoculars3 + bg_event 3, 0, BGEVENT_UP, PokeDollVendingMachine db 8 ; object events - object_event 1, 4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF - object_event 10, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1 - object_event 2, 1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1 - object_event 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON - object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON - object_event 7, 0, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF - object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF - object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF + object_event 1, 4, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF + object_event 10, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1 + object_event 2, 1, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1 + object_event 3, 4, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON + object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON + object_event 7, 0, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF + object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF + object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 05968d8b0..a9eb5263a 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -161,13 +161,13 @@ GoldenrodFlowerShop_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, GOLDENROD_CITY, 6 - warp_event 3, 7, GOLDENROD_CITY, 6 + warp_event 2, 7, GOLDENROD_CITY, 6 + warp_event 3, 7, GOLDENROD_CITY, 6 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1 - object_event 5, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP + object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1 + object_event 5, 6, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index b0bb5549c..54bd4fd05 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -438,54 +438,54 @@ GoldenrodGameCorner_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 13, GOLDENROD_CITY, 10 - warp_event 3, 13, GOLDENROD_CITY, 10 + warp_event 2, 13, GOLDENROD_CITY, 10 + warp_event 3, 13, GOLDENROD_CITY, 10 db 0 ; coord events db 31 ; bg events - bg_event 6, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 6, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 6, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 6, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 6, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 6, 11, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript - bg_event 7, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 7, 7, BGEVENT_READ, GoldenrodGameCornerLuckySlotsMachineScript - bg_event 7, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 7, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 7, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 7, 11, BGEVENT_LEFT, GoldenrodGameCornerSlotsMachineScript - bg_event 12, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 12, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 12, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript - bg_event 12, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 6, 11, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript + bg_event 7, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 7, 7, BGEVENT_READ, GoldenrodGameCornerLuckySlotsMachineScript + bg_event 7, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 7, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 7, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 7, 11, BGEVENT_LEFT, GoldenrodGameCornerSlotsMachineScript + bg_event 12, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 12, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 12, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript + bg_event 12, 9, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript bg_event 12, 10, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript bg_event 12, 11, BGEVENT_RIGHT, GoldenrodGameCornerSlotsMachineScript - bg_event 13, 6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript - bg_event 13, 7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript - bg_event 13, 8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript - bg_event 13, 9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 13, 6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 13, 7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 13, 8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 13, 9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript bg_event 13, 10, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript bg_event 13, 11, BGEVENT_LEFT, GoldenrodGameCornerCardFlipMachineScript - bg_event 18, 6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript - bg_event 18, 7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript - bg_event 18, 8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript - bg_event 18, 9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 18, 6, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 18, 7, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 18, 8, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript + bg_event 18, 9, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript bg_event 18, 10, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript bg_event 18, 11, BGEVENT_RIGHT, GoldenrodGameCornerCardFlipMachineScript - bg_event 12, 1, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript + bg_event 12, 1, BGEVENT_LEFT, GoldenrodGameCornerLeftTheirDrinkScript db 12 ; object events - object_event 3, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1 - object_event 16, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1 - object_event 18, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 - object_event 8, 7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 - object_event 8, 7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 + object_event 3, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1 + object_event 16, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1 + object_event 18, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 + object_event 8, 7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 + object_event 8, 7, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 object_event 11, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1 - object_event 14, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1 - object_event 17, 6, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1 - object_event 10, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1 - object_event 5, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1 - object_event 2, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1 + object_event 14, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1 + object_event 17, 6, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1 + object_event 10, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1 + object_event 5, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1 + object_event 2, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1 object_event 17, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 31f042f33..29be72cd9 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -381,20 +381,20 @@ GoldenrodGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 17, GOLDENROD_CITY, 1 - warp_event 3, 17, GOLDENROD_CITY, 1 + warp_event 2, 17, GOLDENROD_CITY, 1 + warp_event 3, 17, GOLDENROD_CITY, 1 db 1 ; coord events - coord_event 8, 5, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING, WhitneyCriesScript + coord_event 8, 5, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING, WhitneyCriesScript db 2 ; bg events - bg_event 1, 15, BGEVENT_READ, GoldenrodGymStatue - bg_event 4, 15, BGEVENT_READ, GoldenrodGymStatue + bg_event 1, 15, BGEVENT_READ, GoldenrodGymStatue + bg_event 4, 15, BGEVENT_READ, GoldenrodGymStatue db 6 ; object events - object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1 - object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1 - object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1 - object_event 0, 2, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1 - object_event 19, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1 - object_event 5, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1 + object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1 + object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1 + object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1 + object_event 0, 2, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1 + object_event 19, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1 + object_event 5, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index d68090ad8..eeab99b9c 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -138,17 +138,17 @@ GoldenrodHappinessRater_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, GOLDENROD_CITY, 3 - warp_event 3, 7, GOLDENROD_CITY, 3 + warp_event 2, 7, GOLDENROD_CITY, 3 + warp_event 3, 7, GOLDENROD_CITY, 3 db 0 ; coord events db 3 ; bg events - bg_event 0, 1, BGEVENT_READ, HappinessRatersHouseBookshelf - bg_event 1, 1, BGEVENT_READ, HappinessRatersHouseBookshelf - bg_event 7, 1, BGEVENT_READ, HappinessRatersHouseRadio + bg_event 0, 1, BGEVENT_READ, HappinessRatersHouseBookshelf + bg_event 1, 1, BGEVENT_READ, HappinessRatersHouseBookshelf + bg_event 7, 1, BGEVENT_READ, HappinessRatersHouseRadio db 3 ; object events - object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x54953, -1 - object_event 5, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1 - object_event 5, 6, SPRITE_TWIN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1 + object_event 2, 4, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x54953, -1 + object_event 5, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterPokefanMScript, -1 + object_event 5, 6, SPRITE_TWIN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodHappinessRaterTwinScript, -1 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 4817554a2..b8992f8dd 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -166,16 +166,16 @@ GoldenrodMagnetTrainStation_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 8, 17, GOLDENROD_CITY, 5 - warp_event 9, 17, GOLDENROD_CITY, 5 - warp_event 6, 5, SAFFRON_MAGNET_TRAIN_STATION, 4 - warp_event 11, 5, SAFFRON_MAGNET_TRAIN_STATION, 3 + warp_event 8, 17, GOLDENROD_CITY, 5 + warp_event 9, 17, GOLDENROD_CITY, 5 + warp_event 6, 5, SAFFRON_MAGNET_TRAIN_STATION, 4 + warp_event 11, 5, SAFFRON_MAGNET_TRAIN_STATION, 3 db 1 ; coord events - coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromSaffron + coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromSaffron db 0 ; bg events db 2 ; object events - object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1 + object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x550ec, -1 object_event 11, 14, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodMagnetTrainStationGentlemanScript, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index 63fbad27b..16ffddb2c 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -26,15 +26,15 @@ GoldenrodNameRater_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, GOLDENROD_CITY, 8 - warp_event 3, 7, GOLDENROD_CITY, 8 + warp_event 2, 7, GOLDENROD_CITY, 8 + warp_event 3, 7, GOLDENROD_CITY, 8 db 0 ; coord events db 3 ; bg events - bg_event 0, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf - bg_event 1, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf - bg_event 7, 1, BGEVENT_READ, GoldenrodNameRaterRadio + bg_event 0, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf + bg_event 1, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf + bg_event 7, 1, BGEVENT_READ, GoldenrodNameRaterRadio db 1 ; object events - object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1 + object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index b2d0f77ac..2f43993d1 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -53,16 +53,16 @@ GoldenrodPPSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, GOLDENROD_CITY, 7 - warp_event 3, 7, GOLDENROD_CITY, 7 + warp_event 2, 7, GOLDENROD_CITY, 7 + warp_event 3, 7, GOLDENROD_CITY, 7 db 0 ; coord events db 3 ; bg events - bg_event 0, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1 - bg_event 1, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2 - bg_event 7, 1, BGEVENT_READ, GoldenrodPPSpeechHouseRadio + bg_event 0, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1 + bg_event 1, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2 + bg_event 7, 1, BGEVENT_READ, GoldenrodPPSpeechHouseRadio db 2 ; object events - object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1 - object_event 5, 3, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1 + object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1 + object_event 5, 3, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1 diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index a8d57f136..0b5527be2 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -806,20 +806,20 @@ GoldenrodPokecenter1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 7, GOLDENROD_CITY, 15 - warp_event 4, 7, GOLDENROD_CITY, 15 - warp_event 0, 6, POKECOM_CENTER_ADMIN_ROOM_MOBILE, 1 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, GOLDENROD_CITY, 15 + warp_event 4, 7, GOLDENROD_CITY, 15 + warp_event 0, 6, POKECOM_CENTER_ADMIN_ROOM_MOBILE, 1 + warp_event 0, 7, POKECENTER_2F, 1 db 2 ; coord events - coord_event 3, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneLeft - coord_event 4, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneRight + coord_event 3, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneLeft + coord_event 4, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneRight db 0 ; bg events db 5 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x60f91, -1 - object_event 16, 8, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 - object_event 6, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1 - object_event 1, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1 - object_event 7, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x60f91, -1 + object_event 16, 8, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event 6, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1 + object_event 1, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1 + object_event 7, 5, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1 diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index 8aae5d872..85cdcadee 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -648,9 +648,9 @@ GoldenrodUnderground_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 3, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 7 - warp_event 3, 34, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 4 - warp_event 18, 6, GOLDENROD_UNDERGROUND, 4 + warp_event 3, 2, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 7 + warp_event 3, 34, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 4 + warp_event 18, 6, GOLDENROD_UNDERGROUND, 4 warp_event 21, 31, GOLDENROD_UNDERGROUND, 3 warp_event 22, 31, GOLDENROD_UNDERGROUND, 3 warp_event 22, 27, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 1 @@ -658,19 +658,19 @@ GoldenrodUnderground_MapEvents: db 0 ; coord events db 5 ; bg events - bg_event 18, 6, BGEVENT_READ, BasementDoorScript - bg_event 19, 6, BGEVENT_READ, MapGoldenrodUndergroundSignpost1Script - bg_event 6, 13, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal - bg_event 4, 18, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion - bg_event 17, 8, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote + bg_event 18, 6, BGEVENT_READ, BasementDoorScript + bg_event 19, 6, BGEVENT_READ, MapGoldenrodUndergroundSignpost1Script + bg_event 6, 13, BGEVENT_ITEM, GoldenrodUndergroundHiddenParlyzHeal + bg_event 4, 18, BGEVENT_ITEM, GoldenrodUndergroundHiddenSuperPotion + bg_event 17, 8, BGEVENT_ITEM, GoldenrodUndergroundHiddenAntidote db 9 ; object events - object_event 5, 31, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1 - object_event 6, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1 - object_event 3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1 - object_event 2, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1 - object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE - object_event 7, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_GOLDENROD_UNDERGROUND_GRAMPS - object_event 7, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER - object_event 7, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER - object_event 7, 21, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_GOLDENROD_UNDERGROUND_GRANNY + object_event 5, 31, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdEric, -1 + object_event 6, 9, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdTeru, -1 + object_event 3, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1 + object_event 2, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1 + object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundCoinCase, EVENT_GOLDENROD_UNDERGROUND_COIN_CASE + object_event 7, 11, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_GOLDENROD_UNDERGROUND_GRAMPS + object_event 7, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_OLDER_HAIRCUT_BROTHER + object_event 7, 15, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_GOLDENROD_UNDERGROUND_YOUNGER_HAIRCUT_BROTHER + object_event 7, 21, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_GOLDENROD_UNDERGROUND_GRANNY diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 106413e52..980473542 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -932,37 +932,37 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents: db 0, 0 ; filler db 9 ; warp events - warp_event 23, 3, GOLDENROD_UNDERGROUND, 6 + warp_event 23, 3, GOLDENROD_UNDERGROUND, 6 warp_event 22, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 1 warp_event 23, 10, GOLDENROD_UNDERGROUND_WAREHOUSE, 2 - warp_event 5, 25, GOLDENROD_UNDERGROUND, 2 - warp_event 4, 29, GOLDENROD_CITY, 14 - warp_event 5, 29, GOLDENROD_CITY, 14 + warp_event 5, 25, GOLDENROD_UNDERGROUND, 2 + warp_event 4, 29, GOLDENROD_CITY, 14 + warp_event 5, 29, GOLDENROD_CITY, 14 warp_event 21, 25, GOLDENROD_UNDERGROUND, 1 warp_event 20, 29, GOLDENROD_CITY, 13 warp_event 21, 29, GOLDENROD_CITY, 13 db 2 ; coord events - coord_event 19, 4, SCENE_DEFAULT, UndergroundSilverScene1 - coord_event 19, 5, SCENE_DEFAULT, UndergroundSilverScene2 + coord_event 19, 4, SCENE_DEFAULT, UndergroundSilverScene1 + coord_event 19, 5, SCENE_DEFAULT, UndergroundSilverScene2 db 6 ; bg events - bg_event 16, 1, BGEVENT_READ, Switch1Script - bg_event 10, 1, BGEVENT_READ, Switch2Script - bg_event 2, 1, BGEVENT_READ, Switch3Script + bg_event 16, 1, BGEVENT_READ, Switch1Script + bg_event 10, 1, BGEVENT_READ, Switch2Script + bg_event 2, 1, BGEVENT_READ, Switch3Script bg_event 20, 11, BGEVENT_READ, EmergencySwitchScript - bg_event 8, 9, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion - bg_event 1, 8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive + bg_event 8, 9, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenMaxPotion + bg_event 1, 8, BGEVENT_ITEM, GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive db 11 ; object events - object_event 9, 12, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 4, 8, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 17, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 11, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 3, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 9, 12, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 4, 8, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 17, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 11, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 3, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 19, 12, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 3, 27, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1 + object_event 3, 27, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1 object_event 19, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1 - object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL - object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL - object_event 23, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND + object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL + object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL + object_event 23, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 4484d874b..a80b075b3 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -212,19 +212,19 @@ GoldenrodUndergroundWarehouse_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 2, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 2 - warp_event 3, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 3 - warp_event 17, 2, GOLDENROD_DEPT_STORE_B1F, 1 + warp_event 2, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 2 + warp_event 3, 12, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 3 + warp_event 17, 2, GOLDENROD_DEPT_STORE_B1F, 1 db 0 ; coord events db 0 ; bg events db 7 ; object events - object_event 9, 8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 14, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 12, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 9, 8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 14, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 12, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 18, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseMaxEther, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER - object_event 13, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK - object_event 2, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL + object_event 13, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK + object_event 2, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index bd4556397..376aa0d0c 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -29,14 +29,14 @@ GuideGentsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, CHERRYGROVE_CITY, 4 - warp_event 3, 7, CHERRYGROVE_CITY, 4 + warp_event 2, 7, CHERRYGROVE_CITY, 4 + warp_event 3, 7, CHERRYGROVE_CITY, 4 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, GuideGentsHouseBookshelf - bg_event 1, 1, BGEVENT_READ, GuideGentsHouseBookshelf + bg_event 0, 1, BGEVENT_READ, GuideGentsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, GuideGentsHouseBookshelf db 1 ; object events - object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE + object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index dca5f7625..1de0b37b3 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -112,12 +112,12 @@ HallOfFame_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 13, LANCES_ROOM, 3 - warp_event 5, 13, LANCES_ROOM, 4 + warp_event 4, 13, LANCES_ROOM, 3 + warp_event 5, 13, LANCES_ROOM, 4 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 4, 12, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event 4, 12, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index aa8529901..9650fd346 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -21,9 +21,9 @@ IcePath1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 19, ROUTE_44, 1 + warp_event 4, 19, ROUTE_44, 1 warp_event 36, 27, BLACKTHORN_CITY, 7 - warp_event 37, 5, ICE_PATH_B1F, 1 + warp_event 37, 5, ICE_PATH_B1F, 1 warp_event 37, 13, ICE_PATH_B1F, 7 db 0 ; coord events @@ -31,6 +31,6 @@ IcePath1F_MapEvents: db 0 ; bg events db 3 ; object events - object_event 31, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL + object_event 31, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FHMWaterfall, EVENT_GOT_HM07_WATERFALL object_event 32, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FPPUp, EVENT_ICE_PATH_1F_PP_UP - object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN + object_event 35, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePath1FProtein, EVENT_ICE_PATH_1F_PROTEIN diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 0b3919419..149328000 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -77,13 +77,13 @@ IcePathB1F_MapEvents: db 0, 0 ; filler db 8 ; warp events - warp_event 3, 15, ICE_PATH_1F, 3 - warp_event 17, 3, ICE_PATH_B2F_MAHOGANY_SIDE, 1 - warp_event 11, 2, ICE_PATH_B2F_MAHOGANY_SIDE, 3 ; hole - warp_event 4, 7, ICE_PATH_B2F_MAHOGANY_SIDE, 4 ; hole - warp_event 5, 12, ICE_PATH_B2F_MAHOGANY_SIDE, 5 ; hole + warp_event 3, 15, ICE_PATH_1F, 3 + warp_event 17, 3, ICE_PATH_B2F_MAHOGANY_SIDE, 1 + warp_event 11, 2, ICE_PATH_B2F_MAHOGANY_SIDE, 3 ; hole + warp_event 4, 7, ICE_PATH_B2F_MAHOGANY_SIDE, 4 ; hole + warp_event 5, 12, ICE_PATH_B2F_MAHOGANY_SIDE, 5 ; hole warp_event 12, 13, ICE_PATH_B2F_MAHOGANY_SIDE, 6 ; hole - warp_event 5, 25, ICE_PATH_1F, 4 + warp_event 5, 25, ICE_PATH_1F, 4 warp_event 11, 27, ICE_PATH_B2F_BLACKTHORN_SIDE, 1 db 0 ; coord events @@ -92,8 +92,8 @@ IcePathB1F_MapEvents: bg_event 17, 30, BGEVENT_ITEM, IcePathB1FHiddenMaxPotion db 5 ; object events - object_event 11, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1 - object_event 7, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 - object_event 8, 9, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 - object_event 17, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4 - object_event 5, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON + object_event 11, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1 + object_event 7, 8, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 + object_event 8, 9, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 + object_event 17, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4 + object_event 5, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB1FIron, EVENT_ICE_PATH_B1F_IRON diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 42585eeac..23ba93773 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -16,13 +16,13 @@ IcePathB2FBlackthornSide_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 15, ICE_PATH_B1F, 8 - warp_event 3, 3, ICE_PATH_B3F, 2 + warp_event 3, 15, ICE_PATH_B1F, 8 + warp_event 3, 3, ICE_PATH_B3F, 2 db 0 ; coord events db 1 ; bg events - bg_event 2, 10, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal + bg_event 2, 10, BGEVENT_ITEM, IcePathB2FBlackthornSideHiddenIceHeal db 1 ; object events - object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST + object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FBlackthornSideTMRest, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 9d4a53fab..86a706db8 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -32,22 +32,22 @@ IcePathB2FMahoganySide_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 17, 1, ICE_PATH_B1F, 2 - warp_event 9, 11, ICE_PATH_B3F, 1 - warp_event 11, 4, ICE_PATH_B1F, 3 - warp_event 4, 6, ICE_PATH_B1F, 4 - warp_event 4, 12, ICE_PATH_B1F, 5 + warp_event 17, 1, ICE_PATH_B1F, 2 + warp_event 9, 11, ICE_PATH_B3F, 1 + warp_event 11, 4, ICE_PATH_B1F, 3 + warp_event 4, 6, ICE_PATH_B1F, 4 + warp_event 4, 12, ICE_PATH_B1F, 5 warp_event 12, 12, ICE_PATH_B1F, 6 db 0 ; coord events db 1 ; bg events - bg_event 0, 17, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos + bg_event 0, 17, BGEVENT_ITEM, IcePathB2FMahoganySideHiddenCarbos db 6 ; object events - object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A - object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A - object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A + object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A + object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A + object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_4A - object_event 8, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL - object_event 0, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION + object_event 8, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL + object_event 0, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 65b22c670..1130705af 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -17,13 +17,13 @@ IcePathB3F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 5, ICE_PATH_B2F_MAHOGANY_SIDE, 2 - warp_event 15, 5, ICE_PATH_B2F_BLACKTHORN_SIDE, 2 + warp_event 3, 5, ICE_PATH_B2F_MAHOGANY_SIDE, 2 + warp_event 15, 5, ICE_PATH_B2F_BLACKTHORN_SIDE, 2 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 5, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE - object_event 6, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1 + object_event 5, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB3FNevermeltice, EVENT_ICE_PATH_B3F_NEVERMELTICE + object_event 6, 6, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB3FRock, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index c78d8ef48..efff3bab3 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -939,28 +939,28 @@ IlexForest_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 1, 5, ROUTE_34_ILEX_FOREST_GATE, 3 - warp_event 3, 42, ILEX_FOREST_AZALEA_GATE, 1 - warp_event 3, 43, ILEX_FOREST_AZALEA_GATE, 2 + warp_event 1, 5, ROUTE_34_ILEX_FOREST_GATE, 3 + warp_event 3, 42, ILEX_FOREST_AZALEA_GATE, 1 + warp_event 3, 43, ILEX_FOREST_AZALEA_GATE, 2 db 0 ; coord events db 5 ; bg events - bg_event 3, 17, BGEVENT_READ, MapIlexForestSignpost0Script - bg_event 11, 7, BGEVENT_ITEM, IlexForestHiddenEther + bg_event 3, 17, BGEVENT_READ, MapIlexForestSignpost0Script + bg_event 11, 7, BGEVENT_ITEM, IlexForestHiddenEther bg_event 22, 14, BGEVENT_ITEM, IlexForestHiddenSuperPotion - bg_event 1, 17, BGEVENT_ITEM, IlexForestHiddenFullHeal - bg_event 8, 22, BGEVENT_UP, MapIlexForestSignpost4Script + bg_event 1, 17, BGEVENT_ITEM, IlexForestHiddenFullHeal + bg_event 8, 22, BGEVENT_UP, MapIlexForestSignpost4Script db 11 ; object events object_event 14, 31, SPRITE_BIRD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD - object_event 7, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE - object_event 5, 28, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER + object_event 7, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE + object_event 5, 28, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER object_event 15, 14, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IlexForestHeadbuttGuyScript, -1 object_event 20, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE - object_event 8, 29, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT - object_event 3, 24, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS - object_event 12, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBugCatcherWayne, -1 - object_event 9, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK - object_event 17, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE - object_event 27, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER + object_event 8, 29, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT + object_event 3, 24, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS + object_event 12, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBugCatcherWayne, -1 + object_event 9, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK + object_event 17, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE + object_event 27, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index a2193fb8c..0e992960b 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -32,15 +32,15 @@ IlexForestAzaleaGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, ILEX_FOREST, 2 - warp_event 0, 5, ILEX_FOREST, 3 - warp_event 9, 4, AZALEA_TOWN, 7 - warp_event 9, 5, AZALEA_TOWN, 8 + warp_event 0, 4, ILEX_FOREST, 2 + warp_event 0, 5, ILEX_FOREST, 3 + warp_event 9, 4, AZALEA_TOWN, 7 + warp_event 9, 5, AZALEA_TOWN, 8 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1 - object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1 + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1 + object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1 diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 4351d1769..456550685 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -304,21 +304,21 @@ IndigoPlateauPokecenter1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 5, 13, ROUTE_23, 1 - warp_event 6, 13, ROUTE_23, 2 - warp_event 0, 13, POKECENTER_2F, 1 - warp_event 14, 3, WILLS_ROOM, 1 + warp_event 5, 13, ROUTE_23, 1 + warp_event 6, 13, ROUTE_23, 2 + warp_event 0, 13, POKECENTER_2F, 1 + warp_event 14, 3, WILLS_ROOM, 1 db 2 ; coord events - coord_event 16, 4, SCENE_DEFAULT, PlateauRivalBattle1 - coord_event 17, 4, SCENE_DEFAULT, PlateauRivalBattle2 + coord_event 16, 4, SCENE_DEFAULT, PlateauRivalBattle1 + coord_event 17, 4, SCENE_DEFAULT, PlateauRivalBattle2 db 0 ; bg events db 6 ; object events - object_event 3, 7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18012c, -1 - object_event 11, 7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1 + object_event 3, 7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18012c, -1 + object_event 11, 7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1 object_event 11, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1 - object_event 16, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL - object_event 1, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY - object_event 0, 9, SPRITE_JYNX, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY + object_event 16, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL + object_event 1, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY + object_event 0, 9, SPRITE_JYNX, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index cfc8eeeaa..3cc096d1d 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -134,14 +134,14 @@ KarensRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 17, BRUNOS_ROOM, 3 - warp_event 5, 17, BRUNOS_ROOM, 4 - warp_event 4, 2, LANCES_ROOM, 1 - warp_event 5, 2, LANCES_ROOM, 2 + warp_event 4, 17, BRUNOS_ROOM, 3 + warp_event 5, 17, BRUNOS_ROOM, 4 + warp_event 4, 2, LANCES_ROOM, 1 + warp_event 5, 2, LANCES_ROOM, 2 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 5, 7, SPRITE_KAREN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KarenScript_Battle, -1 + object_event 5, 7, SPRITE_KAREN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KarenScript_Battle, -1 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 8067776cd..34c9f7b5d 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -131,14 +131,14 @@ KogasRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 17, WILLS_ROOM, 2 - warp_event 5, 17, WILLS_ROOM, 3 - warp_event 4, 2, BRUNOS_ROOM, 1 - warp_event 5, 2, BRUNOS_ROOM, 2 + warp_event 4, 17, WILLS_ROOM, 2 + warp_event 5, 17, WILLS_ROOM, 3 + warp_event 4, 2, BRUNOS_ROOM, 1 + warp_event 5, 2, BRUNOS_ROOM, 2 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 5, 7, SPRITE_KOGA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1 + object_event 5, 7, SPRITE_KOGA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index a28ac52b5..57d3850b0 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -678,23 +678,23 @@ KurtsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 7, AZALEA_TOWN, 4 - warp_event 4, 7, AZALEA_TOWN, 4 + warp_event 3, 7, AZALEA_TOWN, 4 + warp_event 4, 7, AZALEA_TOWN, 4 db 0 ; coord events db 7 ; bg events - bg_event 6, 1, BGEVENT_READ, KurtsHouseRadio - bg_event 8, 0, BGEVENT_READ, KurtsHouseOakPhoto - bg_event 9, 0, BGEVENT_READ, KurtsHouseOakPhoto - bg_event 5, 1, BGEVENT_READ, KurtsHouseBookshelf - bg_event 2, 1, BGEVENT_READ, KurtsHouseBookshelf - bg_event 3, 1, BGEVENT_READ, KurtsHouseBookshelf - bg_event 4, 1, BGEVENT_READ, KurtsHouseCelebiStatue + bg_event 6, 1, BGEVENT_READ, KurtsHouseRadio + bg_event 8, 0, BGEVENT_READ, KurtsHouseOakPhoto + bg_event 9, 0, BGEVENT_READ, KurtsHouseOakPhoto + bg_event 5, 1, BGEVENT_READ, KurtsHouseBookshelf + bg_event 2, 1, BGEVENT_READ, KurtsHouseBookshelf + bg_event 3, 1, BGEVENT_READ, KurtsHouseBookshelf + bg_event 4, 1, BGEVENT_READ, KurtsHouseCelebiStatue db 5 ; object events - object_event 3, 2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1 - object_event 5, 3, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1 - object_event 6, 3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE - object_event 14, 3, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2 - object_event 11, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2 + object_event 3, 2, SPRITE_KURT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1 + object_event 5, 3, SPRITE_TWIN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1 + object_event 6, 3, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE + object_event 14, 3, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2 + object_event 11, 4, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2 diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index efa8bc4ff..8174da248 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -495,7 +495,7 @@ LakeOfRage_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 7, 3, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 1 + warp_event 7, 3, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 1 warp_event 27, 31, LAKE_OF_RAGE_MAGIKARP_HOUSE, 1 db 0 ; coord events @@ -504,8 +504,8 @@ LakeOfRage_MapEvents: bg_event 21, 27, BGEVENT_READ, MapLakeOfRageSignpost0Script bg_event 25, 31, BGEVENT_READ, MapLakeOfRageSignpost1Script bg_event 11, 28, BGEVENT_ITEM, LakeOfRageHiddenFullRestore - bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy - bg_event 35, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion + bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy + bg_event 35, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion db 12 ; object events object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE @@ -514,9 +514,9 @@ LakeOfRage_MapEvents: object_event 25, 29, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageCooltrainerFScript, -1 object_event 30, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS object_event 24, 26, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS - object_event 4, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS - object_event 36, 7, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS + object_event 4, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS + object_event 36, 7, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS object_event 18, 22, SPRITE_GYARADOS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS - object_event 4, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY - object_event 7, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER - object_event 35, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT + object_event 4, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY + object_event 7, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER + object_event 35, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index 68b299f7c..177d7ea27 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -69,14 +69,14 @@ LakeOfRageHiddenPowerHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, LAKE_OF_RAGE, 1 - warp_event 3, 7, LAKE_OF_RAGE, 1 + warp_event 2, 7, LAKE_OF_RAGE, 1 + warp_event 3, 7, LAKE_OF_RAGE, 1 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, HiddenPowerHouseBookshelf - bg_event 1, 1, BGEVENT_READ, HiddenPowerHouseBookshelf + bg_event 0, 1, BGEVENT_READ, HiddenPowerHouseBookshelf + bg_event 1, 1, BGEVENT_READ, HiddenPowerHouseBookshelf db 1 ; object events - object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HiddenPowerGuy, -1 + object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HiddenPowerGuy, -1 diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index a64b87e2a..2ed82feae 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -208,14 +208,14 @@ LakeOfRageMagikarpHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, LAKE_OF_RAGE, 2 - warp_event 3, 7, LAKE_OF_RAGE, 2 + warp_event 2, 7, LAKE_OF_RAGE, 2 + warp_event 3, 7, LAKE_OF_RAGE, 2 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, MagikarpHouseBookshelf - bg_event 1, 1, BGEVENT_READ, MagikarpHouseBookshelf + bg_event 0, 1, BGEVENT_READ, MagikarpHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MagikarpHouseBookshelf db 1 ; object events - object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1 + object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x19a6ae, -1 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 7cae63c73..f16dc0dfa 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -339,18 +339,18 @@ LancesRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 23, KARENS_ROOM, 3 - warp_event 5, 23, KARENS_ROOM, 4 - warp_event 4, 1, HALL_OF_FAME, 1 - warp_event 5, 1, HALL_OF_FAME, 2 + warp_event 4, 23, KARENS_ROOM, 3 + warp_event 5, 23, KARENS_ROOM, 4 + warp_event 4, 1, HALL_OF_FAME, 1 + warp_event 5, 1, HALL_OF_FAME, 2 db 2 ; coord events - coord_event 4, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromLeft - coord_event 5, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromRight + coord_event 4, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromLeft + coord_event 5, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromRight db 0 ; bg events db 3 ; object events - object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1 - object_event 4, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY - object_event 4, 7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY + object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1 + object_event 4, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY + object_event 4, 7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index ef84ad348..073dbb821 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -223,18 +223,18 @@ LavRadioTower1F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, LAVENDER_TOWN, 7 - warp_event 3, 7, LAVENDER_TOWN, 7 + warp_event 2, 7, LAVENDER_TOWN, 7 + warp_event 3, 7, LAVENDER_TOWN, 7 db 0 ; coord events db 2 ; bg events - bg_event 11, 0, BGEVENT_READ, MapLavRadioTower1FSignpost0Script - bg_event 5, 0, BGEVENT_READ, MapLavRadioTower1FSignpost1Script + bg_event 11, 0, BGEVENT_READ, MapLavRadioTower1FSignpost0Script + bg_event 5, 0, BGEVENT_READ, MapLavRadioTower1FSignpost1Script db 5 ; object events - object_event 6, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1 - object_event 15, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1 - object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1 - object_event 9, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1 - object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1 + object_event 6, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1 + object_event 15, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1 + object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1 + object_event 9, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1 + object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 004e22276..cd97dd8e8 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -49,14 +49,14 @@ LavenderMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, LAVENDER_TOWN, 5 - warp_event 3, 7, LAVENDER_TOWN, 5 + warp_event 2, 7, LAVENDER_TOWN, 5 + warp_event 3, 7, LAVENDER_TOWN, 5 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1 - object_event 6, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1 - object_event 9, 2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1 + object_event 6, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderMartPokefanMScript, -1 + object_event 9, 2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderMartRockerScript, -1 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index c2f102584..0fee0798e 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -25,12 +25,12 @@ LavenderNameRater_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, LAVENDER_TOWN, 4 - warp_event 3, 7, LAVENDER_TOWN, 4 + warp_event 2, 7, LAVENDER_TOWN, 4 + warp_event 3, 7, LAVENDER_TOWN, 4 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 2, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderNameRater, -1 + object_event 2, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderNameRater, -1 diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index 7305a95fe..84d2ec2ea 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -82,16 +82,16 @@ LavenderPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, LAVENDER_TOWN, 1 - warp_event 4, 7, LAVENDER_TOWN, 1 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, LAVENDER_TOWN, 1 + warp_event 4, 7, LAVENDER_TOWN, 1 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1 - object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1 - object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1 - object_event 1, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1 + object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FGentlemanScript, -1 + object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavenderPokecenter1FTeacherScript, -1 + object_event 1, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1 diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm index 7523c528c..7157b4735 100644 --- a/maps/LavenderPokecenter2FBeta.asm +++ b/maps/LavenderPokecenter2FBeta.asm @@ -7,7 +7,7 @@ LavenderPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, LAVENDER_POKECENTER_1F, 3 + warp_event 0, 7, LAVENDER_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index c9a265aad..dd73aa81f 100644 --- a/maps/LavenderSpeechHouse.asm +++ b/maps/LavenderSpeechHouse.asm @@ -30,14 +30,14 @@ LavenderSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, LAVENDER_TOWN, 3 - warp_event 3, 7, LAVENDER_TOWN, 3 + warp_event 2, 7, LAVENDER_TOWN, 3 + warp_event 3, 7, LAVENDER_TOWN, 3 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf + bg_event 0, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, LavenderSpeechHouseBookshelf db 1 ; object events - object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1 + object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderSpeechHousePokefanFScript, -1 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 973271b24..9aeec7ab9 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -107,26 +107,26 @@ LavenderTown_MapEvents: db 0, 0 ; filler db 7 ; warp events - warp_event 5, 5, LAVENDER_POKECENTER_1F, 1 - warp_event 5, 9, MR_FUJIS_HOUSE, 1 - warp_event 3, 13, LAVENDER_SPEECH_HOUSE, 1 - warp_event 7, 13, LAVENDER_NAME_RATER, 1 - warp_event 1, 5, LAVENDER_MART, 2 + warp_event 5, 5, LAVENDER_POKECENTER_1F, 1 + warp_event 5, 9, MR_FUJIS_HOUSE, 1 + warp_event 3, 13, LAVENDER_SPEECH_HOUSE, 1 + warp_event 7, 13, LAVENDER_NAME_RATER, 1 + warp_event 1, 5, LAVENDER_MART, 2 warp_event 13, 11, SOUL_HOUSE, 1 - warp_event 14, 5, LAV_RADIO_TOWER_1F, 1 + warp_event 14, 5, LAV_RADIO_TOWER_1F, 1 db 0 ; coord events db 6 ; bg events - bg_event 11, 3, BGEVENT_READ, LavenderTownSign - bg_event 15, 7, BGEVENT_READ, KantoRadioStationSign - bg_event 3, 9, BGEVENT_READ, VolunteerPokemonHouseSign + bg_event 11, 3, BGEVENT_READ, LavenderTownSign + bg_event 15, 7, BGEVENT_READ, KantoRadioStationSign + bg_event 3, 9, BGEVENT_READ, VolunteerPokemonHouseSign bg_event 15, 13, BGEVENT_READ, SoulHouseSign - bg_event 6, 5, BGEVENT_READ, LavenderPokecenterSignText - bg_event 2, 5, BGEVENT_READ, LavenderMartSignText + bg_event 6, 5, BGEVENT_READ, LavenderPokecenterSignText + bg_event 2, 5, BGEVENT_READ, LavenderMartSignText db 4 ; object events - object_event 12, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1 - object_event 2, 15, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1 + object_event 12, 7, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavenderTownPokefanMScript, -1 + object_event 2, 15, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LavenderTownTeacherScript, -1 object_event 14, 12, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavenderTownGrampsScript, -1 - object_event 6, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1 + object_event 6, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 1, LavenderTownYoungsterScript, -1 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 777053a41..9b56aacd4 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -374,20 +374,20 @@ MahoganyGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 17, MAHOGANY_TOWN, 3 - warp_event 5, 17, MAHOGANY_TOWN, 3 + warp_event 4, 17, MAHOGANY_TOWN, 3 + warp_event 5, 17, MAHOGANY_TOWN, 3 db 0 ; coord events db 2 ; bg events - bg_event 3, 15, BGEVENT_READ, MahoganyGymStatue - bg_event 6, 15, BGEVENT_READ, MahoganyGymStatue + bg_event 3, 15, BGEVENT_READ, MahoganyGymStatue + bg_event 6, 15, BGEVENT_READ, MahoganyGymStatue db 7 ; object events - object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1 - object_event 4, 6, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1 - object_event 0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1 - object_event 9, 17, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1 - object_event 5, 9, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderBrad, -1 - object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderDouglas, -1 - object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1 + object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1 + object_event 4, 6, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1 + object_event 0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1 + object_event 9, 17, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1 + object_event 5, 9, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderBrad, -1 + object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderDouglas, -1 + object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 822240911..376298357 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -222,17 +222,17 @@ MahoganyMart1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, MAHOGANY_TOWN, 1 - warp_event 4, 7, MAHOGANY_TOWN, 1 - warp_event 7, 3, TEAM_ROCKET_BASE_B1F, 1 + warp_event 3, 7, MAHOGANY_TOWN, 1 + warp_event 4, 7, MAHOGANY_TOWN, 1 + warp_event 7, 3, TEAM_ROCKET_BASE_B1F, 1 db 0 ; coord events db 0 ; bg events db 5 ; object events - object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE - object_event 3, 6, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE - object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS + object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + object_event 3, 6, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index de968338a..baced8e5c 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -55,16 +55,16 @@ MahoganyPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, MAHOGANY_TOWN, 4 - warp_event 4, 7, MAHOGANY_TOWN, 4 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, MAHOGANY_TOWN, 4 + warp_event 4, 7, MAHOGANY_TOWN, 4 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19a356, -1 - object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1 - object_event 1, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1 - object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19a356, -1 + object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FPokefanMScript, -1 + object_event 1, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FYoungsterScript, -1 + object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyPokecenter1FCooltrainerFScript, -1 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index f0f91a2b2..53159ea91 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -62,13 +62,13 @@ MahoganyRedGyaradosSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, MAHOGANY_TOWN, 2 - warp_event 3, 7, MAHOGANY_TOWN, 2 + warp_event 2, 7, MAHOGANY_TOWN, 2 + warp_event 3, 7, MAHOGANY_TOWN, 2 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1 - object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1 + object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1 + object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 1a4ce8f44..5fc87cd4f 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -246,24 +246,24 @@ MahoganyTown_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 11, 7, MAHOGANY_MART_1F, 1 - warp_event 17, 7, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 1 - warp_event 6, 13, MAHOGANY_GYM, 1 + warp_event 11, 7, MAHOGANY_MART_1F, 1 + warp_event 17, 7, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 1 + warp_event 6, 13, MAHOGANY_GYM, 1 warp_event 15, 13, MAHOGANY_POKECENTER_1F, 1 - warp_event 9, 1, ROUTE_43_MAHOGANY_GATE, 3 + warp_event 9, 1, ROUTE_43_MAHOGANY_GATE, 3 db 2 ; coord events - coord_event 19, 8, SCENE_DEFAULT, UnknownScript_0x190013 - coord_event 19, 9, SCENE_DEFAULT, UnknownScript_0x190013 + coord_event 19, 8, SCENE_DEFAULT, UnknownScript_0x190013 + coord_event 19, 9, SCENE_DEFAULT, UnknownScript_0x190013 db 4 ; bg events - bg_event 1, 5, BGEVENT_READ, MahoganyTownSign - bg_event 9, 7, BGEVENT_READ, MahoganyTownRagecandybarSign - bg_event 3, 13, BGEVENT_READ, MahoganyGymSign + bg_event 1, 5, BGEVENT_READ, MahoganyTownSign + bg_event 9, 7, BGEVENT_READ, MahoganyTownRagecandybarSign + bg_event 3, 13, BGEVENT_READ, MahoganyGymSign bg_event 16, 13, BGEVENT_READ, MahoganyTownPokecenterSign db 4 ; object events - object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST - object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1 - object_event 6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM - object_event 12, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS + object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST + object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1 + object_event 6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM + object_event 12, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownLassScript, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index c69079aba..8128007f6 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -201,12 +201,12 @@ ManiasHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, CIANWOOD_CITY, 1 - warp_event 3, 7, CIANWOOD_CITY, 1 + warp_event 2, 7, CIANWOOD_CITY, 1 + warp_event 3, 7, CIANWOOD_CITY, 1 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ManiaScript, -1 + object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ManiaScript, -1 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index ad832b1fb..64139989a 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -68,12 +68,12 @@ MobileBattleRoom_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 7, POKECENTER_2F, 6 - warp_event 5, 7, POKECENTER_2F, 6 + warp_event 4, 7, POKECENTER_2F, 6 + warp_event 5, 7, POKECENTER_2F, 6 db 0 ; coord events db 1 ; bg events - bg_event 4, 2, BGEVENT_UP, MapMobileBattleRoomSignpost0Script + bg_event 4, 2, BGEVENT_UP, MapMobileBattleRoomSignpost0Script db 0 ; object events diff --git a/maps/MobileTradeRoom.asm b/maps/MobileTradeRoom.asm index 469822afc..e7c1cb476 100644 --- a/maps/MobileTradeRoom.asm +++ b/maps/MobileTradeRoom.asm @@ -36,12 +36,12 @@ MobileTradeRoom_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 7, POKECENTER_2F, 5 - warp_event 5, 7, POKECENTER_2F, 5 + warp_event 4, 7, POKECENTER_2F, 5 + warp_event 5, 7, POKECENTER_2F, 5 db 0 ; coord events db 1 ; bg events - bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomSignpost0Script + bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomSignpost0Script db 0 ; object events diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index deffa830d..08a9c4c17 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -162,13 +162,13 @@ MountMoon_MapEvents: db 0, 0 ; filler db 8 ; warp events - warp_event 3, 3, ROUTE_3, 1 + warp_event 3, 3, ROUTE_3, 1 warp_event 15, 15, ROUTE_4, 1 - warp_event 13, 3, MOUNT_MOON, 7 + warp_event 13, 3, MOUNT_MOON, 7 warp_event 15, 11, MOUNT_MOON, 8 - warp_event 25, 5, MOUNT_MOON_SQUARE, 1 + warp_event 25, 5, MOUNT_MOON_SQUARE, 1 warp_event 25, 15, MOUNT_MOON_SQUARE, 2 - warp_event 25, 3, MOUNT_MOON, 3 + warp_event 25, 3, MOUNT_MOON, 3 warp_event 25, 13, MOUNT_MOON, 4 db 0 ; coord events @@ -176,4 +176,4 @@ MountMoon_MapEvents: db 0 ; bg events db 1 ; object events - object_event 7, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL + object_event 7, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index 5f260cd5c..54616ea17 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -29,15 +29,15 @@ MountMoonGiftShop_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 7, MOUNT_MOON_SQUARE, 3 - warp_event 4, 7, MOUNT_MOON_SQUARE, 3 + warp_event 3, 7, MOUNT_MOON_SQUARE, 3 + warp_event 4, 7, MOUNT_MOON_SQUARE, 3 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 4, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1 - object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1 - object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 - object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 + object_event 4, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1 + object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1 + object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 + object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 87139c286..8d0cc5dfe 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -134,18 +134,18 @@ MountMoonSquare_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 20, 5, MOUNT_MOON, 5 + warp_event 20, 5, MOUNT_MOON, 5 warp_event 22, 11, MOUNT_MOON, 6 - warp_event 13, 7, MOUNT_MOON_GIFT_SHOP, 1 + warp_event 13, 7, MOUNT_MOON_GIFT_SHOP, 1 db 1 ; coord events - coord_event 7, 11, SCENE_DEFAULT, ClefairyDance + coord_event 7, 11, SCENE_DEFAULT, ClefairyDance db 2 ; bg events - bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone - bg_event 17, 7, BGEVENT_READ, DontLitterSign + bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone + bg_event 17, 7, BGEVENT_READ, DontLitterSign db 3 ; object events - object_event 6, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY - object_event 7, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY - object_event 7, 7, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK + object_event 6, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY + object_event 7, 6, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY + object_event 7, 7, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index b8301b907..f574b3563 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -120,10 +120,10 @@ MountMortar1FInside_MapEvents: db 6 ; warp events warp_event 11, 47, MOUNT_MORTAR_1F_OUTSIDE, 5 warp_event 29, 47, MOUNT_MORTAR_1F_OUTSIDE, 6 - warp_event 5, 39, MOUNT_MORTAR_1F_OUTSIDE, 8 + warp_event 5, 39, MOUNT_MORTAR_1F_OUTSIDE, 8 warp_event 33, 41, MOUNT_MORTAR_1F_OUTSIDE, 9 - warp_event 3, 19, MOUNT_MORTAR_B1F, 1 - warp_event 9, 9, MOUNT_MORTAR_2F_INSIDE, 2 + warp_event 3, 19, MOUNT_MORTAR_B1F, 1 + warp_event 9, 9, MOUNT_MORTAR_2F_INSIDE, 2 db 0 ; coord events @@ -139,5 +139,5 @@ MountMortar1FInside_MapEvents: object_event 35, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET object_event 33, 43, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacMiller, -1 object_event 24, 28, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdMarkus, -1 - object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON + object_event 8, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON object_event 17, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index 9bc92ccdf..eded2353c 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -20,14 +20,14 @@ MountMortar1FOutside_MapEvents: db 0, 0 ; filler db 9 ; warp events - warp_event 3, 33, ROUTE_42, 3 + warp_event 3, 33, ROUTE_42, 3 warp_event 17, 33, ROUTE_42, 4 warp_event 37, 33, ROUTE_42, 5 - warp_event 17, 5, MOUNT_MORTAR_2F_INSIDE, 1 + warp_event 17, 5, MOUNT_MORTAR_2F_INSIDE, 1 warp_event 11, 21, MOUNT_MORTAR_1F_INSIDE, 1 warp_event 29, 21, MOUNT_MORTAR_1F_INSIDE, 2 warp_event 17, 29, MOUNT_MORTAR_B1F, 2 - warp_event 7, 13, MOUNT_MORTAR_1F_INSIDE, 3 + warp_event 7, 13, MOUNT_MORTAR_1F_INSIDE, 3 warp_event 33, 13, MOUNT_MORTAR_1F_INSIDE, 4 db 0 ; coord events diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 18d62603b..e4c0a0c44 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -69,18 +69,18 @@ MountMortar2FInside_MapEvents: db 2 ; warp events warp_event 17, 33, MOUNT_MORTAR_1F_OUTSIDE, 4 - warp_event 3, 5, MOUNT_MORTAR_1F_INSIDE, 6 + warp_event 3, 5, MOUNT_MORTAR_1F_INSIDE, 6 db 0 ; coord events db 1 ; bg events - bg_event 24, 8, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore + bg_event 24, 8, BGEVENT_ITEM, MountMortar2FInsideHiddenFullRestore db 7 ; object events object_event 28, 22, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideMaxPotion, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION - object_event 2, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY + object_event 2, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideRareCandy, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY object_event 19, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideTMDefenseCurl, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL - object_event 16, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE - object_event 9, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER - object_event 28, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE + object_event 16, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE + object_event 9, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER + object_event 28, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE object_event 13, 26, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerSupernerdHugh, -1 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 4eb2eb272..eb58b48de 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -136,19 +136,19 @@ MountMortarB1F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 3, MOUNT_MORTAR_1F_INSIDE, 5 + warp_event 3, 3, MOUNT_MORTAR_1F_INSIDE, 5 warp_event 19, 29, MOUNT_MORTAR_1F_OUTSIDE, 7 db 0 ; coord events db 1 ; bg events - bg_event 4, 6, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive + bg_event 4, 6, BGEVENT_ITEM, MountMortarB1FHiddenMaxRevive db 7 ; object events object_event 29, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION - object_event 4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS - object_event 9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1 - object_event 16, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1 + object_event 4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS + object_event 9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1 + object_event 16, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1 object_event 34, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE - object_event 32, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER + object_event 32, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER object_event 21, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 82dfa9a9f..e382cf226 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -21,14 +21,14 @@ MoveDeletersHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, BLACKTHORN_CITY, 6 - warp_event 3, 7, BLACKTHORN_CITY, 6 + warp_event 2, 7, BLACKTHORN_CITY, 6 + warp_event 3, 7, BLACKTHORN_CITY, 6 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, MoveDeletersHouseBookshelf - bg_event 1, 1, BGEVENT_READ, MoveDeletersHouseBookshelf + bg_event 0, 1, BGEVENT_READ, MoveDeletersHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MoveDeletersHouseBookshelf db 1 ; object events - object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoveDeleter, -1 + object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MoveDeleter, -1 diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 687657967..4396e707d 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -81,18 +81,18 @@ MrFujisHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, LAVENDER_TOWN, 2 - warp_event 3, 7, LAVENDER_TOWN, 2 + warp_event 2, 7, LAVENDER_TOWN, 2 + warp_event 3, 7, LAVENDER_TOWN, 2 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, MrFujisHouseBookshelf - bg_event 1, 1, BGEVENT_READ, MrFujisHouseBookshelf + bg_event 0, 1, BGEVENT_READ, MrFujisHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MrFujisHouseBookshelf db 5 ; object events - object_event 4, 1, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1 - object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1 - object_event 7, 4, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1 - object_event 5, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFujisNidorino, -1 - object_event 1, 3, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MrFujisPidgey, -1 + object_event 4, 1, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1 + object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1 + object_event 7, 4, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1 + object_event 5, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFujisNidorino, -1 + object_event 1, 3, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MrFujisPidgey, -1 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 53332cd18..d79c86d7e 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -374,18 +374,18 @@ MrPokemonsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, ROUTE_30, 2 - warp_event 3, 7, ROUTE_30, 2 + warp_event 2, 7, ROUTE_30, 2 + warp_event 3, 7, ROUTE_30, 2 db 0 ; coord events db 5 ; bg events - bg_event 0, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script - bg_event 1, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script - bg_event 6, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script - bg_event 7, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script - bg_event 6, 4, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script + bg_event 0, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script + bg_event 1, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script + bg_event 6, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script + bg_event 7, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script + bg_event 6, 4, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script db 2 ; object events - object_event 3, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1 - object_event 6, 5, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK + object_event 3, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1 + object_event 6, 5, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 67593de2b..c5121e247 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -49,14 +49,14 @@ MrPsychicsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, SAFFRON_CITY, 5 - warp_event 3, 7, SAFFRON_CITY, 5 + warp_event 2, 7, SAFFRON_CITY, 5 + warp_event 3, 7, SAFFRON_CITY, 5 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, MrPsychicsHouseBookshelf - bg_event 1, 1, BGEVENT_READ, MrPsychicsHouseBookshelf + bg_event 0, 1, BGEVENT_READ, MrPsychicsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, MrPsychicsHouseBookshelf db 1 ; object events - object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1 + object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrPsychic, -1 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index ed6bf6b9a..df4299cff 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -525,12 +525,12 @@ NationalPark_MapEvents: db 4 ; bg events bg_event 14, 44, BGEVENT_READ, MapNationalParkSignpost0Script bg_event 27, 31, BGEVENT_READ, MapNationalParkSignpost1Script - bg_event 6, 47, BGEVENT_ITEM, NationalParkHiddenFullHeal - bg_event 12, 4, BGEVENT_READ, MapNationalParkSignpost3Script + bg_event 6, 47, BGEVENT_ITEM, NationalParkHiddenFullHeal + bg_event 12, 4, BGEVENT_READ, MapNationalParkSignpost3Script db 14 ; object events object_event 15, 24, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NationalParkLassScript, -1 - object_event 14, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1 + object_event 14, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPokefanFScript, -1 object_event 27, 40, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1 object_event 11, 41, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster1Script, -1 object_event 10, 41, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NationalParkYoungster2Script, -1 @@ -538,8 +538,8 @@ NationalPark_MapEvents: object_event 26, 40, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NationalParkPersian, -1 object_event 27, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1 object_event 18, 29, SPRITE_POKEFAN_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1 - object_event 16, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1 - object_event 8, 14, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1 + object_event 16, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1 + object_event 8, 14, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassKrise, -1 object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL - object_event 26, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1 - object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG + object_event 26, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1 + object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index d6cffadcb..6c718ff61 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -232,19 +232,19 @@ NationalParkBugContest_MapEvents: db 4 ; bg events bg_event 14, 44, BGEVENT_READ, MapNationalParkBugContestSignpost0Script bg_event 27, 31, BGEVENT_READ, MapNationalParkBugContestSignpost1Script - bg_event 6, 47, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal - bg_event 12, 4, BGEVENT_READ, MapNationalParkBugContestSignpost3Script + bg_event 6, 47, BGEVENT_ITEM, NationalParkBugContestHiddenFullHeal + bg_event 12, 4, BGEVENT_READ, MapNationalParkBugContestSignpost3Script db 12 ; object events object_event 19, 29, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A object_event 28, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A - object_event 9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A - object_event 7, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A - object_event 23, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A + object_event 9, 18, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A + object_event 7, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A + object_event 23, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A object_event 27, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A - object_event 7, 23, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A + object_event 7, 23, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A - object_event 16, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A + object_event 16, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A object_event 17, 34, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A object_event 35, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL - object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG + object_event 1, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index c961e1490..c0feedf21 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -283,22 +283,22 @@ NewBarkTown_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 6, 3, ELMS_LAB, 1 - warp_event 13, 5, PLAYERS_HOUSE_1F, 1 - warp_event 3, 11, PLAYERS_NEIGHBORS_HOUSE, 1 + warp_event 6, 3, ELMS_LAB, 1 + warp_event 13, 5, PLAYERS_HOUSE_1F, 1 + warp_event 3, 11, PLAYERS_NEIGHBORS_HOUSE, 1 warp_event 11, 13, ELMS_HOUSE, 1 db 2 ; coord events - coord_event 1, 8, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene1 - coord_event 1, 9, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene2 + coord_event 1, 8, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene1 + coord_event 1, 9, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene2 db 4 ; bg events - bg_event 8, 8, BGEVENT_READ, NewBarkTownSign - bg_event 11, 5, BGEVENT_READ, MapNewBarkTownSignpost1Script - bg_event 3, 3, BGEVENT_READ, MapNewBarkTownSignpost2Script - bg_event 9, 13, BGEVENT_READ, MapNewBarkTownSignpost3Script + bg_event 8, 8, BGEVENT_READ, NewBarkTownSign + bg_event 11, 5, BGEVENT_READ, MapNewBarkTownSignpost1Script + bg_event 3, 3, BGEVENT_READ, MapNewBarkTownSignpost2Script + bg_event 9, 13, BGEVENT_READ, MapNewBarkTownSignpost3Script db 3 ; object events - object_event 6, 8, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1 - object_event 12, 9, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1 - object_event 3, 2, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN + object_event 6, 8, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1 + object_event 12, 9, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1 + object_event 3, 2, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 370d0fdbd..4750edf0a 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -258,31 +258,31 @@ OaksLab_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 11, PALLET_TOWN, 3 - warp_event 5, 11, PALLET_TOWN, 3 + warp_event 4, 11, PALLET_TOWN, 3 + warp_event 5, 11, PALLET_TOWN, 3 db 0 ; coord events db 16 ; bg events - bg_event 6, 1, BGEVENT_READ, OaksLabBookshelf - bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf - bg_event 8, 1, BGEVENT_READ, OaksLabBookshelf - bg_event 9, 1, BGEVENT_READ, OaksLabBookshelf - bg_event 0, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 1, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 2, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 3, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 6, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 7, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 8, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 9, 7, BGEVENT_READ, OaksLabBookshelf - bg_event 4, 0, BGEVENT_READ, OaksLabPoster1 - bg_event 5, 0, BGEVENT_READ, OaksLabPoster2 - bg_event 9, 3, BGEVENT_READ, OaksLabTrashcan - bg_event 0, 1, BGEVENT_READ, OaksLabPC + bg_event 6, 1, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 1, BGEVENT_READ, OaksLabBookshelf + bg_event 8, 1, BGEVENT_READ, OaksLabBookshelf + bg_event 9, 1, BGEVENT_READ, OaksLabBookshelf + bg_event 0, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 1, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 2, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 3, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 6, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 7, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 8, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 9, 7, BGEVENT_READ, OaksLabBookshelf + bg_event 4, 0, BGEVENT_READ, OaksLabPoster1 + bg_event 5, 0, BGEVENT_READ, OaksLabPoster2 + bg_event 9, 3, BGEVENT_READ, OaksLabTrashcan + bg_event 0, 1, BGEVENT_READ, OaksLabPC db 4 ; object events - object_event 4, 2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1 - object_event 1, 8, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1 - object_event 8, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1 - object_event 1, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant3Script, -1 + object_event 4, 2, SPRITE_OAK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Oak, -1 + object_event 1, 8, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant1Script, -1 + object_event 8, 9, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant2Script, -1 + object_event 1, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OaksAssistant3Script, -1 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index d036233c1..6e3ffbe5f 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -80,14 +80,14 @@ OlivineCafe_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, OLIVINE_CITY, 7 - warp_event 3, 7, OLIVINE_CITY, 7 + warp_event 2, 7, OLIVINE_CITY, 7 + warp_event 3, 7, OLIVINE_CITY, 7 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1 - object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1 - object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1 + object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1 + object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1 + object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 53dbd674f..181bf2cbf 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -292,10 +292,10 @@ OlivineCity_MapEvents: warp_event 13, 21, OLIVINE_POKECENTER_1F, 1 warp_event 10, 11, OLIVINE_GYM, 1 warp_event 25, 11, OLIVINE_TIMS_HOUSE, 1 - warp_event 0, 0, OLIVINE_HOUSE_BETA, 1 + warp_event 0, 0, OLIVINE_HOUSE_BETA, 1 ; inaccessible warp_event 29, 11, OLIVINE_PUNISHMENT_SPEECH_HOUSE, 1 warp_event 13, 15, OLIVINE_GOOD_ROD_HOUSE, 1 - warp_event 7, 21, OLIVINE_CAFE, 1 + warp_event 7, 21, OLIVINE_CAFE, 1 warp_event 19, 17, OLIVINE_MART, 2 warp_event 29, 27, OLIVINE_LIGHTHOUSE_1F, 1 warp_event 19, 27, OLIVINE_PORT_PASSAGE, 1 @@ -308,9 +308,9 @@ OlivineCity_MapEvents: db 7 ; bg events bg_event 17, 11, BGEVENT_READ, OlivineCitySign bg_event 20, 24, BGEVENT_READ, OlivineCityPortSign - bg_event 7, 11, BGEVENT_READ, OlivineGymSign + bg_event 7, 11, BGEVENT_READ, OlivineGymSign bg_event 30, 28, BGEVENT_READ, OlivineLighthouseSign - bg_event 3, 23, BGEVENT_READ, OlivineCityBattleTowerSign + bg_event 3, 23, BGEVENT_READ, OlivineCityBattleTowerSign bg_event 14, 21, BGEVENT_READ, OlivineCityPokecenterSign bg_event 20, 17, BGEVENT_READ, OlivineCityMartSign diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 585aebd04..67acb021c 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -84,12 +84,12 @@ OlivineGoodRodHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, OLIVINE_CITY, 6 - warp_event 3, 7, OLIVINE_CITY, 6 + warp_event 2, 7, OLIVINE_CITY, 6 + warp_event 3, 7, OLIVINE_CITY, 6 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1 + object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoodRodGuru, -1 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index f146985bd..ab5dd650a 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -199,15 +199,15 @@ OlivineGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 15, OLIVINE_CITY, 2 - warp_event 5, 15, OLIVINE_CITY, 2 + warp_event 4, 15, OLIVINE_CITY, 2 + warp_event 5, 15, OLIVINE_CITY, 2 db 0 ; coord events db 2 ; bg events - bg_event 3, 13, BGEVENT_READ, OlivineGymStatue - bg_event 6, 13, BGEVENT_READ, OlivineGymStatue + bg_event 3, 13, BGEVENT_READ, OlivineGymStatue + bg_event 6, 13, BGEVENT_READ, OlivineGymStatue db 2 ; object events - object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE - object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1 + object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE + object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1 diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 3e9065343..ff92907d7 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -41,15 +41,15 @@ OlivineHouseBeta_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, OLIVINE_CITY, 4 - warp_event 3, 7, OLIVINE_CITY, 4 + warp_event 2, 7, OLIVINE_CITY, 4 + warp_event 3, 7, OLIVINE_CITY, 4 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, OlivineHouseBetaBookshelf1 - bg_event 1, 1, BGEVENT_READ, OlivineHouseBetaBookshelf2 + bg_event 0, 1, BGEVENT_READ, OlivineHouseBetaBookshelf1 + bg_event 1, 1, BGEVENT_READ, OlivineHouseBetaBookshelf2 db 2 ; object events - object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1 - object_event 6, 4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1 + object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1 + object_event 6, 4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index d1300badf..f411731e5 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -40,7 +40,7 @@ OlivineLighthouse1F_MapEvents: db 5 ; warp events warp_event 10, 17, OLIVINE_CITY, 9 warp_event 11, 17, OLIVINE_CITY, 9 - warp_event 3, 11, OLIVINE_LIGHTHOUSE_2F, 1 + warp_event 3, 11, OLIVINE_LIGHTHOUSE_2F, 1 warp_event 16, 13, OLIVINE_LIGHTHOUSE_2F, 3 warp_event 17, 13, OLIVINE_LIGHTHOUSE_2F, 4 @@ -49,5 +49,5 @@ OlivineLighthouse1F_MapEvents: db 0 ; bg events db 2 ; object events - object_event 8, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1 - object_event 16, 9, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1 + object_event 8, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FSailorScript, -1 + object_event 16, 9, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineLighthouse1FPokefanFScript, -1 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index c132b9375..9def30314 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -206,8 +206,8 @@ OlivineLighthouse2F_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 3, 11, OLIVINE_LIGHTHOUSE_1F, 3 - warp_event 5, 3, OLIVINE_LIGHTHOUSE_3F, 2 + warp_event 3, 11, OLIVINE_LIGHTHOUSE_1F, 3 + warp_event 5, 3, OLIVINE_LIGHTHOUSE_3F, 2 warp_event 16, 13, OLIVINE_LIGHTHOUSE_1F, 4 warp_event 17, 13, OLIVINE_LIGHTHOUSE_1F, 5 warp_event 16, 11, OLIVINE_LIGHTHOUSE_3F, 4 @@ -218,5 +218,5 @@ OlivineLighthouse2F_MapEvents: db 0 ; bg events db 2 ; object events - object_event 9, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey1, -1 - object_event 17, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1 + object_event 9, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorHuey1, -1 + object_event 17, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 1d07ae2c8..e81f24fb7 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -114,22 +114,22 @@ OlivineLighthouse3F_MapEvents: db 0, 0 ; filler db 9 ; warp events - warp_event 13, 3, OLIVINE_LIGHTHOUSE_4F, 1 - warp_event 5, 3, OLIVINE_LIGHTHOUSE_2F, 2 - warp_event 9, 5, OLIVINE_LIGHTHOUSE_4F, 4 + warp_event 13, 3, OLIVINE_LIGHTHOUSE_4F, 1 + warp_event 5, 3, OLIVINE_LIGHTHOUSE_2F, 2 + warp_event 9, 5, OLIVINE_LIGHTHOUSE_4F, 4 warp_event 16, 11, OLIVINE_LIGHTHOUSE_2F, 5 warp_event 17, 11, OLIVINE_LIGHTHOUSE_2F, 6 - warp_event 16, 9, OLIVINE_LIGHTHOUSE_4F, 5 - warp_event 17, 9, OLIVINE_LIGHTHOUSE_4F, 6 - warp_event 8, 3, OLIVINE_LIGHTHOUSE_4F, 7 - warp_event 9, 3, OLIVINE_LIGHTHOUSE_4F, 8 + warp_event 16, 9, OLIVINE_LIGHTHOUSE_4F, 5 + warp_event 17, 9, OLIVINE_LIGHTHOUSE_4F, 6 + warp_event 8, 3, OLIVINE_LIGHTHOUSE_4F, 7 + warp_event 9, 3, OLIVINE_LIGHTHOUSE_4F, 8 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 9, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1 - object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 - object_event 3, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1 - object_event 8, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER + object_event 9, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1 + object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 + object_event 3, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1 + object_event 8, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index cc00a643a..b240ac39f 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -83,21 +83,21 @@ OlivineLighthouse4F_MapEvents: db 0, 0 ; filler db 10 ; warp events - warp_event 13, 3, OLIVINE_LIGHTHOUSE_3F, 1 - warp_event 3, 5, OLIVINE_LIGHTHOUSE_5F, 2 - warp_event 9, 7, OLIVINE_LIGHTHOUSE_5F, 3 - warp_event 9, 5, OLIVINE_LIGHTHOUSE_3F, 3 - warp_event 16, 9, OLIVINE_LIGHTHOUSE_3F, 6 - warp_event 17, 9, OLIVINE_LIGHTHOUSE_3F, 7 - warp_event 8, 3, OLIVINE_LIGHTHOUSE_3F, 8 - warp_event 9, 3, OLIVINE_LIGHTHOUSE_3F, 9 - warp_event 16, 7, OLIVINE_LIGHTHOUSE_5F, 4 - warp_event 17, 7, OLIVINE_LIGHTHOUSE_5F, 5 + warp_event 13, 3, OLIVINE_LIGHTHOUSE_3F, 1 + warp_event 3, 5, OLIVINE_LIGHTHOUSE_5F, 2 + warp_event 9, 7, OLIVINE_LIGHTHOUSE_5F, 3 + warp_event 9, 5, OLIVINE_LIGHTHOUSE_3F, 3 + warp_event 16, 9, OLIVINE_LIGHTHOUSE_3F, 6 + warp_event 17, 9, OLIVINE_LIGHTHOUSE_3F, 7 + warp_event 8, 3, OLIVINE_LIGHTHOUSE_3F, 8 + warp_event 9, 3, OLIVINE_LIGHTHOUSE_3F, 9 + warp_event 16, 7, OLIVINE_LIGHTHOUSE_5F, 4 + warp_event 17, 7, OLIVINE_LIGHTHOUSE_5F, 5 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 7, 14, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorKent, -1 - object_event 11, 2, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassConnie, -1 + object_event 7, 14, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorKent, -1 + object_event 11, 2, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassConnie, -1 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index c69b5e98c..bf1fb6717 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -92,22 +92,22 @@ OlivineLighthouse5F_MapEvents: db 0, 0 ; filler db 7 ; warp events - warp_event 9, 15, OLIVINE_LIGHTHOUSE_6F, 1 - warp_event 3, 5, OLIVINE_LIGHTHOUSE_4F, 2 - warp_event 9, 7, OLIVINE_LIGHTHOUSE_4F, 3 - warp_event 16, 7, OLIVINE_LIGHTHOUSE_4F, 9 - warp_event 17, 7, OLIVINE_LIGHTHOUSE_4F, 10 - warp_event 16, 5, OLIVINE_LIGHTHOUSE_6F, 2 - warp_event 17, 5, OLIVINE_LIGHTHOUSE_6F, 3 + warp_event 9, 15, OLIVINE_LIGHTHOUSE_6F, 1 + warp_event 3, 5, OLIVINE_LIGHTHOUSE_4F, 2 + warp_event 9, 7, OLIVINE_LIGHTHOUSE_4F, 3 + warp_event 16, 7, OLIVINE_LIGHTHOUSE_4F, 9 + warp_event 17, 7, OLIVINE_LIGHTHOUSE_4F, 10 + warp_event 16, 5, OLIVINE_LIGHTHOUSE_6F, 2 + warp_event 17, 5, OLIVINE_LIGHTHOUSE_6F, 3 db 0 ; coord events db 1 ; bg events - bg_event 3, 13, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion + bg_event 3, 13, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion db 5 ; object events - object_event 8, 11, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1 - object_event 8, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1 + object_event 8, 11, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1 + object_event 8, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1 object_event 15, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY - object_event 6, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL - object_event 2, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER + object_event 6, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL + object_event 2, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 381795a79..3aff2dad9 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -259,15 +259,15 @@ OlivineLighthouse6F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 9, 15, OLIVINE_LIGHTHOUSE_5F, 1 - warp_event 16, 5, OLIVINE_LIGHTHOUSE_5F, 6 - warp_event 17, 5, OLIVINE_LIGHTHOUSE_5F, 7 + warp_event 9, 15, OLIVINE_LIGHTHOUSE_5F, 1 + warp_event 16, 5, OLIVINE_LIGHTHOUSE_5F, 6 + warp_event 17, 5, OLIVINE_LIGHTHOUSE_5F, 7 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 8, 8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE - object_event 9, 8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1 - object_event 3, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION + object_event 8, 8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE + object_event 9, 8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1 + object_event 3, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index 048bb9785..3bc0774f3 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -47,14 +47,14 @@ OlivineMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, OLIVINE_CITY, 8 - warp_event 3, 7, OLIVINE_CITY, 8 + warp_event 2, 7, OLIVINE_CITY, 8 + warp_event 3, 7, OLIVINE_CITY, 8 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1 - object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1 - object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1 + object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivineMartCooltrainerFScript, -1 + object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineMartLassScript, -1 diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index 2686f00f1..173c7a9b4 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -49,16 +49,16 @@ OlivinePokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, OLIVINE_CITY, 1 - warp_event 4, 7, OLIVINE_CITY, 1 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, OLIVINE_CITY, 1 + warp_event 4, 7, OLIVINE_CITY, 1 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9c002, -1 - object_event 8, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1 - object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1 - object_event 7, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9c002, -1 + object_event 8, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1 + object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FFisherScript, -1 + object_event 7, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePokecenter1FTeacherScript, -1 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 78940406c..716c79962 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -386,20 +386,20 @@ OlivinePort_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 11, 7, OLIVINE_PORT_PASSAGE, 5 - warp_event 7, 23, FAST_SHIP_1F, 1 + warp_event 11, 7, OLIVINE_PORT_PASSAGE, 5 + warp_event 7, 23, FAST_SHIP_1F, 1 db 1 ; coord events - coord_event 7, 15, SCENE_DEFAULT, UnknownScript_0x7491f + coord_event 7, 15, SCENE_DEFAULT, UnknownScript_0x7491f db 1 ; bg events - bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein + bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein db 7 ; object events - object_event 7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY - object_event 7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME - object_event 6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - object_event 4, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + object_event 7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY + object_event 7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + object_event 6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + object_event 4, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME object_event 13, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME - object_event 4, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + object_event 4, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME object_event 11, 15, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 74feb52d5..98040307f 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -21,15 +21,15 @@ OlivinePortPassage_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 15, 0, OLIVINE_CITY, 10 - warp_event 16, 0, OLIVINE_CITY, 11 - warp_event 15, 4, OLIVINE_PORT_PASSAGE, 4 - warp_event 3, 2, OLIVINE_PORT_PASSAGE, 3 - warp_event 3, 14, OLIVINE_PORT, 1 + warp_event 15, 0, OLIVINE_CITY, 10 + warp_event 16, 0, OLIVINE_CITY, 11 + warp_event 15, 4, OLIVINE_PORT_PASSAGE, 4 + warp_event 3, 2, OLIVINE_PORT_PASSAGE, 3 + warp_event 3, 14, OLIVINE_PORT, 1 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 17, 1, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M + object_event 17, 1, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortPassagePokefanMScript, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index 8216d53f6..e590f158d 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -41,15 +41,15 @@ OlivinePunishmentSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, OLIVINE_CITY, 5 - warp_event 3, 7, OLIVINE_CITY, 5 + warp_event 2, 7, OLIVINE_CITY, 5 + warp_event 3, 7, OLIVINE_CITY, 5 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf1 - bg_event 1, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf2 + bg_event 0, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf1 + bg_event 1, 1, BGEVENT_READ, OlivinePunishmentSpeechHouseBookshelf2 db 2 ; object events - object_event 1, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1 - object_event 5, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1 + object_event 1, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDad, -1 + object_event 5, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePunishmentSpeechHouseDaughter, -1 diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 7d59a92e5..60263cf3c 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -21,14 +21,14 @@ OlivineTimsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, OLIVINE_CITY, 3 - warp_event 3, 7, OLIVINE_CITY, 3 + warp_event 2, 7, OLIVINE_CITY, 3 + warp_event 3, 7, OLIVINE_CITY, 3 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, TimsHouseBookshelf - bg_event 1, 1, BGEVENT_READ, TimsHouseBookshelf + bg_event 0, 1, BGEVENT_READ, TimsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, TimsHouseBookshelf db 1 ; object events - object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1 + object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 13ea47815..0bc820103 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -71,18 +71,18 @@ PalletTown_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 5, 5, REDS_HOUSE_1F, 1 - warp_event 13, 5, BLUES_HOUSE, 1 + warp_event 5, 5, REDS_HOUSE_1F, 1 + warp_event 13, 5, BLUES_HOUSE, 1 warp_event 12, 11, OAKS_LAB, 1 db 0 ; coord events db 4 ; bg events - bg_event 7, 9, BGEVENT_READ, PalletTownSign - bg_event 3, 5, BGEVENT_READ, RedsHouseSign + bg_event 7, 9, BGEVENT_READ, PalletTownSign + bg_event 3, 5, BGEVENT_READ, RedsHouseSign bg_event 13, 13, BGEVENT_READ, OaksLabSign - bg_event 11, 5, BGEVENT_READ, BluesHouseSign + bg_event 11, 5, BGEVENT_READ, BluesHouseSign db 2 ; object events - object_event 3, 8, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1 + object_event 3, 8, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PalletTownTeacherScript, -1 object_event 12, 14, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PalletTownFisherScript, -1 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 277f71487..87e918d35 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -158,14 +158,14 @@ PewterCity_MapEvents: warp_event 16, 17, PEWTER_GYM, 1 warp_event 23, 17, PEWTER_MART, 2 warp_event 13, 25, PEWTER_POKECENTER_1F, 1 - warp_event 7, 29, PEWTER_SNOOZE_SPEECH_HOUSE, 1 + warp_event 7, 29, PEWTER_SNOOZE_SPEECH_HOUSE, 1 db 0 ; coord events db 7 ; bg events bg_event 25, 23, BGEVENT_READ, PewterCitySign bg_event 11, 17, BGEVENT_READ, PewterGymSign - bg_event 15, 9, BGEVENT_READ, PewterMuseumSign + bg_event 15, 9, BGEVENT_READ, PewterMuseumSign bg_event 33, 19, BGEVENT_READ, PewterCityMtMoonGiftShopSign bg_event 19, 29, BGEVENT_READ, PewterCityWelcomeSign bg_event 14, 25, BGEVENT_READ, PewterCityPokecenterSign @@ -175,5 +175,5 @@ PewterCity_MapEvents: object_event 19, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1 object_event 14, 29, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1 object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1 - object_event 32, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1 - object_event 30, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1 + object_event 32, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1 + object_event 30, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 0e73c3657..1d4da2419 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -210,16 +210,16 @@ PewterGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 13, PEWTER_CITY, 2 - warp_event 5, 13, PEWTER_CITY, 2 + warp_event 4, 13, PEWTER_CITY, 2 + warp_event 5, 13, PEWTER_CITY, 2 db 0 ; coord events db 2 ; bg events - bg_event 2, 11, BGEVENT_READ, PewterGymStatue - bg_event 7, 11, BGEVENT_READ, PewterGymStatue + bg_event 2, 11, BGEVENT_READ, PewterGymStatue + bg_event 7, 11, BGEVENT_READ, PewterGymStatue db 3 ; object events - object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1 - object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1 - object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1 + object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1 + object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1 + object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index 19e324bca..1862f99b1 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -47,14 +47,14 @@ PewterMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, PEWTER_CITY, 3 - warp_event 3, 7, PEWTER_CITY, 3 + warp_event 2, 7, PEWTER_CITY, 3 + warp_event 3, 7, PEWTER_CITY, 3 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1 - object_event 9, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1 - object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1 + object_event 9, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1 + object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index aed4ba69b..cf90488be 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -30,13 +30,13 @@ PewterNidoranSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, PEWTER_CITY, 1 - warp_event 3, 7, PEWTER_CITY, 1 + warp_event 2, 7, PEWTER_CITY, 1 + warp_event 3, 7, PEWTER_CITY, 1 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 3, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1 - object_event 4, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterNidoran, -1 + object_event 3, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterNidoranSpeechHouseSuperNerdScript, -1 + object_event 4, 5, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterNidoran, -1 diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index 328b92f79..14f1870c3 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -69,17 +69,17 @@ PewterPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, PEWTER_CITY, 4 - warp_event 4, 7, PEWTER_CITY, 4 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, PEWTER_CITY, 4 + warp_event 4, 7, PEWTER_CITY, 4 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 5 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1 - object_event 8, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1 - object_event 1, 3, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1 - object_event 2, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1 - object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Chris, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1 + object_event 8, 6, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FTeacherScript, -1 + object_event 1, 3, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterJigglypuff, -1 + object_event 2, 3, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterPokecenter1FBugCatcherScript, -1 + object_event 7, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Chris, -1 diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm index 49d4deea9..6e5e6c14a 100644 --- a/maps/PewterPokecenter2FBeta.asm +++ b/maps/PewterPokecenter2FBeta.asm @@ -7,7 +7,7 @@ PewterPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, PEWTER_POKECENTER_1F, 3 + warp_event 0, 7, PEWTER_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 2a7e21c8e..61a96a50f 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -22,14 +22,14 @@ PewterSnoozeSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, PEWTER_CITY, 5 - warp_event 3, 7, PEWTER_CITY, 5 + warp_event 2, 7, PEWTER_CITY, 5 + warp_event 3, 7, PEWTER_CITY, 5 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf + bg_event 0, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, PewterSnoozeSpeechHouseBookshelf db 1 ; object events - object_event 5, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1 + object_event 5, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterSnoozeSpeechHouseGrampsScript, -1 diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index 61c52d7c9..ad4f5c39d 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -387,23 +387,23 @@ PlayersHouse1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 6, 7, NEW_BARK_TOWN, 2 - warp_event 7, 7, NEW_BARK_TOWN, 2 - warp_event 9, 0, PLAYERS_HOUSE_2F, 1 + warp_event 6, 7, NEW_BARK_TOWN, 2 + warp_event 7, 7, NEW_BARK_TOWN, 2 + warp_event 9, 0, PLAYERS_HOUSE_2F, 1 db 2 ; coord events - coord_event 8, 4, SCENE_DEFAULT, UnknownScript_0x7a4d8 - coord_event 9, 4, SCENE_DEFAULT, UnknownScript_0x7a4db + coord_event 8, 4, SCENE_DEFAULT, UnknownScript_0x7a4d8 + coord_event 9, 4, SCENE_DEFAULT, UnknownScript_0x7a4db db 4 ; bg events - bg_event 0, 1, BGEVENT_READ, StoveScript - bg_event 1, 1, BGEVENT_READ, SinkScript - bg_event 2, 1, BGEVENT_READ, FridgeScript - bg_event 4, 1, BGEVENT_READ, TVScript + bg_event 0, 1, BGEVENT_READ, StoveScript + bg_event 1, 1, BGEVENT_READ, SinkScript + bg_event 2, 1, BGEVENT_READ, FridgeScript + bg_event 4, 1, BGEVENT_READ, TVScript db 5 ; object events - object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_1 - object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 - object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 - object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 - object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_PLAYERS_HOUSE_1F_NEIGHBOR + object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_1 + object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 + object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 + object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 + object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_PLAYERS_HOUSE_1F_NEIGHBOR diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index d0fe5dece..a5c03a749 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -117,18 +117,18 @@ PlayersHouse2F_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 7, 0, PLAYERS_HOUSE_1F, 3 + warp_event 7, 0, PLAYERS_HOUSE_1F, 3 db 0 ; coord events db 4 ; bg events - bg_event 2, 1, BGEVENT_UP, PlayersHousePCScript - bg_event 3, 1, BGEVENT_READ, PlayersHouseRadioScript - bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelfScript - bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript + bg_event 2, 1, BGEVENT_UP, PlayersHousePCScript + bg_event 3, 1, BGEVENT_READ, PlayersHouseRadioScript + bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelfScript + bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript db 4 ; object events - object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE - object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1 - object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2 - object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL + object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE + object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1 + object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2 + object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm index 127c0f1ec..84400b09e 100644 --- a/maps/PlayersNeighborsHouse.asm +++ b/maps/PlayersNeighborsHouse.asm @@ -100,16 +100,16 @@ PlayersNeighborsHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, NEW_BARK_TOWN, 3 - warp_event 3, 7, NEW_BARK_TOWN, 3 + warp_event 2, 7, NEW_BARK_TOWN, 3 + warp_event 3, 7, NEW_BARK_TOWN, 3 db 0 ; coord events db 3 ; bg events - bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript - bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript - bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadioScript + bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript + bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript + bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadioScript db 2 ; object events - object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughterScript, -1 - object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborScript, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR + object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughterScript, -1 + object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborScript, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index a656ffe0e..05d2f9779 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -18,12 +18,12 @@ PokeSeersHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, CIANWOOD_CITY, 7 - warp_event 3, 7, CIANWOOD_CITY, 7 + warp_event 2, 7, CIANWOOD_CITY, 7 + warp_event 3, 7, CIANWOOD_CITY, 7 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SeerScript, -1 + object_event 2, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SeerScript, -1 diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 27a5224f9..2f15c0c10 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -1024,20 +1024,20 @@ Pokecenter2F_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 0, 7, POKECENTER_2F, -1 - warp_event 5, 0, TRADE_CENTER, 1 - warp_event 9, 0, COLOSSEUM, 1 - warp_event 13, 2, TIME_CAPSULE, 1 - warp_event 6, 0, MOBILE_TRADE_ROOM, 1 - warp_event 10, 0, MOBILE_BATTLE_ROOM, 1 + warp_event 0, 7, POKECENTER_2F, -1 + warp_event 5, 0, TRADE_CENTER, 1 + warp_event 9, 0, COLOSSEUM, 1 + warp_event 13, 2, TIME_CAPSULE, 1 + warp_event 6, 0, MOBILE_TRADE_ROOM, 1 + warp_event 10, 0, MOBILE_BATTLE_ROOM, 1 db 0 ; coord events db 1 ; bg events - bg_event 7, 3, BGEVENT_READ, MapPokecenter2FSignpost0Script + bg_event 7, 3, BGEVENT_READ, MapPokecenter2FSignpost0Script db 4 ; object events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1 - object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1 - object_event 1, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1 + object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1 + object_event 1, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm index dcde9beaf..024286f4a 100644 --- a/maps/PokecomCenterAdminRoomMobile.asm +++ b/maps/PokecomCenterAdminRoomMobile.asm @@ -264,17 +264,17 @@ PokecomCenterAdminRoomMobile_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 0, 31, GOLDENROD_POKECENTER_1F, 3 - warp_event 1, 31, GOLDENROD_POKECENTER_1F, 3 + warp_event 0, 31, GOLDENROD_POKECENTER_1F, 3 + warp_event 1, 31, GOLDENROD_POKECENTER_1F, 3 db 0 ; coord events db 3 ; bg events - bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost0Script - bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost1Script - bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost2Script + bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost0Script + bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost1Script + bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost2Script db 3 ; object events - object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist1Script, -1 - object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist2Script, -1 - object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist3Script, -1 + object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist1Script, -1 + object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist2Script, -1 + object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist3Script, -1 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 7a5260d61..1f54460ba 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -298,19 +298,19 @@ PokemonFanClub_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, VERMILION_CITY, 3 - warp_event 3, 7, VERMILION_CITY, 3 + warp_event 2, 7, VERMILION_CITY, 3 + warp_event 3, 7, VERMILION_CITY, 3 db 0 ; coord events db 2 ; bg events - bg_event 7, 0, BGEVENT_READ, MapPokemonFanClubSignpost0Script - bg_event 9, 0, BGEVENT_READ, MapPokemonFanClubSignpost1Script + bg_event 7, 0, BGEVENT_READ, MapPokemonFanClubSignpost0Script + bg_event 9, 0, BGEVENT_READ, MapPokemonFanClubSignpost1Script db 6 ; object events - object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1 - object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1 - object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FisherScript_0x191824, -1 - object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1 - object_event 2, 4, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL - object_event 7, 3, SPRITE_ODDISH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FanClubBayleef, -1 + object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1 + object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1 + object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FisherScript_0x191824, -1 + object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1 + object_event 2, 4, SPRITE_FAIRY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL + object_event 7, 3, SPRITE_ODDISH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FanClubBayleef, -1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 6989234e0..4395c12e2 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -390,21 +390,21 @@ PowerPlant_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 17, ROUTE_10_NORTH, 2 - warp_event 3, 17, ROUTE_10_NORTH, 2 + warp_event 2, 17, ROUTE_10_NORTH, 2 + warp_event 3, 17, ROUTE_10_NORTH, 2 db 1 ; coord events - coord_event 5, 12, SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL, PowerPlantGuardPhoneScript + coord_event 5, 12, SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL, PowerPlantGuardPhoneScript db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, PowerPlantBookshelf - bg_event 1, 1, BGEVENT_READ, PowerPlantBookshelf + bg_event 0, 1, BGEVENT_READ, PowerPlantBookshelf + bg_event 1, 1, BGEVENT_READ, PowerPlantBookshelf db 7 ; object events - object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1 - object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1 - object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1 - object_event 9, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1 - object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1 + object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1 + object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1 + object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1 + object_event 9, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1 + object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1 object_event 14, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PowerPlantManager, -1 - object_event 5, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1 + object_event 5, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index f2b537f50..32b210b55 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -474,20 +474,20 @@ RadioTower1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 2, 7, GOLDENROD_CITY, 11 - warp_event 3, 7, GOLDENROD_CITY, 11 - warp_event 15, 0, RADIO_TOWER_2F, 2 + warp_event 2, 7, GOLDENROD_CITY, 11 + warp_event 3, 7, GOLDENROD_CITY, 11 + warp_event 15, 0, RADIO_TOWER_2F, 2 db 0 ; coord events db 2 ; bg events - bg_event 3, 0, BGEVENT_READ, MapRadioTower1FSignpost0Script - bg_event 13, 0, BGEVENT_READ, MapRadioTower1FSignpost1Script + bg_event 3, 0, BGEVENT_READ, MapRadioTower1FSignpost0Script + bg_event 13, 0, BGEVENT_READ, MapRadioTower1FSignpost1Script db 6 ; object events - object_event 5, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1 - object_event 16, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS - object_event 15, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS - object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS - object_event 12, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS + object_event 5, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1 + object_event 16, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event 15, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS + object_event 12, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 9343109d5..4b3e14794 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -712,28 +712,28 @@ RadioTower2F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 0, 0, RADIO_TOWER_3F, 1 - warp_event 15, 0, RADIO_TOWER_1F, 3 + warp_event 0, 0, RADIO_TOWER_3F, 1 + warp_event 15, 0, RADIO_TOWER_1F, 3 db 0 ; coord events db 6 ; bg events - bg_event 3, 0, BGEVENT_READ, MapRadioTower2FSignpost0Script - bg_event 5, 0, BGEVENT_READ, MapRadioTower2FSignpost1Script - bg_event 9, 1, BGEVENT_READ, RadioTower2FBookshelf - bg_event 10, 1, BGEVENT_READ, RadioTower2FBookshelf - bg_event 11, 1, BGEVENT_READ, RadioTower2FBookshelf - bg_event 13, 0, BGEVENT_READ, MapRadioTower2FSignpost5Script + bg_event 3, 0, BGEVENT_READ, MapRadioTower2FSignpost0Script + bg_event 5, 0, BGEVENT_READ, MapRadioTower2FSignpost1Script + bg_event 9, 1, BGEVENT_READ, RadioTower2FBookshelf + bg_event 10, 1, BGEVENT_READ, RadioTower2FBookshelf + bg_event 11, 1, BGEVENT_READ, RadioTower2FBookshelf + bg_event 13, 0, BGEVENT_READ, MapRadioTower2FSignpost5Script db 11 ; object events - object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS - object_event 17, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1 - object_event 1, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 8, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 10, 5, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 0, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS - object_event 1, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER - object_event 12, 1, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1 - object_event 14, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1 - object_event 12, 7, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS + object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS + object_event 17, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1 + object_event 1, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 8, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 10, 5, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 0, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS + object_event 1, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER + object_event 12, 1, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1 + object_event 14, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1 + object_event 12, 7, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 26d5d5a9a..554bb4ace 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -330,22 +330,22 @@ RadioTower3F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 0, 0, RADIO_TOWER_2F, 1 - warp_event 7, 0, RADIO_TOWER_4F, 2 - warp_event 17, 0, RADIO_TOWER_4F, 4 + warp_event 0, 0, RADIO_TOWER_2F, 1 + warp_event 7, 0, RADIO_TOWER_4F, 2 + warp_event 17, 0, RADIO_TOWER_4F, 4 db 0 ; coord events db 3 ; bg events - bg_event 3, 0, BGEVENT_READ, MapRadioTower3FSignpost0Script - bg_event 9, 0, BGEVENT_READ, MapRadioTower3FSignpost1Script - bg_event 14, 2, BGEVENT_UP, MapRadioTower3FSignpost2Script + bg_event 3, 0, BGEVENT_READ, MapRadioTower3FSignpost0Script + bg_event 9, 0, BGEVENT_READ, MapRadioTower3FSignpost1Script + bg_event 14, 2, BGEVENT_UP, MapRadioTower3FSignpost2Script db 7 ; object events - object_event 7, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER - object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1 - object_event 11, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1 - object_event 5, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 6, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 16, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 9, 6, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 7, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER + object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1 + object_event 11, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1 + object_event 5, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 6, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 16, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 9, 6, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index b2181228e..0db5df152 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -247,22 +247,22 @@ RadioTower4F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 0, RADIO_TOWER_5F, 1 - warp_event 9, 0, RADIO_TOWER_3F, 2 - warp_event 12, 0, RADIO_TOWER_5F, 2 - warp_event 17, 0, RADIO_TOWER_3F, 3 + warp_event 0, 0, RADIO_TOWER_5F, 1 + warp_event 9, 0, RADIO_TOWER_3F, 2 + warp_event 12, 0, RADIO_TOWER_5F, 2 + warp_event 17, 0, RADIO_TOWER_3F, 3 db 0 ; coord events db 2 ; bg events - bg_event 7, 0, BGEVENT_READ, MapRadioTower4FSignpost0Script - bg_event 15, 0, BGEVENT_READ, MapRadioTower4FSignpost1Script + bg_event 7, 0, BGEVENT_READ, MapRadioTower4FSignpost0Script + bg_event 15, 0, BGEVENT_READ, MapRadioTower4FSignpost1Script db 7 ; object events - object_event 6, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER - object_event 14, 6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1 - object_event 12, 7, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1 - object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 12, 4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 4, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 6, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER + object_event 14, 6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1 + object_event 12, 7, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1 + object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 12, 4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 4, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 70a97ff65..ad8726a2a 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -422,23 +422,23 @@ RadioTower5F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 0, 0, RADIO_TOWER_4F, 1 - warp_event 12, 0, RADIO_TOWER_4F, 3 + warp_event 0, 0, RADIO_TOWER_4F, 1 + warp_event 12, 0, RADIO_TOWER_4F, 3 db 2 ; coord events - coord_event 0, 3, SCENE_DEFAULT, FakeDirectorScript - coord_event 16, 5, SCENE_RADIOTOWER5F_ROCKET_BOSS, RadioTower5FRocketBossScene + coord_event 0, 3, SCENE_DEFAULT, FakeDirectorScript + coord_event 16, 5, SCENE_RADIOTOWER5F_ROCKET_BOSS, RadioTower5FRocketBossScene db 5 ; bg events - bg_event 3, 0, BGEVENT_READ, MapRadioTower5FSignpost0Script - bg_event 11, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script - bg_event 15, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script - bg_event 16, 1, BGEVENT_READ, RadioTower5FBookshelf - bg_event 17, 1, BGEVENT_READ, RadioTower5FBookshelf + bg_event 3, 0, BGEVENT_READ, MapRadioTower5FSignpost0Script + bg_event 11, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script + bg_event 15, 0, BGEVENT_READ, MapRadioTower5FSignpost2Script + bg_event 16, 1, BGEVENT_READ, RadioTower5FBookshelf + bg_event 17, 1, BGEVENT_READ, RadioTower5FBookshelf db 5 ; object events - object_event 3, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Director, -1 - object_event 13, 5, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 17, 2, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 13, 5, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER - object_event 8, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL + object_event 3, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Director, -1 + object_event 13, 5, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 17, 2, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + object_event 13, 5, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER + object_event 8, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index e12724bca..a07b231a4 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -76,16 +76,16 @@ RedsHouse1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 2, 7, PALLET_TOWN, 1 - warp_event 3, 7, PALLET_TOWN, 1 - warp_event 7, 0, REDS_HOUSE_2F, 1 + warp_event 2, 7, PALLET_TOWN, 1 + warp_event 3, 7, PALLET_TOWN, 1 + warp_event 7, 0, REDS_HOUSE_2F, 1 db 0 ; coord events db 3 ; bg events - bg_event 0, 1, BGEVENT_READ, RedsHouse1FBookshelf - bg_event 1, 1, BGEVENT_READ, RedsHouse1FBookshelf - bg_event 2, 1, BGEVENT_READ, RedsHouse1FTV + bg_event 0, 1, BGEVENT_READ, RedsHouse1FBookshelf + bg_event 1, 1, BGEVENT_READ, RedsHouse1FBookshelf + bg_event 2, 1, BGEVENT_READ, RedsHouse1FTV db 1 ; object events - object_event 5, 3, SPRITE_REDS_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RedsMom, -1 + object_event 5, 3, SPRITE_REDS_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RedsMom, -1 diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index db61ec456..6ff76ec80 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -27,12 +27,12 @@ RedsHouse2F_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 7, 0, REDS_HOUSE_1F, 3 + warp_event 7, 0, REDS_HOUSE_1F, 3 db 0 ; coord events db 2 ; bg events - bg_event 3, 5, BGEVENT_READ, RedsHouse2FN64Script - bg_event 0, 1, BGEVENT_READ, RedsHouse2FPCScript + bg_event 3, 5, BGEVENT_READ, RedsHouse2FN64Script + bg_event 0, 1, BGEVENT_READ, RedsHouse2FPCScript db 0 ; object events diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 84c285c28..008f7aec8 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -23,19 +23,19 @@ RockTunnel1F_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 15, 3, ROUTE_9, 1 + warp_event 15, 3, ROUTE_9, 1 warp_event 11, 25, ROUTE_10_SOUTH, 1 - warp_event 5, 3, ROCK_TUNNEL_B1F, 3 - warp_event 15, 9, ROCK_TUNNEL_B1F, 2 - warp_event 27, 3, ROCK_TUNNEL_B1F, 4 + warp_event 5, 3, ROCK_TUNNEL_B1F, 3 + warp_event 15, 9, ROCK_TUNNEL_B1F, 2 + warp_event 27, 3, ROCK_TUNNEL_B1F, 4 warp_event 27, 13, ROCK_TUNNEL_B1F, 1 db 0 ; coord events db 2 ; bg events - bg_event 24, 4, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy + bg_event 24, 4, BGEVENT_ITEM, RockTunnel1FHiddenXAccuracy bg_event 21, 15, BGEVENT_ITEM, RockTunnel1FHiddenXDefend db 2 ; object events - object_event 4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER + object_event 4, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FElixer, EVENT_ROCK_TUNNEL_1F_ELIXER object_event 10, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnel1FTMSteelWing, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index ece139cbf..82cea7924 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -24,17 +24,17 @@ RockTunnelB1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 3, ROCK_TUNNEL_1F, 6 - warp_event 17, 9, ROCK_TUNNEL_1F, 4 - warp_event 23, 3, ROCK_TUNNEL_1F, 3 + warp_event 3, 3, ROCK_TUNNEL_1F, 6 + warp_event 17, 9, ROCK_TUNNEL_1F, 4 + warp_event 23, 3, ROCK_TUNNEL_1F, 3 warp_event 25, 23, ROCK_TUNNEL_1F, 5 db 0 ; coord events db 1 ; bg events - bg_event 4, 14, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion + bg_event 4, 14, BGEVENT_ITEM, RockTunnelB1FHiddenMaxPotion db 3 ; object events - object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON - object_event 6, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP - object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE + object_event 7, 25, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FIron, EVENT_ROCK_TUNNEL_B1F_IRON + object_event 6, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FPPUp, EVENT_ROCK_TUNNEL_B1F_PP_UP + object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RockTunnelB1FRevive, EVENT_ROCK_TUNNEL_B1F_REVIVE diff --git a/maps/Route1.asm b/maps/Route1.asm index d3d48d91e..6fd57c25a 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -86,9 +86,9 @@ Route1_MapEvents: db 0 ; coord events db 1 ; bg events - bg_event 7, 27, BGEVENT_READ, Route1Sign + bg_event 7, 27, BGEVENT_READ, Route1Sign db 3 ; object events - object_event 4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1 - object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1 - object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1 + object_event 4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1 + object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1 + object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1 diff --git a/maps/Route10North.asm b/maps/Route10North.asm index 954aeaac9..e04d646b7 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -17,13 +17,13 @@ Route10North_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 11, 1, ROUTE_10_POKECENTER_1F, 1 - warp_event 3, 9, POWER_PLANT, 1 + warp_event 11, 1, ROUTE_10_POKECENTER_1F, 1 + warp_event 3, 9, POWER_PLANT, 1 db 0 ; coord events db 2 ; bg events - bg_event 5, 11, BGEVENT_READ, PowerPlantSign - bg_event 12, 1, BGEVENT_READ, Route10PokecenterSign + bg_event 5, 11, BGEVENT_READ, PowerPlantSign + bg_event 12, 1, BGEVENT_READ, Route10PokecenterSign db 0 ; object events diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index dc744312c..ecd56522d 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -82,16 +82,16 @@ Route10Pokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, ROUTE_10_NORTH, 1 - warp_event 4, 7, ROUTE_10_NORTH, 1 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, ROUTE_10_NORTH, 1 + warp_event 4, 7, ROUTE_10_NORTH, 1 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1 - object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1 - object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1 - object_event 1, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1 + object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1 + object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1 + object_event 1, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1 diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm index ab9c80bb0..86927bb5a 100644 --- a/maps/Route10Pokecenter2FBeta.asm +++ b/maps/Route10Pokecenter2FBeta.asm @@ -7,7 +7,7 @@ Route10Pokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, ROUTE_10_POKECENTER_1F, 3 + warp_event 0, 7, ROUTE_10_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 50c15c257..b48f97b4f 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -77,13 +77,13 @@ Route10South_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 6, 1, ROCK_TUNNEL_1F, 2 + warp_event 6, 1, ROCK_TUNNEL_1F, 2 db 0 ; coord events db 1 ; bg events - bg_event 5, 3, BGEVENT_READ, Route10Sign + bg_event 5, 3, BGEVENT_READ, Route10Sign db 2 ; object events - object_event 17, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1 - object_event 8, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1 + object_event 17, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1 + object_event 8, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1 diff --git a/maps/Route11.asm b/maps/Route11.asm index 9cb88e091..cc93f5d8f 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -151,12 +151,12 @@ Route11_MapEvents: db 0 ; coord events db 2 ; bg events - bg_event 3, 7, BGEVENT_READ, Route11Sign - bg_event 32, 5, BGEVENT_ITEM, Route11HiddenRevive + bg_event 3, 7, BGEVENT_READ, Route11Sign + bg_event 32, 5, BGEVENT_ITEM, Route11HiddenRevive db 5 ; object events object_event 22, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterOwen, -1 - object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1 - object_event 28, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1 - object_event 8, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1 - object_event 32, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1 + object_event 20, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJason, -1 + object_event 28, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicHerman, -1 + object_event 8, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFidel, -1 + object_event 32, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1 diff --git a/maps/Route12.asm b/maps/Route12.asm index 40bed0b3a..ab468f2e2 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -174,13 +174,13 @@ Route12_MapEvents: db 3 ; bg events bg_event 11, 27, BGEVENT_READ, Route12Sign - bg_event 13, 9, BGEVENT_READ, FishingSpotSign + bg_event 13, 9, BGEVENT_READ, FishingSpotSign bg_event 14, 13, BGEVENT_ITEM, Route12HiddenElixer db 6 ; object events - object_event 5, 13, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1 + object_event 5, 13, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherMartin, -1 object_event 14, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherStephen, -1 object_event 10, 38, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerFisherBarney, -1 - object_event 6, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherKyle, -1 - object_event 5, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM - object_event 5, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET + object_event 6, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherKyle, -1 + object_event 5, 43, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM + object_event 5, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 36fefbcd1..fe1161bd4 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -81,12 +81,12 @@ Route12SuperRodHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, ROUTE_12, 1 - warp_event 3, 7, ROUTE_12, 1 + warp_event 2, 7, ROUTE_12, 1 + warp_event 3, 7, ROUTE_12, 1 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1 + object_event 5, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1 diff --git a/maps/Route13.asm b/maps/Route13.asm index 3f466b04e..164cfaaf3 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -203,8 +203,8 @@ Route13_MapEvents: bg_event 30, 13, BGEVENT_ITEM, Route13HiddenCalcium db 5 ; object events - object_event 42, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1 - object_event 43, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1 - object_event 32, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1 + object_event 42, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1 + object_event 43, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1 + object_event 32, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1 object_event 14, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerHikerKenny, -1 - object_event 25, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmAlex, -1 + object_event 25, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmAlex, -1 diff --git a/maps/Route14.asm b/maps/Route14.asm index 6d04456b0..1a7670279 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -125,5 +125,5 @@ Route14_MapEvents: db 4 ; object events object_event 11, 15, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmCarter, -1 object_event 11, 27, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRoy, -1 - object_event 6, 11, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1 - object_event 7, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 4, Kim, -1 + object_event 6, 11, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1 + object_event 7, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 4, Kim, -1 diff --git a/maps/Route15.asm b/maps/Route15.asm index b539866d1..32db439ea 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -203,13 +203,13 @@ Route15_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 4, ROUTE_15_FUCHSIA_GATE, 3 - warp_event 2, 5, ROUTE_15_FUCHSIA_GATE, 4 + warp_event 2, 4, ROUTE_15_FUCHSIA_GATE, 3 + warp_event 2, 5, ROUTE_15_FUCHSIA_GATE, 4 db 0 ; coord events db 1 ; bg events - bg_event 19, 9, BGEVENT_READ, Route15Sign + bg_event 19, 9, BGEVENT_READ, Route15Sign db 7 ; object events object_event 10, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1 @@ -218,4 +218,4 @@ Route15_MapEvents: object_event 27, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1 object_event 30, 12, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerTeacherColette, -1 object_event 20, 10, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerTeacherHillary, -1 - object_event 12, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP + object_event 12, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 73f40d679..002b31348 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -21,14 +21,14 @@ Route15FuchsiaGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, FUCHSIA_CITY, 8 - warp_event 0, 5, FUCHSIA_CITY, 9 - warp_event 9, 4, ROUTE_15, 1 - warp_event 9, 5, ROUTE_15, 2 + warp_event 0, 4, FUCHSIA_CITY, 8 + warp_event 0, 5, FUCHSIA_CITY, 9 + warp_event 9, 4, ROUTE_15, 1 + warp_event 9, 5, ROUTE_15, 2 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1 + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1 diff --git a/maps/Route16.asm b/maps/Route16.asm index 760037f92..40bbbd4e8 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -30,15 +30,15 @@ Route16_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 3, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE, 1 - warp_event 14, 6, ROUTE_16_GATE, 3 - warp_event 14, 7, ROUTE_16_GATE, 4 - warp_event 9, 6, ROUTE_16_GATE, 1 - warp_event 9, 7, ROUTE_16_GATE, 2 + warp_event 3, 1, ROUTE_16_FUCHSIA_SPEECH_HOUSE, 1 + warp_event 14, 6, ROUTE_16_GATE, 3 + warp_event 14, 7, ROUTE_16_GATE, 4 + warp_event 9, 6, ROUTE_16_GATE, 1 + warp_event 9, 7, ROUTE_16_GATE, 2 db 0 ; coord events db 1 ; bg events - bg_event 5, 5, BGEVENT_READ, CyclingRoadSign + bg_event 5, 5, BGEVENT_READ, CyclingRoadSign db 0 ; object events diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 1adf4e433..53af80d35 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -24,14 +24,14 @@ Route16FuchsiaSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, ROUTE_16, 1 - warp_event 3, 7, ROUTE_16, 1 + warp_event 2, 7, ROUTE_16, 1 + warp_event 3, 7, ROUTE_16, 1 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf + bg_event 0, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, Route16FuchsiaSpeechHouseBookshelf db 1 ; object events - object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1 + object_event 2, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route16FuchsiaSpeechHouseSuperNerdScript, -1 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index f31841a1d..90826b4c9 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -62,16 +62,16 @@ Route16Gate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, ROUTE_16, 4 - warp_event 0, 5, ROUTE_16, 5 - warp_event 9, 4, ROUTE_16, 2 - warp_event 9, 5, ROUTE_16, 3 + warp_event 0, 4, ROUTE_16, 4 + warp_event 0, 5, ROUTE_16, 5 + warp_event 9, 4, ROUTE_16, 2 + warp_event 9, 5, ROUTE_16, 3 db 2 ; coord events - coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x733ed - coord_event 5, 5, SCENE_DEFAULT, UnknownScript_0x733ed + coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x733ed + coord_event 5, 5, SCENE_DEFAULT, UnknownScript_0x733ed db 0 ; bg events db 1 ; object events - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1 + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1 diff --git a/maps/Route17.asm b/maps/Route17.asm index 3f639d0ed..ee9a24e6a 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -140,11 +140,11 @@ Route17_MapEvents: db 0 ; coord events db 2 ; bg events - bg_event 9, 54, BGEVENT_ITEM, Route17HiddenMaxEther - bg_event 8, 77, BGEVENT_ITEM, Route17HiddenMaxElixer + bg_event 9, 54, BGEVENT_ITEM, Route17HiddenMaxEther + bg_event 8, 77, BGEVENT_ITEM, Route17HiddenMaxElixer db 4 ; object events - object_event 4, 17, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1 - object_event 9, 68, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1 - object_event 3, 53, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1 - object_event 6, 80, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerCharles, -1 + object_event 4, 17, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1 + object_event 9, 68, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1 + object_event 3, 53, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1 + object_event 6, 80, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerCharles, -1 diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm index 41cee4f99..c61a83011 100644 --- a/maps/Route17Route18Gate.asm +++ b/maps/Route17Route18Gate.asm @@ -53,16 +53,16 @@ Route17Route18Gate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, ROUTE_17, 1 - warp_event 0, 5, ROUTE_17, 2 - warp_event 9, 4, ROUTE_18, 1 - warp_event 9, 5, ROUTE_18, 2 + warp_event 0, 4, ROUTE_17, 1 + warp_event 0, 5, ROUTE_17, 2 + warp_event 9, 4, ROUTE_18, 1 + warp_event 9, 5, ROUTE_18, 2 db 2 ; coord events - coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x73611 - coord_event 5, 5, SCENE_DEFAULT, UnknownScript_0x73611 + coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x73611 + coord_event 5, 5, SCENE_DEFAULT, UnknownScript_0x73611 db 0 ; bg events db 1 ; object events - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route17Route18GateOfficerScript, -1 + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route17Route18GateOfficerScript, -1 diff --git a/maps/Route18.asm b/maps/Route18.asm index 2b79ba05a..76c201e12 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -79,14 +79,14 @@ Route18_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 6, ROUTE_17_ROUTE_18_GATE, 3 - warp_event 2, 7, ROUTE_17_ROUTE_18_GATE, 4 + warp_event 2, 6, ROUTE_17_ROUTE_18_GATE, 3 + warp_event 2, 7, ROUTE_17_ROUTE_18_GATE, 4 db 0 ; coord events db 1 ; bg events - bg_event 9, 5, BGEVENT_READ, Route18Sign + bg_event 9, 5, BGEVENT_READ, Route18Sign db 2 ; object events - object_event 9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1 - object_event 13, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1 + object_event 9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1 + object_event 13, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1 diff --git a/maps/Route19.asm b/maps/Route19.asm index a655879ac..dda8e549b 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -236,18 +236,18 @@ Route19_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 7, 3, ROUTE_19_FUCHSIA_GATE, 3 + warp_event 7, 3, ROUTE_19_FUCHSIA_GATE, 3 db 0 ; coord events db 2 ; bg events bg_event 11, 13, BGEVENT_READ, Route19Sign - bg_event 11, 1, BGEVENT_READ, CarefulSwimmingSign + bg_event 11, 1, BGEVENT_READ, CarefulSwimmingSign db 6 ; object events - object_event 9, 23, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1 + object_event 9, 23, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1 object_event 13, 28, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermHarold, -1 object_event 11, 17, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermJerome, -1 - object_event 8, 23, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerSwimmermTucker, -1 - object_event 9, 5, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1 - object_event 11, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1 + object_event 8, 23, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerSwimmermTucker, -1 + object_event 9, 5, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1 + object_event 11, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 5592bb4bb..b8f3d02e0 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -47,14 +47,14 @@ Route19FuchsiaGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, FUCHSIA_CITY, 10 - warp_event 5, 0, FUCHSIA_CITY, 11 - warp_event 4, 7, ROUTE_19, 1 - warp_event 5, 7, ROUTE_19, 1 + warp_event 4, 0, FUCHSIA_CITY, 10 + warp_event 5, 0, FUCHSIA_CITY, 11 + warp_event 4, 7, ROUTE_19, 1 + warp_event 5, 7, ROUTE_19, 1 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1 diff --git a/maps/Route2.asm b/maps/Route2.asm index b58f330f6..9cf002f92 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -152,24 +152,24 @@ Route2_MapEvents: warp_event 15, 31, ROUTE_2_GATE, 3 warp_event 16, 27, ROUTE_2_GATE, 1 warp_event 17, 27, ROUTE_2_GATE, 2 - warp_event 12, 7, DIGLETTS_CAVE, 3 + warp_event 12, 7, DIGLETTS_CAVE, 3 db 0 ; coord events db 6 ; bg events - bg_event 7, 51, BGEVENT_READ, Route2Sign - bg_event 11, 9, BGEVENT_READ, MapRoute2Signpost1Script - bg_event 7, 23, BGEVENT_ITEM, Route2HiddenMaxEther - bg_event 4, 14, BGEVENT_ITEM, Route2HiddenFullHeal - bg_event 4, 27, BGEVENT_ITEM, Route2HiddenFullRestore + bg_event 7, 51, BGEVENT_READ, Route2Sign + bg_event 11, 9, BGEVENT_READ, MapRoute2Signpost1Script + bg_event 7, 23, BGEVENT_ITEM, Route2HiddenMaxEther + bg_event 4, 14, BGEVENT_ITEM, Route2HiddenFullHeal + bg_event 4, 27, BGEVENT_ITEM, Route2HiddenFullRestore bg_event 11, 30, BGEVENT_ITEM, Route2HiddenRevive db 8 ; object events object_event 10, 45, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1 - object_event 6, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1 - object_event 0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1 - object_event 0, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT - object_event 2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION - object_event 19, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS + object_event 6, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1 + object_event 0, 40, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1 + object_event 0, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT + object_event 2, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION + object_event 19, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS object_event 14, 50, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Elixer, EVENT_ROUTE_2_ELIXER object_event 10, 14, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1ac306, -1 diff --git a/maps/Route20.asm b/maps/Route20.asm index 61a758b84..8dd8a8a8c 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -114,7 +114,7 @@ Route20_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 38, 7, SEAFOAM_GYM, 1 + warp_event 38, 7, SEAFOAM_GYM, 1 db 0 ; coord events @@ -122,6 +122,6 @@ Route20_MapEvents: bg_event 37, 11, BGEVENT_READ, CinnabarGymSign db 3 ; object events - object_event 52, 8, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1 + object_event 52, 8, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1 object_event 45, 13, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfLori, -1 object_event 12, 13, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCameron, -1 diff --git a/maps/Route21.asm b/maps/Route21.asm index 54612a7ef..a291752fc 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -98,5 +98,5 @@ Route21_MapEvents: db 3 ; object events object_event 11, 16, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1 - object_event 2, 30, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1 + object_event 2, 30, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSeth, -1 object_event 14, 22, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherArnold, -1 diff --git a/maps/Route22.asm b/maps/Route22.asm index ec59e0c98..8402f5e4c 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -17,11 +17,11 @@ Route22_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 13, 5, VICTORY_ROAD_GATE, 1 + warp_event 13, 5, VICTORY_ROAD_GATE, 1 db 0 ; coord events db 1 ; bg events - bg_event 15, 7, BGEVENT_READ, VictoryRoadEntranceSign + bg_event 15, 7, BGEVENT_READ, VictoryRoadEntranceSign db 0 ; object events diff --git a/maps/Route23.asm b/maps/Route23.asm index 5bd9b809c..86e5935f3 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -24,14 +24,14 @@ Route23_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 9, 5, INDIGO_PLATEAU_POKECENTER_1F, 1 - warp_event 10, 5, INDIGO_PLATEAU_POKECENTER_1F, 2 - warp_event 9, 13, VICTORY_ROAD, 10 + warp_event 9, 5, INDIGO_PLATEAU_POKECENTER_1F, 1 + warp_event 10, 5, INDIGO_PLATEAU_POKECENTER_1F, 2 + warp_event 9, 13, VICTORY_ROAD, 10 warp_event 10, 13, VICTORY_ROAD, 10 db 0 ; coord events db 1 ; bg events - bg_event 11, 7, BGEVENT_READ, IndigoPlateauSign + bg_event 11, 7, BGEVENT_READ, IndigoPlateauSign db 0 ; object events diff --git a/maps/Route24.asm b/maps/Route24.asm index 173be8f99..042353bb6 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -126,4 +126,4 @@ Route24_MapEvents: db 0 ; bg events db 1 ; object events - object_event 8, 7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET + object_event 8, 7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET diff --git a/maps/Route25.asm b/maps/Route25.asm index 78caeb418..bc907c9cd 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -431,25 +431,25 @@ Route25_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 47, 5, BILLS_HOUSE, 1 + warp_event 47, 5, BILLS_HOUSE, 1 db 2 ; coord events - coord_event 42, 6, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate1Script - coord_event 42, 7, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate2Script + coord_event 42, 6, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate1Script + coord_event 42, 7, SCENE_ROUTE25_MISTYS_DATE, Route25MistyDate2Script db 2 ; bg events - bg_event 45, 5, BGEVENT_READ, BillsHouseSign - bg_event 4, 5, BGEVENT_ITEM, Route25HiddenPotion + bg_event 45, 5, BGEVENT_READ, BillsHouseSign + bg_event 4, 5, BGEVENT_ITEM, Route25HiddenPotion db 11 ; object events - object_event 46, 9, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND + object_event 46, 9, SPRITE_MISTY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND object_event 46, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND - object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1 + object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1 object_event 16, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassEllen, -1 - object_event 21, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1 - object_event 22, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassLaura, -1 - object_event 25, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1 + object_event 21, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1 + object_event 22, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerLassLaura, -1 + object_event 25, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1 object_event 28, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassShannon, -1 - object_event 31, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1 - object_event 37, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerCooltrainermKevin, -1 - object_event 32, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN + object_event 31, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1 + object_event 37, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerCooltrainermKevin, -1 + object_event 32, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN diff --git a/maps/Route26.asm b/maps/Route26.asm index 05b20d057..1d79bc50a 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -414,21 +414,21 @@ Route26_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 7, 5, VICTORY_ROAD_GATE, 3 + warp_event 7, 5, VICTORY_ROAD_GATE, 3 warp_event 15, 57, ROUTE_26_HEAL_HOUSE, 1 - warp_event 5, 71, DAY_OF_WEEK_SIBLINGS_HOUSE, 1 + warp_event 5, 71, DAY_OF_WEEK_SIBLINGS_HOUSE, 1 db 0 ; coord events db 1 ; bg events - bg_event 8, 6, BGEVENT_READ, Route26Sign + bg_event 8, 6, BGEVENT_READ, Route26Sign db 8 ; object events object_event 14, 24, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermJake, -1 - object_event 9, 38, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1 + object_event 9, 38, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1 object_event 10, 56, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1 - object_event 5, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1 + object_event 5, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1 object_event 13, 79, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicRichard, -1 object_event 10, 92, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherScott, -1 object_event 14, 54, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1 - object_event 9, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER + object_event 9, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm index 8a036b76a..536154500 100644 --- a/maps/Route26HealHouse.asm +++ b/maps/Route26HealHouse.asm @@ -50,14 +50,14 @@ Route26HealHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, ROUTE_26, 2 - warp_event 3, 7, ROUTE_26, 2 + warp_event 2, 7, ROUTE_26, 2 + warp_event 3, 7, ROUTE_26, 2 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, Route26HealHouseBookshelf - bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf + bg_event 0, 1, BGEVENT_READ, Route26HealHouseBookshelf + bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf db 1 ; object events - object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1 + object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1 diff --git a/maps/Route27.asm b/maps/Route27.asm index 9bdc741ee..9b53429c6 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -469,23 +469,23 @@ Route27_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 33, 7, ROUTE_27_SANDSTORM_HOUSE, 1 - warp_event 26, 5, TOHJO_FALLS, 1 - warp_event 36, 5, TOHJO_FALLS, 2 + warp_event 33, 7, ROUTE_27_SANDSTORM_HOUSE, 1 + warp_event 26, 5, TOHJO_FALLS, 1 + warp_event 36, 5, TOHJO_FALLS, 2 db 2 ; coord events coord_event 18, 10, SCENE_DEFAULT, UnknownScript_0x1a0873 coord_event 19, 10, SCENE_DEFAULT, UnknownScript_0x1a0881 db 1 ; bg events - bg_event 25, 7, BGEVENT_READ, TohjoFallsSign + bg_event 25, 7, BGEVENT_READ, TohjoFallsSign db 9 ; object events - object_event 48, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1 - object_event 58, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1 + object_event 48, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1 + object_event 58, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1 object_event 72, 10, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1 - object_event 37, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1 - object_event 65, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicGilbert, -1 + object_event 37, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1 + object_event 65, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicGilbert, -1 object_event 58, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperJose2, -1 object_event 60, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM object_event 53, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 430a10d73..9396b42c5 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -95,14 +95,14 @@ Route27SandstormHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, ROUTE_27, 1 - warp_event 3, 7, ROUTE_27, 1 + warp_event 2, 7, ROUTE_27, 1 + warp_event 3, 7, ROUTE_27, 1 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, SandstormHouseBookshelf - bg_event 1, 1, BGEVENT_READ, SandstormHouseBookshelf + bg_event 0, 1, BGEVENT_READ, SandstormHouseBookshelf + bg_event 1, 1, BGEVENT_READ, SandstormHouseBookshelf db 1 ; object events - object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1 + object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SandstormHouseWoman, -1 diff --git a/maps/Route28.asm b/maps/Route28.asm index d36717833..af41de7c5 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -17,13 +17,13 @@ Route28_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 7, 3, ROUTE_28_STEEL_WING_HOUSE, 1 - warp_event 33, 5, VICTORY_ROAD_GATE, 7 + warp_event 7, 3, ROUTE_28_STEEL_WING_HOUSE, 1 + warp_event 33, 5, VICTORY_ROAD_GATE, 7 db 0 ; coord events db 2 ; bg events - bg_event 31, 5, BGEVENT_READ, Route28Sign - bg_event 25, 2, BGEVENT_ITEM, Route28HiddenRareCandy + bg_event 31, 5, BGEVENT_READ, Route28Sign + bg_event 25, 2, BGEVENT_ITEM, Route28HiddenRareCandy db 0 ; object events diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm index 911c9cf9c..a62f94d52 100644 --- a/maps/Route28SteelWingHouse.asm +++ b/maps/Route28SteelWingHouse.asm @@ -72,15 +72,15 @@ Route28SteelWingHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, ROUTE_28, 1 - warp_event 3, 7, ROUTE_28, 1 + warp_event 2, 7, ROUTE_28, 1 + warp_event 3, 7, ROUTE_28, 1 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, CelebrityHouseBookshelf - bg_event 1, 1, BGEVENT_READ, CelebrityHouseBookshelf + bg_event 0, 1, BGEVENT_READ, CelebrityHouseBookshelf + bg_event 1, 1, BGEVENT_READ, CelebrityHouseBookshelf db 2 ; object events - object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1 - object_event 6, 5, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1 + object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Celebrity, -1 + object_event 6, 5, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CelebritysFearow, -1 diff --git a/maps/Route29.asm b/maps/Route29.asm index 5edbcf4c5..3059f8546 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -417,22 +417,22 @@ Route29_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 27, 1, ROUTE_29_ROUTE_46_GATE, 3 + warp_event 27, 1, ROUTE_29_ROUTE_46_GATE, 3 db 2 ; coord events - coord_event 53, 8, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial1 - coord_event 53, 9, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial2 + coord_event 53, 8, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial1 + coord_event 53, 9, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial2 db 2 ; bg events - bg_event 51, 7, BGEVENT_READ, Route29Sign1 - bg_event 3, 5, BGEVENT_READ, Route29Sign2 + bg_event 51, 7, BGEVENT_READ, Route29Sign1 + bg_event 3, 5, BGEVENT_READ, Route29Sign2 db 8 ; object events object_event 50, 12, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1 object_event 27, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29YoungsterScript, -1 object_event 15, 11, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1 - object_event 12, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1 - object_event 25, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route29FisherScript, -1 - object_event 13, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1 + object_event 12, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1 + object_event 25, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route29FisherScript, -1 + object_event 13, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1 object_event 29, 12, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY - object_event 48, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION + object_event 48, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm index 285fa836d..f575df1ca 100644 --- a/maps/Route29Route46Gate.asm +++ b/maps/Route29Route46Gate.asm @@ -38,15 +38,15 @@ Route29Route46Gate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, ROUTE_46, 1 - warp_event 5, 0, ROUTE_46, 2 - warp_event 4, 7, ROUTE_29, 1 - warp_event 5, 7, ROUTE_29, 1 + warp_event 4, 0, ROUTE_46, 1 + warp_event 5, 0, ROUTE_46, 2 + warp_event 4, 7, ROUTE_29, 1 + warp_event 5, 7, ROUTE_29, 1 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29Route46GateOfficerScript, -1 - object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29Route46GateYoungsterScript, -1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29Route46GateOfficerScript, -1 + object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29Route46GateYoungsterScript, -1 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 7a31fc70b..1b665799f 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -27,14 +27,14 @@ Route2Gate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, ROUTE_2, 3 - warp_event 5, 0, ROUTE_2, 4 - warp_event 4, 7, ROUTE_2, 2 - warp_event 5, 7, ROUTE_2, 2 + warp_event 4, 0, ROUTE_2, 3 + warp_event 5, 0, ROUTE_2, 4 + warp_event 4, 7, ROUTE_2, 2 + warp_event 5, 7, ROUTE_2, 2 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 6, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1 + object_event 6, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1 diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm index ca5059de9..a8a560b79 100644 --- a/maps/Route2NuggetHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -54,12 +54,12 @@ Route2NuggetHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, ROUTE_2, 1 - warp_event 3, 7, ROUTE_2, 1 + warp_event 2, 7, ROUTE_2, 1 + warp_event 3, 7, ROUTE_2, 1 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1 + object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1 diff --git a/maps/Route3.asm b/maps/Route3.asm index 9d15d96cc..a0631c58c 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -134,7 +134,7 @@ Route3_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 52, 1, MOUNT_MOON, 1 + warp_event 52, 1, MOUNT_MOON, 1 db 0 ; coord events @@ -143,6 +143,6 @@ Route3_MapEvents: db 4 ; object events object_event 26, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1 - object_event 10, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1 - object_event 16, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1 - object_event 49, 5, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1 + object_event 10, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1 + object_event 16, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1 + object_event 49, 5, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1 diff --git a/maps/Route30.asm b/maps/Route30.asm index 0ab3d9cf3..dde0384ea 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -408,27 +408,27 @@ Route30_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 7, 39, ROUTE_30_BERRY_HOUSE, 1 - warp_event 17, 5, MR_POKEMONS_HOUSE, 1 + warp_event 7, 39, ROUTE_30_BERRY_HOUSE, 1 + warp_event 17, 5, MR_POKEMONS_HOUSE, 1 db 0 ; coord events db 5 ; bg events - bg_event 9, 43, BGEVENT_READ, Route30Sign + bg_event 9, 43, BGEVENT_READ, Route30Sign bg_event 13, 29, BGEVENT_READ, MrPokemonsHouseDirectionsSign - bg_event 15, 5, BGEVENT_READ, MrPokemonsHouseSign - bg_event 3, 21, BGEVENT_READ, Route30TrainerTips - bg_event 14, 9, BGEVENT_ITEM, Route30HiddenPotion + bg_event 15, 5, BGEVENT_READ, MrPokemonsHouseSign + bg_event 3, 21, BGEVENT_READ, Route30TrainerTips + bg_event 14, 9, BGEVENT_ITEM, Route30HiddenPotion db 11 ; object events - object_event 5, 26, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE - object_event 2, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY - object_event 5, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 - object_event 1, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDon, -1 - object_event 7, 30, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1 - object_event 5, 24, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE - object_event 5, 25, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE - object_event 5, 39, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree1, -1 - object_event 11, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree2, -1 - object_event 2, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1 - object_event 8, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE + object_event 5, 26, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE + object_event 2, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY + object_event 5, 23, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 + object_event 1, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDon, -1 + object_event 7, 30, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1 + object_event 5, 24, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE + object_event 5, 25, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE + object_event 5, 39, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree1, -1 + object_event 11, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30FruitTree2, -1 + object_event 2, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1 + object_event 8, 35, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route30Antidote, EVENT_ROUTE_30_ANTIDOTE diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm index ede2fee7b..829ea271f 100644 --- a/maps/Route30BerryHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -48,14 +48,14 @@ Route30BerryHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, ROUTE_30, 1 - warp_event 3, 7, ROUTE_30, 1 + warp_event 2, 7, ROUTE_30, 1 + warp_event 3, 7, ROUTE_30, 1 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, Route30BerryHouseBookshelf - bg_event 1, 1, BGEVENT_READ, Route30BerryHouseBookshelf + bg_event 0, 1, BGEVENT_READ, Route30BerryHouseBookshelf + bg_event 1, 1, BGEVENT_READ, Route30BerryHouseBookshelf db 1 ; object events - object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1 + object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1 diff --git a/maps/Route31.asm b/maps/Route31.asm index fc4c16fa2..e39dfb539 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -419,21 +419,21 @@ Route31_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 4, 6, ROUTE_31_VIOLET_GATE, 3 - warp_event 4, 7, ROUTE_31_VIOLET_GATE, 4 - warp_event 34, 5, DARK_CAVE_VIOLET_ENTRANCE, 1 + warp_event 4, 6, ROUTE_31_VIOLET_GATE, 3 + warp_event 4, 7, ROUTE_31_VIOLET_GATE, 4 + warp_event 34, 5, DARK_CAVE_VIOLET_ENTRANCE, 1 db 0 ; coord events db 2 ; bg events - bg_event 7, 5, BGEVENT_READ, Route31Sign - bg_event 31, 5, BGEVENT_READ, DarkCaveSign + bg_event 7, 5, BGEVENT_READ, Route31Sign + bg_event 31, 5, BGEVENT_READ, DarkCaveSign db 7 ; object events - object_event 17, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1 - object_event 9, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1 + object_event 17, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1 + object_event 9, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1 object_event 21, 13, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherWade1, -1 - object_event 33, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1 - object_event 16, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31FruitTree, -1 - object_event 29, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION + object_event 33, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1 + object_event 16, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31FruitTree, -1 + object_event 29, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION object_event 19, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31PokeBall, EVENT_ROUTE_31_POKE_BALL diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index f0acc8aa8..7e08b226c 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -29,15 +29,15 @@ Route31VioletGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, VIOLET_CITY, 8 - warp_event 0, 5, VIOLET_CITY, 9 - warp_event 9, 4, ROUTE_31, 1 - warp_event 9, 5, ROUTE_31, 2 + warp_event 0, 4, VIOLET_CITY, 8 + warp_event 0, 5, VIOLET_CITY, 9 + warp_event 9, 4, ROUTE_31, 1 + warp_event 9, 5, ROUTE_31, 2 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1 - object_event 1, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1 + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route31VioletGateOfficerScript, -1 + object_event 1, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route31VioletGateCooltrainerFScript, -1 diff --git a/maps/Route32.asm b/maps/Route32.asm index 78c5f16ce..0617ebfdd 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -931,34 +931,34 @@ Route32_MapEvents: db 4 ; warp events warp_event 11, 73, ROUTE_32_POKECENTER_1F, 1 - warp_event 4, 2, ROUTE_32_RUINS_OF_ALPH_GATE, 3 - warp_event 4, 3, ROUTE_32_RUINS_OF_ALPH_GATE, 4 - warp_event 6, 79, UNION_CAVE_1F, 4 + warp_event 4, 2, ROUTE_32_RUINS_OF_ALPH_GATE, 3 + warp_event 4, 3, ROUTE_32_RUINS_OF_ALPH_GATE, 4 + warp_event 6, 79, UNION_CAVE_1F, 4 db 2 ; coord events - coord_event 18, 8, SCENE_DEFAULT, Route32CooltrainerMStopsYouScene - coord_event 7, 71, SCENE_ROUTE32_OFFER_SLOWPOKETAIL, Route32WannaBuyASlowpokeTailScript + coord_event 18, 8, SCENE_DEFAULT, Route32CooltrainerMStopsYouScene + coord_event 7, 71, SCENE_ROUTE32_OFFER_SLOWPOKETAIL, Route32WannaBuyASlowpokeTailScript db 6 ; bg events - bg_event 13, 5, BGEVENT_READ, Route32Sign - bg_event 9, 1, BGEVENT_READ, Route32RuinsSign + bg_event 13, 5, BGEVENT_READ, Route32Sign + bg_event 9, 1, BGEVENT_READ, Route32RuinsSign bg_event 10, 84, BGEVENT_READ, Route32UnionCaveSign bg_event 12, 73, BGEVENT_READ, Route32PokecenterSign bg_event 12, 67, BGEVENT_ITEM, Route32HiddenGreatBall bg_event 11, 40, BGEVENT_ITEM, Route32HiddenSuperPotion db 14 ; object events - object_event 8, 49, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1 + object_event 8, 49, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherJustin, -1 object_event 12, 56, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerFisherRalph1, -1 - object_event 6, 48, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1 + object_event 6, 48, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherHenry, -1 object_event 12, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterAlbert, -1 - object_event 4, 63, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterGordon, -1 - object_event 3, 45, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1 + object_event 4, 63, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterGordon, -1 + object_event 3, 45, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1 object_event 10, 30, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1 - object_event 19, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1 + object_event 19, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1 object_event 11, 82, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperPeter, -1 - object_event 7, 70, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS - object_event 6, 53, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL + object_event 7, 70, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS + object_event 6, 53, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL object_event 15, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1 object_event 12, 67, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY - object_event 3, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL + object_event 3, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32Repel, EVENT_ROUTE_32_REPEL diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 0127ebe72..7d4571668 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -96,15 +96,15 @@ Route32Pokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, ROUTE_32, 1 - warp_event 4, 7, ROUTE_32, 1 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, ROUTE_32, 1 + warp_event 4, 7, ROUTE_32, 1 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1 - object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1 - object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1 + object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1 + object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1 diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index 8481351b4..3329d54f5 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -48,16 +48,16 @@ Route32RuinsOfAlphGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, RUINS_OF_ALPH_OUTSIDE, 10 - warp_event 0, 5, RUINS_OF_ALPH_OUTSIDE, 11 - warp_event 9, 4, ROUTE_32, 2 - warp_event 9, 5, ROUTE_32, 3 + warp_event 0, 4, RUINS_OF_ALPH_OUTSIDE, 10 + warp_event 0, 5, RUINS_OF_ALPH_OUTSIDE, 11 + warp_event 9, 4, ROUTE_32, 2 + warp_event 9, 5, ROUTE_32, 3 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1 - object_event 8, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1 - object_event 1, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1 + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1 + object_event 8, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1 + object_event 1, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1 diff --git a/maps/Route33.asm b/maps/Route33.asm index dad0a0571..f5b877d24 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -196,7 +196,7 @@ Route33_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 11, 9, UNION_CAVE_1F, 3 + warp_event 11, 9, UNION_CAVE_1F, 3 db 0 ; coord events @@ -204,6 +204,6 @@ Route33_MapEvents: bg_event 11, 11, BGEVENT_READ, Route33Sign db 3 ; object events - object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1 + object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1 object_event 13, 16, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1 object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1 diff --git a/maps/Route34.asm b/maps/Route34.asm index 3a2832cb9..29a48e21e 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -771,23 +771,23 @@ Route34_MapEvents: db 0 ; coord events db 5 ; bg events - bg_event 12, 6, BGEVENT_READ, Route34Sign + bg_event 12, 6, BGEVENT_READ, Route34Sign bg_event 13, 33, BGEVENT_READ, Route34TrainerTips bg_event 10, 13, BGEVENT_READ, DayCareSign - bg_event 8, 32, BGEVENT_ITEM, Route34HiddenRareCandy + bg_event 8, 32, BGEVENT_ITEM, Route34HiddenRareCandy bg_event 17, 19, BGEVENT_ITEM, Route34HiddenSuperPotion db 13 ; object events - object_event 13, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1 + object_event 13, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperTodd1, -1 object_event 15, 32, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1 object_event 11, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterIan, -1 object_event 10, 26, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerGina1, -1 - object_event 9, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerKeithScript, -1 + object_event 9, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerKeithScript, -1 object_event 18, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1 object_event 15, 16, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAY_CARE_MAN_ON_ROUTE_34 object_event 14, 18, SPRITE_DAY_CARE_MON_1, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon1Script, EVENT_DAY_CARE_MON_1 object_event 17, 19, SPRITE_DAY_CARE_MON_2, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DayCareMon2Script, EVENT_DAY_CARE_MON_2 object_event 11, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1 - object_event 3, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1 - object_event 6, 51, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1 - object_event 7, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET + object_event 3, 48, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1 + object_event 6, 51, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1 + object_event 7, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 8472ee54b..73a1dec20 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -137,18 +137,18 @@ Route34IlexForestGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, ROUTE_34, 1 - warp_event 5, 0, ROUTE_34, 2 - warp_event 4, 7, ILEX_FOREST, 1 - warp_event 5, 7, ILEX_FOREST, 1 + warp_event 4, 0, ROUTE_34, 1 + warp_event 5, 0, ROUTE_34, 2 + warp_event 4, 7, ILEX_FOREST, 1 + warp_event 5, 7, ILEX_FOREST, 1 db 1 ; coord events - coord_event 4, 7, 0, UnknownScript_0x62d3d + coord_event 4, 7, 0, UnknownScript_0x62d3d db 0 ; bg events db 4 ; object events - object_event 9, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER - object_event 9, 4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexGateButterfree, -1 - object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS - object_event 5, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY + object_event 9, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER + object_event 9, 4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexGateButterfree, -1 + object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS + object_event 5, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY diff --git a/maps/Route35.asm b/maps/Route35.asm index cd3483e12..86ddb2756 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -464,25 +464,25 @@ Route35_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 9, 33, ROUTE_35_GOLDENROD_GATE, 1 + warp_event 9, 33, ROUTE_35_GOLDENROD_GATE, 1 warp_event 10, 33, ROUTE_35_GOLDENROD_GATE, 2 - warp_event 3, 5, ROUTE_35_NATIONAL_PARK_GATE, 3 + warp_event 3, 5, ROUTE_35_NATIONAL_PARK_GATE, 3 db 0 ; coord events db 2 ; bg events - bg_event 1, 7, BGEVENT_READ, Route35Sign + bg_event 1, 7, BGEVENT_READ, Route35Sign bg_event 11, 31, BGEVENT_READ, Route35Sign db 11 ; object events - object_event 4, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1 - object_event 8, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1 - object_event 7, 20, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1 + object_event 4, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperIvan, -1 + object_event 8, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1 + object_event 7, 20, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1 object_event 10, 26, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerKim, -1 object_event 14, 28, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerBirdKeeperBryan, -1 - object_event 2, 10, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1 - object_event 16, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie, -1 - object_event 5, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1 - object_event 5, 6, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TrainerOfficerDirk, -1 - object_event 2, 25, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1 + object_event 2, 10, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1 + object_event 16, 7, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie, -1 + object_event 5, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1 + object_event 5, 6, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TrainerOfficerDirk, -1 + object_event 2, 25, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1 object_event 13, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 46a2bd9f4..b1adedc86 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -197,16 +197,16 @@ Route35GoldenrodGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, ROUTE_35, 1 - warp_event 5, 0, ROUTE_35, 2 - warp_event 4, 7, GOLDENROD_CITY, 12 - warp_event 5, 7, GOLDENROD_CITY, 12 + warp_event 4, 0, ROUTE_35, 1 + warp_event 5, 0, ROUTE_35, 2 + warp_event 4, 7, GOLDENROD_CITY, 12 + warp_event 5, 7, GOLDENROD_CITY, 12 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1 - object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1 - object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1 + object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1 + object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1 diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 274ae9414..b7b564de4 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -439,17 +439,17 @@ Route35NationalParkGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 0, NATIONAL_PARK, 3 - warp_event 4, 0, NATIONAL_PARK, 4 - warp_event 3, 7, ROUTE_35, 3 - warp_event 4, 7, ROUTE_35, 3 + warp_event 3, 0, NATIONAL_PARK, 3 + warp_event 4, 0, NATIONAL_PARK, 4 + warp_event 3, 7, ROUTE_35, 3 + warp_event 4, 7, ROUTE_35, 3 db 0 ; coord events db 1 ; bg events - bg_event 5, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script + bg_event 5, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script db 3 ; object events - object_event 2, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY - object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER - object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY + object_event 2, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER + object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36.asm b/maps/Route36.asm index 478a8bdff..00729cb16 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -661,28 +661,28 @@ Route36_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 18, 8, ROUTE_36_NATIONAL_PARK_GATE, 3 - warp_event 18, 9, ROUTE_36_NATIONAL_PARK_GATE, 4 + warp_event 18, 8, ROUTE_36_NATIONAL_PARK_GATE, 3 + warp_event 18, 9, ROUTE_36_NATIONAL_PARK_GATE, 4 warp_event 47, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 1 warp_event 48, 13, ROUTE_36_RUINS_OF_ALPH_GATE, 2 db 2 ; coord events - coord_event 20, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript - coord_event 22, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript + coord_event 20, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript + coord_event 22, 7, SCENE_ROUTE36_SUICUNE, Route36SuicuneScript db 4 ; bg events - bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2 + bg_event 29, 1, BGEVENT_READ, Route36TrainerTips2 bg_event 45, 11, BGEVENT_READ, RuinsOfAlphNorthSign - bg_event 55, 7, BGEVENT_READ, Route36Sign - bg_event 21, 7, BGEVENT_READ, Route36TrainerTips1 + bg_event 55, 7, BGEVENT_READ, Route36Sign + bg_event 21, 7, BGEVENT_READ, Route36TrainerTips1 db 9 ; object events object_event 20, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1 object_event 31, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1 - object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO - object_event 51, 8, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1940e0, -1 - object_event 44, 9, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1 - object_event 21, 4, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1 - object_event 46, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY + object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO + object_event 51, 8, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1940e0, -1 + object_event 44, 9, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1 + object_event 21, 4, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1 + object_event 46, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY object_event 33, 12, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO - object_event 21, 6, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 + object_event 21, 6, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 062e088b4..616e6e03b 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -851,26 +851,26 @@ Route36NationalParkGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, NATIONAL_PARK, 1 - warp_event 0, 5, NATIONAL_PARK, 2 - warp_event 9, 4, ROUTE_36, 1 - warp_event 9, 5, ROUTE_36, 2 + warp_event 0, 4, NATIONAL_PARK, 1 + warp_event 0, 5, NATIONAL_PARK, 2 + warp_event 9, 4, ROUTE_36, 1 + warp_event 9, 5, ROUTE_36, 2 db 0 ; coord events db 1 ; bg events - bg_event 6, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script + bg_event 6, 0, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script db 12 ; object events - object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY - object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B - object_event 4, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B - object_event 2, 6, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B - object_event 6, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B - object_event 2, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B - object_event 5, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B - object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B - object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B - object_event 6, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B - object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B - object_event 3, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY + object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B + object_event 4, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B + object_event 2, 6, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B + object_event 6, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B + object_event 2, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B + object_event 5, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B + object_event 3, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B + object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B + object_event 6, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B + object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B + object_event 3, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index e06a71f41..ed894445d 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -36,15 +36,15 @@ Route36RuinsOfAlphGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, ROUTE_36, 3 - warp_event 5, 0, ROUTE_36, 4 - warp_event 4, 7, RUINS_OF_ALPH_OUTSIDE, 9 - warp_event 5, 7, RUINS_OF_ALPH_OUTSIDE, 9 + warp_event 4, 0, ROUTE_36, 3 + warp_event 5, 0, ROUTE_36, 4 + warp_event 4, 7, RUINS_OF_ALPH_OUTSIDE, 9 + warp_event 5, 7, RUINS_OF_ALPH_OUTSIDE, 9 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1 - object_event 7, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateOfficerScript, -1 + object_event 7, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route36RuinsOfAlphGateGrampsScript, -1 diff --git a/maps/Route37.asm b/maps/Route37.asm index 7b0cdbe74..0e9532c67 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -243,14 +243,14 @@ Route37_MapEvents: db 0 ; coord events db 2 ; bg events - bg_event 5, 3, BGEVENT_READ, Route37Sign - bg_event 4, 2, BGEVENT_ITEM, Route37HiddenEther + bg_event 5, 3, BGEVENT_READ, Route37Sign + bg_event 4, 2, BGEVENT_ITEM, Route37HiddenEther db 7 ; object events - object_event 6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1 - object_event 7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1 - object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1 - object_event 13, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1 - object_event 16, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY - object_event 16, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1 - object_event 15, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1 + object_event 6, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1 + object_event 7, 12, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1 + object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicGreg, -1 + object_event 13, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1 + object_event 16, 8, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY + object_event 16, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1 + object_event 15, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0d, -1 diff --git a/maps/Route38.asm b/maps/Route38.asm index a18e69a6d..001cdbddf 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -474,20 +474,20 @@ Route38_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 35, 8, ROUTE_38_ECRUTEAK_GATE, 1 - warp_event 35, 9, ROUTE_38_ECRUTEAK_GATE, 2 + warp_event 35, 8, ROUTE_38_ECRUTEAK_GATE, 1 + warp_event 35, 9, ROUTE_38_ECRUTEAK_GATE, 2 db 0 ; coord events db 2 ; bg events - bg_event 33, 7, BGEVENT_READ, Route38Sign - bg_event 5, 13, BGEVENT_READ, Route38TrainerTips + bg_event 33, 7, BGEVENT_READ, Route38Sign + bg_event 5, 13, BGEVENT_READ, Route38TrainerTips db 7 ; object events - object_event 4, 1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1 - object_event 15, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1 + object_event 4, 1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1 + object_event 15, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1 object_event 12, 15, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1 - object_event 19, 9, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1 - object_event 24, 5, SPRITE_SAILOR, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1 + object_event 19, 9, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1 + object_event 24, 5, SPRITE_SAILOR, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1 object_event 12, 10, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1 - object_event 5, 8, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1 + object_event 5, 8, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index 358bb0eae..2277c3a1d 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -26,14 +26,14 @@ Route38EcruteakGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, ROUTE_38, 1 - warp_event 0, 5, ROUTE_38, 2 - warp_event 9, 4, ECRUTEAK_CITY, 14 - warp_event 9, 5, ECRUTEAK_CITY, 15 + warp_event 0, 4, ROUTE_38, 1 + warp_event 0, 5, ROUTE_38, 2 + warp_event 9, 4, ECRUTEAK_CITY, 14 + warp_event 9, 5, ECRUTEAK_CITY, 15 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1 + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route38EcruteakGateOfficerScript, -1 diff --git a/maps/Route39.asm b/maps/Route39.asm index 8d27b9285..0b8134acf 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -345,25 +345,25 @@ Route39_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 1, 3, ROUTE_39_BARN, 1 - warp_event 5, 3, ROUTE_39_FARMHOUSE, 1 + warp_event 1, 3, ROUTE_39_BARN, 1 + warp_event 5, 3, ROUTE_39_FARMHOUSE, 1 db 0 ; coord events db 4 ; bg events - bg_event 5, 31, BGEVENT_READ, Route39TrainerTips - bg_event 9, 5, BGEVENT_READ, MoomooFarmSign - bg_event 15, 7, BGEVENT_READ, Route39Sign - bg_event 5, 13, BGEVENT_ITEM, Route39HiddenNugget + bg_event 5, 31, BGEVENT_READ, Route39TrainerTips + bg_event 9, 5, BGEVENT_READ, MoomooFarmSign + bg_event 15, 7, BGEVENT_READ, Route39Sign + bg_event 5, 13, BGEVENT_ITEM, Route39HiddenNugget db 10 ; object events object_event 13, 29, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1 object_event 10, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek, -1 object_event 11, 19, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanfRuth, -1 - object_event 3, 12, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 - object_event 6, 11, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 - object_event 4, 15, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 - object_event 8, 13, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 - object_event 13, 7, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1 - object_event 9, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1 - object_event 4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerPokefanfJaime, -1 + object_event 3, 12, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 + object_event 6, 11, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 + object_event 4, 15, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 + object_event 8, 13, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1 + object_event 13, 7, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1 + object_event 9, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1 + object_event 4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerPokefanfJaime, -1 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index e3359e1e4..3180fe903 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -190,14 +190,14 @@ Route39Barn_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 7, ROUTE_39, 1 - warp_event 4, 7, ROUTE_39, 1 + warp_event 3, 7, ROUTE_39, 1 + warp_event 4, 7, ROUTE_39, 1 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 2, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1 - object_event 4, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1 - object_event 3, 3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1 + object_event 2, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1 + object_event 4, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1 + object_event 3, 3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index a82f8a75c..ba8284d04 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -194,15 +194,15 @@ Route39Farmhouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, ROUTE_39, 2 - warp_event 3, 7, ROUTE_39, 2 + warp_event 2, 7, ROUTE_39, 2 + warp_event 3, 7, ROUTE_39, 2 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, FarmhouseBookshelf - bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf + bg_event 0, 1, BGEVENT_READ, FarmhouseBookshelf + bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf db 2 ; object events - object_event 3, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1 - object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1 + object_event 3, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1 + object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1 diff --git a/maps/Route4.asm b/maps/Route4.asm index 3259ebce6..b0f2927c9 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -122,16 +122,16 @@ Route4_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 2, 5, MOUNT_MOON, 2 + warp_event 2, 5, MOUNT_MOON, 2 db 0 ; coord events db 2 ; bg events - bg_event 3, 7, BGEVENT_READ, MtMoonSquareSign - bg_event 10, 3, BGEVENT_ITEM, Route4HiddenUltraBall + bg_event 3, 7, BGEVENT_READ, MtMoonSquareSign + bg_event 10, 3, BGEVENT_ITEM, Route4HiddenUltraBall db 4 ; object events - object_event 17, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1 - object_event 9, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1 - object_event 21, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 - object_event 26, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP + object_event 17, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1 + object_event 9, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1 + object_event 21, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 + object_event 26, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP diff --git a/maps/Route40.asm b/maps/Route40.asm index 2b7081ef3..e8b7d6946 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -339,24 +339,24 @@ Route40_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 9, 5, ROUTE_40_BATTLE_TOWER_GATE, 1 + warp_event 9, 5, ROUTE_40_BATTLE_TOWER_GATE, 1 db 0 ; coord events db 2 ; bg events bg_event 14, 10, BGEVENT_READ, Route40Sign - bg_event 7, 8, BGEVENT_ITEM, Route40HiddenHyperPotion + bg_event 7, 8, BGEVENT_ITEM, Route40HiddenHyperPotion db 12 ; object events object_event 14, 15, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSimon, -1 object_event 18, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerSwimmermRandall, -1 - object_event 3, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1 + object_event 3, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1 object_event 10, 25, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfPaula, -1 - object_event 7, 11, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 - object_event 6, 9, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 - object_event 7, 8, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 + object_event 7, 11, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 + object_event 6, 9, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 + object_event 7, 8, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 object_event 11, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Lass1Script, -1 - object_event 8, 10, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY - object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1 - object_event 13, 4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1 - object_event 16, 9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + object_event 8, 10, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY + object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1 + object_event 13, 4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1 + object_event 16, 9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 3bafbd21b..9678e9aa3 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -72,15 +72,15 @@ Route40BattleTowerGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 7, ROUTE_40, 1 - warp_event 5, 7, ROUTE_40, 1 - warp_event 4, 0, BATTLE_TOWER_OUTSIDE, 1 - warp_event 5, 0, BATTLE_TOWER_OUTSIDE, 2 + warp_event 4, 7, ROUTE_40, 1 + warp_event 5, 7, ROUTE_40, 1 + warp_event 4, 0, BATTLE_TOWER_OUTSIDE, 1 + warp_event 5, 0, BATTLE_TOWER_OUTSIDE, 2 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 3, 3, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR - object_event 7, 5, SPRITE_TWIN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1 + object_event 3, 3, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateRockerScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + object_event 7, 5, SPRITE_TWIN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route40BattleTowerGateTwinScript, -1 diff --git a/maps/Route41.asm b/maps/Route41.asm index 8fbfbce85..79d99d925 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -351,16 +351,16 @@ Route41_MapEvents: db 0 ; coord events db 1 ; bg events - bg_event 9, 35, BGEVENT_ITEM, Route41HiddenMaxEther + bg_event 9, 35, BGEVENT_ITEM, Route41HiddenMaxEther db 10 ; object events - object_event 32, 6, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1 - object_event 46, 8, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1 + object_event 32, 6, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1 + object_event 46, 8, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1 object_event 20, 26, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermBerke, -1 object_event 32, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermKirk, -1 object_event 19, 46, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermMathew, -1 - object_event 17, 4, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1 + object_event 17, 4, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1 object_event 23, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfSusie, -1 object_event 27, 34, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDenise, -1 object_event 44, 28, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfKara, -1 - object_event 9, 50, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1 + object_event 9, 50, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1 diff --git a/maps/Route42.asm b/maps/Route42.asm index 20a4f856c..06e83b5c3 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -320,29 +320,29 @@ Route42_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 0, 8, ROUTE_42_ECRUTEAK_GATE, 3 - warp_event 0, 9, ROUTE_42_ECRUTEAK_GATE, 4 - warp_event 10, 5, MOUNT_MORTAR_1F_OUTSIDE, 1 - warp_event 28, 9, MOUNT_MORTAR_1F_OUTSIDE, 2 - warp_event 46, 7, MOUNT_MORTAR_1F_OUTSIDE, 3 + warp_event 0, 8, ROUTE_42_ECRUTEAK_GATE, 3 + warp_event 0, 9, ROUTE_42_ECRUTEAK_GATE, 4 + warp_event 10, 5, MOUNT_MORTAR_1F_OUTSIDE, 1 + warp_event 28, 9, MOUNT_MORTAR_1F_OUTSIDE, 2 + warp_event 46, 7, MOUNT_MORTAR_1F_OUTSIDE, 3 db 1 ; coord events coord_event 24, 14, SCENE_ROUTE42_SUICUNE, Route42SuicuneScript db 5 ; bg events - bg_event 4, 10, BGEVENT_READ, Route42Sign1 - bg_event 7, 5, BGEVENT_READ, MtMortarSign1 - bg_event 45, 9, BGEVENT_READ, MtMortarSign2 - bg_event 54, 8, BGEVENT_READ, Route42Sign2 + bg_event 4, 10, BGEVENT_READ, Route42Sign1 + bg_event 7, 5, BGEVENT_READ, MtMortarSign1 + bg_event 45, 9, BGEVENT_READ, MtMortarSign2 + bg_event 54, 8, BGEVENT_READ, Route42Sign2 bg_event 16, 11, BGEVENT_ITEM, Route42HiddenMaxPotion db 9 ; object events object_event 40, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherTully, -1 - object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 - object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 + object_event 51, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 + object_event 47, 8, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 object_event 27, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 object_event 28, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 object_event 29, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 - object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL - object_event 33, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION + object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL + object_event 33, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION object_event 26, 16, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index 89ef5cd1a..c6f702452 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -21,14 +21,14 @@ Route42EcruteakGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, ECRUTEAK_CITY, 1 - warp_event 0, 5, ECRUTEAK_CITY, 2 - warp_event 9, 4, ROUTE_42, 1 - warp_event 9, 5, ROUTE_42, 2 + warp_event 0, 4, ECRUTEAK_CITY, 1 + warp_event 0, 5, ECRUTEAK_CITY, 2 + warp_event 9, 4, ROUTE_42, 1 + warp_event 9, 5, ROUTE_42, 2 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1 + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route42EcruteakGateOfficerScript, -1 diff --git a/maps/Route43.asm b/maps/Route43.asm index fa8067663..1eeda343a 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -502,7 +502,7 @@ Route43_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 9, 51, ROUTE_43_MAHOGANY_GATE, 1 + warp_event 9, 51, ROUTE_43_MAHOGANY_GATE, 1 warp_event 10, 51, ROUTE_43_MAHOGANY_GATE, 2 warp_event 17, 35, ROUTE_43_GATE, 3 warp_event 17, 31, ROUTE_43_GATE, 1 @@ -511,16 +511,16 @@ Route43_MapEvents: db 0 ; coord events db 3 ; bg events - bg_event 13, 3, BGEVENT_READ, Route43Sign1 + bg_event 13, 3, BGEVENT_READ, Route43Sign1 bg_event 11, 49, BGEVENT_READ, Route43Sign2 bg_event 16, 38, BGEVENT_READ, Route43TrainerTips db 8 ; object events - object_event 13, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1 + object_event 13, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacBen, -1 object_event 13, 20, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacBrent, -1 - object_event 14, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1 - object_event 4, 16, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1 - object_event 9, 25, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany, -1 + object_event 14, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPokemaniacRon, -1 + object_event 4, 16, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerFisherMarvin, -1 + object_event 9, 25, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTiffany, -1 object_event 13, 40, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperSpencer, -1 - object_event 1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1 + object_event 1, 26, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1 object_event 12, 32, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index a9c1affe5..d0e6ee201 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -249,16 +249,16 @@ Route43Gate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, ROUTE_43, 4 - warp_event 5, 0, ROUTE_43, 5 - warp_event 4, 7, ROUTE_43, 3 - warp_event 5, 7, ROUTE_43, 3 + warp_event 4, 0, ROUTE_43, 4 + warp_event 5, 0, ROUTE_43, 5 + warp_event 4, 7, ROUTE_43, 3 + warp_event 5, 7, ROUTE_43, 3 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS - object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS - object_event 7, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS + object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS + object_event 7, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index c5fbca190..6af688f1a 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -40,14 +40,14 @@ Route43MahoganyGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, ROUTE_43, 1 - warp_event 5, 0, ROUTE_43, 2 - warp_event 4, 7, MAHOGANY_TOWN, 5 - warp_event 5, 7, MAHOGANY_TOWN, 5 + warp_event 4, 0, ROUTE_43, 1 + warp_event 5, 0, ROUTE_43, 2 + warp_event 4, 7, MAHOGANY_TOWN, 5 + warp_event 5, 7, MAHOGANY_TOWN, 5 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route43MahoganyGateOfficer, -1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route43MahoganyGateOfficer, -1 diff --git a/maps/Route44.asm b/maps/Route44.asm index aad425161..1719b8432 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -508,24 +508,24 @@ Route44_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 56, 7, ICE_PATH_1F, 1 + warp_event 56, 7, ICE_PATH_1F, 1 db 0 ; coord events db 3 ; bg events - bg_event 53, 7, BGEVENT_READ, Route44Sign1 - bg_event 6, 10, BGEVENT_READ, Route44Sign2 - bg_event 32, 9, BGEVENT_ITEM, Route44HiddenElixer + bg_event 53, 7, BGEVENT_READ, Route44Sign1 + bg_event 6, 10, BGEVENT_READ, Route44Sign2 + bg_event 32, 9, BGEVENT_ITEM, Route44HiddenElixer db 11 ; object events - object_event 35, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1 + object_event 35, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherWilton1, -1 object_event 19, 13, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherEdgar, -1 - object_event 10, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1 - object_event 43, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacZach, -1 - object_event 51, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperVance1, -1 + object_event 10, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1 + object_event 43, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacZach, -1 + object_event 51, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperVance1, -1 object_event 41, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1 object_event 31, 14, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1 - object_event 9, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1 - object_event 30, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE - object_event 45, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL - object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL + object_event 9, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1 + object_event 30, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE + object_event 45, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL + object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route44MaxRepel, EVENT_ROUTE_44_MAX_REPEL diff --git a/maps/Route45.asm b/maps/Route45.asm index ddfaddd26..991181530 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -533,25 +533,25 @@ Route45_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 2, 5, DARK_CAVE_BLACKTHORN_ENTRANCE, 1 + warp_event 2, 5, DARK_CAVE_BLACKTHORN_ENTRANCE, 1 db 0 ; coord events db 2 ; bg events - bg_event 10, 4, BGEVENT_READ, Route45Sign + bg_event 10, 4, BGEVENT_READ, Route45Sign bg_event 13, 80, BGEVENT_ITEM, Route45HiddenPpUp db 13 ; object events object_event 10, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerErik, -1 object_event 15, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerMichael, -1 - object_event 5, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1 - object_event 9, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerTimothy, -1 + object_event 5, 28, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerParry, -1 + object_event 9, 65, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerTimothy, -1 object_event 11, 50, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltKenji, -1 object_event 17, 18, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1 - object_event 5, 36, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1 + object_event 5, 36, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1 object_event 16, 82, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1 - object_event 6, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET - object_event 5, 66, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE - object_event 6, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER - object_event 7, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION - object_event 4, 70, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerCamperQuentin, -1 + object_event 6, 51, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET + object_event 5, 66, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE + object_event 6, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER + object_event 7, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION + object_event 4, 70, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerCamperQuentin, -1 diff --git a/maps/Route46.asm b/maps/Route46.asm index 497c2654f..cdfb81234 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -252,19 +252,19 @@ Route46_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 7, 33, ROUTE_29_ROUTE_46_GATE, 1 - warp_event 8, 33, ROUTE_29_ROUTE_46_GATE, 2 - warp_event 14, 5, DARK_CAVE_VIOLET_ENTRANCE, 3 + warp_event 7, 33, ROUTE_29_ROUTE_46_GATE, 1 + warp_event 8, 33, ROUTE_29_ROUTE_46_GATE, 2 + warp_event 14, 5, DARK_CAVE_VIOLET_ENTRANCE, 3 db 0 ; coord events db 1 ; bg events - bg_event 9, 27, BGEVENT_READ, Route46Sign + bg_event 9, 27, BGEVENT_READ, Route46Sign db 6 ; object events object_event 12, 19, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1 - object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1 - object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 - object_event 7, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1 - object_event 8, 6, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1 - object_event 1, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED + object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1 + object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 + object_event 7, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1 + object_event 8, 6, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1 + object_event 1, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED diff --git a/maps/Route5.asm b/maps/Route5.asm index fcb1d9988..103c17d56 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -42,8 +42,8 @@ Route5_MapEvents: db 4 ; warp events warp_event 17, 15, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 1 - warp_event 8, 17, ROUTE_5_SAFFRON_GATE, 1 - warp_event 9, 17, ROUTE_5_SAFFRON_GATE, 2 + warp_event 8, 17, ROUTE_5_SAFFRON_GATE, 1 + warp_event 9, 17, ROUTE_5_SAFFRON_GATE, 2 warp_event 10, 11, ROUTE_5_CLEANSE_TAG_HOUSE, 1 db 0 ; coord events diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm index a99de824f..4fc1d0446 100644 --- a/maps/Route5CleanseTagHouse.asm +++ b/maps/Route5CleanseTagHouse.asm @@ -62,15 +62,15 @@ Route5CleanseTagHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, ROUTE_5, 4 - warp_event 3, 7, ROUTE_5, 4 + warp_event 2, 7, ROUTE_5, 4 + warp_event 3, 7, ROUTE_5, 4 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, HouseForSaleBookshelf - bg_event 1, 1, BGEVENT_READ, HouseForSaleBookshelf + bg_event 0, 1, BGEVENT_READ, HouseForSaleBookshelf + bg_event 1, 1, BGEVENT_READ, HouseForSaleBookshelf db 2 ; object events - object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseGrannyScript, -1 - object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseTeacherScript, -1 + object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseGrannyScript, -1 + object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseTeacherScript, -1 diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm index f6f5139db..3a0161af3 100644 --- a/maps/Route5SaffronGate.asm +++ b/maps/Route5SaffronGate.asm @@ -22,14 +22,14 @@ Route5SaffronGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, ROUTE_5, 2 - warp_event 5, 0, ROUTE_5, 3 - warp_event 4, 7, SAFFRON_CITY, 9 - warp_event 5, 7, SAFFRON_CITY, 9 + warp_event 4, 0, ROUTE_5, 2 + warp_event 5, 0, ROUTE_5, 3 + warp_event 4, 7, SAFFRON_CITY, 9 + warp_event 5, 7, SAFFRON_CITY, 9 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronGateOfficerScript, -1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route5SaffronGateOfficerScript, -1 diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm index 15d7e9f03..d62a042b9 100644 --- a/maps/Route5UndergroundPathEntrance.asm +++ b/maps/Route5UndergroundPathEntrance.asm @@ -21,13 +21,13 @@ Route5UndergroundPathEntrance_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, ROUTE_5, 1 - warp_event 4, 7, ROUTE_5, 1 - warp_event 4, 3, UNDERGROUND_PATH, 1 + warp_event 3, 7, ROUTE_5, 1 + warp_event 4, 7, ROUTE_5, 1 + warp_event 4, 3, UNDERGROUND_PATH, 1 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 2, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1 + object_event 2, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route5UndergroundPathEntranceTeacherScript, -1 diff --git a/maps/Route6.asm b/maps/Route6.asm index 8ba5fc6ef..a949881e4 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -93,15 +93,15 @@ Route6_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 17, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 1 - warp_event 6, 1, ROUTE_6_SAFFRON_GATE, 3 + warp_event 17, 3, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 1 + warp_event 6, 1, ROUTE_6_SAFFRON_GATE, 3 db 0 ; coord events db 1 ; bg events - bg_event 19, 5, BGEVENT_READ, Route6UndergroundPathSign + bg_event 19, 5, BGEVENT_READ, Route6UndergroundPathSign db 3 ; object events - object_event 17, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH - object_event 9, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1 + object_event 17, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + object_event 9, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmRex, -1 object_event 10, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerPokefanmAllan, -1 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 85f289df0..c0de7ff54 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -59,14 +59,14 @@ Route6SaffronGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, SAFFRON_CITY, 12 - warp_event 5, 0, SAFFRON_CITY, 13 - warp_event 4, 7, ROUTE_6, 2 - warp_event 5, 7, ROUTE_6, 2 + warp_event 4, 0, SAFFRON_CITY, 12 + warp_event 5, 0, SAFFRON_CITY, 13 + warp_event 4, 7, ROUTE_6, 2 + warp_event 5, 7, ROUTE_6, 2 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route6SaffronGuardScript, -1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route6SaffronGuardScript, -1 diff --git a/maps/Route6UndergroundPathEntrance.asm b/maps/Route6UndergroundPathEntrance.asm index 0f3a2a3ee..7e04b3fb1 100644 --- a/maps/Route6UndergroundPathEntrance.asm +++ b/maps/Route6UndergroundPathEntrance.asm @@ -7,9 +7,9 @@ Route6UndergroundPathEntrance_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, ROUTE_6, 1 - warp_event 4, 7, ROUTE_6, 1 - warp_event 4, 3, UNDERGROUND_PATH, 2 + warp_event 3, 7, ROUTE_6, 1 + warp_event 4, 7, ROUTE_6, 1 + warp_event 4, 3, UNDERGROUND_PATH, 2 db 0 ; coord events diff --git a/maps/Route7.asm b/maps/Route7.asm index 70849c693..6f1c5251f 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -36,13 +36,13 @@ Route7_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 15, 6, ROUTE_7_SAFFRON_GATE, 1 - warp_event 15, 7, ROUTE_7_SAFFRON_GATE, 2 + warp_event 15, 6, ROUTE_7_SAFFRON_GATE, 1 + warp_event 15, 7, ROUTE_7_SAFFRON_GATE, 2 db 0 ; coord events db 2 ; bg events - bg_event 5, 11, BGEVENT_READ, Route7UndergroundPathSign - bg_event 6, 9, BGEVENT_READ, Route7LockedDoor + bg_event 5, 11, BGEVENT_READ, Route7UndergroundPathSign + bg_event 6, 9, BGEVENT_READ, Route7LockedDoor db 0 ; object events diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 8b392b591..67a8c6813 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -47,14 +47,14 @@ Route7SaffronGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, ROUTE_7, 1 - warp_event 0, 5, ROUTE_7, 2 - warp_event 9, 4, SAFFRON_CITY, 10 - warp_event 9, 5, SAFFRON_CITY, 11 + warp_event 0, 4, ROUTE_7, 1 + warp_event 0, 5, ROUTE_7, 2 + warp_event 9, 4, SAFFRON_CITY, 10 + warp_event 9, 5, SAFFRON_CITY, 11 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route7SaffronGuardScript, -1 + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route7SaffronGuardScript, -1 diff --git a/maps/Route8.asm b/maps/Route8.asm index 809ef1a5c..0a9a96aed 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -174,19 +174,19 @@ Route8_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 4, ROUTE_8_SAFFRON_GATE, 3 - warp_event 4, 5, ROUTE_8_SAFFRON_GATE, 4 + warp_event 4, 4, ROUTE_8_SAFFRON_GATE, 3 + warp_event 4, 5, ROUTE_8_SAFFRON_GATE, 4 db 0 ; coord events db 2 ; bg events - bg_event 11, 7, BGEVENT_READ, Route8UndergroundPathSign - bg_event 10, 5, BGEVENT_READ, Route8LockedDoor + bg_event 11, 7, BGEVENT_READ, Route8UndergroundPathSign + bg_event 10, 5, BGEVENT_READ, Route8LockedDoor db 6 ; object events - object_event 10, 8, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1 - object_event 10, 9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1 + object_event 10, 8, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerBikerDwayne, -1 + object_event 10, 9, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerBikerHarris, -1 object_event 10, 10, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBikerZeke, -1 - object_event 23, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1 + object_event 23, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerSupernerdSam, -1 object_event 31, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSupernerdTom, -1 - object_event 33, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1 + object_event 33, 5, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index 9290eefd7..bcaf7f02c 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -21,14 +21,14 @@ Route8SaffronGate_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 0, 4, SAFFRON_CITY, 14 - warp_event 0, 5, SAFFRON_CITY, 15 - warp_event 9, 4, ROUTE_8, 1 - warp_event 9, 5, ROUTE_8, 2 + warp_event 0, 4, SAFFRON_CITY, 14 + warp_event 0, 5, SAFFRON_CITY, 15 + warp_event 9, 4, ROUTE_8, 1 + warp_event 9, 5, ROUTE_8, 2 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1 + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route8SaffronGateOfficerScript, -1 diff --git a/maps/Route9.asm b/maps/Route9.asm index 45c0e6299..5a3d934fd 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -212,13 +212,13 @@ Route9_MapEvents: db 0 ; coord events db 2 ; bg events - bg_event 15, 7, BGEVENT_READ, Route9Sign + bg_event 15, 7, BGEVENT_READ, Route9Sign bg_event 41, 15, BGEVENT_ITEM, Route9HiddenEther db 6 ; object events object_event 23, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperDean, -1 - object_event 39, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1 - object_event 11, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1 + object_event 39, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1 + object_event 11, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 5, TrainerCamperSid, -1 object_event 12, 15, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerEdna, -1 - object_event 28, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerTim, -1 + object_event 28, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerTim, -1 object_event 36, 15, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerHikerSidney, -1 diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index bc167d872..747c2d40d 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -145,20 +145,20 @@ RuinsOfAlphAerodactylChamber_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 4 - warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 4 - warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 8 - warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 9 - warp_event 4, 0, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 1 + warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 4 + warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 4 + warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 8 + warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 9 + warp_event 4, 0, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 1 db 0 ; coord events db 6 ; bg events - bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script - bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script - bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script - bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost3Script - bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script - bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script + bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script + bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script + bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script + bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost3Script + bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script + bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script db 0 ; object events diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm index ce455fab6..5e323f795 100644 --- a/maps/RuinsOfAlphAerodactylItemRoom.asm +++ b/maps/RuinsOfAlphAerodactylItemRoom.asm @@ -34,19 +34,19 @@ RuinsOfAlphAerodactylItemRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5 - warp_event 4, 9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5 - warp_event 3, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 1 - warp_event 4, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 2 + warp_event 3, 9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5 + warp_event 4, 9, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5 + warp_event 3, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 1 + warp_event 4, 1, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 2 db 0 ; coord events db 2 ; bg events - bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script - bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script + bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script + bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script db 4 ; object events - object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM - object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM - object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM - object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM + object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM + object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM + object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM + object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM diff --git a/maps/RuinsOfAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm index 65228a709..96dc3eaef 100644 --- a/maps/RuinsOfAlphAerodactylWordRoom.asm +++ b/maps/RuinsOfAlphAerodactylWordRoom.asm @@ -7,8 +7,8 @@ RuinsOfAlphAerodactylWordRoom_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 9, 5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 3 - warp_event 10, 5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 4 + warp_event 9, 5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 3 + warp_event 10, 5, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 4 warp_event 17, 11, RUINS_OF_ALPH_INNER_CHAMBER, 8 db 0 ; coord events diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 99339f985..e4df9dbe0 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -146,20 +146,20 @@ RuinsOfAlphHoOhChamber_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 1 - warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 1 - warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 2 - warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 3 - warp_event 4, 0, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 1 + warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 1 + warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 1 + warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 2 + warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 3 + warp_event 4, 0, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 1 db 0 ; coord events db 6 ; bg events - bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script - bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script - bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script - bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost3Script - bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script - bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script + bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script + bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphHoOhChamberSignpost1Script + bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost2Script + bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost3Script + bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost4Script + bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphHoOhChamberSignpost5Script db 0 ; object events diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm index 29a7183ab..1c70076f6 100644 --- a/maps/RuinsOfAlphHoOhItemRoom.asm +++ b/maps/RuinsOfAlphHoOhItemRoom.asm @@ -34,19 +34,19 @@ RuinsOfAlphHoOhItemRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5 - warp_event 4, 9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5 - warp_event 3, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 1 - warp_event 4, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 2 + warp_event 3, 9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5 + warp_event 4, 9, RUINS_OF_ALPH_HO_OH_CHAMBER, 5 + warp_event 3, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 1 + warp_event 4, 1, RUINS_OF_ALPH_HO_OH_WORD_ROOM, 2 db 0 ; coord events db 2 ; bg events - bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script - bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script + bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script + bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script db 4 ; object events - object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM - object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM - object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM - object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM + object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM + object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM + object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM + object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM diff --git a/maps/RuinsOfAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm index 40c282351..d5492dbf9 100644 --- a/maps/RuinsOfAlphHoOhWordRoom.asm +++ b/maps/RuinsOfAlphHoOhWordRoom.asm @@ -7,8 +7,8 @@ RuinsOfAlphHoOhWordRoom_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 9, 9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 3 - warp_event 10, 9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 4 + warp_event 9, 9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 3 + warp_event 10, 9, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 4 warp_event 17, 21, RUINS_OF_ALPH_INNER_CHAMBER, 2 db 0 ; coord events diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index 352dcf8dc..7f5348633 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -79,46 +79,46 @@ RuinsOfAlphInnerChamber_MapEvents: db 9 ; warp events warp_event 10, 13, RUINS_OF_ALPH_OUTSIDE, 5 - warp_event 3, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 3 - warp_event 4, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 4 - warp_event 15, 3, RUINS_OF_ALPH_KABUTO_CHAMBER, 3 - warp_event 16, 3, RUINS_OF_ALPH_KABUTO_CHAMBER, 4 - warp_event 3, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 3 - warp_event 4, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 4 + warp_event 3, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 3 + warp_event 4, 15, RUINS_OF_ALPH_HO_OH_CHAMBER, 4 + warp_event 15, 3, RUINS_OF_ALPH_KABUTO_CHAMBER, 3 + warp_event 16, 3, RUINS_OF_ALPH_KABUTO_CHAMBER, 4 + warp_event 3, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 3 + warp_event 4, 21, RUINS_OF_ALPH_OMANYTE_CHAMBER, 4 warp_event 15, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 3 warp_event 16, 24, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 4 db 0 ; coord events db 26 ; bg events - bg_event 2, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 5, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 8, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 11, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 14, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 17, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 2, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 5, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 8, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 11, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 14, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 17, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 2, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 2, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 5, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 11, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 14, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 17, 3, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 2, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 5, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 11, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 14, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 17, 8, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 2, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 17, 13, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 2, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 5, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 8, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 2, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 5, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 11, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 14, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 17, 18, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 2, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 5, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue - bg_event 8, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 2, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 5, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue + bg_event 8, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 11, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 14, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue bg_event 17, 24, BGEVENT_READ, RuinsOfAlphInnerChamberStatue db 3 ; object events - object_event 3, 7, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + object_event 3, 7, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS object_event 14, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS object_event 11, 19, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index 1b01adee1..bb0977a21 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -257,22 +257,22 @@ RuinsOfAlphKabutoChamber_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 2 - warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 2 - warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 4 - warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 5 - warp_event 4, 0, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 1 + warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 2 + warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 2 + warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 4 + warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 5 + warp_event 4, 0, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 1 db 0 ; coord events db 6 ; bg events - bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script - bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script - bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost2Script - bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost3Script - bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost4Script - bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost5Script + bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script + bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphKabutoChamberSignpost1Script + bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost2Script + bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost3Script + bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost4Script + bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphKabutoChamberSignpost5Script db 2 ; object events - object_event 5, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST - object_event 3, 1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1 + object_event 5, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST + object_event 3, 1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1 diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm index ac9753ca4..d40e1dcf2 100644 --- a/maps/RuinsOfAlphKabutoItemRoom.asm +++ b/maps/RuinsOfAlphKabutoItemRoom.asm @@ -34,19 +34,19 @@ RuinsOfAlphKabutoItemRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5 - warp_event 4, 9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5 - warp_event 3, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 1 - warp_event 4, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 2 + warp_event 3, 9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5 + warp_event 4, 9, RUINS_OF_ALPH_KABUTO_CHAMBER, 5 + warp_event 3, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 1 + warp_event 4, 1, RUINS_OF_ALPH_KABUTO_WORD_ROOM, 2 db 0 ; coord events db 2 ; bg events - bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script - bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script + bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script + bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script db 4 ; object events - object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM - object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM - object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM - object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM + object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM + object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM + object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM + object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM diff --git a/maps/RuinsOfAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm index 9820104eb..086ae4c2d 100644 --- a/maps/RuinsOfAlphKabutoWordRoom.asm +++ b/maps/RuinsOfAlphKabutoWordRoom.asm @@ -7,8 +7,8 @@ RuinsOfAlphKabutoWordRoom_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 9, 5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 3 - warp_event 10, 5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 4 + warp_event 9, 5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 3 + warp_event 10, 5, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 4 warp_event 17, 11, RUINS_OF_ALPH_INNER_CHAMBER, 4 db 0 ; coord events diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index f4074ed72..6f166a416 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -146,20 +146,20 @@ RuinsOfAlphOmanyteChamber_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 3 - warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 3 - warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 6 - warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 7 - warp_event 4, 0, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 1 + warp_event 3, 9, RUINS_OF_ALPH_OUTSIDE, 3 + warp_event 4, 9, RUINS_OF_ALPH_OUTSIDE, 3 + warp_event 3, 3, RUINS_OF_ALPH_INNER_CHAMBER, 6 + warp_event 4, 3, RUINS_OF_ALPH_INNER_CHAMBER, 7 + warp_event 4, 0, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 1 db 0 ; coord events db 6 ; bg events - bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script - bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script - bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script - bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost3Script - bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script - bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script + bg_event 2, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script + bg_event 5, 3, BGEVENT_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script + bg_event 3, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script + bg_event 4, 2, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost3Script + bg_event 3, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script + bg_event 4, 0, BGEVENT_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script db 0 ; object events diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm index 1a8dcce72..4013ed19d 100644 --- a/maps/RuinsOfAlphOmanyteItemRoom.asm +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -34,19 +34,19 @@ RuinsOfAlphOmanyteItemRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5 - warp_event 4, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5 - warp_event 3, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 1 - warp_event 4, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 2 + warp_event 3, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5 + warp_event 4, 9, RUINS_OF_ALPH_OMANYTE_CHAMBER, 5 + warp_event 3, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 1 + warp_event 4, 1, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 2 db 0 ; coord events db 2 ; bg events - bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script - bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script + bg_event 2, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script + bg_event 5, 1, BGEVENT_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script db 4 ; object events - object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM - object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM - object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM - object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM + object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM + object_event 5, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM + object_event 2, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM + object_event 5, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM diff --git a/maps/RuinsOfAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm index 5c78330bb..b5e0f4d2e 100644 --- a/maps/RuinsOfAlphOmanyteWordRoom.asm +++ b/maps/RuinsOfAlphOmanyteWordRoom.asm @@ -7,8 +7,8 @@ RuinsOfAlphOmanyteWordRoom_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 9, 7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 3 - warp_event 10, 7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 4 + warp_event 9, 7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 3 + warp_event 10, 7, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 4 warp_event 17, 13, RUINS_OF_ALPH_INNER_CHAMBER, 6 db 0 ; coord events diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 646be0d1c..8ab4b8f5d 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -282,15 +282,15 @@ RuinsOfAlphOutside_MapEvents: db 0, 0 ; filler db 11 ; warp events - warp_event 2, 17, RUINS_OF_ALPH_HO_OH_CHAMBER, 1 - warp_event 14, 7, RUINS_OF_ALPH_KABUTO_CHAMBER, 1 - warp_event 2, 29, RUINS_OF_ALPH_OMANYTE_CHAMBER, 1 + warp_event 2, 17, RUINS_OF_ALPH_HO_OH_CHAMBER, 1 + warp_event 14, 7, RUINS_OF_ALPH_KABUTO_CHAMBER, 1 + warp_event 2, 29, RUINS_OF_ALPH_OMANYTE_CHAMBER, 1 warp_event 16, 33, RUINS_OF_ALPH_AERODACTYL_CHAMBER, 1 warp_event 10, 13, RUINS_OF_ALPH_INNER_CHAMBER, 1 warp_event 17, 11, RUINS_OF_ALPH_RESEARCH_CENTER, 1 - warp_event 6, 19, UNION_CAVE_B1F, 1 - warp_event 6, 27, UNION_CAVE_B1F, 2 - warp_event 7, 5, ROUTE_36_RUINS_OF_ALPH_GATE, 3 + warp_event 6, 19, UNION_CAVE_B1F, 1 + warp_event 6, 27, UNION_CAVE_B1F, 2 + warp_event 7, 5, ROUTE_36_RUINS_OF_ALPH_GATE, 3 warp_event 13, 20, ROUTE_32_RUINS_OF_ALPH_GATE, 1 warp_event 13, 21, ROUTE_32_RUINS_OF_ALPH_GATE, 2 @@ -299,13 +299,13 @@ RuinsOfAlphOutside_MapEvents: coord_event 10, 15, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX, RuinsOfAlphOutsideScientistScene2 db 3 ; bg events - bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script + bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script bg_event 12, 16, BGEVENT_READ, RuinsOfAlphOutsideSignpost1Script bg_event 18, 12, BGEVENT_READ, RuinsOfAlphOutsideSignpost2Script db 5 ; object events - object_event 4, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1 + object_event 4, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1 object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST object_event 13, 17, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER object_event 14, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS - object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index d8113b972..38ead4614 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -394,17 +394,17 @@ RuinsOfAlphResearchCenter_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, RUINS_OF_ALPH_OUTSIDE, 6 - warp_event 3, 7, RUINS_OF_ALPH_OUTSIDE, 6 + warp_event 2, 7, RUINS_OF_ALPH_OUTSIDE, 6 + warp_event 3, 7, RUINS_OF_ALPH_OUTSIDE, 6 db 0 ; coord events db 3 ; bg events - bg_event 6, 5, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script - bg_event 3, 4, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script - bg_event 7, 1, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script + bg_event 6, 5, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost0Script + bg_event 3, 4, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost1Script + bg_event 7, 1, BGEVENT_READ, MapRuinsOfAlphResearchCenterSignpost2Script db 3 ; object events - object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1 - object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1 - object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST + object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1 + object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x59214, -1 + object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index f0fbba12d..32627af69 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -7,7 +7,7 @@ SafariZoneBeta_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 9, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 1 + warp_event 9, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 1 warp_event 10, 23, SAFARI_ZONE_FUCHSIA_GATE_BETA, 2 db 0 ; coord events diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index f18421f40..547ed5bd2 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -7,10 +7,10 @@ SafariZoneFuchsiaGateBeta_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 0, SAFARI_ZONE_BETA, 1 - warp_event 5, 0, SAFARI_ZONE_BETA, 2 - warp_event 4, 7, FUCHSIA_CITY, 7 - warp_event 5, 7, FUCHSIA_CITY, 7 + warp_event 4, 0, SAFARI_ZONE_BETA, 1 + warp_event 5, 0, SAFARI_ZONE_BETA, 2 + warp_event 4, 7, FUCHSIA_CITY, 7 + warp_event 5, 7, FUCHSIA_CITY, 7 db 0 ; coord events diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index a44a0387e..270fc0267 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -7,8 +7,8 @@ SafariZoneMainOffice_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, FUCHSIA_CITY, 2 - warp_event 3, 7, FUCHSIA_CITY, 2 + warp_event 2, 7, FUCHSIA_CITY, 2 + warp_event 3, 7, FUCHSIA_CITY, 2 db 0 ; coord events diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index afa22d55d..41a2db11d 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -78,16 +78,16 @@ SafariZoneWardensHome_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, FUCHSIA_CITY, 6 - warp_event 3, 7, FUCHSIA_CITY, 6 + warp_event 2, 7, FUCHSIA_CITY, 6 + warp_event 3, 7, FUCHSIA_CITY, 6 db 0 ; coord events db 4 ; bg events - bg_event 0, 1, BGEVENT_READ, WardensHomeBookshelf - bg_event 1, 1, BGEVENT_READ, WardensHomeBookshelf - bg_event 7, 0, BGEVENT_READ, WardenPhoto - bg_event 9, 0, BGEVENT_READ, SafariZonePhoto + bg_event 0, 1, BGEVENT_READ, WardensHomeBookshelf + bg_event 1, 1, BGEVENT_READ, WardensHomeBookshelf + bg_event 7, 0, BGEVENT_READ, WardenPhoto + bg_event 9, 0, BGEVENT_READ, SafariZonePhoto db 1 ; object events - object_event 2, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1 + object_event 2, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 752dc6d1e..6d1ddbebc 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -267,17 +267,17 @@ SaffronCity_MapEvents: db 0, 0 ; filler db 15 ; warp events - warp_event 26, 3, FIGHTING_DOJO, 1 - warp_event 34, 3, SAFFRON_GYM, 1 + warp_event 26, 3, FIGHTING_DOJO, 1 + warp_event 34, 3, SAFFRON_GYM, 1 warp_event 25, 11, SAFFRON_MART, 2 - warp_event 9, 29, SAFFRON_POKECENTER_1F, 1 + warp_event 9, 29, SAFFRON_POKECENTER_1F, 1 warp_event 27, 29, MR_PSYCHICS_HOUSE, 1 - warp_event 8, 3, SAFFRON_MAGNET_TRAIN_STATION, 2 + warp_event 8, 3, SAFFRON_MAGNET_TRAIN_STATION, 2 warp_event 18, 21, SILPH_CO_1F, 1 - warp_event 9, 11, COPYCATS_HOUSE_1F, 1 - warp_event 18, 3, ROUTE_5_SAFFRON_GATE, 3 - warp_event 0, 24, ROUTE_7_SAFFRON_GATE, 3 - warp_event 0, 25, ROUTE_7_SAFFRON_GATE, 4 + warp_event 9, 11, COPYCATS_HOUSE_1F, 1 + warp_event 18, 3, ROUTE_5_SAFFRON_GATE, 3 + warp_event 0, 24, ROUTE_7_SAFFRON_GATE, 3 + warp_event 0, 25, ROUTE_7_SAFFRON_GATE, 4 warp_event 16, 33, ROUTE_6_SAFFRON_GATE, 1 warp_event 17, 33, ROUTE_6_SAFFRON_GATE, 2 warp_event 39, 22, ROUTE_8_SAFFRON_GATE, 1 @@ -286,21 +286,21 @@ SaffronCity_MapEvents: db 0 ; coord events db 8 ; bg events - bg_event 21, 5, BGEVENT_READ, SaffronCitySign - bg_event 33, 5, BGEVENT_READ, SaffronGymSign - bg_event 25, 5, BGEVENT_READ, FightingDojoSign + bg_event 21, 5, BGEVENT_READ, SaffronCitySign + bg_event 33, 5, BGEVENT_READ, SaffronGymSign + bg_event 25, 5, BGEVENT_READ, FightingDojoSign bg_event 15, 21, BGEVENT_READ, SilphCoSign bg_event 25, 29, BGEVENT_READ, MrPsychicsHouseSign - bg_event 11, 5, BGEVENT_READ, SaffronCityMagnetTrainStationSign + bg_event 11, 5, BGEVENT_READ, SaffronCityMagnetTrainStationSign bg_event 10, 29, BGEVENT_READ, SaffronCityPokecenterSign bg_event 26, 11, BGEVENT_READ, SaffronCityMartSign db 8 ; object events - object_event 7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LassScript_0x19932a, -1 + object_event 7, 14, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LassScript_0x19932a, -1 object_event 19, 30, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1 - object_event 32, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1 + object_event 32, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerMScript, -1 object_event 20, 24, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityCooltrainerFScript, -1 object_event 27, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x199358, -1 object_event 15, 19, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster1Script, -1 object_event 35, 22, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronCityYoungster2Script, -1 - object_event 19, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityLassScript, -1 + object_event 19, 8, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronCityLassScript, -1 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 732a75168..466c12af8 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -292,48 +292,48 @@ SaffronGym_MapEvents: db 0, 0 ; filler db 32 ; warp events - warp_event 8, 17, SAFFRON_CITY, 2 - warp_event 9, 17, SAFFRON_CITY, 2 + warp_event 8, 17, SAFFRON_CITY, 2 + warp_event 9, 17, SAFFRON_CITY, 2 warp_event 11, 15, SAFFRON_GYM, 18 warp_event 19, 15, SAFFRON_GYM, 19 warp_event 19, 11, SAFFRON_GYM, 20 - warp_event 1, 11, SAFFRON_GYM, 21 - warp_event 5, 3, SAFFRON_GYM, 22 - warp_event 11, 5, SAFFRON_GYM, 23 - warp_event 1, 15, SAFFRON_GYM, 24 - warp_event 19, 3, SAFFRON_GYM, 25 + warp_event 1, 11, SAFFRON_GYM, 21 + warp_event 5, 3, SAFFRON_GYM, 22 + warp_event 11, 5, SAFFRON_GYM, 23 + warp_event 1, 15, SAFFRON_GYM, 24 + warp_event 19, 3, SAFFRON_GYM, 25 warp_event 15, 17, SAFFRON_GYM, 26 - warp_event 5, 17, SAFFRON_GYM, 27 - warp_event 5, 9, SAFFRON_GYM, 28 - warp_event 9, 3, SAFFRON_GYM, 29 - warp_event 15, 9, SAFFRON_GYM, 30 - warp_event 15, 5, SAFFRON_GYM, 31 - warp_event 1, 5, SAFFRON_GYM, 32 + warp_event 5, 17, SAFFRON_GYM, 27 + warp_event 5, 9, SAFFRON_GYM, 28 + warp_event 9, 3, SAFFRON_GYM, 29 + warp_event 15, 9, SAFFRON_GYM, 30 + warp_event 15, 5, SAFFRON_GYM, 31 + warp_event 1, 5, SAFFRON_GYM, 32 warp_event 19, 17, SAFFRON_GYM, 3 - warp_event 19, 9, SAFFRON_GYM, 4 - warp_event 1, 9, SAFFRON_GYM, 5 - warp_event 5, 5, SAFFRON_GYM, 6 - warp_event 11, 3, SAFFRON_GYM, 7 - warp_event 1, 17, SAFFRON_GYM, 8 - warp_event 19, 5, SAFFRON_GYM, 9 + warp_event 19, 9, SAFFRON_GYM, 4 + warp_event 1, 9, SAFFRON_GYM, 5 + warp_event 5, 5, SAFFRON_GYM, 6 + warp_event 11, 3, SAFFRON_GYM, 7 + warp_event 1, 17, SAFFRON_GYM, 8 + warp_event 19, 5, SAFFRON_GYM, 9 warp_event 15, 15, SAFFRON_GYM, 10 - warp_event 5, 15, SAFFRON_GYM, 11 - warp_event 5, 11, SAFFRON_GYM, 12 - warp_event 9, 5, SAFFRON_GYM, 13 + warp_event 5, 15, SAFFRON_GYM, 11 + warp_event 5, 11, SAFFRON_GYM, 12 + warp_event 9, 5, SAFFRON_GYM, 13 warp_event 15, 11, SAFFRON_GYM, 14 - warp_event 15, 3, SAFFRON_GYM, 15 - warp_event 1, 3, SAFFRON_GYM, 16 - warp_event 11, 9, SAFFRON_GYM, 17 + warp_event 15, 3, SAFFRON_GYM, 15 + warp_event 1, 3, SAFFRON_GYM, 16 + warp_event 11, 9, SAFFRON_GYM, 17 db 0 ; coord events db 1 ; bg events - bg_event 8, 15, BGEVENT_READ, SaffronGymStatue + bg_event 8, 15, BGEVENT_READ, SaffronGymStatue db 6 ; object events - object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1 + object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1 object_event 17, 16, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1 - object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1 - object_event 3, 4, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1 - object_event 17, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicJared, -1 - object_event 9, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuyScript, -1 + object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1 + object_event 3, 4, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1 + object_event 17, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicJared, -1 + object_event 9, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuyScript, -1 diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index 0c57587d8..c6e6d2645 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -217,18 +217,18 @@ SaffronMagnetTrainStation_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 8, 17, SAFFRON_CITY, 6 - warp_event 9, 17, SAFFRON_CITY, 6 - warp_event 6, 5, GOLDENROD_MAGNET_TRAIN_STATION, 4 - warp_event 11, 5, GOLDENROD_MAGNET_TRAIN_STATION, 3 + warp_event 8, 17, SAFFRON_CITY, 6 + warp_event 9, 17, SAFFRON_CITY, 6 + warp_event 6, 5, GOLDENROD_MAGNET_TRAIN_STATION, 4 + warp_event 11, 5, GOLDENROD_MAGNET_TRAIN_STATION, 3 db 1 ; coord events - coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromGoldenrod + coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromGoldenrod db 0 ; bg events db 4 ; object events - object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1 + object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1 object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1 - object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION - object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION + object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION + object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 3b701ee2f..b86655188 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -39,14 +39,14 @@ SaffronMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, SAFFRON_CITY, 3 - warp_event 3, 7, SAFFRON_CITY, 3 + warp_event 2, 7, SAFFRON_CITY, 3 + warp_event 3, 7, SAFFRON_CITY, 3 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1 - object_event 7, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1 - object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1 + object_event 7, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerMScript, -1 + object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMartCooltrainerFScript, -1 diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index 943582370..91f2f9ba1 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -113,16 +113,16 @@ SaffronPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, SAFFRON_CITY, 4 - warp_event 4, 7, SAFFRON_CITY, 4 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, SAFFRON_CITY, 4 + warp_event 4, 7, SAFFRON_CITY, 4 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1 - object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1 - object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1 - object_event 1, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1 + object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1 + object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1 + object_event 1, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1 diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm index 9a5196196..912f1281a 100644 --- a/maps/SaffronPokecenter2FBeta.asm +++ b/maps/SaffronPokecenter2FBeta.asm @@ -7,7 +7,7 @@ SaffronPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, SAFFRON_POKECENTER_1F, 3 + warp_event 0, 7, SAFFRON_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index be63733a0..4a912f39f 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -159,12 +159,12 @@ SeafoamGym_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 5, 5, ROUTE_20, 1 + warp_event 5, 5, ROUTE_20, 1 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 5, 2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1 - object_event 6, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY + object_event 5, 2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1 + object_event 6, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 925fffb0f..662084b25 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -57,13 +57,13 @@ SilphCo1F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, SAFFRON_CITY, 7 - warp_event 3, 7, SAFFRON_CITY, 7 + warp_event 2, 7, SAFFRON_CITY, 7 + warp_event 3, 7, SAFFRON_CITY, 7 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 4, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionist, -1 - object_event 13, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1 + object_event 4, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionist, -1 + object_event 13, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1 diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index b9f0be206..e2f48638d 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -17,13 +17,13 @@ SilverCaveItemRooms_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 13, 3, SILVER_CAVE_ROOM_2, 3 - warp_event 7, 15, SILVER_CAVE_ROOM_2, 4 + warp_event 13, 3, SILVER_CAVE_ROOM_2, 3 + warp_event 7, 15, SILVER_CAVE_ROOM_2, 4 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE + object_event 6, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsMaxRevive, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE object_event 15, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveItemRoomsFullRestore, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 9dec24604..fea256208 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -33,6 +33,6 @@ SilverCaveOutside_MapEvents: db 3 ; bg events bg_event 24, 19, BGEVENT_READ, MtSilverPokecenterSign bg_event 17, 13, BGEVENT_READ, MtSilverSign - bg_event 9, 25, BGEVENT_ITEM, SilverCaveOutsideHiddenFullRestore + bg_event 9, 25, BGEVENT_ITEM, SilverCaveOutsideHiddenFullRestore db 0 ; object events diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index 94ac820ce..de066c65e 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -31,14 +31,14 @@ SilverCavePokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, SILVER_CAVE_OUTSIDE, 1 - warp_event 4, 7, SILVER_CAVE_OUTSIDE, 1 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, SILVER_CAVE_OUTSIDE, 1 + warp_event 4, 7, SILVER_CAVE_OUTSIDE, 1 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1 - object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ae59a, -1 + object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SilverCavePokecenter1FGrannyScript, -1 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 74518dbeb..1fe5df55d 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -31,8 +31,8 @@ SilverCaveRoom1_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 9, 33, SILVER_CAVE_OUTSIDE, 2 - warp_event 15, 1, SILVER_CAVE_ROOM_2, 1 + warp_event 9, 33, SILVER_CAVE_OUTSIDE, 2 + warp_event 15, 1, SILVER_CAVE_ROOM_2, 1 db 0 ; coord events @@ -41,7 +41,7 @@ SilverCaveRoom1_MapEvents: bg_event 17, 12, BGEVENT_ITEM, SilverCaveRoom1HiddenUltraBall db 4 ; object events - object_event 4, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER + object_event 4, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1MaxElixer, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER object_event 15, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1Protein, EVENT_SILVER_CAVE_ROOM_1_PROTEIN - object_event 5, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE - object_event 7, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL + object_event 5, 30, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1EscapeRope, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE + object_event 7, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom1UltraBall, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 1002acc78..7a7f9250d 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -25,9 +25,9 @@ SilverCaveRoom2_MapEvents: db 4 ; warp events warp_event 17, 31, SILVER_CAVE_ROOM_1, 2 - warp_event 11, 5, SILVER_CAVE_ROOM_3, 1 + warp_event 11, 5, SILVER_CAVE_ROOM_3, 1 warp_event 13, 21, SILVER_CAVE_ITEM_ROOMS, 1 - warp_event 23, 3, SILVER_CAVE_ITEM_ROOMS, 2 + warp_event 23, 3, SILVER_CAVE_ITEM_ROOMS, 2 db 0 ; coord events @@ -37,4 +37,4 @@ SilverCaveRoom2_MapEvents: db 3 ; object events object_event 24, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2Calcium, EVENT_SILVER_CAVE_ROOM_2_CALCIUM object_event 22, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2UltraBall, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL - object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP + object_event 4, 20, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SilverCaveRoom2PPUp, EVENT_SILVER_CAVE_ROOM_2_PP_UP diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 4ca196ea1..3efd76434 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -52,11 +52,11 @@ SilverCaveRoom3_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 9, 33, SILVER_CAVE_ROOM_2, 2 + warp_event 9, 33, SILVER_CAVE_ROOM_2, 2 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 9, 10, SPRITE_RED, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER + object_event 9, 10, SPRITE_RED, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 79d093970..1a7a1e408 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -323,19 +323,19 @@ SlowpokeWellB1F_MapEvents: db 2 ; warp events warp_event 17, 15, AZALEA_TOWN, 6 - warp_event 7, 11, SLOWPOKE_WELL_B2F, 1 + warp_event 7, 11, SLOWPOKE_WELL_B2F, 1 db 0 ; coord events db 0 ; bg events db 9 ; object events - object_event 15, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS - object_event 5, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS - object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS - object_event 10, 4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS - object_event 7, 4, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FSlowpokeWithMailScript, EVENT_SLOWPOKE_WELL_SLOWPOKES - object_event 6, 2, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FTaillessSlowpokeScript, EVENT_SLOWPOKE_WELL_SLOWPOKES + object_event 15, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS + object_event 5, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS + object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS + object_event 10, 4, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS + object_event 7, 4, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FSlowpokeWithMailScript, EVENT_SLOWPOKE_WELL_SLOWPOKES + object_event 6, 2, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FTaillessSlowpokeScript, EVENT_SLOWPOKE_WELL_SLOWPOKES object_event 16, 14, SPRITE_KURT, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FKurtScript, EVENT_SLOWPOKE_WELL_KURT - object_event 3, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1 - object_event 10, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION + object_event 3, 2, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1 + object_event 10, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index e9da7b24e..21a8f73e4 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -63,12 +63,12 @@ SlowpokeWellB2F_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 9, 11, SLOWPOKE_WELL_B1F, 2 + warp_event 9, 11, SLOWPOKE_WELL_B1F, 2 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1 - object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE + object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1 + object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index dac4aa66e..8c6a86128 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -74,15 +74,15 @@ SoulHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 7, LAVENDER_TOWN, 6 - warp_event 5, 7, LAVENDER_TOWN, 6 + warp_event 4, 7, LAVENDER_TOWN, 6 + warp_event 5, 7, LAVENDER_TOWN, 6 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 4, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1 - object_event 7, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1 - object_event 2, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1 - object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1 + object_event 4, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1 + object_event 7, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1 + object_event 2, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1 + object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseGrannyScript, -1 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index cddd2ed4c..89bf9e562 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -104,22 +104,22 @@ SproutTower1F_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 9, 15, VIOLET_CITY, 7 + warp_event 9, 15, VIOLET_CITY, 7 warp_event 10, 15, VIOLET_CITY, 7 - warp_event 6, 4, SPROUT_TOWER_2F, 1 - warp_event 2, 6, SPROUT_TOWER_2F, 2 - warp_event 17, 3, SPROUT_TOWER_2F, 3 + warp_event 6, 4, SPROUT_TOWER_2F, 1 + warp_event 2, 6, SPROUT_TOWER_2F, 2 + warp_event 17, 3, SPROUT_TOWER_2F, 3 db 0 ; coord events db 2 ; bg events - bg_event 7, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script + bg_event 7, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script bg_event 12, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script db 6 ; object events - object_event 7, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1 - object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1 + object_event 7, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1 + object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1 object_event 11, 12, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1 - object_event 9, 9, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1 - object_event 3, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageChow, -1 - object_event 16, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL + object_event 9, 9, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1 + object_event 3, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageChow, -1 + object_event 16, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 79da8c462..4bc2a6d1d 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -86,9 +86,9 @@ SproutTower2F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 6, 4, SPROUT_TOWER_1F, 3 - warp_event 2, 6, SPROUT_TOWER_1F, 4 - warp_event 17, 3, SPROUT_TOWER_1F, 5 + warp_event 6, 4, SPROUT_TOWER_1F, 3 + warp_event 2, 6, SPROUT_TOWER_1F, 4 + warp_event 17, 3, SPROUT_TOWER_1F, 5 warp_event 10, 14, SPROUT_TOWER_3F, 1 db 0 ; coord events @@ -97,6 +97,6 @@ SproutTower2F_MapEvents: bg_event 12, 15, BGEVENT_READ, MapSproutTower2FSignpost0Script db 3 ; object events - object_event 12, 3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1 - object_event 9, 14, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1 - object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY + object_event 12, 3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1 + object_event 9, 14, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSageEdmond, -1 + object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index b52459ab5..8a366c103 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -334,21 +334,21 @@ SproutTower3F_MapEvents: warp_event 10, 14, SPROUT_TOWER_2F, 4 db 1 ; coord events - coord_event 11, 9, SCENE_DEFAULT, UnknownScript_0x184947 + coord_event 11, 9, SCENE_DEFAULT, UnknownScript_0x184947 db 6 ; bg events - bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script - bg_event 11, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script - bg_event 9, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script - bg_event 10, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script - bg_event 5, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 11, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 9, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script + bg_event 10, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script + bg_event 5, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script bg_event 14, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script db 7 ; object events - object_event 8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1 - object_event 8, 8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1 - object_event 10, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1 + object_event 8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1 + object_event 8, 8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1 + object_event 10, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1 object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageNeal, -1 - object_event 6, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION - object_event 14, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE - object_event 10, 4, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER + object_event 6, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION + object_event 14, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE + object_event 10, 4, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index dabd5eef4..c82fcb37c 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -728,62 +728,62 @@ TeamRocketBaseB1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 27, 2, MAHOGANY_MART_1F, 3 - warp_event 3, 14, TEAM_ROCKET_BASE_B2F, 1 - warp_event 5, 15, TEAM_ROCKET_BASE_B1F, 4 - warp_event 25, 2, TEAM_ROCKET_BASE_B1F, 3 + warp_event 27, 2, MAHOGANY_MART_1F, 3 + warp_event 3, 14, TEAM_ROCKET_BASE_B2F, 1 + warp_event 5, 15, TEAM_ROCKET_BASE_B1F, 4 + warp_event 25, 2, TEAM_ROCKET_BASE_B1F, 3 db 30 ; coord events ; There are five security cameras in the base. ; Walking in front of one triggers two Rocket Grunts. - coord_event 24, 2, 0, SecurityCamera1a - coord_event 24, 3, 0, SecurityCamera1b - coord_event 6, 2, 0, SecurityCamera2a - coord_event 6, 3, 0, SecurityCamera2b - coord_event 24, 6, 0, SecurityCamera3a - coord_event 24, 7, 0, SecurityCamera3b + coord_event 24, 2, 0, SecurityCamera1a + coord_event 24, 3, 0, SecurityCamera1b + coord_event 6, 2, 0, SecurityCamera2a + coord_event 6, 3, 0, SecurityCamera2b + coord_event 24, 6, 0, SecurityCamera3a + coord_event 24, 7, 0, SecurityCamera3b coord_event 22, 16, 0, SecurityCamera4 - coord_event 8, 16, 0, SecurityCamera5 + coord_event 8, 16, 0, SecurityCamera5 ; There are spots on the floor that trigger a Pokémon battle. ; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct. - coord_event 2, 7, SCENE_DEFAULT, ExplodingTrap1 - coord_event 3, 7, SCENE_DEFAULT, ExplodingTrap2 - coord_event 4, 7, SCENE_DEFAULT, ExplodingTrap3 - coord_event 1, 8, SCENE_DEFAULT, ExplodingTrap4 - coord_event 3, 8, SCENE_DEFAULT, ExplodingTrap5 - coord_event 5, 8, SCENE_DEFAULT, ExplodingTrap6 - coord_event 3, 9, SCENE_DEFAULT, ExplodingTrap7 - coord_event 4, 9, SCENE_DEFAULT, ExplodingTrap8 - coord_event 1, 10, SCENE_DEFAULT, ExplodingTrap9 - coord_event 2, 10, SCENE_DEFAULT, ExplodingTrap10 - coord_event 3, 10, SCENE_DEFAULT, ExplodingTrap11 - coord_event 5, 10, SCENE_DEFAULT, ExplodingTrap12 - coord_event 2, 11, SCENE_DEFAULT, ExplodingTrap13 - coord_event 4, 11, SCENE_DEFAULT, ExplodingTrap14 - coord_event 1, 12, SCENE_DEFAULT, ExplodingTrap15 - coord_event 2, 12, SCENE_DEFAULT, ExplodingTrap16 - coord_event 4, 12, SCENE_DEFAULT, ExplodingTrap17 - coord_event 5, 12, SCENE_DEFAULT, ExplodingTrap18 - coord_event 1, 13, SCENE_DEFAULT, ExplodingTrap19 - coord_event 3, 13, SCENE_DEFAULT, ExplodingTrap20 - coord_event 4, 13, SCENE_DEFAULT, ExplodingTrap21 - coord_event 5, 13, SCENE_DEFAULT, ExplodingTrap22 + coord_event 2, 7, SCENE_DEFAULT, ExplodingTrap1 + coord_event 3, 7, SCENE_DEFAULT, ExplodingTrap2 + coord_event 4, 7, SCENE_DEFAULT, ExplodingTrap3 + coord_event 1, 8, SCENE_DEFAULT, ExplodingTrap4 + coord_event 3, 8, SCENE_DEFAULT, ExplodingTrap5 + coord_event 5, 8, SCENE_DEFAULT, ExplodingTrap6 + coord_event 3, 9, SCENE_DEFAULT, ExplodingTrap7 + coord_event 4, 9, SCENE_DEFAULT, ExplodingTrap8 + coord_event 1, 10, SCENE_DEFAULT, ExplodingTrap9 + coord_event 2, 10, SCENE_DEFAULT, ExplodingTrap10 + coord_event 3, 10, SCENE_DEFAULT, ExplodingTrap11 + coord_event 5, 10, SCENE_DEFAULT, ExplodingTrap12 + coord_event 2, 11, SCENE_DEFAULT, ExplodingTrap13 + coord_event 4, 11, SCENE_DEFAULT, ExplodingTrap14 + coord_event 1, 12, SCENE_DEFAULT, ExplodingTrap15 + coord_event 2, 12, SCENE_DEFAULT, ExplodingTrap16 + coord_event 4, 12, SCENE_DEFAULT, ExplodingTrap17 + coord_event 5, 12, SCENE_DEFAULT, ExplodingTrap18 + coord_event 1, 13, SCENE_DEFAULT, ExplodingTrap19 + coord_event 3, 13, SCENE_DEFAULT, ExplodingTrap20 + coord_event 4, 13, SCENE_DEFAULT, ExplodingTrap21 + coord_event 5, 13, SCENE_DEFAULT, ExplodingTrap22 db 9 ; bg events bg_event 19, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script - bg_event 24, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script - bg_event 6, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script - bg_event 8, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 24, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 6, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 8, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script bg_event 22, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script - bg_event 24, 5, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script + bg_event 24, 5, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script bg_event 20, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script bg_event 21, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script - bg_event 3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive + bg_event 3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive db 6 ; object events - object_event 0, 0, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS - object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 0, 0, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS + object_event 2, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 18, 12, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 27, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION + object_event 27, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION object_event 14, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET object_event 21, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 67130dd45..1b3d536f6 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -910,60 +910,60 @@ TeamRocketBaseB2F_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 3, 14, TEAM_ROCKET_BASE_B1F, 2 - warp_event 3, 2, TEAM_ROCKET_BASE_B3F, 1 - warp_event 27, 2, TEAM_ROCKET_BASE_B3F, 2 - warp_event 3, 6, TEAM_ROCKET_BASE_B3F, 3 + warp_event 3, 14, TEAM_ROCKET_BASE_B1F, 2 + warp_event 3, 2, TEAM_ROCKET_BASE_B3F, 1 + warp_event 27, 2, TEAM_ROCKET_BASE_B3F, 2 + warp_event 3, 6, TEAM_ROCKET_BASE_B3F, 3 warp_event 27, 14, TEAM_ROCKET_BASE_B3F, 4 db 9 ; coord events - coord_event 5, 14, SCENE_DEFAULT, LanceHealsScript1 - coord_event 4, 13, SCENE_DEFAULT, LanceHealsScript2 + coord_event 5, 14, SCENE_DEFAULT, LanceHealsScript1 + coord_event 4, 13, SCENE_DEFAULT, LanceHealsScript2 coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, UnknownScript_0x6cf95 coord_event 15, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, UnknownScript_0x6cf9c coord_event 14, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d075 coord_event 15, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d075 - coord_event 12, 3, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a + coord_event 12, 3, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a coord_event 12, 10, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a coord_event 12, 11, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a db 23 ; bg events bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor bg_event 15, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor - bg_event 17, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 16, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 15, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 14, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 13, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 12, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 12, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 12, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 12, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 12, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 12, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 13, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 14, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 15, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 16, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 17, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 17, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 17, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 17, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 17, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript - bg_event 26, 7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal + bg_event 17, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 16, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 15, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 14, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 13, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 12, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 12, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 12, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 12, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 12, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 12, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 13, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 14, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 15, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 16, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 17, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 17, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 17, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 17, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 17, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript + bg_event 26, 7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal db 14 ; object events object_event 20, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE object_event 20, 16, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE - object_event 5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE - object_event 9, 13, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE - object_event 7, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 - object_event 7, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 - object_event 7, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 - object_event 22, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 - object_event 22, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 - object_event 22, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + object_event 5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE + object_event 9, 13, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE + object_event 7, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + object_event 7, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + object_event 7, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + object_event 22, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + object_event 22, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + object_event 22, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 object_event 25, 13, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 21, 14, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 3, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF + object_event 3, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 2b72232fa..86b42908a 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -567,40 +567,40 @@ TeamRocketBaseB3F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 3, 2, TEAM_ROCKET_BASE_B2F, 2 - warp_event 27, 2, TEAM_ROCKET_BASE_B2F, 3 - warp_event 3, 6, TEAM_ROCKET_BASE_B2F, 4 + warp_event 3, 2, TEAM_ROCKET_BASE_B2F, 2 + warp_event 27, 2, TEAM_ROCKET_BASE_B2F, 3 + warp_event 3, 6, TEAM_ROCKET_BASE_B2F, 4 warp_event 27, 14, TEAM_ROCKET_BASE_B2F, 5 db 3 ; coord events - coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e04b - coord_event 11, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e052 - coord_event 8, 10, SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER, RocketBaseRival + coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e04b + coord_event 11, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e052 + coord_event 8, 10, SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER, RocketBaseRival db 10 ; bg events - bg_event 10, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor - bg_event 11, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor - bg_event 10, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript - bg_event 11, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript - bg_event 12, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript - bg_event 13, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript - bg_event 4, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript - bg_event 5, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript - bg_event 6, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript - bg_event 7, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 10, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor + bg_event 11, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor + bg_event 10, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 11, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 12, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 13, 1, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 4, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 5, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 6, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript + bg_event 7, 13, BGEVENT_READ, TeamRocketBaseB3FOathScript db 14 ; object events object_event 25, 14, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceGetPasswordScript, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS - object_event 8, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE - object_event 7, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 21, 7, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 5, 14, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 8, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE + object_event 7, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 21, 7, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 5, 14, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 23, 11, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 24, 14, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeamRocketBaseB3FRocketScript, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 4, 5, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE - object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN - object_event 3, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL - object_event 28, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL - object_event 17, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL + object_event 4, 5, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE + object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN + object_event 3, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL + object_event 28, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL + object_event 17, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FIceHeal, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FUltraBall, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index dc56ead92..c346ab10a 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -55,15 +55,15 @@ TimeCapsule_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 7, POKECENTER_2F, 4 - warp_event 5, 7, POKECENTER_2F, 4 + warp_event 4, 7, POKECENTER_2F, 4 + warp_event 5, 7, POKECENTER_2F, 4 db 0 ; coord events db 2 ; bg events - bg_event 4, 4, BGEVENT_RIGHT, MapTimeCapsuleSignpost1Script - bg_event 5, 4, BGEVENT_LEFT, MapTimeCapsuleSignpost1Script + bg_event 4, 4, BGEVENT_RIGHT, MapTimeCapsuleSignpost1Script + bg_event 5, 4, BGEVENT_LEFT, MapTimeCapsuleSignpost1Script db 2 ; object events - object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 - object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 419173628..e161ac071 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -524,22 +524,22 @@ TinTower1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 9, 15, ECRUTEAK_CITY, 12 + warp_event 9, 15, ECRUTEAK_CITY, 12 warp_event 10, 15, ECRUTEAK_CITY, 12 - warp_event 10, 2, TIN_TOWER_2F, 2 + warp_event 10, 2, TIN_TOWER_2F, 2 db 0 ; coord events db 0 ; bg events db 10 ; object events - object_event 9, 9, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE - object_event 7, 9, SPRITE_RAIKOU, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU - object_event 12, 9, SPRITE_ENTEI, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI - object_event 8, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE - object_event 5, 9, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + object_event 9, 9, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE + object_event 7, 9, SPRITE_RAIKOU, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU + object_event 12, 9, SPRITE_ENTEI, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI + object_event 8, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE + object_event 5, 9, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage2Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 - object_event 14, 6, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 - object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage4Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 - object_event 9, 1, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage5Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 - object_event 14, 2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage6Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + object_event 14, 6, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage4Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + object_event 9, 1, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage5Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + object_event 14, 2, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage6Script, EVENT_TIN_TOWER_1F_WISE_TRIO_2 diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index e23ce1e6a..280ab059c 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -8,7 +8,7 @@ TinTower2F_MapEvents: db 2 ; warp events warp_event 10, 14, TIN_TOWER_3F, 1 - warp_event 10, 2, TIN_TOWER_1F, 3 + warp_event 10, 2, TIN_TOWER_1F, 3 db 0 ; coord events diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 61eebad8f..c089d8124 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -14,11 +14,11 @@ TinTower3F_MapEvents: db 2 ; warp events warp_event 10, 14, TIN_TOWER_2F, 1 - warp_event 16, 2, TIN_TOWER_4F, 2 + warp_event 16, 2, TIN_TOWER_4F, 2 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 3, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL + object_event 3, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower3FFullHeal, EVENT_TIN_TOWER_3F_FULL_HEAL diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 6f5510f9f..c36365543 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -24,17 +24,17 @@ TinTower4F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 2, 4, TIN_TOWER_5F, 2 - warp_event 16, 2, TIN_TOWER_3F, 2 - warp_event 2, 14, TIN_TOWER_5F, 3 + warp_event 2, 4, TIN_TOWER_5F, 2 + warp_event 16, 2, TIN_TOWER_3F, 2 + warp_event 2, 14, TIN_TOWER_5F, 3 warp_event 17, 15, TIN_TOWER_5F, 4 db 0 ; coord events db 1 ; bg events - bg_event 11, 6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion + bg_event 11, 6, BGEVENT_ITEM, TinTower4FHiddenMaxPotion db 3 ; object events object_event 14, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FUltraBall, EVENT_TIN_TOWER_4F_ULTRA_BALL object_event 17, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FPPUp, EVENT_TIN_TOWER_4F_PP_UP - object_event 2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE + object_event 2, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower4FEscapeRope, EVENT_TIN_TOWER_4F_ESCAPE_ROPE diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index bcd38389a..cff375b3d 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -20,15 +20,15 @@ TinTower5F_MapEvents: db 4 ; warp events warp_event 11, 15, TIN_TOWER_6F, 2 - warp_event 2, 4, TIN_TOWER_4F, 1 - warp_event 2, 14, TIN_TOWER_4F, 3 + warp_event 2, 4, TIN_TOWER_4F, 1 + warp_event 2, 14, TIN_TOWER_4F, 3 warp_event 17, 15, TIN_TOWER_4F, 4 db 0 ; coord events db 2 ; bg events bg_event 16, 14, BGEVENT_ITEM, TinTower5FHiddenFullRestore - bg_event 3, 15, BGEVENT_ITEM, TinTower5FHiddenCarbos + bg_event 3, 15, BGEVENT_ITEM, TinTower5FHiddenCarbos db 1 ; object events - object_event 9, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY + object_event 9, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower5FRareCandy, EVENT_TIN_TOWER_5F_RARE_CANDY diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 654aa942f..9fa17a0a2 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -13,7 +13,7 @@ TinTower6F_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 9, TIN_TOWER_7F, 1 + warp_event 3, 9, TIN_TOWER_7F, 1 warp_event 11, 15, TIN_TOWER_5F, 1 db 0 ; coord events @@ -21,4 +21,4 @@ TinTower6F_MapEvents: db 0 ; bg events db 1 ; object events - object_event 8, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION + object_event 8, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower6FMaxPotion, EVENT_TIN_TOWER_6F_MAX_POTION diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 44868df45..5025fbbe9 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -13,15 +13,15 @@ TinTower7F_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 3, 9, TIN_TOWER_6F, 1 + warp_event 3, 9, TIN_TOWER_6F, 1 warp_event 10, 15, TIN_TOWER_8F, 1 - warp_event 12, 7, TIN_TOWER_7F, 4 - warp_event 8, 3, TIN_TOWER_7F, 3 - warp_event 6, 9, TIN_TOWER_9F, 5 + warp_event 12, 7, TIN_TOWER_7F, 4 + warp_event 8, 3, TIN_TOWER_7F, 3 + warp_event 6, 9, TIN_TOWER_9F, 5 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 16, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE + object_event 16, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index fa9968b64..c39f118eb 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -21,18 +21,18 @@ TinTower8F_MapEvents: db 0, 0 ; filler db 6 ; warp events - warp_event 2, 5, TIN_TOWER_7F, 2 - warp_event 2, 11, TIN_TOWER_9F, 1 - warp_event 16, 7, TIN_TOWER_9F, 2 - warp_event 10, 3, TIN_TOWER_9F, 3 + warp_event 2, 5, TIN_TOWER_7F, 2 + warp_event 2, 11, TIN_TOWER_9F, 1 + warp_event 16, 7, TIN_TOWER_9F, 2 + warp_event 10, 3, TIN_TOWER_9F, 3 warp_event 14, 15, TIN_TOWER_9F, 6 - warp_event 6, 9, TIN_TOWER_9F, 7 + warp_event 6, 9, TIN_TOWER_9F, 7 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET - object_event 11, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER - object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE + object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FNugget, EVENT_TIN_TOWER_8F_NUGGET + object_event 11, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FMaxElixer, EVENT_TIN_TOWER_8F_MAX_ELIXER + object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower8FFullRestore, EVENT_TIN_TOWER_8F_FULL_RESTORE diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index f7a0965e5..9de6a607d 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -23,17 +23,17 @@ TinTower9F_MapEvents: db 0, 0 ; filler db 7 ; warp events - warp_event 12, 3, TIN_TOWER_8F, 2 - warp_event 2, 5, TIN_TOWER_8F, 3 - warp_event 12, 7, TIN_TOWER_8F, 4 - warp_event 7, 9, TIN_TOWER_ROOF, 1 - warp_event 16, 7, TIN_TOWER_7F, 5 - warp_event 6, 13, TIN_TOWER_8F, 5 - warp_event 8, 13, TIN_TOWER_8F, 6 + warp_event 12, 3, TIN_TOWER_8F, 2 + warp_event 2, 5, TIN_TOWER_8F, 3 + warp_event 12, 7, TIN_TOWER_8F, 4 + warp_event 7, 9, TIN_TOWER_ROOF, 1 + warp_event 16, 7, TIN_TOWER_7F, 5 + warp_event 6, 13, TIN_TOWER_8F, 5 + warp_event 8, 13, TIN_TOWER_8F, 6 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 9, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP + object_event 9, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower9FHPUp, EVENT_TIN_TOWER_9F_HP_UP diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index c03c47c50..33971dd1d 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -46,11 +46,11 @@ TinTowerRoof_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 9, 13, TIN_TOWER_9F, 4 + warp_event 9, 13, TIN_TOWER_9F, 4 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 9, 5, SPRITE_HO_OH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH + object_event 9, 5, SPRITE_HO_OH, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 272d4a905..4a57e3d2a 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -21,4 +21,4 @@ TohjoFalls_MapEvents: db 0 ; bg events db 1 ; object events - object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE + object_event 2, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TohjoFallsMoonStone, EVENT_TOHJO_FALLS_MOON_STONE diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index c690a9546..eff2e414a 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -55,15 +55,15 @@ TradeCenter_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 7, POKECENTER_2F, 2 - warp_event 5, 7, POKECENTER_2F, 2 + warp_event 4, 7, POKECENTER_2F, 2 + warp_event 5, 7, POKECENTER_2F, 2 db 0 ; coord events db 2 ; bg events - bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script - bg_event 5, 4, BGEVENT_LEFT, MapTradeCenterSignpost1Script + bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script + bg_event 5, 4, BGEVENT_LEFT, MapTradeCenterSignpost1Script db 2 ; object events - object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 - object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 + object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index 2bcfe9a3d..93aa852a4 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -139,20 +139,20 @@ TrainerHouse1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 2, 13, VIRIDIAN_CITY, 3 - warp_event 3, 13, VIRIDIAN_CITY, 3 - warp_event 8, 2, TRAINER_HOUSE_B1F, 1 + warp_event 2, 13, VIRIDIAN_CITY, 3 + warp_event 3, 13, VIRIDIAN_CITY, 3 + warp_event 8, 2, TRAINER_HOUSE_B1F, 1 db 0 ; coord events db 3 ; bg events - bg_event 5, 0, BGEVENT_READ, MapTrainerHouse1FSignpost0Script - bg_event 7, 0, BGEVENT_READ, MapTrainerHouse1FSignpost1Script - bg_event 7, 10, BGEVENT_READ, MapTrainerHouse1FSignpost2Script + bg_event 5, 0, BGEVENT_READ, MapTrainerHouse1FSignpost0Script + bg_event 7, 0, BGEVENT_READ, MapTrainerHouse1FSignpost1Script + bg_event 7, 10, BGEVENT_READ, MapTrainerHouse1FSignpost2Script db 5 ; object events - object_event 0, 11, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1 - object_event 7, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1 - object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1 - object_event 4, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FYoungsterScript, -1 - object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FGentlemanScript, -1 + object_event 0, 11, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1 + object_event 7, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1 + object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1 + object_event 4, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FYoungsterScript, -1 + object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FGentlemanScript, -1 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 7d011b7c8..1f654edcd 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -171,13 +171,13 @@ TrainerHouseB1F_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 9, 4, TRAINER_HOUSE_1F, 3 + warp_event 9, 4, TRAINER_HOUSE_1F, 3 db 1 ; coord events - coord_event 7, 3, SCENE_DEFAULT, TrainerHouseReceptionistScript + coord_event 7, 3, SCENE_DEFAULT, TrainerHouseReceptionistScript db 0 ; bg events db 2 ; object events - object_event 7, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 - object_event 6, 11, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event 7, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 + object_event 6, 11, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm index 2bbb50e4b..72e8cd749 100644 --- a/maps/UndergroundPath.asm +++ b/maps/UndergroundPath.asm @@ -13,13 +13,13 @@ UndergroundPath_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 2, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 3 - warp_event 3, 24, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 3 + warp_event 3, 2, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 3 + warp_event 3, 24, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 3 db 0 ; coord events db 2 ; bg events - bg_event 3, 9, BGEVENT_ITEM, UndergroundPathHiddenFullRestore - bg_event 1, 19, BGEVENT_ITEM, UndergroundPathHiddenXSpecial + bg_event 3, 9, BGEVENT_ITEM, UndergroundPathHiddenFullRestore + bg_event 1, 19, BGEVENT_ITEM, UndergroundPathHiddenXSpecial db 0 ; object events diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 04bae9c63..cafc30144 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -201,22 +201,22 @@ UnionCave1F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 5, 19, UNION_CAVE_B1F, 3 - warp_event 3, 33, UNION_CAVE_B1F, 4 + warp_event 5, 19, UNION_CAVE_B1F, 3 + warp_event 3, 33, UNION_CAVE_B1F, 4 warp_event 17, 31, ROUTE_33, 1 - warp_event 17, 3, ROUTE_32, 4 + warp_event 17, 3, ROUTE_32, 4 db 0 ; coord events db 0 ; bg events db 9 ; object events - object_event 3, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerDaniel, -1 - object_event 4, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1 - object_event 11, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1 + object_event 3, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerDaniel, -1 + object_event 4, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1 + object_event 11, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerHikerRussell, -1 object_event 15, 27, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherRay, -1 object_event 14, 19, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerFirebreatherBill, -1 object_event 17, 21, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL - object_event 4, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK - object_event 4, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION + object_event 4, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK + object_event 4, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION object_event 12, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCave1FAwakening, EVENT_UNION_CAVE_1F_AWAKENING diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 844e2dd64..2a737c315 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -154,10 +154,10 @@ UnionCaveB1F_MapEvents: 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 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 @@ -165,10 +165,10 @@ UnionCaveB1F_MapEvents: 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 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_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 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 diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index f33251e69..1aee3f499 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -143,7 +143,7 @@ UnionCaveB2F_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 5, 3, UNION_CAVE_B1F, 5 + warp_event 5, 3, UNION_CAVE_B1F, 5 db 0 ; coord events @@ -151,8 +151,8 @@ UnionCaveB2F_MapEvents: db 6 ; object events object_event 15, 19, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermNick, -1 - object_event 5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 - object_event 3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 - object_event 16, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER + object_event 5, 13, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 + object_event 3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 + object_event 16, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER object_event 12, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION object_event 11, 31, SPRITE_SURF, SPRITEMOVEDATA_SWIM_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 85dd629c6..781bf2ad1 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -269,33 +269,33 @@ VermilionCity_MapEvents: db 0, 0 ; filler db 10 ; warp events - warp_event 5, 5, VERMILION_FISHING_SPEECH_HOUSE, 1 - warp_event 9, 5, VERMILION_POKECENTER_1F, 1 - warp_event 7, 13, POKEMON_FAN_CLUB, 1 + warp_event 5, 5, VERMILION_FISHING_SPEECH_HOUSE, 1 + warp_event 9, 5, VERMILION_POKECENTER_1F, 1 + warp_event 7, 13, POKEMON_FAN_CLUB, 1 warp_event 13, 13, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 1 warp_event 21, 13, VERMILION_MART, 2 warp_event 21, 17, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, 1 warp_event 10, 19, VERMILION_GYM, 1 warp_event 19, 31, VERMILION_PORT_PASSAGE, 1 warp_event 20, 31, VERMILION_PORT_PASSAGE, 2 - warp_event 34, 7, DIGLETTS_CAVE, 1 + warp_event 34, 7, DIGLETTS_CAVE, 1 db 0 ; coord events db 8 ; bg events - bg_event 25, 3, BGEVENT_READ, VermilionCitySign - bg_event 5, 19, BGEVENT_READ, VermilionGymSign - bg_event 5, 13, BGEVENT_READ, PokemonFanClubSign - bg_event 33, 9, BGEVENT_READ, VermilionCityDiglettsCaveSign + bg_event 25, 3, BGEVENT_READ, VermilionCitySign + bg_event 5, 19, BGEVENT_READ, VermilionGymSign + bg_event 5, 13, BGEVENT_READ, PokemonFanClubSign + bg_event 33, 9, BGEVENT_READ, VermilionCityDiglettsCaveSign bg_event 27, 15, BGEVENT_READ, VermilionCityPortSign - bg_event 10, 5, BGEVENT_READ, VermilionCityPokecenterSign + bg_event 10, 5, BGEVENT_READ, VermilionCityPokecenterSign bg_event 22, 13, BGEVENT_READ, VermilionCityMartSign bg_event 12, 19, BGEVENT_ITEM, VermilionCityHiddenFullHeal db 6 ; object events - object_event 18, 9, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1 - object_event 23, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1 - object_event 26, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1 + object_event 18, 9, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1 + object_event 23, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1 + object_event 26, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1 object_event 14, 16, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionCitySuperNerdScript, -1 - object_event 34, 8, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_BIGDOLLSYM, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX + object_event 34, 8, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_BIGDOLLSYM, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX object_event 31, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1 diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm index 5a78a70af..e6225afa5 100644 --- a/maps/VermilionDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionDiglettsCaveSpeechHouse.asm @@ -22,12 +22,12 @@ VermilionDiglettsCaveSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, VERMILION_CITY, 6 - warp_event 3, 7, VERMILION_CITY, 6 + warp_event 2, 7, VERMILION_CITY, 6 + warp_event 3, 7, VERMILION_CITY, 6 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionDiglettsCaveSpeechHouseGentlemanScript, -1 + object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionDiglettsCaveSpeechHouseGentlemanScript, -1 diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm index a733fac23..dd333af75 100644 --- a/maps/VermilionFishingSpeechHouse.asm +++ b/maps/VermilionFishingSpeechHouse.asm @@ -52,13 +52,13 @@ VermilionFishingSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, VERMILION_CITY, 1 - warp_event 3, 7, VERMILION_CITY, 1 + warp_event 2, 7, VERMILION_CITY, 1 + warp_event 3, 7, VERMILION_CITY, 1 db 0 ; coord events db 1 ; bg events - bg_event 3, 0, BGEVENT_READ, FishingDudesHousePhoto + bg_event 3, 0, BGEVENT_READ, FishingDudesHousePhoto db 1 ; object events - object_event 2, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1 + object_event 2, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingDude, -1 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 605cd857e..0dc1dace3 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -262,33 +262,33 @@ VermilionGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 17, VERMILION_CITY, 7 - warp_event 5, 17, VERMILION_CITY, 7 + warp_event 4, 17, VERMILION_CITY, 7 + warp_event 5, 17, VERMILION_CITY, 7 db 0 ; coord events db 17 ; bg events - bg_event 1, 7, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 3, 7, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 5, 7, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 7, 7, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 9, 7, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 1, 9, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 3, 9, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 5, 9, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 7, 9, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 9, 9, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 1, 11, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 3, 11, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 5, 11, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 7, 11, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 9, 11, BGEVENT_READ, MapVermilionGymSignpost14Script - bg_event 3, 15, BGEVENT_READ, VermilionGymStatue - bg_event 6, 15, BGEVENT_READ, VermilionGymStatue + bg_event 1, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 3, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 5, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 7, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 1, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 3, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 5, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 9, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 1, 11, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 3, 11, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 5, 11, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 7, 11, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 9, 11, BGEVENT_READ, MapVermilionGymSignpost14Script + bg_event 3, 15, BGEVENT_READ, VermilionGymStatue + bg_event 6, 15, BGEVENT_READ, VermilionGymStatue db 5 ; object events - object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1 - object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 - object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 - object_event 0, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1 - object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuyScript, -1 + object_event 5, 2, SPRITE_SURGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1 + object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 + object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 + object_event 0, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1 + object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuyScript, -1 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index 3dda82a2c..db7f34db7 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -35,15 +35,15 @@ VermilionMagnetTrainSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, VERMILION_CITY, 4 - warp_event 3, 7, VERMILION_CITY, 4 + warp_event 2, 7, VERMILION_CITY, 4 + warp_event 3, 7, VERMILION_CITY, 4 db 0 ; coord events db 2 ; bg events - bg_event 0, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf - bg_event 1, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf + bg_event 0, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf + bg_event 1, 1, BGEVENT_READ, VermilionMagnetTrainSpeechHouseBookshelf db 2 ; object events - object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1 - object_event 0, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1 + object_event 2, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHousePokefanFScript, -1 + object_event 0, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMagnetTrainSpeechHouseYoungsterScript, -1 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 8e24b1cb7..16a20d380 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -38,14 +38,14 @@ VermilionMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, VERMILION_CITY, 5 - warp_event 3, 7, VERMILION_CITY, 5 + warp_event 2, 7, VERMILION_CITY, 5 + warp_event 3, 7, VERMILION_CITY, 5 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1 - object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1 - object_event 8, 6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1 + object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1 + object_event 8, 6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1 diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index 700352d7a..a157028c0 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -78,16 +78,16 @@ VermilionPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, VERMILION_CITY, 2 - warp_event 4, 7, VERMILION_CITY, 2 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, VERMILION_CITY, 2 + warp_event 4, 7, VERMILION_CITY, 2 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x191603, -1 - object_event 7, 2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1 - object_event 6, 5, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1 - object_event 1, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x191603, -1 + object_event 7, 2, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1 + object_event 6, 5, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FSailorScript, -1 + object_event 1, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionPokecenter1FBugCatcherScript, -1 diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm index 392c44556..6bca09fd0 100644 --- a/maps/VermilionPokecenter2FBeta.asm +++ b/maps/VermilionPokecenter2FBeta.asm @@ -7,7 +7,7 @@ VermilionPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, VERMILION_POKECENTER_1F, 3 + warp_event 0, 7, VERMILION_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 65dc59834..47a266a46 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -300,16 +300,16 @@ VermilionPort_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 9, 5, VERMILION_PORT_PASSAGE, 5 - warp_event 7, 17, FAST_SHIP_1F, 1 + warp_event 9, 5, VERMILION_PORT_PASSAGE, 5 + warp_event 7, 17, FAST_SHIP_1F, 1 db 1 ; coord events - coord_event 7, 11, SCENE_DEFAULT, UnknownScript_0x74e20 + coord_event 7, 11, SCENE_DEFAULT, UnknownScript_0x74e20 db 1 ; bg events bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron db 3 ; object events - object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1 + object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY + object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1 object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 49756b0d0..1ea12457a 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -20,15 +20,15 @@ VermilionPortPassage_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 15, 0, VERMILION_CITY, 8 - warp_event 16, 0, VERMILION_CITY, 9 - warp_event 15, 4, VERMILION_PORT_PASSAGE, 4 - warp_event 3, 2, VERMILION_PORT_PASSAGE, 3 - warp_event 3, 14, VERMILION_PORT, 1 + warp_event 15, 0, VERMILION_CITY, 8 + warp_event 16, 0, VERMILION_CITY, 9 + warp_event 15, 4, VERMILION_PORT_PASSAGE, 4 + warp_event 3, 2, VERMILION_PORT_PASSAGE, 3 + warp_event 3, 14, VERMILION_PORT, 1 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 17, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1 + object_event 17, 1, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortPassageTeacherScript, -1 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 10582779d..80e9f0d2c 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -240,29 +240,29 @@ VictoryRoad_MapEvents: db 0, 0 ; filler db 10 ; warp events - warp_event 9, 67, VICTORY_ROAD_GATE, 5 - warp_event 1, 49, VICTORY_ROAD, 3 - warp_event 1, 35, VICTORY_ROAD, 2 + warp_event 9, 67, VICTORY_ROAD_GATE, 5 + warp_event 1, 49, VICTORY_ROAD, 3 + warp_event 1, 35, VICTORY_ROAD, 2 warp_event 13, 31, VICTORY_ROAD, 5 warp_event 13, 17, VICTORY_ROAD, 4 warp_event 17, 33, VICTORY_ROAD, 7 warp_event 17, 19, VICTORY_ROAD, 6 - warp_event 0, 11, VICTORY_ROAD, 9 - warp_event 0, 27, VICTORY_ROAD, 8 - warp_event 13, 5, ROUTE_23, 3 + warp_event 0, 11, VICTORY_ROAD, 9 + warp_event 0, 27, VICTORY_ROAD, 8 + warp_event 13, 5, ROUTE_23, 3 db 2 ; coord events - coord_event 12, 8, SCENE_DEFAULT, UnknownScript_0x74492 - coord_event 13, 8, SCENE_DEFAULT, UnknownScript_0x744b5 + coord_event 12, 8, SCENE_DEFAULT, UnknownScript_0x74492 + coord_event 13, 8, SCENE_DEFAULT, UnknownScript_0x744b5 db 2 ; bg events - bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion - bg_event 3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal + bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion + bg_event 3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal db 6 ; object events object_event 18, 13, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD - object_event 3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE + object_event 3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE object_event 18, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE object_event 15, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullHeal, EVENT_VICTORY_ROAD_FULL_HEAL - object_event 7, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP + object_event 7, 38, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadHPUp, EVENT_VICTORY_ROAD_HP_UP diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 41dee39ae..9f5c72ef5 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -99,14 +99,14 @@ VictoryRoadGate_MapEvents: db 0, 0 ; filler db 8 ; warp events - warp_event 17, 7, ROUTE_22, 1 - warp_event 18, 7, ROUTE_22, 1 - warp_event 9, 17, ROUTE_26, 1 + warp_event 17, 7, ROUTE_22, 1 + warp_event 18, 7, ROUTE_22, 1 + warp_event 9, 17, ROUTE_26, 1 warp_event 10, 17, ROUTE_26, 1 - warp_event 9, 0, VICTORY_ROAD, 1 - warp_event 10, 0, VICTORY_ROAD, 1 - warp_event 1, 7, ROUTE_28, 2 - warp_event 2, 7, ROUTE_28, 2 + warp_event 9, 0, VICTORY_ROAD, 1 + warp_event 10, 0, VICTORY_ROAD, 1 + warp_event 1, 7, ROUTE_28, 2 + warp_event 2, 7, ROUTE_28, 2 db 1 ; coord events coord_event 10, 11, SCENE_DEFAULT, VictoryRoadGateBadgeCheckScene @@ -114,6 +114,6 @@ VictoryRoadGate_MapEvents: db 0 ; bg events db 3 ; object events - object_event 8, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1 - object_event 7, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER - object_event 12, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX + object_event 8, 11, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1 + object_event 7, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER + object_event 12, 5, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index e56cd9100..7ef3f82b7 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -280,13 +280,13 @@ VioletCity_MapEvents: db 0, 0 ; filler db 9 ; warp events - warp_event 9, 17, VIOLET_MART, 2 + warp_event 9, 17, VIOLET_MART, 2 warp_event 18, 17, VIOLET_GYM, 1 warp_event 30, 17, EARLS_POKEMON_ACADEMY, 1 - warp_event 3, 15, VIOLET_NICKNAME_SPEECH_HOUSE, 1 + warp_event 3, 15, VIOLET_NICKNAME_SPEECH_HOUSE, 1 warp_event 31, 25, VIOLET_POKECENTER_1F, 1 warp_event 21, 29, VIOLET_KYLES_HOUSE, 1 - warp_event 23, 5, SPROUT_TOWER_1F, 1 + warp_event 23, 5, SPROUT_TOWER_1F, 1 warp_event 39, 24, ROUTE_31_VIOLET_GATE, 1 warp_event 39, 25, ROUTE_31_VIOLET_GATE, 2 @@ -295,7 +295,7 @@ VioletCity_MapEvents: db 7 ; bg events bg_event 24, 20, BGEVENT_READ, VioletCitySign bg_event 15, 17, BGEVENT_READ, VioletGymSign - bg_event 24, 8, BGEVENT_READ, SproutTowerSign + bg_event 24, 8, BGEVENT_READ, SproutTowerSign bg_event 27, 17, BGEVENT_READ, EarlsPokemonAcademySign bg_event 32, 25, BGEVENT_READ, VioletCityPokecenterSign bg_event 10, 17, BGEVENT_READ, VioletCityMartSign @@ -306,7 +306,7 @@ VioletCity_MapEvents: object_event 28, 28, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityLassScript, -1 object_event 24, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1 object_event 17, 20, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityGrampsScript, -1 - object_event 5, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1 + object_event 5, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1 object_event 14, 29, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1 - object_event 4, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP - object_event 35, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY + object_event 4, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP + object_event 35, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index a030379f9..174ff61a3 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -283,17 +283,17 @@ VioletGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 15, VIOLET_CITY, 2 - warp_event 5, 15, VIOLET_CITY, 2 + warp_event 4, 15, VIOLET_CITY, 2 + warp_event 5, 15, VIOLET_CITY, 2 db 0 ; coord events db 2 ; bg events - bg_event 3, 13, BGEVENT_READ, VioletGymStatue - bg_event 6, 13, BGEVENT_READ, VioletGymStatue + bg_event 3, 13, BGEVENT_READ, VioletGymStatue + bg_event 6, 13, BGEVENT_READ, VioletGymStatue db 4 ; object events - object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 - object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1 - object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1 - object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1 + object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 + object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1 + object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1 + object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1 diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index 2766556dd..eb9062708 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -34,13 +34,13 @@ VioletKylesHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 7, VIOLET_CITY, 6 - warp_event 4, 7, VIOLET_CITY, 6 + warp_event 3, 7, VIOLET_CITY, 6 + warp_event 4, 7, VIOLET_CITY, 6 db 0 ; coord events db 0 ; bg events db 2 ; object events - object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1 - object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1 + object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletKylesHousePokefanMScript, -1 + object_event 6, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Kyle, -1 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index 428ae18c9..80b7507c8 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -50,14 +50,14 @@ VioletMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, VIOLET_CITY, 1 - warp_event 3, 7, VIOLET_CITY, 1 + warp_event 2, 7, VIOLET_CITY, 1 + warp_event 3, 7, VIOLET_CITY, 1 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1 - object_event 7, 6, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1 - object_event 5, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x68295, -1 + object_event 7, 6, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1 + object_event 5, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index a59c2e6c1..2054d9da3 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -46,14 +46,14 @@ VioletNicknameSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 3, 7, VIOLET_CITY, 4 - warp_event 4, 7, VIOLET_CITY, 4 + warp_event 3, 7, VIOLET_CITY, 4 + warp_event 4, 7, VIOLET_CITY, 4 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1 - object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1 - object_event 5, 2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BirdScript_0x693ef, -1 + object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1 + object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1 + object_event 5, 2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BirdScript_0x693ef, -1 diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index efa538493..3452c3a7d 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -217,17 +217,17 @@ VioletPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, VIOLET_CITY, 5 - warp_event 4, 7, VIOLET_CITY, 5 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, VIOLET_CITY, 5 + warp_event 4, 7, VIOLET_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 5 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1 - object_event 7, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1 - object_event 1, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1 - object_event 8, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1 - object_event 4, 3, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1 + object_event 7, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1 + object_event 1, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1 + object_event 8, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1 + object_event 4, 3, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 222fb0a24..70c0b8ced 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -217,8 +217,8 @@ ViridianCity_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 32, 7, VIRIDIAN_GYM, 1 - warp_event 21, 9, VIRIDIAN_NICKNAME_SPEECH_HOUSE, 1 + warp_event 32, 7, VIRIDIAN_GYM, 1 + warp_event 21, 9, VIRIDIAN_NICKNAME_SPEECH_HOUSE, 1 warp_event 23, 15, TRAINER_HOUSE_1F, 1 warp_event 29, 19, VIRIDIAN_MART, 2 warp_event 23, 25, VIRIDIAN_POKECENTER_1F, 1 @@ -227,14 +227,14 @@ ViridianCity_MapEvents: db 6 ; bg events bg_event 17, 17, BGEVENT_READ, ViridianCitySign - bg_event 27, 7, BGEVENT_READ, ViridianGymSign - bg_event 19, 1, BGEVENT_READ, ViridianCityWelcomeSign + bg_event 27, 7, BGEVENT_READ, ViridianGymSign + bg_event 19, 1, BGEVENT_READ, ViridianCityWelcomeSign bg_event 21, 15, BGEVENT_READ, TrainerHouseSign bg_event 24, 25, BGEVENT_READ, ViridianCityPokecenterSign bg_event 30, 19, BGEVENT_READ, ViridianCityMartSign db 4 ; object events - object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianCityCoffeeGramps, -1 - object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianCityGrampsNearGym, -1 - object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianCityDreamEaterFisher, -1 + object_event 18, 5, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianCityCoffeeGramps, -1 + object_event 30, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianCityGrampsNearGym, -1 + object_event 6, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianCityDreamEaterFisher, -1 object_event 17, 21, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianCityYoungsterScript, -1 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index ddc29bf5c..ac0003fd5 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -171,15 +171,15 @@ ViridianGym_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 4, 17, VIRIDIAN_CITY, 1 - warp_event 5, 17, VIRIDIAN_CITY, 1 + warp_event 4, 17, VIRIDIAN_CITY, 1 + warp_event 5, 17, VIRIDIAN_CITY, 1 db 0 ; coord events db 2 ; bg events - bg_event 3, 13, BGEVENT_READ, ViridianGymStatue - bg_event 6, 13, BGEVENT_READ, ViridianGymStatue + bg_event 3, 13, BGEVENT_READ, ViridianGymStatue + bg_event 6, 13, BGEVENT_READ, ViridianGymStatue db 2 ; object events - object_event 5, 3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE - object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE + object_event 5, 3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE + object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 53720ea89..29c73dbaf 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -38,14 +38,14 @@ ViridianMart_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, VIRIDIAN_CITY, 4 - warp_event 3, 7, VIRIDIAN_CITY, 4 + warp_event 2, 7, VIRIDIAN_CITY, 4 + warp_event 3, 7, VIRIDIAN_CITY, 4 db 0 ; coord events db 0 ; bg events db 3 ; object events - object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1 - object_event 7, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1 - object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x9b5e7, -1 + object_event 7, 2, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartLassScript, -1 + object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianMartCooltrainerMScript, -1 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 40431b616..8fd12eb25 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -63,15 +63,15 @@ ViridianNicknameSpeechHouse_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 2, 7, VIRIDIAN_CITY, 2 - warp_event 3, 7, VIRIDIAN_CITY, 2 + warp_event 2, 7, VIRIDIAN_CITY, 2 + warp_event 3, 7, VIRIDIAN_CITY, 2 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 2, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1 - object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1 - object_event 5, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1 - object_event 6, 3, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Rattey, -1 + object_event 2, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1 + object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1 + object_event 5, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1 + object_event 6, 3, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Rattey, -1 diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index 11b3d8b86..de6288ed3 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -73,16 +73,16 @@ ViridianPokecenter1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 7, VIRIDIAN_CITY, 5 - warp_event 4, 7, VIRIDIAN_CITY, 5 - warp_event 0, 7, POKECENTER_2F, 1 + warp_event 3, 7, VIRIDIAN_CITY, 5 + warp_event 4, 7, VIRIDIAN_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9b690, -1 - object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1 - object_event 5, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1 - object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9b690, -1 + object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1 + object_event 5, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FCooltrainerFScript, -1 + object_event 1, 6, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianPokecenter1FBugCatcherScript, -1 diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm index 7f184eedc..1c22d7dd1 100644 --- a/maps/ViridianPokecenter2FBeta.asm +++ b/maps/ViridianPokecenter2FBeta.asm @@ -7,7 +7,7 @@ ViridianPokecenter2FBeta_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 0, 7, VIRIDIAN_POKECENTER_1F, 3 + warp_event 0, 7, VIRIDIAN_POKECENTER_1F, 3 db 0 ; coord events diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 1d2eef8df..a38e53a1d 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -42,10 +42,10 @@ WhirlIslandB1F_MapEvents: db 0, 0 ; filler db 9 ; warp events - warp_event 5, 5, WHIRL_ISLAND_NW, 2 - warp_event 35, 3, WHIRL_ISLAND_NE, 2 - warp_event 29, 9, WHIRL_ISLAND_NE, 3 - warp_event 9, 31, WHIRL_ISLAND_SW, 3 + warp_event 5, 5, WHIRL_ISLAND_NW, 2 + warp_event 35, 3, WHIRL_ISLAND_NE, 2 + warp_event 29, 9, WHIRL_ISLAND_NE, 3 + warp_event 9, 31, WHIRL_ISLAND_SW, 3 warp_event 23, 31, WHIRL_ISLAND_SW, 2 warp_event 31, 29, WHIRL_ISLAND_SE, 2 warp_event 25, 21, WHIRL_ISLAND_B2F, 1 @@ -55,14 +55,14 @@ WhirlIslandB1F_MapEvents: db 0 ; coord events db 3 ; bg events - bg_event 30, 4, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy + bg_event 30, 4, BGEVENT_ITEM, WhirlIslandB1FHiddenRareCandy bg_event 36, 18, BGEVENT_ITEM, WhirlIslandB1FHiddenUltraBall - bg_event 2, 23, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore + bg_event 2, 23, BGEVENT_ITEM, WhirlIslandB1FHiddenFullRestore db 6 ; object events - object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE - object_event 2, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS + object_event 7, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FFullRestore, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE + object_event 2, 18, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCarbos, EVENT_WHIRL_ISLAND_B1F_CARBOS object_event 33, 23, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FCalcium, EVENT_WHIRL_ISLAND_B1F_CALCIUM - object_event 17, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET + object_event 17, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FNugget, EVENT_WHIRL_ISLAND_B1F_NUGGET object_event 19, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB1FEscapeRope, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE object_event 23, 26, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhirlIslandB1FBoulder, -1 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index 3d1ace476..acee9670a 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -21,9 +21,9 @@ WhirlIslandB2F_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 11, 5, WHIRL_ISLAND_B1F, 7 - warp_event 7, 11, WHIRL_ISLAND_B1F, 8 - warp_event 7, 25, WHIRL_ISLAND_LUGIA_CHAMBER, 1 + warp_event 11, 5, WHIRL_ISLAND_B1F, 7 + warp_event 7, 11, WHIRL_ISLAND_B1F, 8 + warp_event 7, 25, WHIRL_ISLAND_LUGIA_CHAMBER, 1 warp_event 13, 31, WHIRL_ISLAND_SW, 5 db 0 ; coord events @@ -32,5 +32,5 @@ WhirlIslandB2F_MapEvents: db 3 ; object events object_event 10, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FFullRestore, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE - object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE - object_event 5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER + object_event 6, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxRevive, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE + object_event 5, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandB2FMaxElixer, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 83608829d..35e726b5c 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -7,8 +7,8 @@ WhirlIslandCave_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 7, 5, WHIRL_ISLAND_B1F, 9 - warp_event 3, 13, WHIRL_ISLAND_NW, 4 + warp_event 7, 5, WHIRL_ISLAND_B1F, 9 + warp_event 3, 13, WHIRL_ISLAND_NW, 4 db 0 ; coord events diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index f2b9fab6d..4381a3636 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -45,11 +45,11 @@ WhirlIslandLugiaChamber_MapEvents: db 0, 0 ; filler db 1 ; warp events - warp_event 9, 13, WHIRL_ISLAND_B2F, 3 + warp_event 9, 13, WHIRL_ISLAND_B2F, 3 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 9, 5, SPRITE_LUGIA, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA + object_event 9, 5, SPRITE_LUGIA, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 10458252e..c13cd7a93 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -13,8 +13,8 @@ WhirlIslandNE_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 3, 13, ROUTE_41, 2 - warp_event 17, 3, WHIRL_ISLAND_B1F, 2 + warp_event 3, 13, ROUTE_41, 2 + warp_event 17, 3, WHIRL_ISLAND_B1F, 2 warp_event 13, 11, WHIRL_ISLAND_B1F, 3 db 0 ; coord events diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index 6e0f9c4aa..55e4f2d0b 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -7,10 +7,10 @@ WhirlIslandNW_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 5, 7, ROUTE_41, 1 - warp_event 5, 3, WHIRL_ISLAND_B1F, 1 - warp_event 3, 15, WHIRL_ISLAND_SW, 4 - warp_event 7, 15, WHIRL_ISLAND_CAVE, 2 + warp_event 5, 7, ROUTE_41, 1 + warp_event 5, 3, WHIRL_ISLAND_B1F, 1 + warp_event 3, 15, WHIRL_ISLAND_SW, 4 + warp_event 7, 15, WHIRL_ISLAND_CAVE, 2 db 0 ; coord events diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index 9dd6fc3bc..be43871ce 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -7,8 +7,8 @@ WhirlIslandSE_MapEvents: db 0, 0 ; filler db 2 ; warp events - warp_event 5, 13, ROUTE_41, 4 - warp_event 5, 3, WHIRL_ISLAND_B1F, 6 + warp_event 5, 13, ROUTE_41, 4 + warp_event 5, 3, WHIRL_ISLAND_B1F, 6 db 0 ; coord events diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index d6ae335b2..66c3fff23 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -13,10 +13,10 @@ WhirlIslandSW_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 5, 7, ROUTE_41, 3 - warp_event 17, 3, WHIRL_ISLAND_B1F, 5 - warp_event 3, 3, WHIRL_ISLAND_B1F, 4 - warp_event 3, 15, WHIRL_ISLAND_NW, 3 + warp_event 5, 7, ROUTE_41, 3 + warp_event 17, 3, WHIRL_ISLAND_B1F, 5 + warp_event 3, 3, WHIRL_ISLAND_B1F, 4 + warp_event 3, 15, WHIRL_ISLAND_NW, 3 warp_event 17, 15, WHIRL_ISLAND_B2F, 4 db 0 ; coord events @@ -24,4 +24,4 @@ WhirlIslandSW_MapEvents: db 0 ; bg events db 1 ; object events - object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL + object_event 15, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, WhirlIslandSWUltraBall, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 470ff38a3..af3c5091f 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -130,13 +130,13 @@ WillsRoom_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 5, 17, INDIGO_PLATEAU_POKECENTER_1F, 4 - warp_event 4, 2, KOGAS_ROOM, 1 - warp_event 5, 2, KOGAS_ROOM, 2 + warp_event 5, 17, INDIGO_PLATEAU_POKECENTER_1F, 4 + warp_event 4, 2, KOGAS_ROOM, 1 + warp_event 5, 2, KOGAS_ROOM, 2 db 0 ; coord events db 0 ; bg events db 1 ; object events - object_event 5, 7, SPRITE_WILL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1 + object_event 5, 7, SPRITE_WILL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index a98159020..83a8f8f9e 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -346,19 +346,19 @@ WiseTriosRoom_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 7, 4, ECRUTEAK_CITY, 4 - warp_event 7, 5, ECRUTEAK_CITY, 5 - warp_event 1, 4, ECRUTEAK_TIN_TOWER_ENTRANCE, 5 + warp_event 7, 4, ECRUTEAK_CITY, 4 + warp_event 7, 5, ECRUTEAK_CITY, 5 + warp_event 1, 4, ECRUTEAK_TIN_TOWER_ENTRANCE, 5 db 1 ; coord events - coord_event 7, 4, SCENE_DEFAULT, UnknownScript_0x985a3 + coord_event 7, 4, SCENE_DEFAULT, UnknownScript_0x985a3 db 0 ; bg events db 6 ; object events - object_event 6, 2, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - object_event 7, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 - object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 - object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 - object_event 6, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + object_event 6, 2, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage1Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage2Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + object_event 7, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WiseTriosRoomSage3Script, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + object_event 4, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + object_event 6, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2