diff options
| author | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-22 14:32:37 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-22 14:44:22 -0400 |
| commit | e6a99b8f9e20f7058a140fe7f0668b17ce49c6eb (patch) | |
| tree | 2081afd14167056953c8140699d35532d236938d | |
| parent | 5e70f4cb51843ce2d40579ff272d375b9fa9aa26 (diff) | |
Port updated map event macros
228 files changed, 1974 insertions, 1944 deletions
diff --git a/data/maps/objects/Baadon.asm b/data/maps/objects/Baadon.asm index 8c56184..d7feab5 100644 --- a/data/maps/objects/Baadon.asm +++ b/data/maps/objects/Baadon.asm @@ -10,26 +10,26 @@ SECTION "data/maps/objects/Baadon.asm", ROMX Baadon_MapEvents:: dw $4000 ; unknown - db 9 ; warp events - warp_event 3, 4, 1, BAADON_MART, wOverworldMapBlocks + 50 - warp_event 15, 4, 1, BAADON_POKECENTER_1F, wOverworldMapBlocks + 56 - warp_event 4, 9, 1, BAADON_HOUSE_1, wOverworldMapBlocks + 83 - warp_event 3, 13, 1, BAADON_WALLPAPER_HOUSE, wOverworldMapBlocks + 114 - warp_event 9, 13, 1, BAADON_HOUSE_2, wOverworldMapBlocks + 117 - warp_event 14, 15, 1, BAADON_LEAGUE_1F, wOverworldMapBlocks + 136 - warp_event 15, 15, 2, BAADON_LEAGUE_1F, wOverworldMapBlocks + 136 - warp_event 8, 5, 1, FONTO_ROUTE_GATE_2, wOverworldMapBlocks + 53 - warp_event 9, 5, 2, FONTO_ROUTE_GATE_2, wOverworldMapBlocks + 53 + def_warp_events + warp_event 3, 4, BAADON_MART, 1, 50 + warp_event 15, 4, BAADON_POKECENTER_1F, 1, 56 + warp_event 4, 9, BAADON_HOUSE_1, 1, 83 + warp_event 3, 13, BAADON_WALLPAPER_HOUSE, 1, 114 + warp_event 9, 13, BAADON_HOUSE_2, 1, 117 + warp_event 14, 15, BAADON_LEAGUE_1F, 1, 136 + warp_event 15, 15, BAADON_LEAGUE_1F, 2, 136 + warp_event 8, 5, FONTO_ROUTE_GATE_2, 1, 53 + warp_event 9, 5, FONTO_ROUTE_GATE_2, 2, 53 - db 4 ; bg events - bg_event 4, 4, 0, 1 - bg_event 16, 4, 0, 2 + def_bg_events + bg_event 4, 4, 0, 1 + bg_event 16, 4, 0, 2 bg_event 11, 10, 0, 3 - bg_event 6, 14, 0, 4 + bg_event 6, 14, 0, 4 - db 3 ; person events - object_event 14, 8, SPRITE_SUPER_NERD, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 9, SPRITE_YOUNGSTER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 14, 8, SPRITE_SUPER_NERD, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 9, SPRITE_YOUNGSTER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 14, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 Baadon_Blocks:: diff --git a/data/maps/objects/BaadonHouse1.asm b/data/maps/objects/BaadonHouse1.asm index a4ecf0b..03cced9 100644 --- a/data/maps/objects/BaadonHouse1.asm +++ b/data/maps/objects/BaadonHouse1.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/BaadonHouse1.asm", ROMX BaadonHouse1_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 3, 7, 3, BAADON, wOverworldMapBlocks + 42 - warp_event 4, 7, 3, BAADON, wOverworldMapBlocks + 43 + def_warp_events + warp_event 3, 7, BAADON, 3, 42 + warp_event 4, 7, BAADON, 3, 43 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 2, 3, SPRITE_ELDER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 3, SPRITE_ELDER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 BaadonHouse1_Blocks:: INCBIN "maps/BaadonHouse1.blk" diff --git a/data/maps/objects/BaadonHouse2.asm b/data/maps/objects/BaadonHouse2.asm index cac8df5..0976134 100644 --- a/data/maps/objects/BaadonHouse2.asm +++ b/data/maps/objects/BaadonHouse2.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/BaadonHouse2.asm", ROMX BaadonHouse2_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 5, BAADON, wOverworldMapBlocks + 47 - warp_event 5, 7, 5, BAADON, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, BAADON, 5, 47 + warp_event 5, 7, BAADON, 5, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 7, 5, SPRITE_GRANNY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 7, 5, SPRITE_GRANNY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 BaadonHouse2_Blocks:: INCBIN "maps/BaadonHouse2.blk" diff --git a/data/maps/objects/BaadonLeague1F.asm b/data/maps/objects/BaadonLeague1F.asm index 828fa54..9f28576 100644 --- a/data/maps/objects/BaadonLeague1F.asm +++ b/data/maps/objects/BaadonLeague1F.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/BaadonLeague1F.asm", ROMX BaadonLeague1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 3, 15, 6, BAADON, wOverworldMapBlocks + 82 - warp_event 4, 15, 7, BAADON, wOverworldMapBlocks + 83 - warp_event 7, 1, 1, BAADON_LEAGUE_2F, wOverworldMapBlocks + 14 + def_warp_events + warp_event 3, 15, BAADON, 6, 82 + warp_event 4, 15, BAADON, 7, 83 + warp_event 7, 1, BAADON_LEAGUE_2F, 1, 14 - db 0 ; bg events + def_bg_events - db 5 ; person events - object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 BaadonLeague1F_Blocks:: INCBIN "maps/BaadonLeague1F.blk" diff --git a/data/maps/objects/BaadonLeague2F.asm b/data/maps/objects/BaadonLeague2F.asm index 7021383..c881c53 100644 --- a/data/maps/objects/BaadonLeague2F.asm +++ b/data/maps/objects/BaadonLeague2F.asm @@ -7,17 +7,17 @@ SECTION "data/maps/objects/BaadonLeague2F.asm", ROMX BaadonLeague2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 7, 15, 3, BAADON_LEAGUE_1F, wOverworldMapBlocks + 92 + def_warp_events + warp_event 7, 15, BAADON_LEAGUE_1F, 3, 92 - db 0 ; bg events + def_bg_events - db 5 ; person events - object_event 4, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 2, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 1, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 9, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 11, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 4, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 2, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 1, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 9, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 11, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 BaadonLeague2F_Blocks:: INCBIN "maps/BaadonLeague2F.blk" diff --git a/data/maps/objects/BaadonMart.asm b/data/maps/objects/BaadonMart.asm index 2492e69..f8452cf 100644 --- a/data/maps/objects/BaadonMart.asm +++ b/data/maps/objects/BaadonMart.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/BaadonMart.asm", ROMX BaadonMart_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 1, BAADON, wOverworldMapBlocks + 59 - warp_event 5, 7, 1, BAADON, wOverworldMapBlocks + 59 + def_warp_events + warp_event 4, 7, BAADON, 1, 59 + warp_event 5, 7, BAADON, 1, 59 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 BaadonMart_Blocks:: INCBIN "maps/BaadonMart.blk" diff --git a/data/maps/objects/BaadonPokecenter1F.asm b/data/maps/objects/BaadonPokecenter1F.asm index aa9f38d..ded5a29 100644 --- a/data/maps/objects/BaadonPokecenter1F.asm +++ b/data/maps/objects/BaadonPokecenter1F.asm @@ -7,17 +7,17 @@ SECTION "data/maps/objects/BaadonPokecenter1F.asm", ROMX BaadonPokecenter1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 5, 7, 2, BAADON, wOverworldMapBlocks + 59 - warp_event 6, 7, 2, BAADON, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, BAADON_POKECENTER_2F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 5, 7, BAADON, 2, 59 + warp_event 6, 7, BAADON, 2, 60 + warp_event 0, 7, BAADON_POKECENTER_2F, 1, 57 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 14, 6, SPRITE_FISHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_POKEFAN_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 14, 6, SPRITE_FISHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_POKEFAN_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 BaadonPokecenter1F_Blocks:: INCBIN "maps/BaadonPokecenter1F.blk" diff --git a/data/maps/objects/BaadonPokecenter2F.asm b/data/maps/objects/BaadonPokecenter2F.asm index 4f865a5..4471b52 100644 --- a/data/maps/objects/BaadonPokecenter2F.asm +++ b/data/maps/objects/BaadonPokecenter2F.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/BaadonPokecenter2F.asm", ROMX BaadonPokecenter2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 0, 7, 3, BAADON_POKECENTER_1F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 0, 7, BAADON_POKECENTER_1F, 3, 57 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 BaadonPokecenter2F_Blocks:: INCBIN "maps/BaadonPokecenter2F.blk" diff --git a/data/maps/objects/BaadonRoute1.asm b/data/maps/objects/BaadonRoute1.asm index fccacff..b55f9bd 100644 --- a/data/maps/objects/BaadonRoute1.asm +++ b/data/maps/objects/BaadonRoute1.asm @@ -9,13 +9,13 @@ SECTION "data/maps/objects/BaadonRoute1.asm", ROMX BaadonRoute1_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 12, 48, 3, BAADON_ROUTE_GATE_WEST, wOverworldMapBlocks + 407 - warp_event 13, 48, 4, BAADON_ROUTE_GATE_WEST, wOverworldMapBlocks + 407 + def_warp_events + warp_event 12, 48, BAADON_ROUTE_GATE_WEST, 3, 407 + warp_event 13, 48, BAADON_ROUTE_GATE_WEST, 4, 407 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events BaadonRoute1_Blocks:: INCBIN "maps/BaadonRoute1.blk" diff --git a/data/maps/objects/BaadonRoute2.asm b/data/maps/objects/BaadonRoute2.asm index e632431..1cee953 100644 --- a/data/maps/objects/BaadonRoute2.asm +++ b/data/maps/objects/BaadonRoute2.asm @@ -9,11 +9,11 @@ SECTION "data/maps/objects/BaadonRoute2.asm", ROMX BaadonRoute2_MapEvents:: dw $4000 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events BaadonRoute2_Blocks:: INCBIN "maps/BaadonRoute2.blk" diff --git a/data/maps/objects/BaadonRoute3.asm b/data/maps/objects/BaadonRoute3.asm index eaca20b..d1ee4a5 100644 --- a/data/maps/objects/BaadonRoute3.asm +++ b/data/maps/objects/BaadonRoute3.asm @@ -9,13 +9,13 @@ SECTION "data/maps/objects/BaadonRoute3.asm", ROMX BaadonRoute3_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 8, 30, 3, BAADON_ROUTE_GATE_NEWTYPE, wOverworldMapBlocks + 261 - warp_event 9, 30, 4, BAADON_ROUTE_GATE_NEWTYPE, wOverworldMapBlocks + 261 + def_warp_events + warp_event 8, 30, BAADON_ROUTE_GATE_NEWTYPE, 3, 261 + warp_event 9, 30, BAADON_ROUTE_GATE_NEWTYPE, 4, 261 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events BaadonRoute3_Blocks:: INCBIN "maps/BaadonRoute3.blk" diff --git a/data/maps/objects/BaadonRouteGateNewtype.asm b/data/maps/objects/BaadonRouteGateNewtype.asm index 6fcbe21..e81841f 100644 --- a/data/maps/objects/BaadonRouteGateNewtype.asm +++ b/data/maps/objects/BaadonRouteGateNewtype.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/BaadonRouteGateNewtype.asm", ROMX BaadonRouteGateNewtype_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 4, 7, 1, ROUTE_15, wOverworldMapBlocks + 47 - warp_event 5, 7, 2, ROUTE_15, wOverworldMapBlocks + 47 - warp_event 4, 0, 1, BAADON_ROUTE_3, wOverworldMapBlocks + 14 - warp_event 5, 0, 2, BAADON_ROUTE_3, wOverworldMapBlocks + 14 + def_warp_events + warp_event 4, 7, ROUTE_15, 1, 47 + warp_event 5, 7, ROUTE_15, 2, 47 + warp_event 4, 0, BAADON_ROUTE_3, 1, 14 + warp_event 5, 0, BAADON_ROUTE_3, 2, 14 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events BaadonRouteGateNewtype_Blocks:: INCBIN "maps/BaadonRouteGateNewtype.blk" diff --git a/data/maps/objects/BaadonRouteGateWest.asm b/data/maps/objects/BaadonRouteGateWest.asm index 7eac9a2..4dab177 100644 --- a/data/maps/objects/BaadonRouteGateWest.asm +++ b/data/maps/objects/BaadonRouteGateWest.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/BaadonRouteGateWest.asm", ROMX BaadonRouteGateWest_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 4, 7, 11, WEST, wOverworldMapBlocks + 47 - warp_event 5, 7, 12, WEST, wOverworldMapBlocks + 47 - warp_event 4, 0, 1, BAADON_ROUTE_1, wOverworldMapBlocks + 14 - warp_event 5, 0, 2, BAADON_ROUTE_1, wOverworldMapBlocks + 14 + def_warp_events + warp_event 4, 7, WEST, 11, 47 + warp_event 5, 7, WEST, 12, 47 + warp_event 4, 0, BAADON_ROUTE_1, 1, 14 + warp_event 5, 0, BAADON_ROUTE_1, 2, 14 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events BaadonRouteGateWest_Blocks:: INCBIN "maps/BaadonRouteGateWest.blk" diff --git a/data/maps/objects/BaadonWallpaperHouse.asm b/data/maps/objects/BaadonWallpaperHouse.asm index 56e809c..d3b6f09 100644 --- a/data/maps/objects/BaadonWallpaperHouse.asm +++ b/data/maps/objects/BaadonWallpaperHouse.asm @@ -7,13 +7,13 @@ SECTION "data/maps/objects/BaadonWallpaperHouse.asm", ROMX BaadonWallpaperHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 2, 7, 4, BAADON, wOverworldMapBlocks + 42 - warp_event 3, 7, 4, BAADON, wOverworldMapBlocks + 42 + def_warp_events + warp_event 2, 7, BAADON, 4, 42 + warp_event 3, 7, BAADON, 4, 42 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events BaadonWallpaperHouse_Blocks:: INCBIN "maps/BaadonWallpaperHouse.blk" diff --git a/data/maps/objects/BullForest.asm b/data/maps/objects/BullForest.asm index 2f2f9bf..6846205 100644 --- a/data/maps/objects/BullForest.asm +++ b/data/maps/objects/BullForest.asm @@ -10,25 +10,25 @@ SECTION "data/maps/objects/BullForest.asm", ROMX BullForest_MapEvents:: dw $4000 ; unknown - db 8 ; warp events - warp_event 25, 6, 1, BULL_MART, wOverworldMapBlocks + 117 - warp_event 9, 9, 1, BULL_HOUSE_1, wOverworldMapBlocks + 135 - warp_event 27, 11, 1, BULL_HOUSE_2, wOverworldMapBlocks + 170 - warp_event 19, 13, 1, BULL_HOUSE_3, wOverworldMapBlocks + 192 - warp_event 13, 18, 1, BULL_POKECENTER_1F, wOverworldMapBlocks + 267 - warp_event 26, 21, 1, BULL_LEAGUE_1F, wOverworldMapBlocks + 300 - warp_event 27, 21, 2, BULL_LEAGUE_1F, wOverworldMapBlocks + 300 - warp_event 3, 22, 1, BULL_HOUSE_4, wOverworldMapBlocks + 314 + def_warp_events + warp_event 25, 6, BULL_MART, 1, 117 + warp_event 9, 9, BULL_HOUSE_1, 1, 135 + warp_event 27, 11, BULL_HOUSE_2, 1, 170 + warp_event 19, 13, BULL_HOUSE_3, 1, 192 + warp_event 13, 18, BULL_POKECENTER_1F, 1, 267 + warp_event 26, 21, BULL_LEAGUE_1F, 1, 300 + warp_event 27, 21, BULL_LEAGUE_1F, 2, 300 + warp_event 3, 22, BULL_HOUSE_4, 1, 314 - db 3 ; bg events - bg_event 26, 6, 0, 1 - bg_event 2, 16, 0, 2 + def_bg_events + bg_event 26, 6, 0, 1 + bg_event 2, 16, 0, 2 bg_event 14, 18, 0, 3 - db 5 ; person events - object_event 21, 9, SPRITE_TWIN, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 21, 9, SPRITE_TWIN, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 11, 12, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 16, SPRITE_GRANNY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 16, SPRITE_GRANNY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 20, 19, SPRITE_TEACHER, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 20, 29, SPRITE_BUG_CATCHER_BOY, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/BullForestRoute1.asm b/data/maps/objects/BullForestRoute1.asm index ceb2ea2..f837fdf 100644 --- a/data/maps/objects/BullForestRoute1.asm +++ b/data/maps/objects/BullForestRoute1.asm @@ -9,14 +9,14 @@ SECTION "data/maps/objects/BullForestRoute1.asm", ROMX BullForestRoute1_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 8, 12, 3, NEWTYPE_ROUTE_GATE, wOverworldMapBlocks + 222 - warp_event 9, 12, 4, NEWTYPE_ROUTE_GATE, wOverworldMapBlocks + 222 - warp_event 9, 5, 1, BULL_FOREST_ROUTE_1_HOUSE, wOverworldMapBlocks + 98 + def_warp_events + warp_event 8, 12, NEWTYPE_ROUTE_GATE, 3, 222 + warp_event 9, 12, NEWTYPE_ROUTE_GATE, 4, 222 + warp_event 9, 5, BULL_FOREST_ROUTE_1_HOUSE, 1, 98 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events BullForestRoute1_Blocks:: INCBIN "maps/BullForestRoute1.blk" diff --git a/data/maps/objects/BullForestRoute1House.asm b/data/maps/objects/BullForestRoute1House.asm index e253222..56e1c13 100644 --- a/data/maps/objects/BullForestRoute1House.asm +++ b/data/maps/objects/BullForestRoute1House.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/BullForestRoute1House.asm", ROMX BullForestRoute1House_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 3, BULL_FOREST_ROUTE_1, wOverworldMapBlocks + 47 - warp_event 5, 7, 3, BULL_FOREST_ROUTE_1, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, BULL_FOREST_ROUTE_1, 3, 47 + warp_event 5, 7, BULL_FOREST_ROUTE_1, 3, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 1, 5, SPRITE_COOLTRAINER_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 1, 5, SPRITE_COOLTRAINER_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 BullForestRoute1House_Blocks:: INCBIN "maps/BullForestRoute1House.blk" diff --git a/data/maps/objects/BullForestRoute2.asm b/data/maps/objects/BullForestRoute2.asm index ef6728f..d1322a1 100644 --- a/data/maps/objects/BullForestRoute2.asm +++ b/data/maps/objects/BullForestRoute2.asm @@ -9,13 +9,13 @@ SECTION "data/maps/objects/BullForestRoute2.asm", ROMX BullForestRoute2_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 8, 48, 3, BULL_FOREST_ROUTE_GATE_STAND, wOverworldMapBlocks + 405 - warp_event 9, 48, 4, BULL_FOREST_ROUTE_GATE_STAND, wOverworldMapBlocks + 405 + def_warp_events + warp_event 8, 48, BULL_FOREST_ROUTE_GATE_STAND, 3, 405 + warp_event 9, 48, BULL_FOREST_ROUTE_GATE_STAND, 4, 405 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events BullForestRoute2_Blocks:: INCBIN "maps/BullForestRoute2.blk" diff --git a/data/maps/objects/BullForestRoute3.asm b/data/maps/objects/BullForestRoute3.asm index 87a02f1..b53b088 100644 --- a/data/maps/objects/BullForestRoute3.asm +++ b/data/maps/objects/BullForestRoute3.asm @@ -9,11 +9,11 @@ SECTION "data/maps/objects/BullForestRoute3.asm", ROMX BullForestRoute3_MapEvents:: dw $4000 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events BullForestRoute3_Blocks:: INCBIN "maps/BullForestRoute3.blk" diff --git a/data/maps/objects/BullForestRouteGateStand.asm b/data/maps/objects/BullForestRouteGateStand.asm index ee252b2..49609d8 100644 --- a/data/maps/objects/BullForestRouteGateStand.asm +++ b/data/maps/objects/BullForestRouteGateStand.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/BullForestRouteGateStand.asm", ROMX BullForestRouteGateStand_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 4, 7, 9, STAND, wOverworldMapBlocks + 47 - warp_event 5, 7, 10, STAND, wOverworldMapBlocks + 47 - warp_event 4, 0, 1, BULL_FOREST_ROUTE_2, wOverworldMapBlocks + 14 - warp_event 5, 0, 2, BULL_FOREST_ROUTE_2, wOverworldMapBlocks + 14 + def_warp_events + warp_event 4, 7, STAND, 9, 47 + warp_event 5, 7, STAND, 10, 47 + warp_event 4, 0, BULL_FOREST_ROUTE_2, 1, 14 + warp_event 5, 0, BULL_FOREST_ROUTE_2, 2, 14 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events BullForestRouteGateStand_Blocks:: INCBIN "maps/BullForestRouteGateStand.blk" diff --git a/data/maps/objects/BullHouse1.asm b/data/maps/objects/BullHouse1.asm index 430fea2..1b4636a 100644 --- a/data/maps/objects/BullHouse1.asm +++ b/data/maps/objects/BullHouse1.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/BullHouse1.asm", ROMX BullHouse1_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 3, 7, 2, BULL_FOREST, wOverworldMapBlocks + 42 - warp_event 4, 7, 2, BULL_FOREST, wOverworldMapBlocks + 43 + def_warp_events + warp_event 3, 7, BULL_FOREST, 2, 42 + warp_event 4, 7, BULL_FOREST, 2, 43 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 2, 3, SPRITE_KIKUKO, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 3, SPRITE_KIKUKO, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 BullHouse1_Blocks:: INCBIN "maps/BullHouse1.blk" diff --git a/data/maps/objects/BullHouse2.asm b/data/maps/objects/BullHouse2.asm index 286b8e8..6be8e42 100644 --- a/data/maps/objects/BullHouse2.asm +++ b/data/maps/objects/BullHouse2.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/BullHouse2.asm", ROMX BullHouse2_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 3, BULL_FOREST, wOverworldMapBlocks + 47 - warp_event 5, 7, 3, BULL_FOREST, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, BULL_FOREST, 3, 47 + warp_event 5, 7, BULL_FOREST, 3, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 8, 4, SPRITE_GRANNY, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 8, 4, SPRITE_GRANNY, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 BullHouse2_Blocks:: INCBIN "maps/BullHouse2.blk" diff --git a/data/maps/objects/BullHouse3.asm b/data/maps/objects/BullHouse3.asm index 6979863..98e93d4 100644 --- a/data/maps/objects/BullHouse3.asm +++ b/data/maps/objects/BullHouse3.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/BullHouse3.asm", ROMX BullHouse3_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 4, BULL_FOREST, wOverworldMapBlocks + 47 - warp_event 5, 7, 4, BULL_FOREST, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, BULL_FOREST, 4, 47 + warp_event 5, 7, BULL_FOREST, 4, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 4, 3, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 4, 3, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 BullHouse3_Blocks:: INCBIN "maps/BullHouse3.blk" diff --git a/data/maps/objects/BullHouse4.asm b/data/maps/objects/BullHouse4.asm index 9bf3763..3b602c3 100644 --- a/data/maps/objects/BullHouse4.asm +++ b/data/maps/objects/BullHouse4.asm @@ -7,13 +7,13 @@ SECTION "data/maps/objects/BullHouse4.asm", ROMX BullHouse4_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 8, BULL_FOREST, wOverworldMapBlocks + 47 - warp_event 5, 7, 8, BULL_FOREST, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, BULL_FOREST, 8, 47 + warp_event 5, 7, BULL_FOREST, 8, 47 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events BullHouse4_Blocks:: INCBIN "maps/BullHouse4.blk" diff --git a/data/maps/objects/BullLeague1F.asm b/data/maps/objects/BullLeague1F.asm index f7e51d0..1a53389 100644 --- a/data/maps/objects/BullLeague1F.asm +++ b/data/maps/objects/BullLeague1F.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/BullLeague1F.asm", ROMX BullLeague1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 3, 15, 6, BULL_FOREST, wOverworldMapBlocks + 82 - warp_event 4, 15, 7, BULL_FOREST, wOverworldMapBlocks + 83 - warp_event 7, 1, 1, BULL_LEAGUE_2F, wOverworldMapBlocks + 14 + def_warp_events + warp_event 3, 15, BULL_FOREST, 6, 82 + warp_event 4, 15, BULL_FOREST, 7, 83 + warp_event 7, 1, BULL_LEAGUE_2F, 1, 14 - db 0 ; bg events + def_bg_events - db 5 ; person events - object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 BullLeague1F_Blocks:: INCBIN "maps/BullLeague1F.blk" diff --git a/data/maps/objects/BullLeague2F.asm b/data/maps/objects/BullLeague2F.asm index cb825a1..a3282c6 100644 --- a/data/maps/objects/BullLeague2F.asm +++ b/data/maps/objects/BullLeague2F.asm @@ -7,17 +7,17 @@ SECTION "data/maps/objects/BullLeague2F.asm", ROMX BullLeague2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 7, 15, 3, BULL_LEAGUE_1F, wOverworldMapBlocks + 92 + def_warp_events + warp_event 7, 15, BULL_LEAGUE_1F, 3, 92 - db 0 ; bg events + def_bg_events - db 5 ; person events - object_event 4, 4, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 9, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 9, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 4, 4, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 9, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 9, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 BullLeague2F_Blocks:: INCBIN "maps/BullLeague2F.blk" diff --git a/data/maps/objects/BullMart.asm b/data/maps/objects/BullMart.asm index 14cbb05..bc37eae 100644 --- a/data/maps/objects/BullMart.asm +++ b/data/maps/objects/BullMart.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/BullMart.asm", ROMX BullMart_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 1, BULL_FOREST, wOverworldMapBlocks + 59 - warp_event 5, 7, 1, BULL_FOREST, wOverworldMapBlocks + 59 + def_warp_events + warp_event 4, 7, BULL_FOREST, 1, 59 + warp_event 5, 7, BULL_FOREST, 1, 59 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_FISHER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_FISHER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 BullMart_Blocks:: INCBIN "maps/BullMart.blk" diff --git a/data/maps/objects/BullPokecenter1F.asm b/data/maps/objects/BullPokecenter1F.asm index ca32a16..3c2396b 100644 --- a/data/maps/objects/BullPokecenter1F.asm +++ b/data/maps/objects/BullPokecenter1F.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/BullPokecenter1F.asm", ROMX BullPokecenter1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 5, 7, 5, BULL_FOREST, wOverworldMapBlocks + 59 - warp_event 6, 7, 5, BULL_FOREST, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, BULL_POKECENTER_2F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 5, 7, BULL_FOREST, 5, 59 + warp_event 6, 7, BULL_FOREST, 5, 60 + warp_event 0, 7, BULL_POKECENTER_2F, 1, 57 - db 0 ; bg events + def_bg_events - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 BullPokecenter1F_Blocks:: INCBIN "maps/BullPokecenter1F.blk" diff --git a/data/maps/objects/BullPokecenter2F.asm b/data/maps/objects/BullPokecenter2F.asm index 0fc3b4b..73d4988 100644 --- a/data/maps/objects/BullPokecenter2F.asm +++ b/data/maps/objects/BullPokecenter2F.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/BullPokecenter2F.asm", ROMX BullPokecenter2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 0, 7, 3, BULL_POKECENTER_1F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 0, 7, BULL_POKECENTER_1F, 3, 57 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 BullPokecenter2F_Blocks:: INCBIN "maps/BullPokecenter2F.blk" diff --git a/data/maps/objects/CaveMinecarts1.asm b/data/maps/objects/CaveMinecarts1.asm index 922c9f2..de93b46 100644 --- a/data/maps/objects/CaveMinecarts1.asm +++ b/data/maps/objects/CaveMinecarts1.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/CaveMinecarts1.asm", ROMX CaveMinecarts1_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events CaveMinecarts1_Blocks:: INCBIN "maps/CaveMinecarts1.blk" diff --git a/data/maps/objects/CaveMinecarts2.asm b/data/maps/objects/CaveMinecarts2.asm index b878892..12cacb0 100644 --- a/data/maps/objects/CaveMinecarts2.asm +++ b/data/maps/objects/CaveMinecarts2.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/CaveMinecarts2.asm", ROMX CaveMinecarts2_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events CaveMinecarts2_Blocks:: INCBIN "maps/CaveMinecarts2.blk" diff --git a/data/maps/objects/CaveMinecarts3.asm b/data/maps/objects/CaveMinecarts3.asm index bae9ae6..06fc392 100644 --- a/data/maps/objects/CaveMinecarts3.asm +++ b/data/maps/objects/CaveMinecarts3.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/CaveMinecarts3.asm", ROMX CaveMinecarts3_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events CaveMinecarts3_Blocks:: INCBIN "maps/CaveMinecarts3.blk" diff --git a/data/maps/objects/CaveMinecarts4.asm b/data/maps/objects/CaveMinecarts4.asm index 955d7a3..8c14c90 100644 --- a/data/maps/objects/CaveMinecarts4.asm +++ b/data/maps/objects/CaveMinecarts4.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/CaveMinecarts4.asm", ROMX CaveMinecarts4_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events CaveMinecarts4_Blocks:: INCBIN "maps/CaveMinecarts4.blk" diff --git a/data/maps/objects/CaveMinecarts5.asm b/data/maps/objects/CaveMinecarts5.asm index 5e64a3d..b57cf73 100644 --- a/data/maps/objects/CaveMinecarts5.asm +++ b/data/maps/objects/CaveMinecarts5.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/CaveMinecarts5.asm", ROMX CaveMinecarts5_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events CaveMinecarts5_Blocks:: INCBIN "maps/CaveMinecarts5.blk" diff --git a/data/maps/objects/CaveMinecarts6.asm b/data/maps/objects/CaveMinecarts6.asm index ca84386..bbb03f8 100644 --- a/data/maps/objects/CaveMinecarts6.asm +++ b/data/maps/objects/CaveMinecarts6.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/CaveMinecarts6.asm", ROMX CaveMinecarts6_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events CaveMinecarts6_Blocks:: INCBIN "maps/CaveMinecarts6.blk" diff --git a/data/maps/objects/CaveMinecarts7.asm b/data/maps/objects/CaveMinecarts7.asm index 222f0c2..cb170a1 100644 --- a/data/maps/objects/CaveMinecarts7.asm +++ b/data/maps/objects/CaveMinecarts7.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/CaveMinecarts7.asm", ROMX CaveMinecarts7_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events CaveMinecarts7_Blocks:: INCBIN "maps/CaveMinecarts7.blk" diff --git a/data/maps/objects/Fonto.asm b/data/maps/objects/Fonto.asm index 011235b..cae0c45 100644 --- a/data/maps/objects/Fonto.asm +++ b/data/maps/objects/Fonto.asm @@ -10,25 +10,25 @@ SECTION "data/maps/objects/Fonto.asm", ROMX Fonto_MapEvents:: dw $4000 ; unknown - db 5 ; warp events - warp_event 4, 3, 1, FONTO_ROCKET_HOUSE, wOverworldMapBlocks + 35 - warp_event 15, 4, 1, FONTO_MART, wOverworldMapBlocks + 56 - warp_event 3, 7, 1, FONTO_HOUSE, wOverworldMapBlocks + 66 - warp_event 3, 12, 1, FONTO_POKECENTER_1F, wOverworldMapBlocks + 114 - warp_event 16, 13, 1, FONTO_LAB, wOverworldMapBlocks + 121 + def_warp_events + warp_event 4, 3, FONTO_ROCKET_HOUSE, 1, 35 + warp_event 15, 4, FONTO_MART, 1, 56 + warp_event 3, 7, FONTO_HOUSE, 1, 66 + warp_event 3, 12, FONTO_POKECENTER_1F, 1, 114 + warp_event 16, 13, FONTO_LAB, 1, 121 - db 5 ; bg events - bg_event 15, 4, 0, 1 - bg_event 14, 6, 0, 2 - bg_event 4, 12, 0, 3 - bg_event 6, 12, 0, 4 + def_bg_events + bg_event 15, 4, 0, 1 + bg_event 14, 6, 0, 2 + bg_event 4, 12, 0, 3 + bg_event 6, 12, 0, 4 bg_event 10, 12, 0, 5 - db 4 ; person events - object_event 2, 4, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_SIDON, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 14, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 16, 8, SPRITE_TWIN, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 4, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_SIDON, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 14, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 16, 8, SPRITE_TWIN, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 Fonto_Blocks:: INCBIN "maps/Fonto.blk" diff --git a/data/maps/objects/FontoHouse.asm b/data/maps/objects/FontoHouse.asm index 05c8a5e..4e49ff2 100644 --- a/data/maps/objects/FontoHouse.asm +++ b/data/maps/objects/FontoHouse.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/FontoHouse.asm", ROMX FontoHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 3, FONTO, wOverworldMapBlocks + 47 - warp_event 5, 7, 3, FONTO, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, FONTO, 3, 47 + warp_event 5, 7, FONTO, 3, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 8, 4, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 8, 4, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 FontoHouse_Blocks:: INCBIN "maps/FontoHouse.blk" diff --git a/data/maps/objects/FontoLab.asm b/data/maps/objects/FontoLab.asm index 59fa933..30a7cac 100644 --- a/data/maps/objects/FontoLab.asm +++ b/data/maps/objects/FontoLab.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/FontoLab.asm", ROMX FontoLab_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 3, 7, 5, FONTO, wOverworldMapBlocks + 46 - warp_event 4, 7, 5, FONTO, wOverworldMapBlocks + 47 + def_warp_events + warp_event 3, 7, FONTO, 5, 46 + warp_event 4, 7, FONTO, 5, 47 - db 0 ; bg events + def_bg_events - db 2 ; person events - object_event 2, 2, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 8, 5, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 2, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 8, 5, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 FontoLab_Blocks:: INCBIN "maps/FontoLab.blk" diff --git a/data/maps/objects/FontoMart.asm b/data/maps/objects/FontoMart.asm index 3241f57..8e8ffe9 100644 --- a/data/maps/objects/FontoMart.asm +++ b/data/maps/objects/FontoMart.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/FontoMart.asm", ROMX FontoMart_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 2, FONTO, wOverworldMapBlocks + 59 - warp_event 5, 7, 2, FONTO, wOverworldMapBlocks + 59 + def_warp_events + warp_event 4, 7, FONTO, 2, 59 + warp_event 5, 7, FONTO, 2, 59 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 FontoMart_Blocks:: INCBIN "maps/FontoMart.blk" diff --git a/data/maps/objects/FontoPokecenter1F.asm b/data/maps/objects/FontoPokecenter1F.asm index aefac44..67fe8f2 100644 --- a/data/maps/objects/FontoPokecenter1F.asm +++ b/data/maps/objects/FontoPokecenter1F.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/FontoPokecenter1F.asm", ROMX FontoPokecenter1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 5, 7, 4, FONTO, wOverworldMapBlocks + 59 - warp_event 6, 7, 4, FONTO, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, FONTO_POKECENTER_2F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 5, 7, FONTO, 4, 59 + warp_event 6, 7, FONTO, 4, 60 + warp_event 0, 7, FONTO_POKECENTER_2F, 1, 57 - db 0 ; bg events + def_bg_events - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 FontoPokecenter1F_Blocks:: INCBIN "maps/FontoPokecenter1F.blk" diff --git a/data/maps/objects/FontoPokecenter2F.asm b/data/maps/objects/FontoPokecenter2F.asm index 025df9f..5ae6d4f 100644 --- a/data/maps/objects/FontoPokecenter2F.asm +++ b/data/maps/objects/FontoPokecenter2F.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/FontoPokecenter2F.asm", ROMX FontoPokecenter2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 0, 7, 3, FONTO_POKECENTER_1F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 0, 7, FONTO_POKECENTER_1F, 3, 57 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 FontoPokecenter2F_Blocks:: INCBIN "maps/FontoPokecenter2F.blk" diff --git a/data/maps/objects/FontoRocketHouse.asm b/data/maps/objects/FontoRocketHouse.asm index b97cb16..d7db86f 100644 --- a/data/maps/objects/FontoRocketHouse.asm +++ b/data/maps/objects/FontoRocketHouse.asm @@ -7,17 +7,17 @@ SECTION "data/maps/objects/FontoRocketHouse.asm", ROMX FontoRocketHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 12, 7, 1, FONTO, wOverworldMapBlocks + 63 - warp_event 13, 7, 1, FONTO, wOverworldMapBlocks + 63 + def_warp_events + warp_event 12, 7, FONTO, 1, 63 + warp_event 13, 7, FONTO, 1, 63 - db 0 ; bg events + def_bg_events - db 4 ; person events - object_event 5, 4, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 2, SPRITE_ROCKET_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 2, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 12, 2, SPRITE_POPPO, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 4, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 2, SPRITE_ROCKET_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 2, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 12, 2, SPRITE_POPPO, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 FontoRocketHouse_Blocks:: INCBIN "maps/FontoRocketHouse.blk" diff --git a/data/maps/objects/FontoRoute1.asm b/data/maps/objects/FontoRoute1.asm index 728de9e..85de272 100644 --- a/data/maps/objects/FontoRoute1.asm +++ b/data/maps/objects/FontoRoute1.asm @@ -9,12 +9,12 @@ SECTION "data/maps/objects/FontoRoute1.asm", ROMX FontoRoute1_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 6, 9, 3, FONTO_ROUTE_GATE_1, wOverworldMapBlocks + 209 + def_warp_events + warp_event 6, 9, FONTO_ROUTE_GATE_1, 3, 209 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events FontoRoute1_Blocks:: INCBIN "maps/FontoRoute1.blk" diff --git a/data/maps/objects/FontoRoute2.asm b/data/maps/objects/FontoRoute2.asm index fa7b2dc..3614edc 100644 --- a/data/maps/objects/FontoRoute2.asm +++ b/data/maps/objects/FontoRoute2.asm @@ -9,11 +9,11 @@ SECTION "data/maps/objects/FontoRoute2.asm", ROMX FontoRoute2_MapEvents:: dw $4000 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events FontoRoute2_Blocks:: INCBIN "maps/FontoRoute2.blk" diff --git a/data/maps/objects/FontoRoute3.asm b/data/maps/objects/FontoRoute3.asm index 1aced4a..bb198c5 100644 --- a/data/maps/objects/FontoRoute3.asm +++ b/data/maps/objects/FontoRoute3.asm @@ -9,11 +9,11 @@ SECTION "data/maps/objects/FontoRoute3.asm", ROMX FontoRoute3_MapEvents:: dw $4000 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events FontoRoute3_Blocks:: INCBIN "maps/FontoRoute3.blk" diff --git a/data/maps/objects/FontoRoute4.asm b/data/maps/objects/FontoRoute4.asm index 6839a6f..6d5745c 100644 --- a/data/maps/objects/FontoRoute4.asm +++ b/data/maps/objects/FontoRoute4.asm @@ -9,13 +9,13 @@ SECTION "data/maps/objects/FontoRoute4.asm", ROMX FontoRoute4_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 8, 30, 3, FONTO_ROUTE_GATE_2, wOverworldMapBlocks + 261 - warp_event 9, 30, 4, FONTO_ROUTE_GATE_2, wOverworldMapBlocks + 261 + def_warp_events + warp_event 8, 30, FONTO_ROUTE_GATE_2, 3, 261 + warp_event 9, 30, FONTO_ROUTE_GATE_2, 4, 261 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events FontoRoute4_Blocks:: INCBIN "maps/FontoRoute4.blk" diff --git a/data/maps/objects/FontoRoute5.asm b/data/maps/objects/FontoRoute5.asm index a52e375..3cf32d4 100644 --- a/data/maps/objects/FontoRoute5.asm +++ b/data/maps/objects/FontoRoute5.asm @@ -9,13 +9,13 @@ SECTION "data/maps/objects/FontoRoute5.asm", ROMX FontoRoute5_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 8, 30, 3, FONTO_ROUTE_GATE_3, wOverworldMapBlocks + 261 - warp_event 9, 30, 4, FONTO_ROUTE_GATE_3, wOverworldMapBlocks + 261 + def_warp_events + warp_event 8, 30, FONTO_ROUTE_GATE_3, 3, 261 + warp_event 9, 30, FONTO_ROUTE_GATE_3, 4, 261 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events FontoRoute5_Blocks:: INCBIN "maps/FontoRoute5.blk" diff --git a/data/maps/objects/FontoRoute6.asm b/data/maps/objects/FontoRoute6.asm index 10d7690..e84a1b1 100644 --- a/data/maps/objects/FontoRoute6.asm +++ b/data/maps/objects/FontoRoute6.asm @@ -9,11 +9,11 @@ SECTION "data/maps/objects/FontoRoute6.asm", ROMX FontoRoute6_MapEvents:: dw $4000 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events FontoRoute6_Blocks:: INCBIN "maps/FontoRoute6.blk" diff --git a/data/maps/objects/FontoRouteGate1.asm b/data/maps/objects/FontoRouteGate1.asm index 2ef0c71..ba94798 100644 --- a/data/maps/objects/FontoRouteGate1.asm +++ b/data/maps/objects/FontoRouteGate1.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/FontoRouteGate1.asm", ROMX FontoRouteGate1_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 0, 7, 7, SOUTH, wOverworldMapBlocks + 45 - warp_event 1, 7, 7, SOUTH, wOverworldMapBlocks + 45 - warp_event 8, 7, 1, FONTO_ROUTE_1, wOverworldMapBlocks + 49 - warp_event 9, 7, 1, FONTO_ROUTE_1, wOverworldMapBlocks + 49 + def_warp_events + warp_event 0, 7, SOUTH, 7, 45 + warp_event 1, 7, SOUTH, 7, 45 + warp_event 8, 7, FONTO_ROUTE_1, 1, 49 + warp_event 9, 7, FONTO_ROUTE_1, 1, 49 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events FontoRouteGate1_Blocks:: INCBIN "maps/FontoRouteGate1.blk" diff --git a/data/maps/objects/FontoRouteGate2.asm b/data/maps/objects/FontoRouteGate2.asm index bf69bf8..7aa3c65 100644 --- a/data/maps/objects/FontoRouteGate2.asm +++ b/data/maps/objects/FontoRouteGate2.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/FontoRouteGate2.asm", ROMX FontoRouteGate2_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 4, 7, 8, BAADON, wOverworldMapBlocks + 47 - warp_event 5, 7, 9, BAADON, wOverworldMapBlocks + 47 - warp_event 4, 0, 1, FONTO_ROUTE_4, wOverworldMapBlocks + 14 - warp_event 5, 0, 2, FONTO_ROUTE_4, wOverworldMapBlocks + 14 + def_warp_events + warp_event 4, 7, BAADON, 8, 47 + warp_event 5, 7, BAADON, 9, 47 + warp_event 4, 0, FONTO_ROUTE_4, 1, 14 + warp_event 5, 0, FONTO_ROUTE_4, 2, 14 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events FontoRouteGate2_Blocks:: INCBIN "maps/FontoRouteGate2.blk" diff --git a/data/maps/objects/FontoRouteGate3.asm b/data/maps/objects/FontoRouteGate3.asm index 18af188..0546dfc 100644 --- a/data/maps/objects/FontoRouteGate3.asm +++ b/data/maps/objects/FontoRouteGate3.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/FontoRouteGate3.asm", ROMX FontoRouteGate3_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 4, 7, 5, SOUTH, wOverworldMapBlocks + 47 - warp_event 5, 7, 6, SOUTH, wOverworldMapBlocks + 47 - warp_event 4, 0, 1, FONTO_ROUTE_5, wOverworldMapBlocks + 14 - warp_event 5, 0, 2, FONTO_ROUTE_5, wOverworldMapBlocks + 14 + def_warp_events + warp_event 4, 7, SOUTH, 5, 47 + warp_event 5, 7, SOUTH, 6, 47 + warp_event 4, 0, FONTO_ROUTE_5, 1, 14 + warp_event 5, 0, FONTO_ROUTE_5, 2, 14 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events FontoRouteGate3_Blocks:: INCBIN "maps/FontoRouteGate3.blk" diff --git a/data/maps/objects/Haiteku.asm b/data/maps/objects/Haiteku.asm index 1207b6a..e2ce022 100644 --- a/data/maps/objects/Haiteku.asm +++ b/data/maps/objects/Haiteku.asm @@ -8,19 +8,19 @@ SECTION "data/maps/objects/Haiteku.asm", ROMX Haiteku_MapEvents:: dw $4000 ; unknown - db 9 ; warp events - warp_event 31, 10, 1, HAITEKU_POKECENTER_1F, wOverworldMapBlocks + 172 - warp_event 10, 11, 1, HAITEKU_LEAGUE_1F, wOverworldMapBlocks + 162 - warp_event 11, 11, 2, HAITEKU_LEAGUE_1F, wOverworldMapBlocks + 162 - warp_event 31, 16, 1, HAITEKU_MART, wOverworldMapBlocks + 250 - warp_event 7, 17, 1, HAITEKU_HOUSE_1, wOverworldMapBlocks + 238 - warp_event 15, 17, 1, HAITEKU_HOUSE_2, wOverworldMapBlocks + 242 - warp_event 33, 20, 1, HAITEKU_IMPOSTER_OAK_HOUSE, wOverworldMapBlocks + 303 - warp_event 6, 27, 1, HAITEKU_AQUARIUM_1F, wOverworldMapBlocks + 368 - warp_event 7, 27, 2, HAITEKU_AQUARIUM_1F, wOverworldMapBlocks + 368 + def_warp_events + warp_event 31, 10, HAITEKU_POKECENTER_1F, 1, 172 + warp_event 10, 11, HAITEKU_LEAGUE_1F, 1, 162 + warp_event 11, 11, HAITEKU_LEAGUE_1F, 2, 162 + warp_event 31, 16, HAITEKU_MART, 1, 250 + warp_event 7, 17, HAITEKU_HOUSE_1, 1, 238 + warp_event 15, 17, HAITEKU_HOUSE_2, 1, 242 + warp_event 33, 20, HAITEKU_IMPOSTER_OAK_HOUSE, 1, 303 + warp_event 6, 27, HAITEKU_AQUARIUM_1F, 1, 368 + warp_event 7, 27, HAITEKU_AQUARIUM_1F, 2, 368 - db 8 ; bg events - bg_event 24, 7, 0, 1 + def_bg_events + bg_event 24, 7, 0, 1 bg_event 12, 12, 0, 2 bg_event 32, 10, 0, 3 bg_event 10, 17, 0, 4 @@ -29,7 +29,7 @@ Haiteku_MapEvents:: bg_event 30, 25, 0, 7 bg_event 24, 28, 0, 8 - db 5 ; person events + def_object_events object_event 22, 15, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 23, 14, SPRITE_PIPPI, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 23, 24, SPRITE_SAILOR, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/HaitekuAquarium1F.asm b/data/maps/objects/HaitekuAquarium1F.asm index 5b7a1de..ce088f3 100644 --- a/data/maps/objects/HaitekuAquarium1F.asm +++ b/data/maps/objects/HaitekuAquarium1F.asm @@ -7,17 +7,17 @@ SECTION "data/maps/objects/HaitekuAquarium1F.asm", ROMX HaitekuAquarium1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 12, 7, 8, HAITEKU, wOverworldMapBlocks + 63 - warp_event 13, 7, 9, HAITEKU, wOverworldMapBlocks + 63 - warp_event 0, 7, 1, HAITEKU_AQUARIUM_2F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 12, 7, HAITEKU, 8, 63 + warp_event 13, 7, HAITEKU, 9, 63 + warp_event 0, 7, HAITEKU_AQUARIUM_2F, 1, 57 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 15, 5, SPRITE_RECEPTIONIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 12, 2, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 5, SPRITE_LASS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 15, 5, SPRITE_RECEPTIONIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 12, 2, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 5, SPRITE_LASS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 HaitekuAquarium1F_Blocks:: INCBIN "maps/HaitekuAquarium1F.blk" diff --git a/data/maps/objects/HaitekuAquarium2F.asm b/data/maps/objects/HaitekuAquarium2F.asm index 61a377d..00ebacd 100644 --- a/data/maps/objects/HaitekuAquarium2F.asm +++ b/data/maps/objects/HaitekuAquarium2F.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/HaitekuAquarium2F.asm", ROMX HaitekuAquarium2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 0, 7, 3, HAITEKU_AQUARIUM_1F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 0, 7, HAITEKU_AQUARIUM_1F, 3, 57 - db 0 ; bg events + def_bg_events - db 2 ; person events - object_event 7, 6, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 4, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 7, 6, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 4, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 HaitekuAquarium2F_Blocks:: INCBIN "maps/HaitekuAquarium2F.blk" diff --git a/data/maps/objects/HaitekuHouse1.asm b/data/maps/objects/HaitekuHouse1.asm index d359c1c..cb1af15 100644 --- a/data/maps/objects/HaitekuHouse1.asm +++ b/data/maps/objects/HaitekuHouse1.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/HaitekuHouse1.asm", ROMX HaitekuHouse1_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 5, HAITEKU, wOverworldMapBlocks + 47 - warp_event 5, 7, 5, HAITEKU, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, HAITEKU, 5, 47 + warp_event 5, 7, HAITEKU, 5, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 7, 3, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 7, 3, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 HaitekuHouse1_Blocks:: INCBIN "maps/HaitekuHouse1.blk" diff --git a/data/maps/objects/HaitekuHouse2.asm b/data/maps/objects/HaitekuHouse2.asm index e0df087..ed3b166 100644 --- a/data/maps/objects/HaitekuHouse2.asm +++ b/data/maps/objects/HaitekuHouse2.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/HaitekuHouse2.asm", ROMX HaitekuHouse2_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 6, HAITEKU, wOverworldMapBlocks + 47 - warp_event 5, 7, 6, HAITEKU, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, HAITEKU, 6, 47 + warp_event 5, 7, HAITEKU, 6, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 7, 3, SPRITE_SAILOR, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 7, 3, SPRITE_SAILOR, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 HaitekuHouse2_Blocks:: INCBIN "maps/HaitekuHouse2.blk" diff --git a/data/maps/objects/HaitekuImposterOakHouse.asm b/data/maps/objects/HaitekuImposterOakHouse.asm index 87ce9b3..42cd58c 100644 --- a/data/maps/objects/HaitekuImposterOakHouse.asm +++ b/data/maps/objects/HaitekuImposterOakHouse.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/HaitekuImposterOakHouse.asm", ROMX HaitekuImposterOakHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 7, HAITEKU, wOverworldMapBlocks + 47 - warp_event 5, 7, 7, HAITEKU, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, HAITEKU, 7, 47 + warp_event 5, 7, HAITEKU, 7, 47 - db 0 ; bg events + def_bg_events - db 2 ; person events - object_event 7, 3, SPRITE_EVIL_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 2, SPRITE_POKEFAN_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 7, 3, SPRITE_EVIL_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 2, SPRITE_POKEFAN_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 HaitekuImposterOakHouse_Blocks:: INCBIN "maps/HaitekuImposterOakHouse.blk" diff --git a/data/maps/objects/HaitekuLeague1F.asm b/data/maps/objects/HaitekuLeague1F.asm index c00342d..08a5e29 100644 --- a/data/maps/objects/HaitekuLeague1F.asm +++ b/data/maps/objects/HaitekuLeague1F.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/HaitekuLeague1F.asm", ROMX HaitekuLeague1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 3, 15, 2, HAITEKU, wOverworldMapBlocks + 82 - warp_event 4, 15, 3, HAITEKU, wOverworldMapBlocks + 83 - warp_event 7, 1, 1, HAITEKU_LEAGUE_2F, wOverworldMapBlocks + 14 + def_warp_events + warp_event 3, 15, HAITEKU, 2, 82 + warp_event 4, 15, HAITEKU, 3, 83 + warp_event 7, 1, HAITEKU_LEAGUE_2F, 1, 14 - db 0 ; bg events + def_bg_events - db 5 ; person events - object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 HaitekuLeague1F_Blocks:: INCBIN "maps/HaitekuLeague1F.blk" diff --git a/data/maps/objects/HaitekuLeague2F.asm b/data/maps/objects/HaitekuLeague2F.asm index 5eadc64..0e5667a 100644 --- a/data/maps/objects/HaitekuLeague2F.asm +++ b/data/maps/objects/HaitekuLeague2F.asm @@ -7,17 +7,17 @@ SECTION "data/maps/objects/HaitekuLeague2F.asm", ROMX HaitekuLeague2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 7, 15, 3, HAITEKU_LEAGUE_1F, wOverworldMapBlocks + 92 + def_warp_events + warp_event 7, 15, HAITEKU_LEAGUE_1F, 3, 92 - db 0 ; bg events + def_bg_events - db 5 ; person events - object_event 4, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 8, 12, SPRITE_COOLTRAINER_F, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 10, SPRITE_24, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 7, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 4, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 8, 12, SPRITE_COOLTRAINER_F, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 10, SPRITE_24, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 7, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 HaitekuLeague2F_Blocks:: INCBIN "maps/HaitekuLeague2F.blk" diff --git a/data/maps/objects/HaitekuMart.asm b/data/maps/objects/HaitekuMart.asm index 5570978..e08b681 100644 --- a/data/maps/objects/HaitekuMart.asm +++ b/data/maps/objects/HaitekuMart.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/HaitekuMart.asm", ROMX HaitekuMart_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 4, HAITEKU, wOverworldMapBlocks + 51 - warp_event 5, 7, 4, HAITEKU, wOverworldMapBlocks + 51 + def_warp_events + warp_event 4, 7, HAITEKU, 4, 51 + warp_event 5, 7, HAITEKU, 4, 51 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_SAILOR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_SAILOR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 HaitekuMart_Blocks:: INCBIN "maps/HaitekuMart.blk" diff --git a/data/maps/objects/HaitekuPokecenter1F.asm b/data/maps/objects/HaitekuPokecenter1F.asm index e17a4aa..1f776a7 100644 --- a/data/maps/objects/HaitekuPokecenter1F.asm +++ b/data/maps/objects/HaitekuPokecenter1F.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/HaitekuPokecenter1F.asm", ROMX HaitekuPokecenter1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 5, 7, 1, HAITEKU, wOverworldMapBlocks + 59 - warp_event 6, 7, 1, HAITEKU, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, HAITEKU_POKECENTER_2F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 5, 7, HAITEKU, 1, 59 + warp_event 6, 7, HAITEKU, 1, 60 + warp_event 0, 7, HAITEKU_POKECENTER_2F, 1, 57 - db 0 ; bg events + def_bg_events - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_FISHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_SAILOR, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_FISHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_SAILOR, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 HaitekuPokecenter1F_Blocks:: INCBIN "maps/HaitekuPokecenter1F.blk" diff --git a/data/maps/objects/HaitekuPokecenter2F.asm b/data/maps/objects/HaitekuPokecenter2F.asm index ef3abc9..3b24a1d 100644 --- a/data/maps/objects/HaitekuPokecenter2F.asm +++ b/data/maps/objects/HaitekuPokecenter2F.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/HaitekuPokecenter2F.asm", ROMX HaitekuPokecenter2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 0, 7, 3, HAITEKU_POKECENTER_1F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 0, 7, HAITEKU_POKECENTER_1F, 3, 57 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 HaitekuPokecenter2F_Blocks:: INCBIN "maps/HaitekuPokecenter2F.blk" diff --git a/data/maps/objects/HaitekuWestRoute.asm b/data/maps/objects/HaitekuWestRoute.asm index 52b9e0d..f78213c 100644 --- a/data/maps/objects/HaitekuWestRoute.asm +++ b/data/maps/objects/HaitekuWestRoute.asm @@ -9,11 +9,11 @@ SECTION "data/maps/objects/HaitekuWestRoute.asm", ROMX HaitekuWestRoute_MapEvents:: dw $4000 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events HaitekuWestRoute_Blocks:: INCBIN "maps/HaitekuWestRoute.blk" diff --git a/data/maps/objects/HaitekuWestRouteGate.asm b/data/maps/objects/HaitekuWestRouteGate.asm index 77774c2..eeb7e90 100644 --- a/data/maps/objects/HaitekuWestRouteGate.asm +++ b/data/maps/objects/HaitekuWestRouteGate.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/HaitekuWestRouteGate.asm", ROMX HaitekuWestRouteGate_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 4, 7, 1, HAITEKU_WEST_ROUTE_OCEAN, wOverworldMapBlocks + 47 - warp_event 5, 7, 2, HAITEKU_WEST_ROUTE_OCEAN, wOverworldMapBlocks + 47 - warp_event 4, 0, 8, SOUTH, wOverworldMapBlocks + 14 - warp_event 5, 0, 9, SOUTH, wOverworldMapBlocks + 14 + def_warp_events + warp_event 4, 7, HAITEKU_WEST_ROUTE_OCEAN, 1, 47 + warp_event 5, 7, HAITEKU_WEST_ROUTE_OCEAN, 2, 47 + warp_event 4, 0, SOUTH, 8, 14 + warp_event 5, 0, SOUTH, 9, 14 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events HaitekuWestRouteGate_Blocks:: INCBIN "maps/HaitekuWestRouteGate.blk" diff --git a/data/maps/objects/HaitekuWestRouteOcean.asm b/data/maps/objects/HaitekuWestRouteOcean.asm index e3edb54..eee5980 100644 --- a/data/maps/objects/HaitekuWestRouteOcean.asm +++ b/data/maps/objects/HaitekuWestRouteOcean.asm @@ -9,13 +9,13 @@ SECTION "data/maps/objects/HaitekuWestRouteOcean.asm", ROMX HaitekuWestRouteOcean_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 10, 9, 1, HAITEKU_WEST_ROUTE_GATE, wOverworldMapBlocks + 86 - warp_event 11, 9, 2, HAITEKU_WEST_ROUTE_GATE, wOverworldMapBlocks + 86 + def_warp_events + warp_event 10, 9, HAITEKU_WEST_ROUTE_GATE, 1, 86 + warp_event 11, 9, HAITEKU_WEST_ROUTE_GATE, 2, 86 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events HaitekuWestRouteOcean_Blocks:: INCBIN "maps/HaitekuWestRouteOcean.blk" diff --git a/data/maps/objects/Kanto.asm b/data/maps/objects/Kanto.asm index 6575e28..c6b49e1 100644 --- a/data/maps/objects/Kanto.asm +++ b/data/maps/objects/Kanto.asm @@ -9,53 +9,53 @@ SECTION "data/maps/objects/Kanto.asm", ROMX Kanto_MapEvents:: dw $4000 ; unknown - db 30 ; warp events - warp_event 40, 3, 1, KANTO_CERULEAN_HOUSE, wOverworldMapBlocks + 93 - warp_event 13, 4, 1, KANTO_POKECENTER_1F, wOverworldMapBlocks + 115 - warp_event 4, 5, 1, KANTO_LEAGUE_1F, wOverworldMapBlocks + 111 - warp_event 5, 5, 2, KANTO_LEAGUE_1F, wOverworldMapBlocks + 111 - warp_event 51, 11, 1, KANTO_LAVENDER_HOUSE, wOverworldMapBlocks + 242 - warp_event 14, 17, 1, KANTO_CELADON_MART_1F, wOverworldMapBlocks + 332 - warp_event 15, 17, 1, KANTO_CELADON_MART_1F, wOverworldMapBlocks + 332 - warp_event 3, 18, 1, KANTO_MART, wOverworldMapBlocks + 362 - warp_event 22, 19, 1, KANTO_GAMEFREAK_HQ_1, wOverworldMapBlocks + 372 - warp_event 23, 19, 2, KANTO_GAMEFREAK_HQ_1, wOverworldMapBlocks + 372 - warp_event 30, 19, 1, KANTO_SILPH_CO, wOverworldMapBlocks + 376 - warp_event 31, 19, 2, KANTO_SILPH_CO, wOverworldMapBlocks + 376 - warp_event 16, 23, 1, KANTO_VIRIDIAN_HOUSE, wOverworldMapBlocks + 441 - warp_event 29, 23, 1, KANTO_GAME_CORNER, wOverworldMapBlocks + 447 - warp_event 34, 23, 1, KANTO_GAME_CORNER_PRIZES, wOverworldMapBlocks + 450 - warp_event 40, 23, 1, KANTO_DINER, wOverworldMapBlocks + 453 - warp_event 52, 23, 1, KANTO_SCHOOL, wOverworldMapBlocks + 459 - warp_event 53, 23, 2, KANTO_SCHOOL, wOverworldMapBlocks + 459 - warp_event 38, 29, 1, KANTO_HOSPITAL, wOverworldMapBlocks + 560 - warp_event 49, 30, 1, KANTO_POKECENTER_2_1F, wOverworldMapBlocks + 601 - warp_event 5, 38, 1, KANTO_REDS_HOUSE, wOverworldMapBlocks + 723 - warp_event 13, 38, 1, KANTO_GREENS_HOUSE_1F, wOverworldMapBlocks + 727 - warp_event 39, 38, 1, KANTO_ELDERS_HOUSE, wOverworldMapBlocks + 740 - warp_event 12, 43, 1, KANTO_OAKS_LAB, wOverworldMapBlocks + 799 - warp_event 13, 43, 2, KANTO_OAKS_LAB, wOverworldMapBlocks + 799 - warp_event 52, 45, 1, KANTO_LEAGUE_2_1F, wOverworldMapBlocks + 855 - warp_event 53, 45, 2, KANTO_LEAGUE_2_1F, wOverworldMapBlocks + 855 - warp_event 45, 46, 1, KANTO_FISHING_GURU, wOverworldMapBlocks + 887 - warp_event 6, 27, 3, ROUTE_SILENT_EAST_GATE, wOverworldMapBlocks + 508 - warp_event 21, 13, 5, KANTO_GAMEFREAK_HQ_1, wOverworldMapBlocks + 263 + def_warp_events + warp_event 40, 3, KANTO_CERULEAN_HOUSE, 1, 93 + warp_event 13, 4, KANTO_POKECENTER_1F, 1, 115 + warp_event 4, 5, KANTO_LEAGUE_1F, 1, 111 + warp_event 5, 5, KANTO_LEAGUE_1F, 2, 111 + warp_event 51, 11, KANTO_LAVENDER_HOUSE, 1, 242 + warp_event 14, 17, KANTO_CELADON_MART_1F, 1, 332 + warp_event 15, 17, KANTO_CELADON_MART_1F, 1, 332 + warp_event 3, 18, KANTO_MART, 1, 362 + warp_event 22, 19, KANTO_GAMEFREAK_HQ_1, 1, 372 + warp_event 23, 19, KANTO_GAMEFREAK_HQ_1, 2, 372 + warp_event 30, 19, KANTO_SILPH_CO, 1, 376 + warp_event 31, 19, KANTO_SILPH_CO, 2, 376 + warp_event 16, 23, KANTO_VIRIDIAN_HOUSE, 1, 441 + warp_event 29, 23, KANTO_GAME_CORNER, 1, 447 + warp_event 34, 23, KANTO_GAME_CORNER_PRIZES, 1, 450 + warp_event 40, 23, KANTO_DINER, 1, 453 + warp_event 52, 23, KANTO_SCHOOL, 1, 459 + warp_event 53, 23, KANTO_SCHOOL, 2, 459 + warp_event 38, 29, KANTO_HOSPITAL, 1, 560 + warp_event 49, 30, KANTO_POKECENTER_2_1F, 1, 601 + warp_event 5, 38, KANTO_REDS_HOUSE, 1, 723 + warp_event 13, 38, KANTO_GREENS_HOUSE_1F, 1, 727 + warp_event 39, 38, KANTO_ELDERS_HOUSE, 1, 740 + warp_event 12, 43, KANTO_OAKS_LAB, 1, 799 + warp_event 13, 43, KANTO_OAKS_LAB, 2, 799 + warp_event 52, 45, KANTO_LEAGUE_2_1F, 1, 855 + warp_event 53, 45, KANTO_LEAGUE_2_1F, 2, 855 + warp_event 45, 46, KANTO_FISHING_GURU, 1, 887 + warp_event 6, 27, ROUTE_SILENT_EAST_GATE, 3, 508 + warp_event 21, 13, KANTO_GAMEFREAK_HQ_1, 5, 263 - db 12 ; bg events - bg_event 14, 4, 0, 1 - bg_event 42, 4, 0, 2 - bg_event 54, 8, 0, 3 - bg_event 4, 18, 0, 4 + def_bg_events + bg_event 14, 4, 0, 1 + bg_event 42, 4, 0, 2 + bg_event 54, 8, 0, 3 + bg_event 4, 18, 0, 4 bg_event 18, 18, 0, 5 bg_event 26, 19, 0, 6 bg_event 46, 18, 0, 7 - bg_event 8, 38, 0, 8 + bg_event 8, 38, 0, 8 bg_event 16, 38, 0, 9 - bg_event 6, 41, 0, 10 + bg_event 6, 41, 0, 10 bg_event 12, 45, 0, 11 bg_event 50, 30, 0, 12 - db 0 ; person events + def_object_events Kanto_Blocks:: INCBIN "maps/Kanto.blk" diff --git a/data/maps/objects/KantoCeladonElevator.asm b/data/maps/objects/KantoCeladonElevator.asm index 391ba9e..fe9ccaa 100644 --- a/data/maps/objects/KantoCeladonElevator.asm +++ b/data/maps/objects/KantoCeladonElevator.asm @@ -7,13 +7,13 @@ SECTION "data/maps/objects/KantoCeladonElevator.asm", ROMX KantoCeladonElevator_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 1, 3, 4, KANTO_CELADON_MART_1F, wOverworldMapBlocks + 17 - warp_event 2, 3, 4, KANTO_CELADON_MART_1F, wOverworldMapBlocks + 18 + def_warp_events + warp_event 1, 3, KANTO_CELADON_MART_1F, 4, 17 + warp_event 2, 3, KANTO_CELADON_MART_1F, 4, 18 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events KantoCeladonElevator_Blocks:: INCBIN "maps/KantoCeladonElevator.blk" diff --git a/data/maps/objects/KantoCeladonMart1F.asm b/data/maps/objects/KantoCeladonMart1F.asm index e97c1a2..6216621 100644 --- a/data/maps/objects/KantoCeladonMart1F.asm +++ b/data/maps/objects/KantoCeladonMart1F.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/KantoCeladonMart1F.asm", ROMX KantoCeladonMart1F_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 13, 7, 6, KANTO, wOverworldMapBlocks + 63 - warp_event 14, 7, 7, KANTO, wOverworldMapBlocks + 64 - warp_event 15, 0, 2, KANTO_CELADON_MART_2F, wOverworldMapBlocks + 22 - warp_event 2, 0, 2, KANTO_CELADON_ELEVATOR, wOverworldMapBlocks + 16 + def_warp_events + warp_event 13, 7, KANTO, 6, 63 + warp_event 14, 7, KANTO, 7, 64 + warp_event 15, 0, KANTO_CELADON_MART_2F, 2, 22 + warp_event 2, 0, KANTO_CELADON_ELEVATOR, 2, 16 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 7, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 7, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoCeladonMart1F_Blocks:: INCBIN "maps/KantoCeladonMart1F.blk" diff --git a/data/maps/objects/KantoCeladonMart2F.asm b/data/maps/objects/KantoCeladonMart2F.asm index 306e463..fd1a7ba 100644 --- a/data/maps/objects/KantoCeladonMart2F.asm +++ b/data/maps/objects/KantoCeladonMart2F.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/KantoCeladonMart2F.asm", ROMX KantoCeladonMart2F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 12, 0, 1, KANTO_CELADON_MART_3F, wOverworldMapBlocks + 21 - warp_event 15, 0, 3, KANTO_CELADON_MART_1F, wOverworldMapBlocks + 22 - warp_event 2, 0, 1, KANTO_CELADON_ELEVATOR, wOverworldMapBlocks + 16 + def_warp_events + warp_event 12, 0, KANTO_CELADON_MART_3F, 1, 21 + warp_event 15, 0, KANTO_CELADON_MART_1F, 3, 22 + warp_event 2, 0, KANTO_CELADON_ELEVATOR, 1, 16 - db 0 ; bg events + def_bg_events - db 2 ; person events - object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 5, SPRITE_LASS, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 5, SPRITE_LASS, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoCeladonMart2F_Blocks:: INCBIN "maps/KantoCeladonMart2F.blk" diff --git a/data/maps/objects/KantoCeladonMart3F.asm b/data/maps/objects/KantoCeladonMart3F.asm index 86ed78e..291b565 100644 --- a/data/maps/objects/KantoCeladonMart3F.asm +++ b/data/maps/objects/KantoCeladonMart3F.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/KantoCeladonMart3F.asm", ROMX KantoCeladonMart3F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 12, 0, 1, KANTO_CELADON_MART_2F, wOverworldMapBlocks + 21 - warp_event 15, 0, 2, KANTO_CELADON_MART_4F, wOverworldMapBlocks + 22 - warp_event 2, 0, 1, KANTO_CELADON_ELEVATOR, wOverworldMapBlocks + 16 + def_warp_events + warp_event 12, 0, KANTO_CELADON_MART_2F, 1, 21 + warp_event 15, 0, KANTO_CELADON_MART_4F, 2, 22 + warp_event 2, 0, KANTO_CELADON_ELEVATOR, 1, 16 - db 0 ; bg events + def_bg_events - db 2 ; person events - object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 5, SPRITE_GIRL, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 5, SPRITE_GIRL, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoCeladonMart3F_Blocks:: INCBIN "maps/KantoCeladonMart3F.blk" diff --git a/data/maps/objects/KantoCeladonMart4F.asm b/data/maps/objects/KantoCeladonMart4F.asm index db1c820..11de06c 100644 --- a/data/maps/objects/KantoCeladonMart4F.asm +++ b/data/maps/objects/KantoCeladonMart4F.asm @@ -7,17 +7,17 @@ SECTION "data/maps/objects/KantoCeladonMart4F.asm", ROMX KantoCeladonMart4F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 12, 0, 1, KANTO_CELADON_MART_5F, wOverworldMapBlocks + 21 - warp_event 15, 0, 2, KANTO_CELADON_MART_3F, wOverworldMapBlocks + 22 - warp_event 2, 0, 1, KANTO_CELADON_ELEVATOR, wOverworldMapBlocks + 16 + def_warp_events + warp_event 12, 0, KANTO_CELADON_MART_5F, 1, 21 + warp_event 15, 0, KANTO_CELADON_MART_3F, 2, 22 + warp_event 2, 0, KANTO_CELADON_ELEVATOR, 1, 16 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 14, 5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 8, 5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 14, 5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 8, 5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoCeladonMart4F_Blocks:: INCBIN "maps/KantoCeladonMart4F.blk" diff --git a/data/maps/objects/KantoCeladonMart5F.asm b/data/maps/objects/KantoCeladonMart5F.asm index b783876..01ddf4d 100644 --- a/data/maps/objects/KantoCeladonMart5F.asm +++ b/data/maps/objects/KantoCeladonMart5F.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/KantoCeladonMart5F.asm", ROMX KantoCeladonMart5F_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 13, 0, 1, KANTO_CELADON_MART_4F, wOverworldMapBlocks + 21 - warp_event 2, 0, 1, KANTO_CELADON_ELEVATOR, wOverworldMapBlocks + 16 + def_warp_events + warp_event 13, 0, KANTO_CELADON_MART_4F, 1, 21 + warp_event 2, 0, KANTO_CELADON_ELEVATOR, 1, 16 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 8, 3, SPRITE_SIDON, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 8, 3, SPRITE_SIDON, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoCeladonMart5F_Blocks:: INCBIN "maps/KantoCeladonMart5F.blk" diff --git a/data/maps/objects/KantoCeruleanHouse.asm b/data/maps/objects/KantoCeruleanHouse.asm index 93d6c59..2a3735f 100644 --- a/data/maps/objects/KantoCeruleanHouse.asm +++ b/data/maps/objects/KantoCeruleanHouse.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/KantoCeruleanHouse.asm", ROMX KantoCeruleanHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 1, KANTO, wOverworldMapBlocks + 47 - warp_event 5, 7, 1, KANTO, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, KANTO, 1, 47 + warp_event 5, 7, KANTO, 1, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 3, 3, SPRITE_FISHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 3, 3, SPRITE_FISHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoCeruleanHouse_Blocks:: INCBIN "maps/KantoCeruleanHouse.blk" diff --git a/data/maps/objects/KantoDiner.asm b/data/maps/objects/KantoDiner.asm index b161d29..5f04c7d 100644 --- a/data/maps/objects/KantoDiner.asm +++ b/data/maps/objects/KantoDiner.asm @@ -7,13 +7,13 @@ SECTION "data/maps/objects/KantoDiner.asm", ROMX KantoDiner_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 16, KANTO, wOverworldMapBlocks + 47 - warp_event 5, 7, 16, KANTO, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, KANTO, 16, 47 + warp_event 5, 7, KANTO, 16, 47 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events KantoDiner_Blocks:: INCBIN "maps/KantoDiner.blk" diff --git a/data/maps/objects/KantoEastRoute.asm b/data/maps/objects/KantoEastRoute.asm index eb8605f..6ebb087 100644 --- a/data/maps/objects/KantoEastRoute.asm +++ b/data/maps/objects/KantoEastRoute.asm @@ -9,13 +9,13 @@ SECTION "data/maps/objects/KantoEastRoute.asm", ROMX KantoEastRoute_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 28, 5, 1, STAND_ROUTE_GATE_KANTO, wOverworldMapBlocks + 93 - warp_event 29, 5, 2, STAND_ROUTE_GATE_KANTO, wOverworldMapBlocks + 93 + def_warp_events + warp_event 28, 5, STAND_ROUTE_GATE_KANTO, 1, 93 + warp_event 29, 5, STAND_ROUTE_GATE_KANTO, 2, 93 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events KantoEastRoute_Blocks:: INCBIN "maps/KantoEastRoute.blk" diff --git a/data/maps/objects/KantoEldersHouse.asm b/data/maps/objects/KantoEldersHouse.asm index 7ea0b94..7cde195 100644 --- a/data/maps/objects/KantoEldersHouse.asm +++ b/data/maps/objects/KantoEldersHouse.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/KantoEldersHouse.asm", ROMX KantoEldersHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 23, KANTO, wOverworldMapBlocks + 47 - warp_event 5, 7, 23, KANTO, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, KANTO, 23, 47 + warp_event 5, 7, KANTO, 23, 47 - db 0 ; bg events + def_bg_events - db 2 ; person events - object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 5, SPRITE_GRANNY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 5, SPRITE_GRANNY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoEldersHouse_Blocks:: INCBIN "maps/KantoEldersHouse.blk" diff --git a/data/maps/objects/KantoFishingGuru.asm b/data/maps/objects/KantoFishingGuru.asm index a5a2312..6aecf66 100644 --- a/data/maps/objects/KantoFishingGuru.asm +++ b/data/maps/objects/KantoFishingGuru.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/KantoFishingGuru.asm", ROMX KantoFishingGuru_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 3, 7, 28, KANTO, wOverworldMapBlocks + 46 - warp_event 4, 7, 28, KANTO, wOverworldMapBlocks + 47 + def_warp_events + warp_event 3, 7, KANTO, 28, 46 + warp_event 4, 7, KANTO, 28, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 4, 3, SPRITE_FISHING_GURU, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 4, 3, SPRITE_FISHING_GURU, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoFishingGuru_Blocks:: INCBIN "maps/KantoFishingGuru.blk" diff --git a/data/maps/objects/KantoGameCorner.asm b/data/maps/objects/KantoGameCorner.asm index 424a77a..4e09abe 100644 --- a/data/maps/objects/KantoGameCorner.asm +++ b/data/maps/objects/KantoGameCorner.asm @@ -7,25 +7,25 @@ SECTION "data/maps/objects/KantoGameCorner.asm", ROMX KantoGameCorner_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 8, 13, 14, KANTO, wOverworldMapBlocks + 117 - warp_event 9, 13, 14, KANTO, wOverworldMapBlocks + 117 - warp_event 10, 13, 14, KANTO, wOverworldMapBlocks + 118 - warp_event 11, 13, 14, KANTO, wOverworldMapBlocks + 118 + def_warp_events + warp_event 8, 13, KANTO, 14, 117 + warp_event 9, 13, KANTO, 14, 117 + warp_event 10, 13, KANTO, 14, 118 + warp_event 11, 13, KANTO, 14, 118 - db 0 ; bg events + def_bg_events - db 10 ; person events - object_event 3, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 6, SPRITE_POKEFAN_M, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 7, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 8, SPRITE_ROCKER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 11, 6, SPRITE_GIRL, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 11, 8, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_FISHER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 17, 9, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 3, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 6, SPRITE_POKEFAN_M, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 7, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 8, SPRITE_ROCKER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 11, 6, SPRITE_GIRL, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 11, 8, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_FISHER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 17, 9, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoGameCorner_Blocks:: INCBIN "maps/KantoGameCorner.blk" diff --git a/data/maps/objects/KantoGameCornerPrizes.asm b/data/maps/objects/KantoGameCornerPrizes.asm index b21ca78..7393049 100644 --- a/data/maps/objects/KantoGameCornerPrizes.asm +++ b/data/maps/objects/KantoGameCornerPrizes.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/KantoGameCornerPrizes.asm", ROMX KantoGameCornerPrizes_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 15, KANTO, wOverworldMapBlocks + 47 - warp_event 5, 7, 15, KANTO, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, KANTO, 15, 47 + warp_event 5, 7, KANTO, 15, 47 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 2, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoGameCornerPrizes_Blocks:: INCBIN "maps/KantoGameCornerPrizes.blk" diff --git a/data/maps/objects/KantoGamefreakHQ1.asm b/data/maps/objects/KantoGamefreakHQ1.asm index 2964f40..055b82b 100644 --- a/data/maps/objects/KantoGamefreakHQ1.asm +++ b/data/maps/objects/KantoGamefreakHQ1.asm @@ -7,20 +7,20 @@ SECTION "data/maps/objects/KantoGamefreakHQ1.asm", ROMX KantoGamefreakHQ1_MapEvents:: dw $4000 ; unknown - db 5 ; warp events - warp_event 4, 11, 9, KANTO, wOverworldMapBlocks + 63 - warp_event 5, 11, 10, KANTO, wOverworldMapBlocks + 63 - warp_event 7, 1, 2, KANTO_GAMEFREAK_HQ_2, wOverworldMapBlocks + 14 - warp_event 2, 1, 3, KANTO_GAMEFREAK_HQ_2, wOverworldMapBlocks + 12 - warp_event 4, 0, 30, KANTO, wOverworldMapBlocks + 13 + def_warp_events + warp_event 4, 11, KANTO, 9, 63 + warp_event 5, 11, KANTO, 10, 63 + warp_event 7, 1, KANTO_GAMEFREAK_HQ_2, 2, 14 + warp_event 2, 1, KANTO_GAMEFREAK_HQ_2, 3, 12 + warp_event 4, 0, KANTO, 30, 13 - db 0 ; bg events + def_bg_events - db 4 ; person events - object_event 1, 5, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 5, SPRITE_SIDON, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 8, SPRITE_PIPPI, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 7, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 1, 5, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 5, SPRITE_SIDON, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 8, SPRITE_PIPPI, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 7, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoGamefreakHQ1_Blocks:: INCBIN "maps/KantoGamefreakHQ1.blk" diff --git a/data/maps/objects/KantoGamefreakHQ2.asm b/data/maps/objects/KantoGamefreakHQ2.asm index f419688..ba8687a 100644 --- a/data/maps/objects/KantoGamefreakHQ2.asm +++ b/data/maps/objects/KantoGamefreakHQ2.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/KantoGamefreakHQ2.asm", ROMX KantoGamefreakHQ2_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 6, 1, 1, KANTO_GAMEFREAK_HQ_3, wOverworldMapBlocks + 14 - warp_event 7, 1, 3, KANTO_GAMEFREAK_HQ_1, wOverworldMapBlocks + 14 - warp_event 2, 1, 4, KANTO_GAMEFREAK_HQ_1, wOverworldMapBlocks + 12 - warp_event 4, 1, 4, KANTO_GAMEFREAK_HQ_3, wOverworldMapBlocks + 13 + def_warp_events + warp_event 6, 1, KANTO_GAMEFREAK_HQ_3, 1, 14 + warp_event 7, 1, KANTO_GAMEFREAK_HQ_1, 3, 14 + warp_event 2, 1, KANTO_GAMEFREAK_HQ_1, 4, 12 + warp_event 4, 1, KANTO_GAMEFREAK_HQ_3, 4, 13 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 2, 4, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 4, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoGamefreakHQ2_Blocks:: INCBIN "maps/KantoGamefreakHQ2.blk" diff --git a/data/maps/objects/KantoGamefreakHQ3.asm b/data/maps/objects/KantoGamefreakHQ3.asm index 4e36ec7..4797f26 100644 --- a/data/maps/objects/KantoGamefreakHQ3.asm +++ b/data/maps/objects/KantoGamefreakHQ3.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/KantoGamefreakHQ3.asm", ROMX KantoGamefreakHQ3_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 6, 1, 1, KANTO_GAMEFREAK_HQ_2, wOverworldMapBlocks + 14 - warp_event 7, 1, 2, KANTO_GAMEFREAK_HQ_4, wOverworldMapBlocks + 14 - warp_event 2, 1, 3, KANTO_GAMEFREAK_HQ_4, wOverworldMapBlocks + 12 - warp_event 4, 1, 4, KANTO_GAMEFREAK_HQ_2, wOverworldMapBlocks + 13 + def_warp_events + warp_event 6, 1, KANTO_GAMEFREAK_HQ_2, 1, 14 + warp_event 7, 1, KANTO_GAMEFREAK_HQ_4, 2, 14 + warp_event 2, 1, KANTO_GAMEFREAK_HQ_4, 3, 12 + warp_event 4, 1, KANTO_GAMEFREAK_HQ_2, 4, 13 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 0, 5, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 7, SPRITE_BURGLAR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 7, SPRITE_FISHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 0, 5, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 7, SPRITE_BURGLAR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 7, SPRITE_FISHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoGamefreakHQ3_Blocks:: INCBIN "maps/KantoGamefreakHQ3.blk" diff --git a/data/maps/objects/KantoGamefreakHQ4.asm b/data/maps/objects/KantoGamefreakHQ4.asm index fc1ee0f..916349e 100644 --- a/data/maps/objects/KantoGamefreakHQ4.asm +++ b/data/maps/objects/KantoGamefreakHQ4.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/KantoGamefreakHQ4.asm", ROMX KantoGamefreakHQ4_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 2, 7, 1, KANTO_GAMEFREAK_HQ_5, wOverworldMapBlocks + 42 - warp_event 6, 1, 2, KANTO_GAMEFREAK_HQ_3, wOverworldMapBlocks + 14 - warp_event 2, 1, 3, KANTO_GAMEFREAK_HQ_3, wOverworldMapBlocks + 12 + def_warp_events + warp_event 2, 7, KANTO_GAMEFREAK_HQ_5, 1, 42 + warp_event 6, 1, KANTO_GAMEFREAK_HQ_3, 2, 14 + warp_event 2, 1, KANTO_GAMEFREAK_HQ_3, 3, 12 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events KantoGamefreakHQ4_Blocks:: INCBIN "maps/KantoGamefreakHQ4.blk" diff --git a/data/maps/objects/KantoGamefreakHQ5.asm b/data/maps/objects/KantoGamefreakHQ5.asm index 96d02ca..80396a3 100644 --- a/data/maps/objects/KantoGamefreakHQ5.asm +++ b/data/maps/objects/KantoGamefreakHQ5.asm @@ -7,13 +7,13 @@ SECTION "data/maps/objects/KantoGamefreakHQ5.asm", ROMX KantoGamefreakHQ5_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 3, 7, 1, KANTO_GAMEFREAK_HQ_4, wOverworldMapBlocks + 42 - warp_event 4, 7, 1, KANTO_GAMEFREAK_HQ_4, wOverworldMapBlocks + 43 + def_warp_events + warp_event 3, 7, KANTO_GAMEFREAK_HQ_4, 1, 42 + warp_event 4, 7, KANTO_GAMEFREAK_HQ_4, 1, 43 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events KantoGamefreakHQ5_Blocks:: INCBIN "maps/KantoGamefreakHQ5.blk" diff --git a/data/maps/objects/KantoGreensHouse1F.asm b/data/maps/objects/KantoGreensHouse1F.asm index d6600b1..8bd2800 100644 --- a/data/maps/objects/KantoGreensHouse1F.asm +++ b/data/maps/objects/KantoGreensHouse1F.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/KantoGreensHouse1F.asm", ROMX KantoGreensHouse1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 2, 7, 22, KANTO, wOverworldMapBlocks + 42 - warp_event 3, 7, 22, KANTO, wOverworldMapBlocks + 42 - warp_event 7, 1, 1, KANTO_GREENS_HOUSE_2F, wOverworldMapBlocks + 14 + def_warp_events + warp_event 2, 7, KANTO, 22, 42 + warp_event 3, 7, KANTO, 22, 42 + warp_event 7, 1, KANTO_GREENS_HOUSE_2F, 1, 14 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 5, 3, SPRITE_0F, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 3, SPRITE_0F, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoGreensHouse1F_Blocks:: INCBIN "maps/KantoGreensHouse1F.blk" diff --git a/data/maps/objects/KantoGreensHouse2F.asm b/data/maps/objects/KantoGreensHouse2F.asm index a534362..8271e92 100644 --- a/data/maps/objects/KantoGreensHouse2F.asm +++ b/data/maps/objects/KantoGreensHouse2F.asm @@ -7,12 +7,12 @@ SECTION "data/maps/objects/KantoGreensHouse2F.asm", ROMX KantoGreensHouse2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 7, 1, 3, KANTO_GREENS_HOUSE_1F, wOverworldMapBlocks + 14 + def_warp_events + warp_event 7, 1, KANTO_GREENS_HOUSE_1F, 3, 14 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events KantoGreensHouse2F_Blocks:: INCBIN "maps/KantoGreensHouse2F.blk" diff --git a/data/maps/objects/KantoHospital.asm b/data/maps/objects/KantoHospital.asm index 252b56b..7a3c871 100644 --- a/data/maps/objects/KantoHospital.asm +++ b/data/maps/objects/KantoHospital.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/KantoHospital.asm", ROMX KantoHospital_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 1, 7, 19, KANTO, wOverworldMapBlocks + 57 - warp_event 2, 7, 19, KANTO, wOverworldMapBlocks + 58 + def_warp_events + warp_event 1, 7, KANTO, 19, 57 + warp_event 2, 7, KANTO, 19, 58 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 6, SPRITE_ROCKER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 12, 6, SPRITE_GIRL, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 6, SPRITE_ROCKER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 12, 6, SPRITE_GIRL, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoHospital_Blocks:: INCBIN "maps/KantoHospital.blk" diff --git a/data/maps/objects/KantoLavenderHouse.asm b/data/maps/objects/KantoLavenderHouse.asm index e74f072..ad8ea25 100644 --- a/data/maps/objects/KantoLavenderHouse.asm +++ b/data/maps/objects/KantoLavenderHouse.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/KantoLavenderHouse.asm", ROMX KantoLavenderHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 5, KANTO, wOverworldMapBlocks + 47 - warp_event 5, 7, 5, KANTO, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, KANTO, 5, 47 + warp_event 5, 7, KANTO, 5, 47 - db 0 ; bg events + def_bg_events - db 2 ; person events - object_event 7, 3, SPRITE_POKEFAN_M, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 5, SPRITE_POKEFAN_F, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 7, 3, SPRITE_POKEFAN_M, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 5, SPRITE_POKEFAN_F, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoLavenderHouse_Blocks:: INCBIN "maps/KantoLavenderHouse.blk" diff --git a/data/maps/objects/KantoLeague1F.asm b/data/maps/objects/KantoLeague1F.asm index ea51b73..e583d6a 100644 --- a/data/maps/objects/KantoLeague1F.asm +++ b/data/maps/objects/KantoLeague1F.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/KantoLeague1F.asm", ROMX KantoLeague1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 3, 15, 3, KANTO, wOverworldMapBlocks + 82 - warp_event 4, 15, 4, KANTO, wOverworldMapBlocks + 83 - warp_event 7, 1, 1, KANTO_LEAGUE_2F, wOverworldMapBlocks + 14 + def_warp_events + warp_event 3, 15, KANTO, 3, 82 + warp_event 4, 15, KANTO, 4, 83 + warp_event 7, 1, KANTO_LEAGUE_2F, 1, 14 - db 0 ; bg events + def_bg_events - db 5 ; person events - object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 KantoLeague1F_Blocks:: INCBIN "maps/KantoLeague1F.blk" diff --git a/data/maps/objects/KantoLeague21F.asm b/data/maps/objects/KantoLeague21F.asm index a773116..01152fb 100644 --- a/data/maps/objects/KantoLeague21F.asm +++ b/data/maps/objects/KantoLeague21F.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/KantoLeague21F.asm", ROMX KantoLeague21F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 3, 15, 26, KANTO, wOverworldMapBlocks + 82 - warp_event 4, 15, 27, KANTO, wOverworldMapBlocks + 83 - warp_event 7, 1, 1, KANTO_LEAGUE_2_2F, wOverworldMapBlocks + 14 + def_warp_events + warp_event 3, 15, KANTO, 26, 82 + warp_event 4, 15, KANTO, 27, 83 + warp_event 7, 1, KANTO_LEAGUE_2_2F, 1, 14 - db 0 ; bg events + def_bg_events - db 5 ; person events - object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 KantoLeague21F_Blocks:: INCBIN "maps/KantoLeague21F.blk" diff --git a/data/maps/objects/KantoLeague22F.asm b/data/maps/objects/KantoLeague22F.asm index a45069b..20d0d5b 100644 --- a/data/maps/objects/KantoLeague22F.asm +++ b/data/maps/objects/KantoLeague22F.asm @@ -7,17 +7,17 @@ SECTION "data/maps/objects/KantoLeague22F.asm", ROMX KantoLeague22F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 7, 15, 3, KANTO_LEAGUE_2_1F, wOverworldMapBlocks + 92 + def_warp_events + warp_event 7, 15, KANTO_LEAGUE_2_1F, 3, 92 - db 0 ; bg events + def_bg_events - db 5 ; person events - object_event 4, 7, SPRITE_POKEFAN_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 4, 7, SPRITE_POKEFAN_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoLeague22F_Blocks:: INCBIN "maps/KantoLeague22F.blk" diff --git a/data/maps/objects/KantoLeague2F.asm b/data/maps/objects/KantoLeague2F.asm index d6e38f4..fb54ef0 100644 --- a/data/maps/objects/KantoLeague2F.asm +++ b/data/maps/objects/KantoLeague2F.asm @@ -7,17 +7,17 @@ SECTION "data/maps/objects/KantoLeague2F.asm", ROMX KantoLeague2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 7, 15, 3, KANTO_LEAGUE_1F, wOverworldMapBlocks + 92 + def_warp_events + warp_event 7, 15, KANTO_LEAGUE_1F, 3, 92 - db 0 ; bg events + def_bg_events - db 5 ; person events - object_event 4, 7, SPRITE_RED, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 4, 7, SPRITE_RED, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoLeague2F_Blocks:: INCBIN "maps/KantoLeague2F.blk" diff --git a/data/maps/objects/KantoMart.asm b/data/maps/objects/KantoMart.asm index 0ad9314..82fcc26 100644 --- a/data/maps/objects/KantoMart.asm +++ b/data/maps/objects/KantoMart.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/KantoMart.asm", ROMX KantoMart_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 8, KANTO, wOverworldMapBlocks + 59 - warp_event 5, 7, 8, KANTO, wOverworldMapBlocks + 59 + def_warp_events + warp_event 4, 7, KANTO, 8, 59 + warp_event 5, 7, KANTO, 8, 59 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_TWIN, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_GRAMPS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_TWIN, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_GRAMPS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoMart_Blocks:: INCBIN "maps/KantoMart.blk" diff --git a/data/maps/objects/KantoOaksLab.asm b/data/maps/objects/KantoOaksLab.asm index 2760121..05e927c 100644 --- a/data/maps/objects/KantoOaksLab.asm +++ b/data/maps/objects/KantoOaksLab.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/KantoOaksLab.asm", ROMX KantoOaksLab_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 3, 7, 24, KANTO, wOverworldMapBlocks + 42 - warp_event 4, 7, 25, KANTO, wOverworldMapBlocks + 43 + def_warp_events + warp_event 3, 7, KANTO, 24, 42 + warp_event 4, 7, KANTO, 25, 43 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 3, 2, SPRITE_NANAMI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 3, 2, SPRITE_NANAMI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoOaksLab_Blocks:: INCBIN "maps/KantoOaksLab.blk" diff --git a/data/maps/objects/KantoPokecenter1F.asm b/data/maps/objects/KantoPokecenter1F.asm index 1ee32fd..7bc25fa 100644 --- a/data/maps/objects/KantoPokecenter1F.asm +++ b/data/maps/objects/KantoPokecenter1F.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/KantoPokecenter1F.asm", ROMX KantoPokecenter1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 5, 7, 2, KANTO, wOverworldMapBlocks + 59 - warp_event 6, 7, 2, KANTO, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, KANTO_POKECENTER_2F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 5, 7, KANTO, 2, 59 + warp_event 6, 7, KANTO, 2, 60 + warp_event 0, 7, KANTO_POKECENTER_2F, 1, 57 - db 0 ; bg events + def_bg_events - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoPokecenter1F_Blocks:: INCBIN "maps/KantoPokecenter1F.blk" diff --git a/data/maps/objects/KantoPokecenter21F.asm b/data/maps/objects/KantoPokecenter21F.asm index 2e7a2ac..f75c7e1 100644 --- a/data/maps/objects/KantoPokecenter21F.asm +++ b/data/maps/objects/KantoPokecenter21F.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/KantoPokecenter21F.asm", ROMX KantoPokecenter21F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 5, 7, 20, KANTO, wOverworldMapBlocks + 59 - warp_event 6, 7, 20, KANTO, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, KANTO_POKECENTER_2_2F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 5, 7, KANTO, 20, 59 + warp_event 6, 7, KANTO, 20, 60 + warp_event 0, 7, KANTO_POKECENTER_2_2F, 1, 57 - db 0 ; bg events + def_bg_events - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoPokecenter21F_Blocks:: INCBIN "maps/KantoPokecenter21F.blk" diff --git a/data/maps/objects/KantoPokecenter22F.asm b/data/maps/objects/KantoPokecenter22F.asm index 1e46fe2..57c1396 100644 --- a/data/maps/objects/KantoPokecenter22F.asm +++ b/data/maps/objects/KantoPokecenter22F.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/KantoPokecenter22F.asm", ROMX KantoPokecenter22F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 0, 7, 3, KANTO_POKECENTER_2_1F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 0, 7, KANTO_POKECENTER_2_1F, 3, 57 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoPokecenter22F_Blocks:: INCBIN "maps/KantoPokecenter22F.blk" diff --git a/data/maps/objects/KantoPokecenter2F.asm b/data/maps/objects/KantoPokecenter2F.asm index 43a9070..78ee08c 100644 --- a/data/maps/objects/KantoPokecenter2F.asm +++ b/data/maps/objects/KantoPokecenter2F.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/KantoPokecenter2F.asm", ROMX KantoPokecenter2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 0, 7, 3, KANTO_POKECENTER_1F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 0, 7, KANTO_POKECENTER_1F, 3, 57 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoPokecenter2F_Blocks:: INCBIN "maps/KantoPokecenter2F.blk" diff --git a/data/maps/objects/KantoRedsHouse.asm b/data/maps/objects/KantoRedsHouse.asm index 7043e27..b9ab05e 100644 --- a/data/maps/objects/KantoRedsHouse.asm +++ b/data/maps/objects/KantoRedsHouse.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/KantoRedsHouse.asm", ROMX KantoRedsHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 21, KANTO, wOverworldMapBlocks + 47 - warp_event 5, 7, 21, KANTO, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, KANTO, 21, 47 + warp_event 5, 7, KANTO, 21, 47 - db 0 ; bg events + def_bg_events - db 2 ; person events - object_event 7, 3, SPRITE_SUPER_NERD, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 5, SPRITE_TEACHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 7, 3, SPRITE_SUPER_NERD, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 5, SPRITE_TEACHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoRedsHouse_Blocks:: INCBIN "maps/KantoRedsHouse.blk" diff --git a/data/maps/objects/KantoSchool.asm b/data/maps/objects/KantoSchool.asm index dcba623..ec3c000 100644 --- a/data/maps/objects/KantoSchool.asm +++ b/data/maps/objects/KantoSchool.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/KantoSchool.asm", ROMX KantoSchool_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 3, 15, 17, KANTO, wOverworldMapBlocks + 82 - warp_event 4, 15, 18, KANTO, wOverworldMapBlocks + 83 + def_warp_events + warp_event 3, 15, KANTO, 17, 82 + warp_event 4, 15, KANTO, 18, 83 - db 0 ; bg events + def_bg_events - db 5 ; person events - object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 KantoSchool_Blocks:: INCBIN "maps/KantoSchool.blk" diff --git a/data/maps/objects/KantoSilphCo.asm b/data/maps/objects/KantoSilphCo.asm index 38bd8ab..65049c9 100644 --- a/data/maps/objects/KantoSilphCo.asm +++ b/data/maps/objects/KantoSilphCo.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/KantoSilphCo.asm", ROMX KantoSilphCo_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 6, 15, 11, KANTO, wOverworldMapBlocks + 148 - warp_event 7, 15, 12, KANTO, wOverworldMapBlocks + 148 + def_warp_events + warp_event 6, 15, KANTO, 11, 148 + warp_event 7, 15, KANTO, 12, 148 - db 0 ; bg events + def_bg_events - db 2 ; person events - object_event 2, 2, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 22, 1, SPRITE_OFFICER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 2, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 22, 1, SPRITE_OFFICER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoSilphCo_Blocks:: INCBIN "maps/KantoSilphCo.blk" diff --git a/data/maps/objects/KantoUnusedArea.asm b/data/maps/objects/KantoUnusedArea.asm index 7429d38..3b1949e 100644 --- a/data/maps/objects/KantoUnusedArea.asm +++ b/data/maps/objects/KantoUnusedArea.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/KantoUnusedArea.asm", ROMX KantoUnusedArea_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events KantoUnusedArea_Blocks:: INCBIN "maps/KantoUnusedArea.blk" diff --git a/data/maps/objects/KantoViridianHouse.asm b/data/maps/objects/KantoViridianHouse.asm index 29bc41f..f30f726 100644 --- a/data/maps/objects/KantoViridianHouse.asm +++ b/data/maps/objects/KantoViridianHouse.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/KantoViridianHouse.asm", ROMX KantoViridianHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 13, KANTO, wOverworldMapBlocks + 47 - warp_event 5, 7, 13, KANTO, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, KANTO, 13, 47 + warp_event 5, 7, KANTO, 13, 47 - db 0 ; bg events + def_bg_events - db 2 ; person events - object_event 7, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 5, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 7, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 5, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 KantoViridianHouse_Blocks:: INCBIN "maps/KantoViridianHouse.blk" diff --git a/data/maps/objects/MtFuji.asm b/data/maps/objects/MtFuji.asm index 7271580..42896bc 100644 --- a/data/maps/objects/MtFuji.asm +++ b/data/maps/objects/MtFuji.asm @@ -8,11 +8,11 @@ SECTION "data/maps/objects/MtFuji.asm", ROMX MtFuji_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events MtFuji_Blocks:: INCBIN "maps/MtFuji.blk" diff --git a/data/maps/objects/MtFujiRoute.asm b/data/maps/objects/MtFujiRoute.asm index 9aad754..f2e6c08 100644 --- a/data/maps/objects/MtFujiRoute.asm +++ b/data/maps/objects/MtFujiRoute.asm @@ -9,11 +9,11 @@ SECTION "data/maps/objects/MtFujiRoute.asm", ROMX MtFujiRoute_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events MtFujiRoute_Blocks:: INCBIN "maps/MtFujiRoute.blk" diff --git a/data/maps/objects/Newtype.asm b/data/maps/objects/Newtype.asm index 6577531..da333e3 100644 --- a/data/maps/objects/Newtype.asm +++ b/data/maps/objects/Newtype.asm @@ -10,33 +10,33 @@ SECTION "data/maps/objects/Newtype.asm", ROMX Newtype_MapEvents:: dw $4000 ; unknown - db 13 ; warp events - warp_event 7, 8, 1, NEWTYPE_POKECENTER_1F, wOverworldMapBlocks + 134 - warp_event 30, 9, 1, NEWTYPE_LEAGUE_1F, wOverworldMapBlocks + 146 - warp_event 31, 9, 2, NEWTYPE_LEAGUE_1F, wOverworldMapBlocks + 146 - warp_event 23, 13, 1, NEWTYPE_SAILOR_HOUSE, wOverworldMapBlocks + 194 - warp_event 7, 14, 1, NEWTYPE_MART, wOverworldMapBlocks + 212 - warp_event 33, 15, 1, NEWTYPE_DOJO, wOverworldMapBlocks + 225 - warp_event 34, 15, 2, NEWTYPE_DOJO, wOverworldMapBlocks + 226 - warp_event 23, 22, 1, NEWTYPE_HOUSE_1, wOverworldMapBlocks + 324 - warp_event 5, 23, 1, NEWTYPE_DINER, wOverworldMapBlocks + 315 - warp_event 11, 28, 1, NEWTYPE_HOUSE_2, wOverworldMapBlocks + 396 - warp_event 35, 30, 1, NEWTYPE_HOUSE_3, wOverworldMapBlocks + 434 - warp_event 18, 5, 1, SUGAR_ROUTE_GATE, wOverworldMapBlocks + 88 - warp_event 19, 5, 2, SUGAR_ROUTE_GATE, wOverworldMapBlocks + 88 + def_warp_events + warp_event 7, 8, NEWTYPE_POKECENTER_1F, 1, 134 + warp_event 30, 9, NEWTYPE_LEAGUE_1F, 1, 146 + warp_event 31, 9, NEWTYPE_LEAGUE_1F, 2, 146 + warp_event 23, 13, NEWTYPE_SAILOR_HOUSE, 1, 194 + warp_event 7, 14, NEWTYPE_MART, 1, 212 + warp_event 33, 15, NEWTYPE_DOJO, 1, 225 + warp_event 34, 15, NEWTYPE_DOJO, 2, 226 + warp_event 23, 22, NEWTYPE_HOUSE_1, 1, 324 + warp_event 5, 23, NEWTYPE_DINER, 1, 315 + warp_event 11, 28, NEWTYPE_HOUSE_2, 1, 396 + warp_event 35, 30, NEWTYPE_HOUSE_3, 1, 434 + warp_event 18, 5, SUGAR_ROUTE_GATE, 1, 88 + warp_event 19, 5, SUGAR_ROUTE_GATE, 2, 88 - db 5 ; bg events - bg_event 0, 8, 0, 1 - bg_event 8, 8, 0, 2 - bg_event 8, 14, 0, 3 + def_bg_events + bg_event 0, 8, 0, 1 + bg_event 8, 8, 0, 2 + bg_event 8, 14, 0, 3 bg_event 30, 15, 0, 4 bg_event 30, 21, 0, 5 - db 4 ; person events - object_event 5, 10, SPRITE_SILVER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 10, SPRITE_SILVER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 24, 26, SPRITE_FISHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 24, 9, SPRITE_ROCKER, FACE_UP, 2, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 30, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 24, 9, SPRITE_ROCKER, FACE_UP, 2, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 30, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 Newtype_Blocks:: INCBIN "maps/Newtype.blk" diff --git a/data/maps/objects/NewtypeDiner.asm b/data/maps/objects/NewtypeDiner.asm index fafd30a..6940910 100644 --- a/data/maps/objects/NewtypeDiner.asm +++ b/data/maps/objects/NewtypeDiner.asm @@ -7,17 +7,17 @@ SECTION "data/maps/objects/NewtypeDiner.asm", ROMX NewtypeDiner_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 2, 7, 9, NEWTYPE, wOverworldMapBlocks + 42 - warp_event 3, 7, 9, NEWTYPE, wOverworldMapBlocks + 42 + def_warp_events + warp_event 2, 7, NEWTYPE, 9, 42 + warp_event 3, 7, NEWTYPE, 9, 42 - db 0 ; bg events + def_bg_events - db 4 ; person events - object_event 2, 1, SPRITE_CLERK, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 3, SPRITE_GIRL, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 3, SPRITE_SAILOR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 1, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 1, SPRITE_CLERK, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 3, SPRITE_GIRL, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 3, SPRITE_SAILOR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 1, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 NewtypeDiner_Blocks:: INCBIN "maps/NewtypeDiner.blk" diff --git a/data/maps/objects/NewtypeDojo.asm b/data/maps/objects/NewtypeDojo.asm index 444a861..4969564 100644 --- a/data/maps/objects/NewtypeDojo.asm +++ b/data/maps/objects/NewtypeDojo.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/NewtypeDojo.asm", ROMX NewtypeDojo_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 3, 15, 6, NEWTYPE, wOverworldMapBlocks + 82 - warp_event 4, 15, 7, NEWTYPE, wOverworldMapBlocks + 83 + def_warp_events + warp_event 3, 15, NEWTYPE, 6, 82 + warp_event 4, 15, NEWTYPE, 7, 83 - db 0 ; bg events + def_bg_events - db 5 ; person events - object_event 3, 2, SPRITE_BLACKBELT, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 6, SPRITE_BLACKBELT, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 6, SPRITE_BLACKBELT, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 10, SPRITE_BLACKBELT, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 10, SPRITE_BLACKBELT, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 3, 2, SPRITE_BLACKBELT, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 6, SPRITE_BLACKBELT, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 6, SPRITE_BLACKBELT, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 10, SPRITE_BLACKBELT, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 10, SPRITE_BLACKBELT, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 NewtypeDojo_Blocks:: INCBIN "maps/NewtypeDojo.blk" diff --git a/data/maps/objects/NewtypeHouse1.asm b/data/maps/objects/NewtypeHouse1.asm index 30de46a..3465429 100644 --- a/data/maps/objects/NewtypeHouse1.asm +++ b/data/maps/objects/NewtypeHouse1.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/NewtypeHouse1.asm", ROMX NewtypeHouse1_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 8, NEWTYPE, wOverworldMapBlocks + 47 - warp_event 5, 7, 8, NEWTYPE, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, NEWTYPE, 8, 47 + warp_event 5, 7, NEWTYPE, 8, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 7, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 7, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 NewtypeHouse1_Blocks:: INCBIN "maps/NewtypeHouse1.blk" diff --git a/data/maps/objects/NewtypeHouse2.asm b/data/maps/objects/NewtypeHouse2.asm index d0153d0..b7af1b1 100644 --- a/data/maps/objects/NewtypeHouse2.asm +++ b/data/maps/objects/NewtypeHouse2.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/NewtypeHouse2.asm", ROMX NewtypeHouse2_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 10, NEWTYPE, wOverworldMapBlocks + 47 - warp_event 5, 7, 10, NEWTYPE, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, NEWTYPE, 10, 47 + warp_event 5, 7, NEWTYPE, 10, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 4, 3, SPRITE_GENTLEMAN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 4, 3, SPRITE_GENTLEMAN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 NewtypeHouse2_Blocks:: INCBIN "maps/NewtypeHouse2.blk" diff --git a/data/maps/objects/NewtypeHouse3.asm b/data/maps/objects/NewtypeHouse3.asm index bf7bcfb..5ddfc28 100644 --- a/data/maps/objects/NewtypeHouse3.asm +++ b/data/maps/objects/NewtypeHouse3.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/NewtypeHouse3.asm", ROMX NewtypeHouse3_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 11, NEWTYPE, wOverworldMapBlocks + 47 - warp_event 5, 7, 11, NEWTYPE, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, NEWTYPE, 11, 47 + warp_event 5, 7, NEWTYPE, 11, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 4, 3, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 4, 3, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 NewtypeHouse3_Blocks:: INCBIN "maps/NewtypeHouse3.blk" diff --git a/data/maps/objects/NewtypeLeague1F.asm b/data/maps/objects/NewtypeLeague1F.asm index cd9ea41..f9ece9d 100644 --- a/data/maps/objects/NewtypeLeague1F.asm +++ b/data/maps/objects/NewtypeLeague1F.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/NewtypeLeague1F.asm", ROMX NewtypeLeague1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 3, 15, 2, NEWTYPE, wOverworldMapBlocks + 82 - warp_event 4, 15, 3, NEWTYPE, wOverworldMapBlocks + 83 - warp_event 7, 1, 1, NEWTYPE_LEAGUE_2F, wOverworldMapBlocks + 14 + def_warp_events + warp_event 3, 15, NEWTYPE, 2, 82 + warp_event 4, 15, NEWTYPE, 3, 83 + warp_event 7, 1, NEWTYPE_LEAGUE_2F, 1, 14 - db 0 ; bg events + def_bg_events - db 5 ; person events - object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 NewtypeLeague1F_Blocks:: INCBIN "maps/NewtypeLeague1F.blk" diff --git a/data/maps/objects/NewtypeLeague2F.asm b/data/maps/objects/NewtypeLeague2F.asm index 19cae51..b47b767 100644 --- a/data/maps/objects/NewtypeLeague2F.asm +++ b/data/maps/objects/NewtypeLeague2F.asm @@ -7,17 +7,17 @@ SECTION "data/maps/objects/NewtypeLeague2F.asm", ROMX NewtypeLeague2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 7, 15, 3, NEWTYPE_LEAGUE_1F, wOverworldMapBlocks + 92 + def_warp_events + warp_event 7, 15, NEWTYPE_LEAGUE_1F, 3, 92 - db 0 ; bg events + def_bg_events - db 5 ; person events - object_event 5, 5, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 0, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 0, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 11, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 5, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 0, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 0, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 11, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 NewtypeLeague2F_Blocks:: INCBIN "maps/NewtypeLeague2F.blk" diff --git a/data/maps/objects/NewtypeMart.asm b/data/maps/objects/NewtypeMart.asm index 2ada20c..f1276e4 100644 --- a/data/maps/objects/NewtypeMart.asm +++ b/data/maps/objects/NewtypeMart.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/NewtypeMart.asm", ROMX NewtypeMart_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 5, NEWTYPE, wOverworldMapBlocks + 59 - warp_event 5, 7, 5, NEWTYPE, wOverworldMapBlocks + 59 + def_warp_events + warp_event 4, 7, NEWTYPE, 5, 59 + warp_event 5, 7, NEWTYPE, 5, 59 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_POKEFAN_F, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_POKEFAN_F, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 NewtypeMart_Blocks:: INCBIN "maps/NewtypeMart.blk" diff --git a/data/maps/objects/NewtypePokecenter1F.asm b/data/maps/objects/NewtypePokecenter1F.asm index 9122876..7eb0c9d 100644 --- a/data/maps/objects/NewtypePokecenter1F.asm +++ b/data/maps/objects/NewtypePokecenter1F.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/NewtypePokecenter1F.asm", ROMX NewtypePokecenter1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 5, 7, 1, NEWTYPE, wOverworldMapBlocks + 59 - warp_event 6, 7, 1, NEWTYPE, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, NEWTYPE_POKECENTER_2F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 5, 7, NEWTYPE, 1, 59 + warp_event 6, 7, NEWTYPE, 1, 60 + warp_event 0, 7, NEWTYPE_POKECENTER_2F, 1, 57 - db 0 ; bg events + def_bg_events - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 NewtypePokecenter1F_Blocks:: INCBIN "maps/NewtypePokecenter1F.blk" diff --git a/data/maps/objects/NewtypePokecenter2F.asm b/data/maps/objects/NewtypePokecenter2F.asm index 50a988e..94d7953 100644 --- a/data/maps/objects/NewtypePokecenter2F.asm +++ b/data/maps/objects/NewtypePokecenter2F.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/NewtypePokecenter2F.asm", ROMX NewtypePokecenter2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 0, 7, 3, NEWTYPE_POKECENTER_1F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 0, 7, NEWTYPE_POKECENTER_1F, 3, 57 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 NewtypePokecenter2F_Blocks:: INCBIN "maps/NewtypePokecenter2F.blk" diff --git a/data/maps/objects/NewtypeRoute.asm b/data/maps/objects/NewtypeRoute.asm index 50df1b4..8f7dae1 100644 --- a/data/maps/objects/NewtypeRoute.asm +++ b/data/maps/objects/NewtypeRoute.asm @@ -9,11 +9,11 @@ SECTION "data/maps/objects/NewtypeRoute.asm", ROMX NewtypeRoute_MapEvents:: dw $4000 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events NewtypeRoute_Blocks:: INCBIN "maps/NewtypeRoute.blk" diff --git a/data/maps/objects/NewtypeRouteGate.asm b/data/maps/objects/NewtypeRouteGate.asm index 382549b..13135ed 100644 --- a/data/maps/objects/NewtypeRouteGate.asm +++ b/data/maps/objects/NewtypeRouteGate.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/NewtypeRouteGate.asm", ROMX NewtypeRouteGate_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 4, 7, 1, ROUTE_18, wOverworldMapBlocks + 47 - warp_event 5, 7, 2, ROUTE_18, wOverworldMapBlocks + 47 - warp_event 4, 0, 1, BULL_FOREST_ROUTE_1, wOverworldMapBlocks + 14 - warp_event 5, 0, 2, BULL_FOREST_ROUTE_1, wOverworldMapBlocks + 14 + def_warp_events + warp_event 4, 7, ROUTE_18, 1, 47 + warp_event 5, 7, ROUTE_18, 2, 47 + warp_event 4, 0, BULL_FOREST_ROUTE_1, 1, 14 + warp_event 5, 0, BULL_FOREST_ROUTE_1, 2, 14 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events NewtypeRouteGate_Blocks:: INCBIN "maps/NewtypeRouteGate.blk" diff --git a/data/maps/objects/NewtypeSailorHouse.asm b/data/maps/objects/NewtypeSailorHouse.asm index 234929c..150c85f 100644 --- a/data/maps/objects/NewtypeSailorHouse.asm +++ b/data/maps/objects/NewtypeSailorHouse.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/NewtypeSailorHouse.asm", ROMX NewtypeSailorHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 4, NEWTYPE, wOverworldMapBlocks + 47 - warp_event 5, 7, 4, NEWTYPE, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, NEWTYPE, 4, 47 + warp_event 5, 7, NEWTYPE, 4, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 6, 3, SPRITE_47, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 6, 3, SPRITE_47, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 NewtypeSailorHouse_Blocks:: INCBIN "maps/NewtypeSailorHouse.blk" diff --git a/data/maps/objects/North.asm b/data/maps/objects/North.asm index 0b236bb..312af28 100644 --- a/data/maps/objects/North.asm +++ b/data/maps/objects/North.asm @@ -8,22 +8,22 @@ SECTION "data/maps/objects/North.asm", ROMX North_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 5, 5, 1, NORTH_HOUSE_1, wOverworldMapBlocks + 51 - warp_event 15, 6, 1, NORTH_MART, wOverworldMapBlocks + 72 - warp_event 5, 9, 1, NORTH_HOUSE_2, wOverworldMapBlocks + 83 - warp_event 13, 10, 1, NORTH_POKECENTER_1F, wOverworldMapBlocks + 103 + def_warp_events + warp_event 5, 5, NORTH_HOUSE_1, 1, 51 + warp_event 15, 6, NORTH_MART, 1, 72 + warp_event 5, 9, NORTH_HOUSE_2, 1, 83 + warp_event 13, 10, NORTH_POKECENTER_1F, 1, 103 - db 4 ; bg events - bg_event 12, 4, 0, 1 - bg_event 16, 6, 0, 2 + def_bg_events + bg_event 12, 4, 0, 1 + bg_event 16, 6, 0, 2 bg_event 14, 10, 0, 3 - bg_event 8, 12, 0, 4 + bg_event 8, 12, 0, 4 - db 3 ; person events - object_event 9, 6, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 9, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 9, 6, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 9, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 North_Blocks:: INCBIN "maps/North.blk" diff --git a/data/maps/objects/NorthHouse1.asm b/data/maps/objects/NorthHouse1.asm index a60ac00..ca1ac90 100644 --- a/data/maps/objects/NorthHouse1.asm +++ b/data/maps/objects/NorthHouse1.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/NorthHouse1.asm", ROMX NorthHouse1_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 1, NORTH, wOverworldMapBlocks + 47 - warp_event 5, 7, 1, NORTH, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, NORTH, 1, 47 + warp_event 5, 7, NORTH, 1, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 2, 3, SPRITE_TWIN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 3, SPRITE_TWIN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 NorthHouse1_Blocks:: INCBIN "maps/NorthHouse1.blk" diff --git a/data/maps/objects/NorthHouse2.asm b/data/maps/objects/NorthHouse2.asm index f8fce5f..5703871 100644 --- a/data/maps/objects/NorthHouse2.asm +++ b/data/maps/objects/NorthHouse2.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/NorthHouse2.asm", ROMX NorthHouse2_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 3, NORTH, wOverworldMapBlocks + 47 - warp_event 5, 7, 3, NORTH, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, NORTH, 3, 47 + warp_event 5, 7, NORTH, 3, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 2, 3, SPRITE_TWIN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 3, SPRITE_TWIN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 NorthHouse2_Blocks:: INCBIN "maps/NorthHouse2.blk" diff --git a/data/maps/objects/NorthMart.asm b/data/maps/objects/NorthMart.asm index 3af319f..e0fc425 100644 --- a/data/maps/objects/NorthMart.asm +++ b/data/maps/objects/NorthMart.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/NorthMart.asm", ROMX NorthMart_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 2, NORTH, wOverworldMapBlocks + 51 - warp_event 5, 7, 2, NORTH, wOverworldMapBlocks + 51 + def_warp_events + warp_event 4, 7, NORTH, 2, 51 + warp_event 5, 7, NORTH, 2, 51 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_GIRL, FACE_RIGHT, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_GIRL, FACE_RIGHT, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 NorthMart_Blocks:: INCBIN "maps/NorthMart.blk" diff --git a/data/maps/objects/NorthPokecenter1F.asm b/data/maps/objects/NorthPokecenter1F.asm index 29fc812..ec9efa4 100644 --- a/data/maps/objects/NorthPokecenter1F.asm +++ b/data/maps/objects/NorthPokecenter1F.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/NorthPokecenter1F.asm", ROMX NorthPokecenter1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 5, 7, 4, NORTH, wOverworldMapBlocks + 59 - warp_event 6, 7, 4, NORTH, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, NORTH_POKECENTER_2F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 5, 7, NORTH, 4, 59 + warp_event 6, 7, NORTH, 4, 60 + warp_event 0, 7, NORTH_POKECENTER_2F, 1, 57 - db 0 ; bg events + def_bg_events - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_24, FACE_RIGHT, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_24, FACE_RIGHT, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 NorthPokecenter1F_Blocks:: INCBIN "maps/NorthPokecenter1F.blk" diff --git a/data/maps/objects/NorthPokecenter2F.asm b/data/maps/objects/NorthPokecenter2F.asm index e092e41..22bf2b2 100644 --- a/data/maps/objects/NorthPokecenter2F.asm +++ b/data/maps/objects/NorthPokecenter2F.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/NorthPokecenter2F.asm", ROMX NorthPokecenter2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 0, 7, 3, NORTH_POKECENTER_1F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 0, 7, NORTH_POKECENTER_1F, 3, 57 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 NorthPokecenter2F_Blocks:: INCBIN "maps/NorthPokecenter2F.blk" diff --git a/data/maps/objects/Office1.asm b/data/maps/objects/Office1.asm index ae45362..a284e8d 100644 --- a/data/maps/objects/Office1.asm +++ b/data/maps/objects/Office1.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/Office1.asm", ROMX Office1_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events Office1_Blocks:: INCBIN "maps/Office1.blk" diff --git a/data/maps/objects/Office2.asm b/data/maps/objects/Office2.asm index 24ef079..c69be22 100644 --- a/data/maps/objects/Office2.asm +++ b/data/maps/objects/Office2.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/Office2.asm", ROMX Office2_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events Office2_Blocks:: INCBIN "maps/Office2.blk" diff --git a/data/maps/objects/Office3.asm b/data/maps/objects/Office3.asm index 7a70ad1..5b5a4e7 100644 --- a/data/maps/objects/Office3.asm +++ b/data/maps/objects/Office3.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/Office3.asm", ROMX Office3_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events Office3_Blocks:: INCBIN "maps/Office3.blk" diff --git a/data/maps/objects/OldCity.asm b/data/maps/objects/OldCity.asm index ca8bb1e..0f32a33 100644 --- a/data/maps/objects/OldCity.asm +++ b/data/maps/objects/OldCity.asm @@ -9,39 +9,39 @@ SECTION "data/maps/objects/OldCity.asm", ROMX OldCity_MapEvents:: dw $4000 ; unknown - db 14 ; warp events - warp_event 4, 14, 1, OLD_CITY_MUSEUM, wOverworldMapBlocks + 211 - warp_event 5, 14, 2, OLD_CITY_MUSEUM, wOverworldMapBlocks + 211 - warp_event 26, 14, 1, OLD_CITY_GYM, wOverworldMapBlocks + 222 - warp_event 27, 14, 2, OLD_CITY_GYM, wOverworldMapBlocks + 222 - warp_event 11, 17, 1, OLD_CITY_TOWER_1F, wOverworldMapBlocks + 240 - warp_event 12, 17, 2, OLD_CITY_TOWER_1F, wOverworldMapBlocks + 241 - warp_event 30, 22, 1, OLD_CITY_BILLS_HOUSE, wOverworldMapBlocks + 328 - warp_event 3, 26, 1, OLD_CITY_MART, wOverworldMapBlocks + 366 - warp_event 10, 26, 1, OLD_CITY_HOUSE, wOverworldMapBlocks + 370 - warp_event 27, 28, 1, OLD_CITY_POKECENTER_1F, wOverworldMapBlocks + 404 - warp_event 3, 31, 1, OLD_CITY_KURTS_HOUSE, wOverworldMapBlocks + 418 - warp_event 18, 30, 3, ROUTE_1_GATE_1F, wOverworldMapBlocks + 426 - warp_event 19, 30, 4, ROUTE_1_GATE_1F, wOverworldMapBlocks + 426 - warp_event 22, 26, 1, OLD_CITY_SCHOOL, wOverworldMapBlocks + 376 + def_warp_events + warp_event 4, 14, OLD_CITY_MUSEUM, 1, 211 + warp_event 5, 14, OLD_CITY_MUSEUM, 2, 211 + warp_event 26, 14, OLD_CITY_GYM, 1, 222 + warp_event 27, 14, OLD_CITY_GYM, 2, 222 + warp_event 11, 17, OLD_CITY_TOWER_1F, 1, 240 + warp_event 12, 17, OLD_CITY_TOWER_1F, 2, 241 + warp_event 30, 22, OLD_CITY_BILLS_HOUSE, 1, 328 + warp_event 3, 26, OLD_CITY_MART, 1, 366 + warp_event 10, 26, OLD_CITY_HOUSE, 1, 370 + warp_event 27, 28, OLD_CITY_POKECENTER_1F, 1, 404 + warp_event 3, 31, OLD_CITY_KURTS_HOUSE, 1, 418 + warp_event 18, 30, ROUTE_1_GATE_1F, 3, 426 + warp_event 19, 30, ROUTE_1_GATE_1F, 4, 426 + warp_event 22, 26, OLD_CITY_SCHOOL, 1, 376 - db 12 ; bg events - bg_event 8, 14, 0, 1 - bg_event 8, 16, 0, 2 + def_bg_events + bg_event 8, 14, 0, 1 + bg_event 8, 16, 0, 2 bg_event 28, 16, 0, 3 bg_event 20, 22, 0, 4 bg_event 26, 22, 0, 5 - bg_event 8, 26, 0, 6 + bg_event 8, 26, 0, 6 bg_event 28, 28, 0, 7 bg_event 20, 29, 0, 8 - bg_event 4, 32, 0, 9 + bg_event 4, 32, 0, 9 bg_event 30, 22, 0, 10 - bg_event 4, 14, 0, 11 - bg_event 5, 14, 0, 11 + bg_event 4, 14, 0, 11 + bg_event 5, 14, 0, 11 - db 5 ; person events - object_event 8, 30, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 20, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 8, 30, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 20, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 26, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 21, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 17, 19, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/OldCityBillsHouse.asm b/data/maps/objects/OldCityBillsHouse.asm index 0e79b5c..a620e44 100644 --- a/data/maps/objects/OldCityBillsHouse.asm +++ b/data/maps/objects/OldCityBillsHouse.asm @@ -7,20 +7,20 @@ SECTION "data/maps/objects/OldCityBillsHouse.asm", ROMX OldCityBillsHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 3, 7, 7, OLD_CITY, wOverworldMapBlocks + 42 - warp_event 4, 7, 7, OLD_CITY, wOverworldMapBlocks + 43 + def_warp_events + warp_event 3, 7, OLD_CITY, 7, 42 + warp_event 4, 7, OLD_CITY, 7, 43 - db 6 ; bg events - bg_event 2, 1, 0, 1 - bg_event 3, 1, 0, 2 - bg_event 4, 1, 0, 3 - bg_event 6, 1, 0, 4 - bg_event 7, 1, 0, 5 - bg_event 1, 1, 0, 6 + def_bg_events + bg_event 2, 1, 0, 1 + bg_event 3, 1, 0, 2 + bg_event 4, 1, 0, 3 + bg_event 6, 1, 0, 4 + bg_event 7, 1, 0, 5 + bg_event 1, 1, 0, 6 - db 1 ; person events - object_event 5, 4, SPRITE_MASAKI, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 4, SPRITE_MASAKI, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 OldCityBillsHouse_Blocks:: INCBIN "maps/OldCityBillsHouse.blk" diff --git a/data/maps/objects/OldCityGym.asm b/data/maps/objects/OldCityGym.asm index 3405b04..674e1dd 100644 --- a/data/maps/objects/OldCityGym.asm +++ b/data/maps/objects/OldCityGym.asm @@ -7,21 +7,21 @@ SECTION "data/maps/objects/OldCityGym.asm", ROMX OldCityGym_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 17, 3, OLD_CITY, wOverworldMapBlocks + 102 - warp_event 5, 17, 4, OLD_CITY, wOverworldMapBlocks + 102 + def_warp_events + warp_event 4, 17, OLD_CITY, 3, 102 + warp_event 5, 17, OLD_CITY, 4, 102 - db 2 ; bg events - bg_event 3, 15, 0, 1 - bg_event 6, 15, 0, 1 + def_bg_events + bg_event 3, 15, 0, 1 + bg_event 6, 15, 0, 1 - db 6 ; person events - object_event 4, 5, SPRITE_HAYATO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 8, 9, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 - object_event 8, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 - object_event 1, 1, SPRITE_SUPER_NERD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 - object_event 1, 9, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 - object_event 7, 15, SPRITE_GYM_GUY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 + def_object_events + object_event 4, 5, SPRITE_HAYATO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 8, 9, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 + object_event 8, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 + object_event 1, 1, SPRITE_SUPER_NERD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 + object_event 1, 9, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 + object_event 7, 15, SPRITE_GYM_GUY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 OldCityGym_Blocks:: INCBIN "maps/OldCityGym.blk" diff --git a/data/maps/objects/OldCityHouse.asm b/data/maps/objects/OldCityHouse.asm index dd140a4..8c6f767 100644 --- a/data/maps/objects/OldCityHouse.asm +++ b/data/maps/objects/OldCityHouse.asm @@ -7,20 +7,20 @@ SECTION "data/maps/objects/OldCityHouse.asm", ROMX OldCityHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 3, 7, 9, OLD_CITY, wOverworldMapBlocks + 42 - warp_event 4, 7, 9, OLD_CITY, wOverworldMapBlocks + 43 + def_warp_events + warp_event 3, 7, OLD_CITY, 9, 42 + warp_event 4, 7, OLD_CITY, 9, 43 - db 4 ; bg events - bg_event 0, 1, 0, 1 - bg_event 1, 1, 0, 2 - bg_event 2, 1, 0, 3 - bg_event 7, 1, 0, 4 + def_bg_events + bg_event 0, 1, 0, 1 + bg_event 1, 1, 0, 2 + bg_event 2, 1, 0, 3 + bg_event 7, 1, 0, 4 - db 3 ; person events - object_event 2, 3, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 6, SPRITE_LASS, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 3, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 6, SPRITE_LASS, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 OldCityHouse_Blocks:: INCBIN "maps/OldCityHouse.blk" diff --git a/data/maps/objects/OldCityKurtsHouse.asm b/data/maps/objects/OldCityKurtsHouse.asm index 178b8a4..65c2988 100644 --- a/data/maps/objects/OldCityKurtsHouse.asm +++ b/data/maps/objects/OldCityKurtsHouse.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/OldCityKurtsHouse.asm", ROMX OldCityKurtsHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 3, 7, 11, OLD_CITY, wOverworldMapBlocks + 58 - warp_event 4, 7, 11, OLD_CITY, wOverworldMapBlocks + 59 + def_warp_events + warp_event 3, 7, OLD_CITY, 11, 58 + warp_event 4, 7, OLD_CITY, 11, 59 - db 5 ; bg events - bg_event 4, 1, 0, 1 - bg_event 5, 1, 0, 2 - bg_event 12, 1, 0, 3 - bg_event 14, 0, 0, 4 - bg_event 15, 0, 0, 4 + def_bg_events + bg_event 4, 1, 0, 1 + bg_event 5, 1, 0, 2 + bg_event 12, 1, 0, 3 + bg_event 14, 0, 0, 4 + bg_event 15, 0, 0, 4 - db 1 ; person events - object_event 2, 2, SPRITE_GANTETSU, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 2, SPRITE_GANTETSU, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 OldCityKurtsHouse_Blocks:: INCBIN "maps/OldCityKurtsHouse.blk" diff --git a/data/maps/objects/OldCityMart.asm b/data/maps/objects/OldCityMart.asm index bbcafd0..6749b32 100644 --- a/data/maps/objects/OldCityMart.asm +++ b/data/maps/objects/OldCityMart.asm @@ -7,17 +7,17 @@ SECTION "data/maps/objects/OldCityMart.asm", ROMX OldCityMart_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 8, OLD_CITY, wOverworldMapBlocks + 51 - warp_event 5, 7, 8, OLD_CITY, wOverworldMapBlocks + 51 + def_warp_events + warp_event 4, 7, OLD_CITY, 8, 51 + warp_event 5, 7, OLD_CITY, 8, 51 - db 1 ; bg events - bg_event 0, 7, 0, 1 + def_bg_events + bg_event 0, 7, 0, 1 - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 OldCityMart_Blocks:: INCBIN "maps/OldCityMart.blk" diff --git a/data/maps/objects/OldCityMuseum.asm b/data/maps/objects/OldCityMuseum.asm index 60f2505..ece18c0 100644 --- a/data/maps/objects/OldCityMuseum.asm +++ b/data/maps/objects/OldCityMuseum.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/OldCityMuseum.asm", ROMX OldCityMuseum_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 2, 7, 1, OLD_CITY, wOverworldMapBlocks + 58 - warp_event 3, 7, 2, OLD_CITY, wOverworldMapBlocks + 58 + def_warp_events + warp_event 2, 7, OLD_CITY, 1, 58 + warp_event 3, 7, OLD_CITY, 2, 58 - db 4 ; bg events - bg_event 2, 3, 0, 1 - bg_event 5, 4, 0, 2 - bg_event 9, 4, 0, 3 - bg_event 13, 4, 0, 4 + def_bg_events + bg_event 2, 3, 0, 1 + bg_event 5, 4, 0, 2 + bg_event 9, 4, 0, 3 + bg_event 13, 4, 0, 4 - db 2 ; person events - object_event 1, 5, SPRITE_FISHER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 4, SPRITE_EGG, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 1, 5, SPRITE_FISHER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 4, SPRITE_EGG, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 OldCityMuseum_Blocks:: INCBIN "maps/OldCityMuseum.blk" diff --git a/data/maps/objects/OldCityPokecenter1F.asm b/data/maps/objects/OldCityPokecenter1F.asm index 28fa3bb..3ffaa89 100644 --- a/data/maps/objects/OldCityPokecenter1F.asm +++ b/data/maps/objects/OldCityPokecenter1F.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/OldCityPokecenter1F.asm", ROMX OldCityPokecenter1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 5, 7, 10, OLD_CITY, wOverworldMapBlocks + 59 - warp_event 6, 7, 10, OLD_CITY, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 5, 7, OLD_CITY, 10, 59 + warp_event 6, 7, OLD_CITY, 10, 60 + warp_event 0, 7, OLD_CITY_POKECENTER_2F, 1, 57 - db 1 ; bg events - bg_event 13, 1, 0, 1 + def_bg_events + bg_event 13, 1, 0, 1 - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_YOUNGSTER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_35, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_YOUNGSTER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_35, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 OldCityPokecenter1F_Blocks:: INCBIN "maps/OldCityPokecenter1F.blk" diff --git a/data/maps/objects/OldCityPokecenter2F.asm b/data/maps/objects/OldCityPokecenter2F.asm index b6354c3..b7c12e3 100644 --- a/data/maps/objects/OldCityPokecenter2F.asm +++ b/data/maps/objects/OldCityPokecenter2F.asm @@ -7,20 +7,20 @@ SECTION "data/maps/objects/OldCityPokecenter2F.asm", ROMX OldCityPokecenter2F_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 0, 7, 3, OLD_CITY_POKECENTER_1F, wOverworldMapBlocks + 57 - warp_event 5, 0, 1, OLD_CITY_POKECENTER_TRADE, wOverworldMapBlocks + 17 - warp_event 9, 0, 1, OLD_CITY_POKECENTER_BATTLE, wOverworldMapBlocks + 19 - warp_event 13, 2, 1, OLD_CITY_POKECENTER_TIME_MACHINE, wOverworldMapBlocks + 35 + def_warp_events + warp_event 0, 7, OLD_CITY_POKECENTER_1F, 3, 57 + warp_event 5, 0, OLD_CITY_POKECENTER_TRADE, 1, 17 + warp_event 9, 0, OLD_CITY_POKECENTER_BATTLE, 1, 19 + warp_event 13, 2, OLD_CITY_POKECENTER_TIME_MACHINE, 1, 35 - db 1 ; bg events - bg_event 1, 1, 0, 1 + def_bg_events + bg_event 1, 1, 0, 1 - db 4 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 3, SPRITE_GRAMPS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 3, SPRITE_GRAMPS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 OldCityPokecenter2F_Blocks:: INCBIN "maps/OldCityPokecenter2F.blk" diff --git a/data/maps/objects/OldCityPokecenterBattle.asm b/data/maps/objects/OldCityPokecenterBattle.asm index d9e3704..452bc3c 100644 --- a/data/maps/objects/OldCityPokecenterBattle.asm +++ b/data/maps/objects/OldCityPokecenterBattle.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/OldCityPokecenterBattle.asm", ROMX OldCityPokecenterBattle_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 3, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 47 - warp_event 5, 7, 3, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, OLD_CITY_POKECENTER_2F, 3, 47 + warp_event 5, 7, OLD_CITY_POKECENTER_2F, 3, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 3, 3, SPRITE_GOLD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 3, 3, SPRITE_GOLD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 OldCityPokecenterBattle_Blocks:: INCBIN "maps/OldCityPokecenterBattle.blk" diff --git a/data/maps/objects/OldCityPokecenterTimeMachine.asm b/data/maps/objects/OldCityPokecenterTimeMachine.asm index d4a91fb..8904a6d 100644 --- a/data/maps/objects/OldCityPokecenterTimeMachine.asm +++ b/data/maps/objects/OldCityPokecenterTimeMachine.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/OldCityPokecenterTimeMachine.asm", ROMX OldCityPokecenterTimeMachine_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 2, 7, 4, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 58 - warp_event 3, 7, 4, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 58 + def_warp_events + warp_event 2, 7, OLD_CITY_POKECENTER_2F, 4, 58 + warp_event 3, 7, OLD_CITY_POKECENTER_2F, 4, 58 - db 1 ; bg events - bg_event 15, 3, 0, 1 + def_bg_events + bg_event 15, 3, 0, 1 - db 1 ; person events - object_event 13, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 13, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 OldCityPokecenterTimeMachine_Blocks:: INCBIN "maps/OldCityPokecenterTimeMachine.blk" diff --git a/data/maps/objects/OldCityPokecenterTrade.asm b/data/maps/objects/OldCityPokecenterTrade.asm index 178cbea..9f73384 100644 --- a/data/maps/objects/OldCityPokecenterTrade.asm +++ b/data/maps/objects/OldCityPokecenterTrade.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/OldCityPokecenterTrade.asm", ROMX OldCityPokecenterTrade_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 2, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 47 - warp_event 5, 7, 2, OLD_CITY_POKECENTER_2F, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, OLD_CITY_POKECENTER_2F, 2, 47 + warp_event 5, 7, OLD_CITY_POKECENTER_2F, 2, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 3, 3, SPRITE_GOLD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 3, 3, SPRITE_GOLD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 OldCityPokecenterTrade_Blocks:: INCBIN "maps/OldCityPokecenterTrade.blk" diff --git a/data/maps/objects/OldCitySchool.asm b/data/maps/objects/OldCitySchool.asm index db27565..c782c22 100644 --- a/data/maps/objects/OldCitySchool.asm +++ b/data/maps/objects/OldCitySchool.asm @@ -7,23 +7,23 @@ SECTION "data/maps/objects/OldCitySchool.asm", ROMX OldCitySchool_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 3, 15, 14, OLD_CITY, wOverworldMapBlocks + 82 - warp_event 4, 15, 14, OLD_CITY, wOverworldMapBlocks + 83 + def_warp_events + warp_event 3, 15, OLD_CITY, 14, 82 + warp_event 4, 15, OLD_CITY, 14, 83 - db 4 ; bg events - bg_event 0, 1, 0, 1 - bg_event 1, 1, 0, 1 - bg_event 3, 0, 0, 2 - bg_event 4, 0, 0, 2 + def_bg_events + bg_event 0, 1, 0, 1 + bg_event 1, 1, 0, 1 + bg_event 3, 0, 0, 2 + bg_event 4, 0, 0, 2 - db 6 ; person events - object_event 2, 5, SPRITE_GIRL, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_TEACHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 11, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 5, SPRITE_GIRL, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_TEACHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 11, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 OldCitySchool_Blocks:: INCBIN "maps/OldCitySchool.blk" diff --git a/data/maps/objects/OldCityTower1F.asm b/data/maps/objects/OldCityTower1F.asm index 64ddb60..09dbc35 100644 --- a/data/maps/objects/OldCityTower1F.asm +++ b/data/maps/objects/OldCityTower1F.asm @@ -7,21 +7,21 @@ SECTION "data/maps/objects/OldCityTower1F.asm", ROMX OldCityTower1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 3, 7, 5, OLD_CITY, wOverworldMapBlocks + 42 - warp_event 4, 7, 6, OLD_CITY, wOverworldMapBlocks + 43 - warp_event 0, 1, 1, OLD_CITY_TOWER_2F, wOverworldMapBlocks + 11 + def_warp_events + warp_event 3, 7, OLD_CITY, 5, 42 + warp_event 4, 7, OLD_CITY, 6, 43 + warp_event 0, 1, OLD_CITY_TOWER_2F, 1, 11 - db 3 ; bg events - bg_event 2, 6, 0, 1 - bg_event 5, 6, 0, 2 - bg_event 4, 1, 0, 3 + def_bg_events + bg_event 2, 6, 0, 1 + bg_event 5, 6, 0, 2 + bg_event 4, 1, 0, 3 - db 4 ; person events - object_event 0, 2, SPRITE_SAGE, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 - object_event 1, 5, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 5, 1, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 6, 4, SPRITE_SAGE, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 + def_object_events + object_event 0, 2, SPRITE_SAGE, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 + object_event 1, 5, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 5, 1, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 6, 4, SPRITE_SAGE, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 OldCityTower1F_Blocks:: INCBIN "maps/OldCityTower1F.blk" diff --git a/data/maps/objects/OldCityTower2F.asm b/data/maps/objects/OldCityTower2F.asm index 078661f..e5da8c0 100644 --- a/data/maps/objects/OldCityTower2F.asm +++ b/data/maps/objects/OldCityTower2F.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/OldCityTower2F.asm", ROMX OldCityTower2F_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 0, 1, 3, OLD_CITY_TOWER_1F, wOverworldMapBlocks + 11 - warp_event 7, 7, 2, OLD_CITY_TOWER_3F, wOverworldMapBlocks + 44 + def_warp_events + warp_event 0, 1, OLD_CITY_TOWER_1F, 3, 11 + warp_event 7, 7, OLD_CITY_TOWER_3F, 2, 44 - db 2 ; bg events - bg_event 3, 0, 0, 1 - bg_event 4, 1, 0, 2 + def_bg_events + bg_event 3, 0, 0, 1 + bg_event 4, 1, 0, 2 - db 4 ; person events - object_event 2, 3, SPRITE_MEDIUM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 5, 3, SPRITE_MEDIUM, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 2, 6, SPRITE_MEDIUM, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 5, 6, SPRITE_MEDIUM, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + def_object_events + object_event 2, 3, SPRITE_MEDIUM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 5, 3, SPRITE_MEDIUM, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 2, 6, SPRITE_MEDIUM, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 5, 6, SPRITE_MEDIUM, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 OldCityTower2F_Blocks:: INCBIN "maps/OldCityTower2F.blk" diff --git a/data/maps/objects/OldCityTower3F.asm b/data/maps/objects/OldCityTower3F.asm index fae518e..6e4bb01 100644 --- a/data/maps/objects/OldCityTower3F.asm +++ b/data/maps/objects/OldCityTower3F.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/OldCityTower3F.asm", ROMX OldCityTower3F_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 0, 1, 1, OLD_CITY_TOWER_4F, wOverworldMapBlocks + 11 - warp_event 7, 7, 2, OLD_CITY_TOWER_2F, wOverworldMapBlocks + 44 + def_warp_events + warp_event 0, 1, OLD_CITY_TOWER_4F, 1, 11 + warp_event 7, 7, OLD_CITY_TOWER_2F, 2, 44 - db 2 ; bg events - bg_event 3, 0, 0, 1 - bg_event 4, 1, 0, 2 + def_bg_events + bg_event 3, 0, 0, 1 + bg_event 4, 1, 0, 2 - db 4 ; person events - object_event 2, 3, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 3, 4, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 - object_event 4, 4, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 5, 5, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + def_object_events + object_event 2, 3, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 3, 4, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 + object_event 4, 4, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 5, 5, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 OldCityTower3F_Blocks:: INCBIN "maps/OldCityTower3F.blk" diff --git a/data/maps/objects/OldCityTower4F.asm b/data/maps/objects/OldCityTower4F.asm index a3bae56..e683db5 100644 --- a/data/maps/objects/OldCityTower4F.asm +++ b/data/maps/objects/OldCityTower4F.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/OldCityTower4F.asm", ROMX OldCityTower4F_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 0, 1, 1, OLD_CITY_TOWER_3F, wOverworldMapBlocks + 11 - warp_event 7, 7, 1, OLD_CITY_TOWER_5F, wOverworldMapBlocks + 44 + def_warp_events + warp_event 0, 1, OLD_CITY_TOWER_3F, 1, 11 + warp_event 7, 7, OLD_CITY_TOWER_5F, 1, 44 - db 2 ; bg events - bg_event 3, 0, 0, 1 - bg_event 4, 1, 0, 2 + def_bg_events + bg_event 3, 0, 0, 1 + bg_event 4, 1, 0, 2 - db 4 ; person events - object_event 3, 2, SPRITE_SAGE, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 - object_event 4, 7, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 - object_event 6, 7, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 - object_event 7, 1, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 + def_object_events + object_event 3, 2, SPRITE_SAGE, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 + object_event 4, 7, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 + object_event 6, 7, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 + object_event 7, 1, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 OldCityTower4F_Blocks:: INCBIN "maps/OldCityTower4F.blk" diff --git a/data/maps/objects/OldCityTower5F.asm b/data/maps/objects/OldCityTower5F.asm index 590aad9..db0d13b 100644 --- a/data/maps/objects/OldCityTower5F.asm +++ b/data/maps/objects/OldCityTower5F.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/OldCityTower5F.asm", ROMX OldCityTower5F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 5, 5, 2, OLD_CITY_TOWER_4F, wOverworldMapBlocks + 30 + def_warp_events + warp_event 5, 5, OLD_CITY_TOWER_4F, 2, 30 - db 3 ; bg events - bg_event 2, 0, 0, 1 - bg_event 3, 0, 0, 2 - bg_event 4, 1, 0, 3 + def_bg_events + bg_event 2, 0, 0, 1 + bg_event 3, 0, 0, 2 + bg_event 4, 1, 0, 3 - db 1 ; person events - object_event 2, 3, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 3, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 OldCityTower5F_Blocks:: INCBIN "maps/OldCityTower5F.blk" diff --git a/data/maps/objects/PlayerHouse1F.asm b/data/maps/objects/PlayerHouse1F.asm index 4721993..3218ec8 100644 --- a/data/maps/objects/PlayerHouse1F.asm +++ b/data/maps/objects/PlayerHouse1F.asm @@ -7,20 +7,20 @@ SECTION "data/maps/objects/PlayerHouse1F.asm", ROMX PlayerHouse1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 6, 7, 1, SILENT_HILL, wOverworldMapBlocks + 48 - warp_event 7, 7, 1, SILENT_HILL, wOverworldMapBlocks + 48 - warp_event 9, 0, 1, PLAYER_HOUSE_2F, wOverworldMapBlocks + 16 + def_warp_events + warp_event 6, 7, SILENT_HILL, 1, 48 + warp_event 7, 7, SILENT_HILL, 1, 48 + warp_event 9, 0, PLAYER_HOUSE_2F, 1, 16 - db 5 ; bg events - bg_event 0, 1, 0, 1 - bg_event 1, 1, 0, 2 - bg_event 2, 1, 0, 3 - bg_event 4, 1, 0, 4 - bg_event 5, 1, 0, 5 + def_bg_events + bg_event 0, 1, 0, 1 + bg_event 1, 1, 0, 2 + bg_event 2, 1, 0, 3 + bg_event 4, 1, 0, 4 + bg_event 5, 1, 0, 5 - db 1 ; person events - object_event 7, 3, SPRITE_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 7, 3, SPRITE_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 PlayerHouse1F_Blocks:: INCBIN "maps/PlayerHouse1F.blk" diff --git a/data/maps/objects/PlayerHouse2F.asm b/data/maps/objects/PlayerHouse2F.asm index 6e6fc68..26f9aa1 100644 --- a/data/maps/objects/PlayerHouse2F.asm +++ b/data/maps/objects/PlayerHouse2F.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/PlayerHouse2F.asm", ROMX PlayerHouse2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 9, 0, 3, PLAYER_HOUSE_1F, wOverworldMapBlocks + 16 + def_warp_events + warp_event 9, 0, PLAYER_HOUSE_1F, 3, 16 - db 5 ; bg events - bg_event 1, 1, 0, 1 - bg_event 2, 1, 0, 2 - bg_event 3, 1, 0, 3 - bg_event 5, 1, 0, 4 - bg_event 7, 2, 0, 5 + def_bg_events + bg_event 1, 1, 0, 1 + bg_event 2, 1, 0, 2 + bg_event 3, 1, 0, 3 + bg_event 5, 1, 0, 4 + bg_event 7, 2, 0, 5 - db 2 ; person events - object_event 8, 1, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 1, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 8, 1, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 1, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 PlayerHouse2F_Blocks:: INCBIN "maps/PlayerHouse2F.blk" diff --git a/data/maps/objects/PowerPlant1.asm b/data/maps/objects/PowerPlant1.asm index 9a8f33e..300235e 100644 --- a/data/maps/objects/PowerPlant1.asm +++ b/data/maps/objects/PowerPlant1.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/PowerPlant1.asm", ROMX PowerPlant1_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events PowerPlant1_Blocks:: INCBIN "maps/PowerPlant1.blk" diff --git a/data/maps/objects/PowerPlant2.asm b/data/maps/objects/PowerPlant2.asm index 9f68bb5..2ca92c1 100644 --- a/data/maps/objects/PowerPlant2.asm +++ b/data/maps/objects/PowerPlant2.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/PowerPlant2.asm", ROMX PowerPlant2_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events PowerPlant2_Blocks:: INCBIN "maps/PowerPlant2.blk" diff --git a/data/maps/objects/PowerPlant3.asm b/data/maps/objects/PowerPlant3.asm index 46bdc0f..9ef0ef7 100644 --- a/data/maps/objects/PowerPlant3.asm +++ b/data/maps/objects/PowerPlant3.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/PowerPlant3.asm", ROMX PowerPlant3_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events PowerPlant3_Blocks:: INCBIN "maps/PowerPlant3.blk" diff --git a/data/maps/objects/PowerPlant4.asm b/data/maps/objects/PowerPlant4.asm index 9c5ee38..feb440b 100644 --- a/data/maps/objects/PowerPlant4.asm +++ b/data/maps/objects/PowerPlant4.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/PowerPlant4.asm", ROMX PowerPlant4_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events PowerPlant4_Blocks:: INCBIN "maps/PowerPlant4.blk" diff --git a/data/maps/objects/Prince.asm b/data/maps/objects/Prince.asm index 6ad0f8a..d903d8e 100644 --- a/data/maps/objects/Prince.asm +++ b/data/maps/objects/Prince.asm @@ -9,11 +9,11 @@ SECTION "data/maps/objects/Prince.asm", ROMX Prince_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events Prince_Blocks:: INCBIN "maps/Prince.blk" diff --git a/data/maps/objects/PrinceRoute.asm b/data/maps/objects/PrinceRoute.asm index 5eea1ff..23134f7 100644 --- a/data/maps/objects/PrinceRoute.asm +++ b/data/maps/objects/PrinceRoute.asm @@ -9,11 +9,11 @@ SECTION "data/maps/objects/PrinceRoute.asm", ROMX PrinceRoute_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events PrinceRoute_Blocks:: INCBIN "maps/PrinceRoute.blk" diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index 5fcd48f..6432ab3 100644 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -9,18 +9,18 @@ SECTION "data/maps/objects/Route15.asm", ROMX Route15_MapEvents:: dw $4000 ; unknown - db 7 ; warp events - warp_event 8, 5, 1, BAADON_ROUTE_GATE_NEWTYPE, wOverworldMapBlocks + 68 - warp_event 9, 5, 2, BAADON_ROUTE_GATE_NEWTYPE, wOverworldMapBlocks + 68 - warp_event 9, 10, 1, ROUTE_15_POKECENTER_1F, wOverworldMapBlocks + 131 - warp_event 14, 12, 6, ROUTE_15, wOverworldMapBlocks + 155 - warp_event 14, 13, 7, ROUTE_15, wOverworldMapBlocks + 155 - warp_event 21, 8, 4, ROUTE_15, wOverworldMapBlocks + 116 - warp_event 21, 9, 5, ROUTE_15, wOverworldMapBlocks + 116 + def_warp_events + warp_event 8, 5, BAADON_ROUTE_GATE_NEWTYPE, 1, 68 + warp_event 9, 5, BAADON_ROUTE_GATE_NEWTYPE, 2, 68 + warp_event 9, 10, ROUTE_15_POKECENTER_1F, 1, 131 + warp_event 14, 12, ROUTE_15, 6, 155 + warp_event 14, 13, ROUTE_15, 7, 155 + warp_event 21, 8, ROUTE_15, 4, 116 + warp_event 21, 9, ROUTE_15, 5, 116 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events Route15_Blocks:: INCBIN "maps/Route15.blk" diff --git a/data/maps/objects/Route15Pokecenter1F.asm b/data/maps/objects/Route15Pokecenter1F.asm index a4dd565..2f48fb0 100644 --- a/data/maps/objects/Route15Pokecenter1F.asm +++ b/data/maps/objects/Route15Pokecenter1F.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/Route15Pokecenter1F.asm", ROMX Route15Pokecenter1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 5, 7, 3, ROUTE_15, wOverworldMapBlocks + 59 - warp_event 6, 7, 3, ROUTE_15, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, ROUTE_15_POKECENTER_2F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 5, 7, ROUTE_15, 3, 59 + warp_event 6, 7, ROUTE_15, 3, 60 + warp_event 0, 7, ROUTE_15_POKECENTER_2F, 1, 57 - db 0 ; bg events + def_bg_events - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 Route15Pokecenter1F_Blocks:: INCBIN "maps/Route15Pokecenter1F.blk" diff --git a/data/maps/objects/Route15Pokecenter2F.asm b/data/maps/objects/Route15Pokecenter2F.asm index 9ac2787..84cb9b3 100644 --- a/data/maps/objects/Route15Pokecenter2F.asm +++ b/data/maps/objects/Route15Pokecenter2F.asm @@ -7,12 +7,12 @@ SECTION "data/maps/objects/Route15Pokecenter2F.asm", ROMX Route15Pokecenter2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 0, 7, 3, ROUTE_15_POKECENTER_1F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 0, 7, ROUTE_15_POKECENTER_1F, 3, 57 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events Route15Pokecenter2F_Blocks:: INCBIN "maps/Route15Pokecenter2F.blk" diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm index c83c5e7..3a17ff5 100644 --- a/data/maps/objects/Route18.asm +++ b/data/maps/objects/Route18.asm @@ -9,14 +9,14 @@ SECTION "data/maps/objects/Route18.asm", ROMX Route18_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 8, 5, 1, NEWTYPE_ROUTE_GATE, wOverworldMapBlocks + 53 - warp_event 9, 5, 2, NEWTYPE_ROUTE_GATE, wOverworldMapBlocks + 53 - warp_event 13, 28, 1, ROUTE_18_POKECENTER_1F, wOverworldMapBlocks + 247 + def_warp_events + warp_event 8, 5, NEWTYPE_ROUTE_GATE, 1, 53 + warp_event 9, 5, NEWTYPE_ROUTE_GATE, 2, 53 + warp_event 13, 28, ROUTE_18_POKECENTER_1F, 1, 247 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events Route18_Blocks:: INCBIN "maps/Route18.blk" diff --git a/data/maps/objects/Route18Pokecenter1F.asm b/data/maps/objects/Route18Pokecenter1F.asm index 9018bcf..584b751 100644 --- a/data/maps/objects/Route18Pokecenter1F.asm +++ b/data/maps/objects/Route18Pokecenter1F.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/Route18Pokecenter1F.asm", ROMX Route18Pokecenter1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 5, 7, 3, ROUTE_18, wOverworldMapBlocks + 59 - warp_event 6, 7, 3, ROUTE_18, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, ROUTE_18_POKECENTER_2F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 5, 7, ROUTE_18, 3, 59 + warp_event 6, 7, ROUTE_18, 3, 60 + warp_event 0, 7, ROUTE_18_POKECENTER_2F, 1, 57 - db 0 ; bg events + def_bg_events - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 Route18Pokecenter1F_Blocks:: INCBIN "maps/Route18Pokecenter1F.blk" diff --git a/data/maps/objects/Route18Pokecenter2F.asm b/data/maps/objects/Route18Pokecenter2F.asm index 6c95739..de1b523 100644 --- a/data/maps/objects/Route18Pokecenter2F.asm +++ b/data/maps/objects/Route18Pokecenter2F.asm @@ -7,12 +7,12 @@ SECTION "data/maps/objects/Route18Pokecenter2F.asm", ROMX Route18Pokecenter2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 0, 7, 3, ROUTE_18_POKECENTER_1F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 0, 7, ROUTE_18_POKECENTER_1F, 3, 57 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events Route18Pokecenter2F_Blocks:: INCBIN "maps/Route18Pokecenter2F.blk" diff --git a/data/maps/objects/Route1Gate1F.asm b/data/maps/objects/Route1Gate1F.asm index fcbd314..3d4afc9 100644 --- a/data/maps/objects/Route1Gate1F.asm +++ b/data/maps/objects/Route1Gate1F.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/Route1Gate1F.asm", ROMX Route1Gate1F_MapEvents:: dw $4000 ; unknown - db 5 ; warp events - warp_event 4, 7, 1, ROUTE_1_P2, wOverworldMapBlocks + 47 - warp_event 5, 7, 2, ROUTE_1_P2, wOverworldMapBlocks + 47 - warp_event 4, 0, 12, OLD_CITY, wOverworldMapBlocks + 14 - warp_event 5, 0, 13, OLD_CITY, wOverworldMapBlocks + 14 - warp_event 1, 0, 1, ROUTE_1_GATE_2F, wOverworldMapBlocks + 12 + def_warp_events + warp_event 4, 7, ROUTE_1_P2, 1, 47 + warp_event 5, 7, ROUTE_1_P2, 2, 47 + warp_event 4, 0, OLD_CITY, 12, 14 + warp_event 5, 0, OLD_CITY, 13, 14 + warp_event 1, 0, ROUTE_1_GATE_2F, 1, 12 - db 0 ; bg events + def_bg_events - db 2 ; person events - object_event 6, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 6, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 Route1Gate1F_Blocks:: INCBIN "maps/Route1Gate1F.blk" diff --git a/data/maps/objects/Route1Gate2F.asm b/data/maps/objects/Route1Gate2F.asm index 18fe387..198ed0a 100644 --- a/data/maps/objects/Route1Gate2F.asm +++ b/data/maps/objects/Route1Gate2F.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/Route1Gate2F.asm", ROMX Route1Gate2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 5, 0, 5, ROUTE_1_GATE_1F, wOverworldMapBlocks + 13 + def_warp_events + warp_event 5, 0, ROUTE_1_GATE_1F, 5, 13 - db 2 ; bg events - bg_event 1, 0, 0, 1 - bg_event 3, 0, 0, 2 + def_bg_events + bg_event 1, 0, 0, 1 + bg_event 3, 0, 0, 2 - db 2 ; person events - object_event 3, 3, SPRITE_LASS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 4, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 3, 3, SPRITE_LASS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 4, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 Route1Gate2F_Blocks:: INCBIN "maps/Route1Gate2F.blk" diff --git a/data/maps/objects/Route1P1.asm b/data/maps/objects/Route1P1.asm index 0a66c03..dda9717 100644 --- a/data/maps/objects/Route1P1.asm +++ b/data/maps/objects/Route1P1.asm @@ -9,16 +9,16 @@ SECTION "data/maps/objects/Route1P1.asm", ROMX Route1P1_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 8, 8, 2, SHIZUKANA_OKA, wOverworldMapBlocks + 110 - warp_event 8, 9, 3, SHIZUKANA_OKA, wOverworldMapBlocks + 110 + def_warp_events + warp_event 8, 8, SHIZUKANA_OKA, 2, 110 + warp_event 8, 9, SHIZUKANA_OKA, 3, 110 - db 2 ; bg events - bg_event 12, 7, 0, 1 - bg_event 20, 8, 0, 2 + def_bg_events + bg_event 12, 7, 0, 1 + bg_event 20, 8, 0, 2 - db 2 ; person events - object_event 20, 5, SPRITE_SUPER_NERD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 20, 5, SPRITE_SUPER_NERD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 18, 12, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 Route1P1_Blocks:: diff --git a/data/maps/objects/Route1P2.asm b/data/maps/objects/Route1P2.asm index dd8381d..dfd4a23 100644 --- a/data/maps/objects/Route1P2.asm +++ b/data/maps/objects/Route1P2.asm @@ -9,18 +9,18 @@ SECTION "data/maps/objects/Route1P2.asm", ROMX Route1P2_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 8, 5, 1, ROUTE_1_GATE_1F, wOverworldMapBlocks + 53 - warp_event 9, 5, 2, ROUTE_1_GATE_1F, wOverworldMapBlocks + 53 - warp_event 8, 25, 6, SHIZUKANA_OKA, wOverworldMapBlocks + 213 - warp_event 9, 25, 9, SHIZUKANA_OKA, wOverworldMapBlocks + 213 + def_warp_events + warp_event 8, 5, ROUTE_1_GATE_1F, 1, 53 + warp_event 9, 5, ROUTE_1_GATE_1F, 2, 53 + warp_event 8, 25, SHIZUKANA_OKA, 6, 213 + warp_event 9, 25, SHIZUKANA_OKA, 9, 213 - db 1 ; bg events + def_bg_events bg_event 10, 20, 0, 1 - db 2 ; person events - object_event 8, 6, SPRITE_SILVER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 15, SPRITE_TEACHER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 + def_object_events + object_event 8, 6, SPRITE_SILVER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 15, SPRITE_TEACHER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 Route1P2_Blocks:: INCBIN "maps/Route1P2.blk" diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index 5480743..ab400d0 100644 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -9,19 +9,19 @@ SECTION "data/maps/objects/Route2.asm", ROMX Route2_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 6, 5, 3, ROUTE_2_GATE_1F, wOverworldMapBlocks + 67 - warp_event 15, 4, 1, ROUTE_2_HOUSE, wOverworldMapBlocks + 71 + def_warp_events + warp_event 6, 5, ROUTE_2_GATE_1F, 3, 67 + warp_event 15, 4, ROUTE_2_HOUSE, 1, 71 - db 3 ; bg events - bg_event 15, 4, 0, 3 - bg_event 14, 5, 0, 1 + def_bg_events + bg_event 15, 4, 0, 3 + bg_event 14, 5, 0, 1 bg_event 24, 10, 0, 2 - db 3 ; person events + def_object_events object_event 19, 11, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 - object_event 15, 7, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 8, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 + object_event 15, 7, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 8, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 Route2_Blocks:: INCBIN "maps/Route2.blk" diff --git a/data/maps/objects/Route2Gate1F.asm b/data/maps/objects/Route2Gate1F.asm index a9639b0..8719634 100644 --- a/data/maps/objects/Route2Gate1F.asm +++ b/data/maps/objects/Route2Gate1F.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/Route2Gate1F.asm", ROMX Route2Gate1F_MapEvents:: dw $4000 ; unknown - db 5 ; warp events - warp_event 0, 7, 13, WEST, wOverworldMapBlocks + 45 - warp_event 1, 7, 13, WEST, wOverworldMapBlocks + 45 - warp_event 8, 7, 1, ROUTE_2, wOverworldMapBlocks + 49 - warp_event 9, 7, 1, ROUTE_2, wOverworldMapBlocks + 49 - warp_event 1, 0, 1, ROUTE_2_GATE_2F, wOverworldMapBlocks + 12 + def_warp_events + warp_event 0, 7, WEST, 13, 45 + warp_event 1, 7, WEST, 13, 45 + warp_event 8, 7, ROUTE_2, 1, 49 + warp_event 9, 7, ROUTE_2, 1, 49 + warp_event 1, 0, ROUTE_2_GATE_2F, 1, 12 - db 0 ; bg events + def_bg_events - db 2 ; person events - object_event 8, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 1, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 8, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 1, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 Route2Gate1F_Blocks:: INCBIN "maps/Route2Gate1F.blk" diff --git a/data/maps/objects/Route2Gate2F.asm b/data/maps/objects/Route2Gate2F.asm index 1fc7984..56c99fd 100644 --- a/data/maps/objects/Route2Gate2F.asm +++ b/data/maps/objects/Route2Gate2F.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/Route2Gate2F.asm", ROMX Route2Gate2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 5, 0, 5, ROUTE_2_GATE_1F, wOverworldMapBlocks + 13 + def_warp_events + warp_event 5, 0, ROUTE_2_GATE_1F, 5, 13 - db 2 ; bg events - bg_event 1, 0, 0, 1 - bg_event 3, 0, 0, 2 + def_bg_events + bg_event 1, 0, 0, 1 + bg_event 3, 0, 0, 2 - db 2 ; person events - object_event 2, 2, SPRITE_LASS, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 4, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 2, SPRITE_LASS, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 4, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 Route2Gate2F_Blocks:: INCBIN "maps/Route2Gate2F.blk" diff --git a/data/maps/objects/Route2House.asm b/data/maps/objects/Route2House.asm index 2088ef6..e8010d1 100644 --- a/data/maps/objects/Route2House.asm +++ b/data/maps/objects/Route2House.asm @@ -7,20 +7,20 @@ SECTION "data/maps/objects/Route2House.asm", ROMX Route2House_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 2, ROUTE_2, wOverworldMapBlocks + 43 - warp_event 5, 7, 2, ROUTE_2, wOverworldMapBlocks + 43 + def_warp_events + warp_event 4, 7, ROUTE_2, 2, 43 + warp_event 5, 7, ROUTE_2, 2, 43 - db 6 ; bg events - bg_event 0, 0, 0, 1 - bg_event 2, 0, 0, 1 - bg_event 4, 0, 0, 1 - bg_event 6, 0, 0, 1 - bg_event 0, 3, 0, 2 - bg_event 4, 3, 0, 3 + def_bg_events + bg_event 0, 0, 0, 1 + bg_event 2, 0, 0, 1 + bg_event 4, 0, 0, 1 + bg_event 6, 0, 0, 1 + bg_event 0, 3, 0, 2 + bg_event 4, 3, 0, 3 - db 1 ; person events - object_event 6, 6, SPRITE_SCIENTIST, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 6, 6, SPRITE_SCIENTIST, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 Route2House_Blocks:: INCBIN "maps/Route2House.blk" diff --git a/data/maps/objects/RouteSilentEast.asm b/data/maps/objects/RouteSilentEast.asm index fe47b6a..9a7a256 100644 --- a/data/maps/objects/RouteSilentEast.asm +++ b/data/maps/objects/RouteSilentEast.asm @@ -9,12 +9,12 @@ SECTION "data/maps/objects/RouteSilentEast.asm", ROMX RouteSilentEast_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 55, 9, 1, ROUTE_SILENT_EAST_GATE, wOverworldMapBlocks + 208 + def_warp_events + warp_event 55, 9, ROUTE_SILENT_EAST_GATE, 1, 208 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events RouteSilentEast_Blocks:: INCBIN "maps/RouteSilentEast.blk" diff --git a/data/maps/objects/RouteSilentEastGate.asm b/data/maps/objects/RouteSilentEastGate.asm index e292b83..f4f556e 100644 --- a/data/maps/objects/RouteSilentEastGate.asm +++ b/data/maps/objects/RouteSilentEastGate.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/RouteSilentEastGate.asm", ROMX RouteSilentEastGate_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 0, 7, 1, ROUTE_SILENT_EAST, wOverworldMapBlocks + 45 - warp_event 1, 7, 1, ROUTE_SILENT_EAST, wOverworldMapBlocks + 45 - warp_event 8, 7, 29, KANTO, wOverworldMapBlocks + 49 - warp_event 9, 7, 29, KANTO, wOverworldMapBlocks + 49 + def_warp_events + warp_event 0, 7, ROUTE_SILENT_EAST, 1, 45 + warp_event 1, 7, ROUTE_SILENT_EAST, 1, 45 + warp_event 8, 7, KANTO, 29, 49 + warp_event 9, 7, KANTO, 29, 49 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events RouteSilentEastGate_Blocks:: INCBIN "maps/RouteSilentEastGate.blk" diff --git a/data/maps/objects/RuinsOfAlphEntrance.asm b/data/maps/objects/RuinsOfAlphEntrance.asm index e0e5d1f..4ff53b3 100644 --- a/data/maps/objects/RuinsOfAlphEntrance.asm +++ b/data/maps/objects/RuinsOfAlphEntrance.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/RuinsOfAlphEntrance.asm", ROMX RuinsOfAlphEntrance_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events RuinsOfAlphEntrance_Blocks:: INCBIN "maps/RuinsOfAlphEntrance.blk" diff --git a/data/maps/objects/RuinsOfAlphMain.asm b/data/maps/objects/RuinsOfAlphMain.asm index decc978..8e0a36c 100644 --- a/data/maps/objects/RuinsOfAlphMain.asm +++ b/data/maps/objects/RuinsOfAlphMain.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/RuinsOfAlphMain.asm", ROMX RuinsOfAlphMain_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events RuinsOfAlphMain_Blocks:: INCBIN "maps/RuinsOfAlphMain.blk" diff --git a/data/maps/objects/ShizukanaOka.asm b/data/maps/objects/ShizukanaOka.asm index e4c1e51..b7f8e46 100644 --- a/data/maps/objects/ShizukanaOka.asm +++ b/data/maps/objects/ShizukanaOka.asm @@ -7,29 +7,29 @@ SECTION "data/maps/objects/ShizukanaOka.asm", ROMX ShizukanaOka_MapEvents:: dw $4000 ; unknown - db 10 ; warp events - warp_event 49, 28, 1, ROUTE_1_P1, wOverworldMapBlocks + 490 - warp_event 49, 29, 1, ROUTE_1_P1, wOverworldMapBlocks + 490 - warp_event 49, 30, 2, ROUTE_1_P1, wOverworldMapBlocks + 521 - warp_event 49, 31, 2, ROUTE_1_P1, wOverworldMapBlocks + 521 - warp_event 4, 0, 3, ROUTE_1_P2, wOverworldMapBlocks + 34 - warp_event 5, 0, 3, ROUTE_1_P2, wOverworldMapBlocks + 34 - warp_event 6, 0, 3, ROUTE_1_P2, wOverworldMapBlocks + 35 - warp_event 7, 0, 4, ROUTE_1_P2, wOverworldMapBlocks + 35 - warp_event 8, 0, 4, ROUTE_1_P2, wOverworldMapBlocks + 36 - warp_event 9, 0, 4, ROUTE_1_P2, wOverworldMapBlocks + 36 + def_warp_events + warp_event 49, 28, ROUTE_1_P1, 1, 490 + warp_event 49, 29, ROUTE_1_P1, 1, 490 + warp_event 49, 30, ROUTE_1_P1, 2, 521 + warp_event 49, 31, ROUTE_1_P1, 2, 521 + warp_event 4, 0, ROUTE_1_P2, 3, 34 + warp_event 5, 0, ROUTE_1_P2, 3, 34 + warp_event 6, 0, ROUTE_1_P2, 3, 35 + warp_event 7, 0, ROUTE_1_P2, 4, 35 + warp_event 8, 0, ROUTE_1_P2, 4, 36 + warp_event 9, 0, ROUTE_1_P2, 4, 36 - db 2 ; bg events - bg_event 9, 2, 0, 1 + def_bg_events + bg_event 9, 2, 0, 1 bg_event 47, 28, 0, 2 - db 6 ; person events + def_object_events object_event 41, 28, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 7, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 + object_event 9, 7, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 object_event 41, 19, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 object_event 27, 14, SPRITE_FISHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 object_event 36, 16, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 - object_event 9, 25, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 + object_event 9, 25, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 ShizukanaOka_Blocks:: INCBIN "maps/ShizukanaOka.blk" diff --git a/data/maps/objects/SilentHill.asm b/data/maps/objects/SilentHill.asm index daabd30..231b31c 100644 --- a/data/maps/objects/SilentHill.asm +++ b/data/maps/objects/SilentHill.asm @@ -10,24 +10,24 @@ SECTION "data/maps/objects/SilentHill.asm", ROMX SilentHill_MapEvents:: dw $4000 ; unknown - db 5 ; warp events - warp_event 5, 4, 1, PLAYER_HOUSE_1F, wOverworldMapBlocks + 51 - warp_event 13, 4, 1, SILENT_HILL_POKECENTER, wOverworldMapBlocks + 55 - warp_event 3, 12, 1, SILENT_HILL_HOUSE, wOverworldMapBlocks + 114 - warp_event 14, 11, 1, SILENT_HILL_LAB_FRONT, wOverworldMapBlocks + 104 - warp_event 15, 11, 2, SILENT_HILL_LAB_FRONT, wOverworldMapBlocks + 104 + def_warp_events + warp_event 5, 4, PLAYER_HOUSE_1F, 1, 51 + warp_event 13, 4, SILENT_HILL_POKECENTER, 1, 55 + warp_event 3, 12, SILENT_HILL_HOUSE, 1, 114 + warp_event 14, 11, SILENT_HILL_LAB_FRONT, 1, 104 + warp_event 15, 11, SILENT_HILL_LAB_FRONT, 2, 104 - db 5 ; bg events - bg_event 8, 4, 0, 1 - bg_event 14, 4, 0, 2 - bg_event 16, 5, 0, 3 + def_bg_events + bg_event 8, 4, 0, 1 + bg_event 14, 4, 0, 2 + bg_event 16, 5, 0, 3 bg_event 10, 11, 0, 4 - bg_event 6, 12, 0, 5 + bg_event 6, 12, 0, 5 - db 4 ; person events - object_event 6, 10, SPRITE_SILVER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 9, SPRITE_BLUE, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 8, 6, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 6, 10, SPRITE_SILVER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 9, SPRITE_BLUE, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 8, 6, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 13, SPRITE_SUPER_NERD, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 SilentHill_Blocks:: diff --git a/data/maps/objects/SilentHillHouse.asm b/data/maps/objects/SilentHillHouse.asm index eb2fb03..1ada160 100644 --- a/data/maps/objects/SilentHillHouse.asm +++ b/data/maps/objects/SilentHillHouse.asm @@ -7,21 +7,21 @@ SECTION "data/maps/objects/SilentHillHouse.asm", ROMX SilentHillHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 3, SILENT_HILL, wOverworldMapBlocks + 47 - warp_event 5, 7, 3, SILENT_HILL, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, SILENT_HILL, 3, 47 + warp_event 5, 7, SILENT_HILL, 3, 47 - db 6 ; bg events - bg_event 0, 1, 0, 1 - bg_event 4, 1, 0, 2 - bg_event 5, 1, 0, 3 - bg_event 9, 1, 0, 4 - bg_event 8, 1, 0, 5 - bg_event 2, 0, 0, 6 + def_bg_events + bg_event 0, 1, 0, 1 + bg_event 4, 1, 0, 2 + bg_event 5, 1, 0, 3 + bg_event 9, 1, 0, 4 + bg_event 8, 1, 0, 5 + bg_event 2, 0, 0, 6 - db 2 ; person events - object_event 5, 3, SPRITE_SILVERS_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 4, SPRITE_ROCKER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 3, SPRITE_SILVERS_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 4, SPRITE_ROCKER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 SilentHillHouse_Blocks:: INCBIN "maps/SilentHillHouse.blk" diff --git a/data/maps/objects/SilentHillLabBack.asm b/data/maps/objects/SilentHillLabBack.asm index ed60cec..56f248e 100644 --- a/data/maps/objects/SilentHillLabBack.asm +++ b/data/maps/objects/SilentHillLabBack.asm @@ -7,23 +7,23 @@ SECTION "data/maps/objects/SilentHillLabBack.asm", ROMX SilentHillLabBack_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 3, 7, 3, SILENT_HILL_LAB_FRONT, wOverworldMapBlocks + 42 - warp_event 4, 7, 3, SILENT_HILL_LAB_FRONT, wOverworldMapBlocks + 43 + def_warp_events + warp_event 3, 7, SILENT_HILL_LAB_FRONT, 3, 42 + warp_event 4, 7, SILENT_HILL_LAB_FRONT, 3, 43 - db 5 ; bg events - bg_event 0, 1, 0, 1 - bg_event 1, 1, 0, 2 - bg_event 2, 1, 0, 3 - bg_event 3, 1, 0, 4 - bg_event 6, 0, 0, 5 + def_bg_events + bg_event 0, 1, 0, 1 + bg_event 1, 1, 0, 2 + bg_event 2, 1, 0, 3 + bg_event 3, 1, 0, 4 + bg_event 6, 0, 0, 5 - db 5 ; person events - object_event 4, 2, SPRITE_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 4, SPRITE_SILVER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 4, 2, SPRITE_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 4, SPRITE_SILVER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 SilentHillLabBack_Blocks:: INCBIN "maps/SilentHillLabBack.blk" diff --git a/data/maps/objects/SilentHillLabFront.asm b/data/maps/objects/SilentHillLabFront.asm index 66cb05a..564d6e3 100644 --- a/data/maps/objects/SilentHillLabFront.asm +++ b/data/maps/objects/SilentHillLabFront.asm @@ -7,40 +7,40 @@ SECTION "data/maps/objects/SilentHillLabFront.asm", ROMX SilentHillLabFront_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 3, 15, 4, SILENT_HILL, wOverworldMapBlocks + 82 - warp_event 4, 15, 5, SILENT_HILL, wOverworldMapBlocks + 83 - warp_event 4, 0, 2, SILENT_HILL_LAB_BACK, wOverworldMapBlocks + 13 + def_warp_events + warp_event 3, 15, SILENT_HILL, 4, 82 + warp_event 4, 15, SILENT_HILL, 5, 83 + warp_event 4, 0, SILENT_HILL_LAB_BACK, 2, 13 - db 15 ; bg events - bg_event 6, 1, 0, 1 - bg_event 2, 0, 0, 2 - bg_event 0, 7, 0, 3 - bg_event 1, 7, 0, 4 - bg_event 2, 7, 0, 5 - bg_event 5, 7, 0, 6 - bg_event 6, 7, 0, 7 - bg_event 7, 7, 0, 8 - bg_event 0, 11, 0, 9 - bg_event 1, 11, 0, 10 - bg_event 2, 11, 0, 11 - bg_event 5, 11, 0, 12 - bg_event 6, 11, 0, 13 - bg_event 7, 11, 0, 14 - bg_event 4, 0, 0, 15 + def_bg_events + bg_event 6, 1, 0, 1 + bg_event 2, 0, 0, 2 + bg_event 0, 7, 0, 3 + bg_event 1, 7, 0, 4 + bg_event 2, 7, 0, 5 + bg_event 5, 7, 0, 6 + bg_event 6, 7, 0, 7 + bg_event 7, 7, 0, 8 + bg_event 0, 11, 0, 9 + bg_event 1, 11, 0, 10 + bg_event 2, 11, 0, 11 + bg_event 5, 11, 0, 12 + bg_event 6, 11, 0, 13 + bg_event 7, 11, 0, 14 + bg_event 4, 0, 0, 15 - db 11 ; person events - object_event 4, 2, SPRITE_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 0, SPRITE_OKIDO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 4, SPRITE_SILVER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 0, SPRITE_SILVER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 14, SPRITE_BLUE, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 3, SPRITE_BLUE, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 13, SPRITE_NANAMI, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 8, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 12, SPRITE_SCIENTIST, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 1, SPRITE_POKEDEX, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 1, SPRITE_POKEDEX, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 4, 2, SPRITE_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 0, SPRITE_OKIDO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 4, SPRITE_SILVER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 0, SPRITE_SILVER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 14, SPRITE_BLUE, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 3, SPRITE_BLUE, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 13, SPRITE_NANAMI, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 8, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 12, SPRITE_SCIENTIST, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 1, SPRITE_POKEDEX, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 1, SPRITE_POKEDEX, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 SilentHillLabFront_Blocks:: INCBIN "maps/SilentHillLabFront.blk" diff --git a/data/maps/objects/SilentHillPokecenter.asm b/data/maps/objects/SilentHillPokecenter.asm index cd68ffc..c7e3392 100644 --- a/data/maps/objects/SilentHillPokecenter.asm +++ b/data/maps/objects/SilentHillPokecenter.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/SilentHillPokecenter.asm", ROMX SilentHillPokecenter_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 5, 7, 2, SILENT_HILL, wOverworldMapBlocks + 59 - warp_event 6, 7, 2, SILENT_HILL, wOverworldMapBlocks + 60 + def_warp_events + warp_event 5, 7, SILENT_HILL, 2, 59 + warp_event 6, 7, SILENT_HILL, 2, 60 - db 1 ; bg events - bg_event 13, 1, 0, 1 + def_bg_events + bg_event 13, 1, 0, 1 - db 5 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 4, SPRITE_24, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_SIDON, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 4, SPRITE_24, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_SIDON, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 SilentHillPokecenter_Blocks:: INCBIN "maps/SilentHillPokecenter.blk" diff --git a/data/maps/objects/SlowpokeWellEntrance.asm b/data/maps/objects/SlowpokeWellEntrance.asm index 3c7ede6..949051c 100644 --- a/data/maps/objects/SlowpokeWellEntrance.asm +++ b/data/maps/objects/SlowpokeWellEntrance.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/SlowpokeWellEntrance.asm", ROMX SlowpokeWellEntrance_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events SlowpokeWellEntrance_Blocks:: INCBIN "maps/SlowpokeWellEntrance.blk" diff --git a/data/maps/objects/SlowpokeWellMain.asm b/data/maps/objects/SlowpokeWellMain.asm index 0a20a6f..6c80504 100644 --- a/data/maps/objects/SlowpokeWellMain.asm +++ b/data/maps/objects/SlowpokeWellMain.asm @@ -7,11 +7,11 @@ SECTION "data/maps/objects/SlowpokeWellMain.asm", ROMX SlowpokeWellMain_MapEvents:: dw $0 ; unknown - db 0 ; warp events + def_warp_events - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events SlowpokeWellMain_Blocks:: INCBIN "maps/SlowpokeWellMain.blk" diff --git a/data/maps/objects/South.asm b/data/maps/objects/South.asm index 027b283..f3c9f32 100644 --- a/data/maps/objects/South.asm +++ b/data/maps/objects/South.asm @@ -10,25 +10,25 @@ SECTION "data/maps/objects/South.asm", ROMX South_MapEvents:: dw $4000 ; unknown - db 9 ; warp events - warp_event 26, 10, 1, SOUTH_HOUSE_1, wOverworldMapBlocks + 170 - warp_event 33, 14, 1, SOUTH_POKECENTER_1F, wOverworldMapBlocks + 225 - warp_event 19, 22, 1, SOUTH_MART, wOverworldMapBlocks + 322 - warp_event 33, 23, 1, SOUTH_HOUSE_2, wOverworldMapBlocks + 329 - warp_event 30, 5, 1, FONTO_ROUTE_GATE_3, wOverworldMapBlocks + 94 - warp_event 31, 5, 2, FONTO_ROUTE_GATE_3, wOverworldMapBlocks + 94 - warp_event 35, 19, 2, FONTO_ROUTE_GATE_1, wOverworldMapBlocks + 278 - warp_event 30, 30, 3, HAITEKU_WEST_ROUTE_GATE, wOverworldMapBlocks + 432 - warp_event 31, 30, 4, HAITEKU_WEST_ROUTE_GATE, wOverworldMapBlocks + 432 + def_warp_events + warp_event 26, 10, SOUTH_HOUSE_1, 1, 170 + warp_event 33, 14, SOUTH_POKECENTER_1F, 1, 225 + warp_event 19, 22, SOUTH_MART, 1, 322 + warp_event 33, 23, SOUTH_HOUSE_2, 1, 329 + warp_event 30, 5, FONTO_ROUTE_GATE_3, 1, 94 + warp_event 31, 5, FONTO_ROUTE_GATE_3, 2, 94 + warp_event 35, 19, FONTO_ROUTE_GATE_1, 2, 278 + warp_event 30, 30, HAITEKU_WEST_ROUTE_GATE, 3, 432 + warp_event 31, 30, HAITEKU_WEST_ROUTE_GATE, 4, 432 - db 5 ; bg events + def_bg_events bg_event 30, 14, 0, 1 bg_event 34, 14, 0, 2 bg_event 28, 17, 0, 3 bg_event 16, 22, 0, 4 bg_event 20, 22, 0, 5 - db 4 ; person events + def_object_events object_event 25, 21, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 24, 21, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 22, 16, SPRITE_ROCKER, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/SouthHouse1.asm b/data/maps/objects/SouthHouse1.asm index 07db5fa..ed0a313 100644 --- a/data/maps/objects/SouthHouse1.asm +++ b/data/maps/objects/SouthHouse1.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/SouthHouse1.asm", ROMX SouthHouse1_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 1, SOUTH, wOverworldMapBlocks + 47 - warp_event 5, 7, 1, SOUTH, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, SOUTH, 1, 47 + warp_event 5, 7, SOUTH, 1, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 2, 3, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 3, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 SouthHouse1_Blocks:: INCBIN "maps/SouthHouse1.blk" diff --git a/data/maps/objects/SouthHouse2.asm b/data/maps/objects/SouthHouse2.asm index 2474d72..a015a49 100644 --- a/data/maps/objects/SouthHouse2.asm +++ b/data/maps/objects/SouthHouse2.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/SouthHouse2.asm", ROMX SouthHouse2_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 4, SOUTH, wOverworldMapBlocks + 47 - warp_event 5, 7, 4, SOUTH, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, SOUTH, 4, 47 + warp_event 5, 7, SOUTH, 4, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 1, 2, SPRITE_FISHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 1, 2, SPRITE_FISHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 SouthHouse2_Blocks:: INCBIN "maps/SouthHouse2.blk" diff --git a/data/maps/objects/SouthMart.asm b/data/maps/objects/SouthMart.asm index a173179..7b5e40c 100644 --- a/data/maps/objects/SouthMart.asm +++ b/data/maps/objects/SouthMart.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/SouthMart.asm", ROMX SouthMart_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 3, SOUTH, wOverworldMapBlocks + 59 - warp_event 5, 7, 3, SOUTH, wOverworldMapBlocks + 59 + def_warp_events + warp_event 4, 7, SOUTH, 3, 59 + warp_event 5, 7, SOUTH, 3, 59 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 SouthMart_Blocks:: INCBIN "maps/SouthMart.blk" diff --git a/data/maps/objects/SouthPokecenter1F.asm b/data/maps/objects/SouthPokecenter1F.asm index 3cfe73c..7167e61 100644 --- a/data/maps/objects/SouthPokecenter1F.asm +++ b/data/maps/objects/SouthPokecenter1F.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/SouthPokecenter1F.asm", ROMX SouthPokecenter1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 5, 7, 2, SOUTH, wOverworldMapBlocks + 59 - warp_event 6, 7, 2, SOUTH, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, SOUTH_POKECENTER_2F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 5, 7, SOUTH, 2, 59 + warp_event 6, 7, SOUTH, 2, 60 + warp_event 0, 7, SOUTH_POKECENTER_2F, 1, 57 - db 0 ; bg events + def_bg_events - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 SouthPokecenter1F_Blocks:: INCBIN "maps/SouthPokecenter1F.blk" diff --git a/data/maps/objects/SouthPokecenter2F.asm b/data/maps/objects/SouthPokecenter2F.asm index 5674b0e..063b8a8 100644 --- a/data/maps/objects/SouthPokecenter2F.asm +++ b/data/maps/objects/SouthPokecenter2F.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/SouthPokecenter2F.asm", ROMX SouthPokecenter2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 0, 7, 3, SOUTH_POKECENTER_1F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 0, 7, SOUTH_POKECENTER_1F, 3, 57 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 SouthPokecenter2F_Blocks:: INCBIN "maps/SouthPokecenter2F.blk" diff --git a/data/maps/objects/Stand.asm b/data/maps/objects/Stand.asm index 029a4b1..b40dd40 100644 --- a/data/maps/objects/Stand.asm +++ b/data/maps/objects/Stand.asm @@ -9,21 +9,21 @@ SECTION "data/maps/objects/Stand.asm", ROMX Stand_MapEvents:: dw $4000 ; unknown - db 10 ; warp events - warp_event 24, 17, 1, STAND_LAB, wOverworldMapBlocks + 247 - warp_event 33, 20, 1, STAND_POKECENTER_1F, wOverworldMapBlocks + 303 - warp_event 16, 21, 1, STAND_OFFICE, wOverworldMapBlocks + 295 - warp_event 35, 26, 1, STAND_MART, wOverworldMapBlocks + 382 - warp_event 26, 29, 1, STAND_HOUSE, wOverworldMapBlocks + 404 - warp_event 17, 31, 1, STAND_ROCKET_HOUSE_1F, wOverworldMapBlocks + 425 - warp_event 34, 31, 1, STAND_LEAGUE_1F, wOverworldMapBlocks + 434 - warp_event 35, 31, 2, STAND_LEAGUE_1F, wOverworldMapBlocks + 434 - warp_event 30, 13, 1, BULL_FOREST_ROUTE_GATE_STAND, wOverworldMapBlocks + 198 - warp_event 31, 13, 2, BULL_FOREST_ROUTE_GATE_STAND, wOverworldMapBlocks + 198 + def_warp_events + warp_event 24, 17, STAND_LAB, 1, 247 + warp_event 33, 20, STAND_POKECENTER_1F, 1, 303 + warp_event 16, 21, STAND_OFFICE, 1, 295 + warp_event 35, 26, STAND_MART, 1, 382 + warp_event 26, 29, STAND_HOUSE, 1, 404 + warp_event 17, 31, STAND_ROCKET_HOUSE_1F, 1, 425 + warp_event 34, 31, STAND_LEAGUE_1F, 1, 434 + warp_event 35, 31, STAND_LEAGUE_1F, 2, 434 + warp_event 30, 13, BULL_FOREST_ROUTE_GATE_STAND, 1, 198 + warp_event 31, 13, BULL_FOREST_ROUTE_GATE_STAND, 2, 198 - db 10 ; bg events - bg_event 8, 8, 0, 1 - bg_event 14, 8, 0, 2 + def_bg_events + bg_event 8, 8, 0, 1 + bg_event 14, 8, 0, 2 bg_event 20, 10, 0, 3 bg_event 16, 16, 0, 4 bg_event 10, 20, 0, 5 @@ -33,16 +33,16 @@ Stand_MapEvents:: bg_event 36, 26, 0, 9 bg_event 32, 35, 0, 10 - db 9 ; person events + def_object_events object_event 10, 10, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 17, SPRITE_TWIN, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 28, 19, SPRITE_ROCKER, FACE_RIGHT, 0, 3, -1, -1, 0, 0, 0, 0, 0, 0 object_event 30, 31, SPRITE_TEACHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 21, 8, SPRITE_SIDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 6, SPRITE_PIPPI, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_SIDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 21, 8, SPRITE_SIDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 6, SPRITE_PIPPI, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_SIDON, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 15, SPRITE_POPPO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 21, SPRITE_SIDON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 21, SPRITE_SIDON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 Stand_Blocks:: INCBIN "maps/Stand.blk" diff --git a/data/maps/objects/StandHouse.asm b/data/maps/objects/StandHouse.asm index 75655c0..bd5f043 100644 --- a/data/maps/objects/StandHouse.asm +++ b/data/maps/objects/StandHouse.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/StandHouse.asm", ROMX StandHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 5, STAND, wOverworldMapBlocks + 47 - warp_event 5, 7, 5, STAND, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, STAND, 5, 47 + warp_event 5, 7, STAND, 5, 47 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 2, 3, SPRITE_SUPER_NERD, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 3, SPRITE_SUPER_NERD, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 StandHouse_Blocks:: INCBIN "maps/StandHouse.blk" diff --git a/data/maps/objects/StandLab.asm b/data/maps/objects/StandLab.asm index eabce9c..cae7733 100644 --- a/data/maps/objects/StandLab.asm +++ b/data/maps/objects/StandLab.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/StandLab.asm", ROMX StandLab_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 3, 7, 1, STAND, wOverworldMapBlocks + 42 - warp_event 4, 7, 1, STAND, wOverworldMapBlocks + 43 + def_warp_events + warp_event 3, 7, STAND, 1, 42 + warp_event 4, 7, STAND, 1, 43 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 2, 3, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 3, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 StandLab_Blocks:: INCBIN "maps/StandLab.blk" diff --git a/data/maps/objects/StandLeague1F.asm b/data/maps/objects/StandLeague1F.asm index 00d550c..c12de25 100644 --- a/data/maps/objects/StandLeague1F.asm +++ b/data/maps/objects/StandLeague1F.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/StandLeague1F.asm", ROMX StandLeague1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 3, 15, 7, STAND, wOverworldMapBlocks + 82 - warp_event 4, 15, 8, STAND, wOverworldMapBlocks + 83 - warp_event 7, 1, 1, STAND_LEAGUE_2F, wOverworldMapBlocks + 14 + def_warp_events + warp_event 3, 15, STAND, 7, 82 + warp_event 4, 15, STAND, 8, 83 + warp_event 7, 1, STAND_LEAGUE_2F, 1, 14 - db 0 ; bg events + def_bg_events - db 5 ; person events - object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 5, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 7, SPRITE_LASS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 StandLeague1F_Blocks:: INCBIN "maps/StandLeague1F.blk" diff --git a/data/maps/objects/StandLeague2F.asm b/data/maps/objects/StandLeague2F.asm index 9b80537..ca3d5c6 100644 --- a/data/maps/objects/StandLeague2F.asm +++ b/data/maps/objects/StandLeague2F.asm @@ -7,17 +7,17 @@ SECTION "data/maps/objects/StandLeague2F.asm", ROMX StandLeague2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 7, 15, 3, STAND_LEAGUE_1F, wOverworldMapBlocks + 92 + def_warp_events + warp_event 7, 15, STAND_LEAGUE_1F, 3, 92 - db 0 ; bg events + def_bg_events - db 5 ; person events - object_event 4, 7, SPRITE_POKEFAN_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 4, 7, SPRITE_POKEFAN_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 StandLeague2F_Blocks:: INCBIN "maps/StandLeague2F.blk" diff --git a/data/maps/objects/StandMart.asm b/data/maps/objects/StandMart.asm index f05bc5b..faf08d7 100644 --- a/data/maps/objects/StandMart.asm +++ b/data/maps/objects/StandMart.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/StandMart.asm", ROMX StandMart_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 4, STAND, wOverworldMapBlocks + 59 - warp_event 5, 7, 4, STAND, wOverworldMapBlocks + 59 + def_warp_events + warp_event 4, 7, STAND, 4, 59 + warp_event 5, 7, STAND, 4, 59 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 StandMart_Blocks:: INCBIN "maps/StandMart.blk" diff --git a/data/maps/objects/StandOffice.asm b/data/maps/objects/StandOffice.asm index a85dbeb..d74f09a 100644 --- a/data/maps/objects/StandOffice.asm +++ b/data/maps/objects/StandOffice.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/StandOffice.asm", ROMX StandOffice_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 2, 7, 3, STAND, wOverworldMapBlocks + 58 - warp_event 3, 7, 3, STAND, wOverworldMapBlocks + 58 + def_warp_events + warp_event 2, 7, STAND, 3, 58 + warp_event 3, 7, STAND, 3, 58 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 13, 4, SPRITE_ROCKER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 6, SPRITE_SUPER_NERD, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 7, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 13, 4, SPRITE_ROCKER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 6, SPRITE_SUPER_NERD, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 7, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 StandOffice_Blocks:: INCBIN "maps/StandOffice.blk" diff --git a/data/maps/objects/StandPokecenter1F.asm b/data/maps/objects/StandPokecenter1F.asm index 76bfa3f..6c6ea43 100644 --- a/data/maps/objects/StandPokecenter1F.asm +++ b/data/maps/objects/StandPokecenter1F.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/StandPokecenter1F.asm", ROMX StandPokecenter1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 5, 7, 2, STAND, wOverworldMapBlocks + 59 - warp_event 6, 7, 2, STAND, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, STAND_POKECENTER_2F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 5, 7, STAND, 2, 59 + warp_event 6, 7, STAND, 2, 60 + warp_event 0, 7, STAND_POKECENTER_2F, 1, 57 - db 0 ; bg events + def_bg_events - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GIRL, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GIRL, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 StandPokecenter1F_Blocks:: INCBIN "maps/StandPokecenter1F.blk" diff --git a/data/maps/objects/StandPokecenter2F.asm b/data/maps/objects/StandPokecenter2F.asm index ced417c..e01d9bb 100644 --- a/data/maps/objects/StandPokecenter2F.asm +++ b/data/maps/objects/StandPokecenter2F.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/StandPokecenter2F.asm", ROMX StandPokecenter2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 0, 7, 3, STAND_POKECENTER_1F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 0, 7, STAND_POKECENTER_1F, 3, 57 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 StandPokecenter2F_Blocks:: INCBIN "maps/StandPokecenter2F.blk" diff --git a/data/maps/objects/StandRocketHouse1F.asm b/data/maps/objects/StandRocketHouse1F.asm index 6bda8de..369dc31 100644 --- a/data/maps/objects/StandRocketHouse1F.asm +++ b/data/maps/objects/StandRocketHouse1F.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/StandRocketHouse1F.asm", ROMX StandRocketHouse1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 2, 7, 6, STAND, wOverworldMapBlocks + 58 - warp_event 3, 7, 6, STAND, wOverworldMapBlocks + 58 - warp_event 15, 1, 1, STAND_ROCKET_HOUSE_2F, wOverworldMapBlocks + 22 + def_warp_events + warp_event 2, 7, STAND, 6, 58 + warp_event 3, 7, STAND, 6, 58 + warp_event 15, 1, STAND_ROCKET_HOUSE_2F, 1, 22 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 11, 4, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 11, 4, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 StandRocketHouse1F_Blocks:: INCBIN "maps/StandRocketHouse1F.blk" diff --git a/data/maps/objects/StandRocketHouse2F.asm b/data/maps/objects/StandRocketHouse2F.asm index 5ed8d35..8dce9cd 100644 --- a/data/maps/objects/StandRocketHouse2F.asm +++ b/data/maps/objects/StandRocketHouse2F.asm @@ -7,13 +7,13 @@ SECTION "data/maps/objects/StandRocketHouse2F.asm", ROMX StandRocketHouse2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 15, 1, 3, STAND_ROCKET_HOUSE_1F, wOverworldMapBlocks + 22 + def_warp_events + warp_event 15, 1, STAND_ROCKET_HOUSE_1F, 3, 22 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 5, 4, SPRITE_ROCKET_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 4, SPRITE_ROCKET_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 StandRocketHouse2F_Blocks:: INCBIN "maps/StandRocketHouse2F.blk" diff --git a/data/maps/objects/StandRoute.asm b/data/maps/objects/StandRoute.asm index 140d0af..ce418ff 100644 --- a/data/maps/objects/StandRoute.asm +++ b/data/maps/objects/StandRoute.asm @@ -9,13 +9,13 @@ SECTION "data/maps/objects/StandRoute.asm", ROMX StandRoute_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 8, 48, 3, STAND_ROUTE_GATE_KANTO, wOverworldMapBlocks + 405 - warp_event 9, 48, 4, STAND_ROUTE_GATE_KANTO, wOverworldMapBlocks + 405 + def_warp_events + warp_event 8, 48, STAND_ROUTE_GATE_KANTO, 3, 405 + warp_event 9, 48, STAND_ROUTE_GATE_KANTO, 4, 405 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events StandRoute_Blocks:: INCBIN "maps/StandRoute.blk" diff --git a/data/maps/objects/StandRouteGateKanto.asm b/data/maps/objects/StandRouteGateKanto.asm index a80039f..44e29eb 100644 --- a/data/maps/objects/StandRouteGateKanto.asm +++ b/data/maps/objects/StandRouteGateKanto.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/StandRouteGateKanto.asm", ROMX StandRouteGateKanto_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 4, 7, 1, KANTO_EAST_ROUTE, wOverworldMapBlocks + 47 - warp_event 5, 7, 2, KANTO_EAST_ROUTE, wOverworldMapBlocks + 47 - warp_event 4, 0, 1, STAND_ROUTE, wOverworldMapBlocks + 14 - warp_event 5, 0, 2, STAND_ROUTE, wOverworldMapBlocks + 14 + def_warp_events + warp_event 4, 7, KANTO_EAST_ROUTE, 1, 47 + warp_event 5, 7, KANTO_EAST_ROUTE, 2, 47 + warp_event 4, 0, STAND_ROUTE, 1, 14 + warp_event 5, 0, STAND_ROUTE, 2, 14 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events StandRouteGateKanto_Blocks:: INCBIN "maps/StandRouteGateKanto.blk" diff --git a/data/maps/objects/Sugar.asm b/data/maps/objects/Sugar.asm index 4711e69..61616d5 100644 --- a/data/maps/objects/Sugar.asm +++ b/data/maps/objects/Sugar.asm @@ -8,21 +8,21 @@ SECTION "data/maps/objects/Sugar.asm", ROMX Sugar_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 5, 5, 1, SUGAR_HOUSE, wOverworldMapBlocks + 51 - warp_event 15, 9, 1, SUGAR_HOUSE_2, wOverworldMapBlocks + 88 - warp_event 5, 10, 1, SUGAR_MART, wOverworldMapBlocks + 99 - warp_event 9, 10, 1, SUGAR_POKECENTER_1F, wOverworldMapBlocks + 101 + def_warp_events + warp_event 5, 5, SUGAR_HOUSE, 1, 51 + warp_event 15, 9, SUGAR_HOUSE_2, 1, 88 + warp_event 5, 10, SUGAR_MART, 1, 99 + warp_event 9, 10, SUGAR_POKECENTER_1F, 1, 101 - db 4 ; bg events - bg_event 14, 6, 0, 1 - bg_event 6, 10, 0, 2 + def_bg_events + bg_event 14, 6, 0, 1 + bg_event 6, 10, 0, 2 bg_event 10, 10, 0, 3 bg_event 10, 14, 0, 4 - db 3 ; person events - object_event 8, 12, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 6, SPRITE_GRANNY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 8, 12, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 6, SPRITE_GRANNY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 13, 11, SPRITE_GRAMPS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 Sugar_Blocks:: diff --git a/data/maps/objects/SugarHouse.asm b/data/maps/objects/SugarHouse.asm index 9e1f697..ce96dc0 100644 --- a/data/maps/objects/SugarHouse.asm +++ b/data/maps/objects/SugarHouse.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/SugarHouse.asm", ROMX SugarHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 3, 15, 1, SUGAR, wOverworldMapBlocks + 82 - warp_event 4, 15, 1, SUGAR, wOverworldMapBlocks + 83 + def_warp_events + warp_event 3, 15, SUGAR, 1, 82 + warp_event 4, 15, SUGAR, 1, 83 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 3, 5, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 5, SPRITE_TWIN, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_GRAMPS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 3, 5, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 5, SPRITE_TWIN, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_GRAMPS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 SugarHouse_Blocks:: INCBIN "maps/SugarHouse.blk" diff --git a/data/maps/objects/SugarHouse2.asm b/data/maps/objects/SugarHouse2.asm index 4d74ca0..43b0ee7 100644 --- a/data/maps/objects/SugarHouse2.asm +++ b/data/maps/objects/SugarHouse2.asm @@ -7,14 +7,14 @@ SECTION "data/maps/objects/SugarHouse2.asm", ROMX SugarHouse2_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 3, 7, 2, SUGAR, wOverworldMapBlocks + 42 - warp_event 4, 7, 2, SUGAR, wOverworldMapBlocks + 43 + def_warp_events + warp_event 3, 7, SUGAR, 2, 42 + warp_event 4, 7, SUGAR, 2, 43 - db 0 ; bg events + def_bg_events - db 1 ; person events - object_event 2, 3, SPRITE_FISHING_GURU, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 3, SPRITE_FISHING_GURU, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 SugarHouse2_Blocks:: INCBIN "maps/SugarHouse2.blk" diff --git a/data/maps/objects/SugarMart.asm b/data/maps/objects/SugarMart.asm index 8bae8e3..ae68fe8 100644 --- a/data/maps/objects/SugarMart.asm +++ b/data/maps/objects/SugarMart.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/SugarMart.asm", ROMX SugarMart_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 3, SUGAR, wOverworldMapBlocks + 59 - warp_event 5, 7, 3, SUGAR, wOverworldMapBlocks + 59 + def_warp_events + warp_event 4, 7, SUGAR, 3, 59 + warp_event 5, 7, SUGAR, 3, 59 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 SugarMart_Blocks:: INCBIN "maps/SugarMart.blk" diff --git a/data/maps/objects/SugarPokecenter1F.asm b/data/maps/objects/SugarPokecenter1F.asm index f43eae9..5180dc2 100644 --- a/data/maps/objects/SugarPokecenter1F.asm +++ b/data/maps/objects/SugarPokecenter1F.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/SugarPokecenter1F.asm", ROMX SugarPokecenter1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 5, 7, 4, SUGAR, wOverworldMapBlocks + 59 - warp_event 6, 7, 4, SUGAR, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, SUGAR_POKECENTER_2F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 5, 7, SUGAR, 4, 59 + warp_event 6, 7, SUGAR, 4, 60 + warp_event 0, 7, SUGAR_POKECENTER_2F, 1, 57 - db 0 ; bg events + def_bg_events - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 SugarPokecenter1F_Blocks:: INCBIN "maps/SugarPokecenter1F.blk" diff --git a/data/maps/objects/SugarPokecenter2F.asm b/data/maps/objects/SugarPokecenter2F.asm index 903a0b3..b17c518 100644 --- a/data/maps/objects/SugarPokecenter2F.asm +++ b/data/maps/objects/SugarPokecenter2F.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/SugarPokecenter2F.asm", ROMX SugarPokecenter2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 0, 7, 3, SUGAR_POKECENTER_1F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 0, 7, SUGAR_POKECENTER_1F, 3, 57 - db 0 ; bg events + def_bg_events - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 SugarPokecenter2F_Blocks:: INCBIN "maps/SugarPokecenter2F.blk" diff --git a/data/maps/objects/SugarRoute.asm b/data/maps/objects/SugarRoute.asm index e5024fd..024fe89 100644 --- a/data/maps/objects/SugarRoute.asm +++ b/data/maps/objects/SugarRoute.asm @@ -9,13 +9,13 @@ SECTION "data/maps/objects/SugarRoute.asm", ROMX SugarRoute_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 8, 48, 3, SUGAR_ROUTE_GATE, wOverworldMapBlocks + 405 - warp_event 9, 48, 4, SUGAR_ROUTE_GATE, wOverworldMapBlocks + 405 + def_warp_events + warp_event 8, 48, SUGAR_ROUTE_GATE, 3, 405 + warp_event 9, 48, SUGAR_ROUTE_GATE, 4, 405 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events SugarRoute_Blocks:: INCBIN "maps/SugarRoute.blk" diff --git a/data/maps/objects/SugarRouteGate.asm b/data/maps/objects/SugarRouteGate.asm index 2ebce43..35e2cbb 100644 --- a/data/maps/objects/SugarRouteGate.asm +++ b/data/maps/objects/SugarRouteGate.asm @@ -7,15 +7,15 @@ SECTION "data/maps/objects/SugarRouteGate.asm", ROMX SugarRouteGate_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 4, 7, 12, NEWTYPE, wOverworldMapBlocks + 47 - warp_event 5, 7, 13, NEWTYPE, wOverworldMapBlocks + 47 - warp_event 4, 0, 1, SUGAR_ROUTE, wOverworldMapBlocks + 14 - warp_event 5, 0, 2, SUGAR_ROUTE, wOverworldMapBlocks + 14 + def_warp_events + warp_event 4, 7, NEWTYPE, 12, 47 + warp_event 5, 7, NEWTYPE, 13, 47 + warp_event 4, 0, SUGAR_ROUTE, 1, 14 + warp_event 5, 0, SUGAR_ROUTE, 2, 14 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events SugarRouteGate_Blocks:: INCBIN "maps/SugarRouteGate.blk" diff --git a/data/maps/objects/West.asm b/data/maps/objects/West.asm index 15abadc..72de676 100644 --- a/data/maps/objects/West.asm +++ b/data/maps/objects/West.asm @@ -9,32 +9,32 @@ SECTION "data/maps/objects/West.asm", ROMX West_MapEvents:: dw $4000 ; unknown - db 13 ; warp events - warp_event 13, 5, 1, WEST_MART_1F, wOverworldMapBlocks + 85 - warp_event 14, 5, 2, WEST_MART_1F, wOverworldMapBlocks + 86 - warp_event 31, 7, 1, WEST_RADIO_TOWER_1F, wOverworldMapBlocks + 120 - warp_event 32, 7, 2, WEST_RADIO_TOWER_1F, wOverworldMapBlocks + 121 - warp_event 18, 12, 1, WEST_ROCKET_RAIDED_HOUSE, wOverworldMapBlocks + 192 - warp_event 25, 14, 1, WEST_POKECENTER_1F, wOverworldMapBlocks + 221 - warp_event 14, 19, 1, WEST_GYM, wOverworldMapBlocks + 268 - warp_event 15, 19, 2, WEST_GYM, wOverworldMapBlocks + 268 - warp_event 26, 19, 1, WEST_HOUSE_1, wOverworldMapBlocks + 274 - warp_event 32, 19, 1, WEST_HOUSE_2, wOverworldMapBlocks + 277 - warp_event 22, 5, 1, BAADON_ROUTE_GATE_WEST, wOverworldMapBlocks + 90 - warp_event 23, 5, 2, BAADON_ROUTE_GATE_WEST, wOverworldMapBlocks + 90 - warp_event 35, 15, 1, ROUTE_2_GATE_1F, wOverworldMapBlocks + 226 + def_warp_events + warp_event 13, 5, WEST_MART_1F, 1, 85 + warp_event 14, 5, WEST_MART_1F, 2, 86 + warp_event 31, 7, WEST_RADIO_TOWER_1F, 1, 120 + warp_event 32, 7, WEST_RADIO_TOWER_1F, 2, 121 + warp_event 18, 12, WEST_ROCKET_RAIDED_HOUSE, 1, 192 + warp_event 25, 14, WEST_POKECENTER_1F, 1, 221 + warp_event 14, 19, WEST_GYM, 1, 268 + warp_event 15, 19, WEST_GYM, 2, 268 + warp_event 26, 19, WEST_HOUSE_1, 1, 274 + warp_event 32, 19, WEST_HOUSE_2, 1, 277 + warp_event 22, 5, BAADON_ROUTE_GATE_WEST, 1, 90 + warp_event 23, 5, BAADON_ROUTE_GATE_WEST, 2, 90 + warp_event 35, 15, ROUTE_2_GATE_1F, 1, 226 - db 6 ; bg events - bg_event 16, 7, 0, 1 - bg_event 28, 9, 0, 2 + def_bg_events + bg_event 16, 7, 0, 1 + bg_event 28, 9, 0, 2 bg_event 12, 10, 0, 3 bg_event 32, 12, 0, 4 bg_event 26, 14, 0, 5 bg_event 18, 20, 0, 6 - db 7 ; person events - object_event 6, 8, SPRITE_SAILOR, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 12, 7, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 6, 8, SPRITE_SAILOR, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 12, 7, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 26, 10, SPRITE_ROCKER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 30, 14, SPRITE_LASS, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 29, 14, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestGym.asm b/data/maps/objects/WestGym.asm index de11175..0d63c5b 100644 --- a/data/maps/objects/WestGym.asm +++ b/data/maps/objects/WestGym.asm @@ -7,21 +7,21 @@ SECTION "data/maps/objects/WestGym.asm", ROMX WestGym_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 17, 7, WEST, wOverworldMapBlocks + 102 - warp_event 5, 17, 8, WEST, wOverworldMapBlocks + 102 + def_warp_events + warp_event 4, 17, WEST, 7, 102 + warp_event 5, 17, WEST, 8, 102 - db 2 ; bg events - bg_event 3, 15, 0, 1 - bg_event 6, 15, 0, 1 + def_bg_events + bg_event 3, 15, 0, 1 + bg_event 6, 15, 0, 1 - db 6 ; person events - object_event 4, 4, SPRITE_TSUKUSHI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 7, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 - object_event 3, 11, SPRITE_COOLTRAINER_F, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 - object_event 5, 9, SPRITE_LASS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 4, 6, SPRITE_TWIN, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 - object_event 7, 15, SPRITE_GYM_GUY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 4, 4, SPRITE_TSUKUSHI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 7, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 + object_event 3, 11, SPRITE_COOLTRAINER_F, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 + object_event 5, 9, SPRITE_LASS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 4, 6, SPRITE_TWIN, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 + object_event 7, 15, SPRITE_GYM_GUY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 WestGym_Blocks:: INCBIN "maps/WestGym.blk" diff --git a/data/maps/objects/WestHouse1.asm b/data/maps/objects/WestHouse1.asm index 5796355..d6cd067 100644 --- a/data/maps/objects/WestHouse1.asm +++ b/data/maps/objects/WestHouse1.asm @@ -7,20 +7,20 @@ SECTION "data/maps/objects/WestHouse1.asm", ROMX WestHouse1_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 9, WEST, wOverworldMapBlocks + 47 - warp_event 5, 7, 9, WEST, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, WEST, 9, 47 + warp_event 5, 7, WEST, 9, 47 - db 4 ; bg events - bg_event 0, 1, 0, 1 - bg_event 1, 1, 0, 2 - bg_event 5, 1, 0, 3 - bg_event 8, 0, 0, 4 + def_bg_events + bg_event 0, 1, 0, 1 + bg_event 1, 1, 0, 2 + bg_event 5, 1, 0, 3 + bg_event 8, 0, 0, 4 - db 3 ; person events - object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 6, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 4, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 6, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 4, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 WestHouse1_Blocks:: INCBIN "maps/WestHouse1.blk" diff --git a/data/maps/objects/WestHouse2.asm b/data/maps/objects/WestHouse2.asm index be8ea8f..cb3f699 100644 --- a/data/maps/objects/WestHouse2.asm +++ b/data/maps/objects/WestHouse2.asm @@ -7,20 +7,20 @@ SECTION "data/maps/objects/WestHouse2.asm", ROMX WestHouse2_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 10, WEST, wOverworldMapBlocks + 47 - warp_event 5, 7, 10, WEST, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, WEST, 10, 47 + warp_event 5, 7, WEST, 10, 47 - db 4 ; bg events - bg_event 0, 1, 0, 1 - bg_event 1, 1, 0, 2 - bg_event 5, 1, 0, 3 - bg_event 8, 0, 0, 4 + def_bg_events + bg_event 0, 1, 0, 1 + bg_event 1, 1, 0, 2 + bg_event 5, 1, 0, 3 + bg_event 8, 0, 0, 4 - db 3 ; person events - object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 8, 6, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 5, SPRITE_BUG_CATCHER_BOY, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 8, 6, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 5, SPRITE_BUG_CATCHER_BOY, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 WestHouse2_Blocks:: INCBIN "maps/WestHouse2.blk" diff --git a/data/maps/objects/WestMart1F.asm b/data/maps/objects/WestMart1F.asm index f3a0415..5055ae9 100644 --- a/data/maps/objects/WestMart1F.asm +++ b/data/maps/objects/WestMart1F.asm @@ -7,18 +7,18 @@ SECTION "data/maps/objects/WestMart1F.asm", ROMX WestMart1F_MapEvents:: dw $4000 ; unknown - db 4 ; warp events - warp_event 13, 7, 1, WEST, wOverworldMapBlocks + 63 - warp_event 14, 7, 2, WEST, wOverworldMapBlocks + 64 - warp_event 15, 0, 2, WEST_MART_2F, wOverworldMapBlocks + 22 - warp_event 2, 0, 1, WEST_MART_ELEVATOR, wOverworldMapBlocks + 16 + def_warp_events + warp_event 13, 7, WEST, 1, 63 + warp_event 14, 7, WEST, 2, 64 + warp_event 15, 0, WEST_MART_2F, 2, 22 + warp_event 2, 0, WEST_MART_ELEVATOR, 1, 16 - db 2 ; bg events - bg_event 14, 0, 0, 1 - bg_event 3, 0, 0, 2 + def_bg_events + bg_event 14, 0, 0, 1 + bg_event 3, 0, 0, 2 - db 1 ; person events - object_event 7, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 7, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 WestMart1F_Blocks:: INCBIN "maps/WestMart1F.blk" diff --git a/data/maps/objects/WestMart2F.asm b/data/maps/objects/WestMart2F.asm index 853fe93..2525e73 100644 --- a/data/maps/objects/WestMart2F.asm +++ b/data/maps/objects/WestMart2F.asm @@ -7,34 +7,34 @@ SECTION "data/maps/objects/WestMart2F.asm", ROMX WestMart2F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 12, 0, 1, WEST_MART_3F, wOverworldMapBlocks + 21 - warp_event 15, 0, 3, WEST_MART_1F, wOverworldMapBlocks + 22 - warp_event 2, 0, 1, WEST_MART_ELEVATOR, wOverworldMapBlocks + 16 + def_warp_events + warp_event 12, 0, WEST_MART_3F, 1, 21 + warp_event 15, 0, WEST_MART_1F, 3, 22 + warp_event 2, 0, WEST_MART_ELEVATOR, 1, 16 - db 16 ; bg events - bg_event 14, 0, 0, 1 - bg_event 3, 0, 0, 2 - bg_event 3, 4, 0, 3 - bg_event 3, 5, 0, 3 - bg_event 3, 6, 0, 3 - bg_event 3, 7, 0, 3 - bg_event 7, 4, 0, 3 - bg_event 7, 5, 0, 3 - bg_event 7, 6, 0, 3 - bg_event 7, 7, 0, 3 - bg_event 4, 1, 0, 3 - bg_event 5, 1, 0, 3 - bg_event 6, 1, 0, 3 - bg_event 7, 1, 0, 3 - bg_event 8, 1, 0, 3 - bg_event 9, 1, 0, 3 + def_bg_events + bg_event 14, 0, 0, 1 + bg_event 3, 0, 0, 2 + bg_event 3, 4, 0, 3 + bg_event 3, 5, 0, 3 + bg_event 3, 6, 0, 3 + bg_event 3, 7, 0, 3 + bg_event 7, 4, 0, 3 + bg_event 7, 5, 0, 3 + bg_event 7, 6, 0, 3 + bg_event 7, 7, 0, 3 + bg_event 4, 1, 0, 3 + bg_event 5, 1, 0, 3 + bg_event 6, 1, 0, 3 + bg_event 7, 1, 0, 3 + bg_event 8, 1, 0, 3 + bg_event 9, 1, 0, 3 - db 4 ; person events - object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 6, SPRITE_LASS, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 5, SPRITE_BURGLAR, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_ROCKET_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 6, SPRITE_LASS, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 5, SPRITE_BURGLAR, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_ROCKET_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 WestMart2F_Blocks:: INCBIN "maps/WestMart2F.blk" diff --git a/data/maps/objects/WestMart3F.asm b/data/maps/objects/WestMart3F.asm index 3665b94..955b6f7 100644 --- a/data/maps/objects/WestMart3F.asm +++ b/data/maps/objects/WestMart3F.asm @@ -7,31 +7,31 @@ SECTION "data/maps/objects/WestMart3F.asm", ROMX WestMart3F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 12, 0, 1, WEST_MART_2F, wOverworldMapBlocks + 21 - warp_event 15, 0, 2, WEST_MART_4F, wOverworldMapBlocks + 22 - warp_event 2, 0, 1, WEST_MART_ELEVATOR, wOverworldMapBlocks + 16 + def_warp_events + warp_event 12, 0, WEST_MART_2F, 1, 21 + warp_event 15, 0, WEST_MART_4F, 2, 22 + warp_event 2, 0, WEST_MART_ELEVATOR, 1, 16 - db 14 ; bg events - bg_event 14, 0, 0, 1 - bg_event 3, 0, 0, 2 - bg_event 1, 4, 0, 3 - bg_event 1, 5, 0, 3 - bg_event 1, 6, 0, 3 - bg_event 1, 7, 0, 3 - bg_event 5, 4, 0, 3 - bg_event 5, 5, 0, 3 - bg_event 5, 6, 0, 3 - bg_event 5, 7, 0, 3 - bg_event 9, 4, 0, 3 - bg_event 9, 5, 0, 3 - bg_event 9, 6, 0, 3 - bg_event 9, 7, 0, 3 + def_bg_events + bg_event 14, 0, 0, 1 + bg_event 3, 0, 0, 2 + bg_event 1, 4, 0, 3 + bg_event 1, 5, 0, 3 + bg_event 1, 6, 0, 3 + bg_event 1, 7, 0, 3 + bg_event 5, 4, 0, 3 + bg_event 5, 5, 0, 3 + bg_event 5, 6, 0, 3 + bg_event 5, 7, 0, 3 + bg_event 9, 4, 0, 3 + bg_event 9, 5, 0, 3 + bg_event 9, 6, 0, 3 + bg_event 9, 7, 0, 3 - db 3 ; person events - object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 4, SPRITE_GENTLEMAN, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 5, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 4, SPRITE_GENTLEMAN, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 5, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 WestMart3F_Blocks:: INCBIN "maps/WestMart3F.blk" diff --git a/data/maps/objects/WestMart4F.asm b/data/maps/objects/WestMart4F.asm index 0b1f857..d1d597c 100644 --- a/data/maps/objects/WestMart4F.asm +++ b/data/maps/objects/WestMart4F.asm @@ -7,31 +7,31 @@ SECTION "data/maps/objects/WestMart4F.asm", ROMX WestMart4F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 12, 0, 1, WEST_MART_5F, wOverworldMapBlocks + 21 - warp_event 15, 0, 2, WEST_MART_3F, wOverworldMapBlocks + 22 - warp_event 2, 0, 1, WEST_MART_ELEVATOR, wOverworldMapBlocks + 16 + def_warp_events + warp_event 12, 0, WEST_MART_5F, 1, 21 + warp_event 15, 0, WEST_MART_3F, 2, 22 + warp_event 2, 0, WEST_MART_ELEVATOR, 1, 16 - db 14 ; bg events - bg_event 14, 0, 0, 1 - bg_event 3, 0, 0, 2 - bg_event 2, 5, 0, 3 - bg_event 3, 5, 0, 3 - bg_event 4, 5, 0, 3 - bg_event 5, 5, 0, 3 - bg_event 6, 5, 0, 3 - bg_event 7, 5, 0, 3 - bg_event 8, 5, 0, 3 - bg_event 9, 5, 0, 3 - bg_event 6, 1, 0, 3 - bg_event 7, 1, 0, 3 - bg_event 8, 1, 0, 3 - bg_event 9, 1, 0, 3 + def_bg_events + bg_event 14, 0, 0, 1 + bg_event 3, 0, 0, 2 + bg_event 2, 5, 0, 3 + bg_event 3, 5, 0, 3 + bg_event 4, 5, 0, 3 + bg_event 5, 5, 0, 3 + bg_event 6, 5, 0, 3 + bg_event 7, 5, 0, 3 + bg_event 8, 5, 0, 3 + bg_event 9, 5, 0, 3 + bg_event 6, 1, 0, 3 + bg_event 7, 1, 0, 3 + bg_event 8, 1, 0, 3 + bg_event 9, 1, 0, 3 - db 3 ; person events - object_event 13, 5, SPRITE_CLERK, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 8, 6, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 13, 5, SPRITE_CLERK, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 8, 6, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 WestMart4F_Blocks:: INCBIN "maps/WestMart4F.blk" diff --git a/data/maps/objects/WestMart5F.asm b/data/maps/objects/WestMart5F.asm index bf963f0..86facb2 100644 --- a/data/maps/objects/WestMart5F.asm +++ b/data/maps/objects/WestMart5F.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/WestMart5F.asm", ROMX WestMart5F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 12, 0, 1, WEST_MART_4F, wOverworldMapBlocks + 21 - warp_event 15, 0, 1, WEST_MART_6F, wOverworldMapBlocks + 22 - warp_event 2, 0, 1, WEST_MART_ELEVATOR, wOverworldMapBlocks + 16 + def_warp_events + warp_event 12, 0, WEST_MART_4F, 1, 21 + warp_event 15, 0, WEST_MART_6F, 1, 22 + warp_event 2, 0, WEST_MART_ELEVATOR, 1, 16 - db 2 ; bg events - bg_event 14, 0, 0, 1 - bg_event 3, 0, 0, 2 + def_bg_events + bg_event 14, 0, 0, 1 + bg_event 3, 0, 0, 2 - db 3 ; person events - object_event 8, 5, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 5, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 4, SPRITE_NYOROBON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 8, 5, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 5, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 4, SPRITE_NYOROBON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 WestMart5F_Blocks:: INCBIN "maps/WestMart5F.blk" diff --git a/data/maps/objects/WestMart6F.asm b/data/maps/objects/WestMart6F.asm index 8228270..d843b9e 100644 --- a/data/maps/objects/WestMart6F.asm +++ b/data/maps/objects/WestMart6F.asm @@ -7,20 +7,20 @@ SECTION "data/maps/objects/WestMart6F.asm", ROMX WestMart6F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 15, 0, 2, WEST_MART_5F, wOverworldMapBlocks + 22 + def_warp_events + warp_event 15, 0, WEST_MART_5F, 2, 22 - db 5 ; bg events - bg_event 8, 1, 0, 1 - bg_event 9, 1, 0, 2 - bg_event 10, 1, 0, 3 - bg_event 11, 1, 0, 4 - bg_event 14, 0, 0, 5 + def_bg_events + bg_event 8, 1, 0, 1 + bg_event 9, 1, 0, 2 + bg_event 10, 1, 0, 3 + bg_event 11, 1, 0, 4 + bg_event 14, 0, 0, 5 - db 3 ; person events - object_event 12, 3, SPRITE_OFFICER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 4, SPRITE_SIDON, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 6, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 12, 3, SPRITE_OFFICER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 4, SPRITE_SIDON, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 6, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 WestMart6F_Blocks:: INCBIN "maps/WestMart6F.blk" diff --git a/data/maps/objects/WestMartElevator.asm b/data/maps/objects/WestMartElevator.asm index 18861c9..60363a6 100644 --- a/data/maps/objects/WestMartElevator.asm +++ b/data/maps/objects/WestMartElevator.asm @@ -7,13 +7,13 @@ SECTION "data/maps/objects/WestMartElevator.asm", ROMX WestMartElevator_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 1, 3, 4, WEST_MART_1F, wOverworldMapBlocks + 17 - warp_event 2, 3, 4, WEST_MART_1F, wOverworldMapBlocks + 18 + def_warp_events + warp_event 1, 3, WEST_MART_1F, 4, 17 + warp_event 2, 3, WEST_MART_1F, 4, 18 - db 0 ; bg events + def_bg_events - db 0 ; person events + def_object_events WestMartElevator_Blocks:: INCBIN "maps/WestMartElevator.blk" diff --git a/data/maps/objects/WestPokecenter1F.asm b/data/maps/objects/WestPokecenter1F.asm index 27a39e2..0da7c23 100644 --- a/data/maps/objects/WestPokecenter1F.asm +++ b/data/maps/objects/WestPokecenter1F.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/WestPokecenter1F.asm", ROMX WestPokecenter1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 5, 7, 6, WEST, wOverworldMapBlocks + 59 - warp_event 6, 7, 6, WEST, wOverworldMapBlocks + 60 - warp_event 0, 7, 1, WEST_POKECENTER_2F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 5, 7, WEST, 6, 59 + warp_event 6, 7, WEST, 6, 60 + warp_event 0, 7, WEST_POKECENTER_2F, 1, 57 - db 1 ; bg events - bg_event 13, 1, 0, 1 + def_bg_events + bg_event 13, 1, 0, 1 - db 4 ; person events - object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 5, SPRITE_LASS, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 10, 1, SPRITE_ROCKET_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 14, 6, SPRITE_GENTLEMAN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 5, SPRITE_LASS, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 10, 1, SPRITE_ROCKET_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 WestPokecenter1F_Blocks:: INCBIN "maps/WestPokecenter1F.blk" diff --git a/data/maps/objects/WestPokecenter2F.asm b/data/maps/objects/WestPokecenter2F.asm index 7e2c0e3..3487cf2 100644 --- a/data/maps/objects/WestPokecenter2F.asm +++ b/data/maps/objects/WestPokecenter2F.asm @@ -7,16 +7,16 @@ SECTION "data/maps/objects/WestPokecenter2F.asm", ROMX WestPokecenter2F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 0, 7, 3, WEST_POKECENTER_1F, wOverworldMapBlocks + 57 + def_warp_events + warp_event 0, 7, WEST_POKECENTER_1F, 3, 57 - db 1 ; bg events - bg_event 1, 1, 0, 1 + def_bg_events + bg_event 1, 1, 0, 1 - db 3 ; person events - object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 WestPokecenter2F_Blocks:: INCBIN "maps/WestPokecenter2F.blk" diff --git a/data/maps/objects/WestRadioTower1F.asm b/data/maps/objects/WestRadioTower1F.asm index baa2d7f..7f5796a 100644 --- a/data/maps/objects/WestRadioTower1F.asm +++ b/data/maps/objects/WestRadioTower1F.asm @@ -7,19 +7,19 @@ SECTION "data/maps/objects/WestRadioTower1F.asm", ROMX WestRadioTower1F_MapEvents:: dw $4000 ; unknown - db 3 ; warp events - warp_event 2, 7, 3, WEST, wOverworldMapBlocks + 42 - warp_event 3, 7, 4, WEST, wOverworldMapBlocks + 42 - warp_event 7, 0, 2, WEST_RADIO_TOWER_2F, wOverworldMapBlocks + 14 + def_warp_events + warp_event 2, 7, WEST, 3, 42 + warp_event 3, 7, WEST, 4, 42 + warp_event 7, 0, WEST_RADIO_TOWER_2F, 2, 14 - db 2 ; bg events - bg_event 5, 0, 0, 1 - bg_event 0, 1, 0, 2 + def_bg_events + bg_event 5, 0, 0, 1 + bg_event 0, 1, 0, 2 - db 3 ; person events - object_event 6, 6, SPRITE_RECEPTIONIST, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 3, SPRITE_SUPER_NERD, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 4, SPRITE_ROCKER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 6, 6, SPRITE_RECEPTIONIST, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 3, SPRITE_SUPER_NERD, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 4, SPRITE_ROCKER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 WestRadioTower1F_Blocks:: INCBIN "maps/WestRadioTower1F.blk" diff --git a/data/maps/objects/WestRadioTower2F.asm b/data/maps/objects/WestRadioTower2F.asm index 5efdd72..475cb84 100644 --- a/data/maps/objects/WestRadioTower2F.asm +++ b/data/maps/objects/WestRadioTower2F.asm @@ -7,21 +7,21 @@ SECTION "data/maps/objects/WestRadioTower2F.asm", ROMX WestRadioTower2F_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 0, 0, 1, WEST_RADIO_TOWER_3F, wOverworldMapBlocks + 11 - warp_event 7, 0, 3, WEST_RADIO_TOWER_1F, wOverworldMapBlocks + 14 + def_warp_events + warp_event 0, 0, WEST_RADIO_TOWER_3F, 1, 11 + warp_event 7, 0, WEST_RADIO_TOWER_1F, 3, 14 - db 1 ; bg events - bg_event 5, 0, 0, 1 + def_bg_events + bg_event 5, 0, 0, 1 - db 7 ; person events - object_event 4, 6, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 5, SPRITE_ROCKER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 5, SPRITE_SUPER_NERD, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 2, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 1, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 6, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 7, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 4, 6, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 5, SPRITE_ROCKER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 5, SPRITE_SUPER_NERD, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 2, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 1, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 6, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 7, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 WestRadioTower2F_Blocks:: INCBIN "maps/WestRadioTower2F.blk" diff --git a/data/maps/objects/WestRadioTower3F.asm b/data/maps/objects/WestRadioTower3F.asm index db9f966..d47a328 100644 --- a/data/maps/objects/WestRadioTower3F.asm +++ b/data/maps/objects/WestRadioTower3F.asm @@ -7,22 +7,22 @@ SECTION "data/maps/objects/WestRadioTower3F.asm", ROMX WestRadioTower3F_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 0, 0, 1, WEST_RADIO_TOWER_2F, wOverworldMapBlocks + 11 - warp_event 7, 0, 2, WEST_RADIO_TOWER_4F, wOverworldMapBlocks + 14 + def_warp_events + warp_event 0, 0, WEST_RADIO_TOWER_2F, 1, 11 + warp_event 7, 0, WEST_RADIO_TOWER_4F, 2, 14 - db 1 ; bg events - bg_event 5, 0, 0, 1 + def_bg_events + bg_event 5, 0, 0, 1 - db 8 ; person events - object_event 4, 6, SPRITE_SUPER_NERD, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 6, SPRITE_ROCKER, FACE_UP, 2, 1, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 1, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 5, SPRITE_GIRL, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 2, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 3, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 7, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 6, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 4, 6, SPRITE_SUPER_NERD, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 6, SPRITE_ROCKER, FACE_UP, 2, 1, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 1, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 5, SPRITE_GIRL, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 2, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 3, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 7, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 6, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 WestRadioTower3F_Blocks:: INCBIN "maps/WestRadioTower3F.blk" diff --git a/data/maps/objects/WestRadioTower4F.asm b/data/maps/objects/WestRadioTower4F.asm index c3a5175..0429dbd 100644 --- a/data/maps/objects/WestRadioTower4F.asm +++ b/data/maps/objects/WestRadioTower4F.asm @@ -7,23 +7,23 @@ SECTION "data/maps/objects/WestRadioTower4F.asm", ROMX WestRadioTower4F_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 0, 0, 1, WEST_RADIO_TOWER_5F, wOverworldMapBlocks + 11 - warp_event 7, 0, 2, WEST_RADIO_TOWER_3F, wOverworldMapBlocks + 14 + def_warp_events + warp_event 0, 0, WEST_RADIO_TOWER_5F, 1, 11 + warp_event 7, 0, WEST_RADIO_TOWER_3F, 2, 14 - db 1 ; bg events - bg_event 5, 0, 0, 1 + def_bg_events + bg_event 5, 0, 0, 1 - db 9 ; person events - object_event 2, 6, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 5, SPRITE_BURGLAR, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 6, SPRITE_ROCKER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 0, 5, SPRITE_GIRL, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 5, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 4, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 1, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 2, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 2, 6, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 5, SPRITE_BURGLAR, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 6, SPRITE_ROCKER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 0, 5, SPRITE_GIRL, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 5, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 4, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 1, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 2, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 WestRadioTower4F_Blocks:: INCBIN "maps/WestRadioTower4F.blk" diff --git a/data/maps/objects/WestRadioTower5F.asm b/data/maps/objects/WestRadioTower5F.asm index 9cbd21a..656470e 100644 --- a/data/maps/objects/WestRadioTower5F.asm +++ b/data/maps/objects/WestRadioTower5F.asm @@ -7,23 +7,23 @@ SECTION "data/maps/objects/WestRadioTower5F.asm", ROMX WestRadioTower5F_MapEvents:: dw $4000 ; unknown - db 1 ; warp events - warp_event 0, 0, 1, WEST_RADIO_TOWER_4F, wOverworldMapBlocks + 11 + def_warp_events + warp_event 0, 0, WEST_RADIO_TOWER_4F, 1, 11 - db 3 ; bg events - bg_event 3, 0, 0, 1 - bg_event 6, 4, 0, 2 - bg_event 7, 4, 0, 2 + def_bg_events + bg_event 3, 0, 0, 1 + bg_event 6, 4, 0, 2 + bg_event 7, 4, 0, 2 - db 8 ; person events - object_event 6, 6, SPRITE_SCIENTIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 5, 2, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 6, SPRITE_PIPPI, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 5, SPRITE_PIPPI, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 7, SPRITE_SAKAKI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 4, 2, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 2, 4, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 6, 7, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 6, 6, SPRITE_SCIENTIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 5, 2, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 6, SPRITE_PIPPI, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 5, SPRITE_PIPPI, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 7, SPRITE_SAKAKI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 4, 2, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 2, 4, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 6, 7, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 WestRadioTower5F_Blocks:: INCBIN "maps/WestRadioTower5F.blk" diff --git a/data/maps/objects/WestRocketRaidedHouse.asm b/data/maps/objects/WestRocketRaidedHouse.asm index 5ae6133..6c88ac7 100644 --- a/data/maps/objects/WestRocketRaidedHouse.asm +++ b/data/maps/objects/WestRocketRaidedHouse.asm @@ -7,25 +7,25 @@ SECTION "data/maps/objects/WestRocketRaidedHouse.asm", ROMX WestRocketRaidedHouse_MapEvents:: dw $4000 ; unknown - db 2 ; warp events - warp_event 4, 7, 5, WEST, wOverworldMapBlocks + 47 - warp_event 5, 7, 5, WEST, wOverworldMapBlocks + 47 + def_warp_events + warp_event 4, 7, WEST, 5, 47 + warp_event 5, 7, WEST, 5, 47 - db 7 ; bg events - bg_event 0, 1, 0, 1 - bg_event 1, 1, 0, 2 - bg_event 2, 1, 0, 3 - bg_event 4, 1, 0, 4 - bg_event 5, 1, 0, 4 - bg_event 7, 1, 0, 5 - bg_event 8, 0, 0, 6 + def_bg_events + bg_event 0, 1, 0, 1 + bg_event 1, 1, 0, 2 + bg_event 2, 1, 0, 3 + bg_event 4, 1, 0, 4 + bg_event 5, 1, 0, 4 + bg_event 7, 1, 0, 5 + bg_event 8, 0, 0, 6 - db 5 ; person events - object_event 8, 1, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 5, SPRITE_36, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 3, 4, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 1, 3, SPRITE_POKEFAN_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 - object_event 7, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + def_object_events + object_event 8, 1, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 5, SPRITE_36, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 3, 4, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 1, 3, SPRITE_POKEFAN_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 + object_event 7, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 WestRocketRaidedHouse_Blocks:: INCBIN "maps/WestRocketRaidedHouse.blk" diff --git a/macros/maps.asm b/macros/maps.asm index 135b8a3..ca661f6 100644 --- a/macros/maps.asm +++ b/macros/maps.asm @@ -108,17 +108,46 @@ map: MACRO db 0, 0 ; ??? ENDM +def_warp_events: MACRO +if DEF(_NUM_WARP_EVENTS) + PURGE _NUM_WARP_EVENTS +endc +_NUM_WARP_EVENTS EQUS "_NUM_WARP_EVENTS_\@" + db _NUM_WARP_EVENTS +_NUM_WARP_EVENTS = 0 +ENDM + warp_event: MACRO db \2, \1 ; y, x - db \3 ; index - map_id \4 - dw \5 ; unused wOverworldMap offset + db \4 ; index + map_id \3 + dw wOverworldMapBlocks + \5 ; unused +_NUM_WARP_EVENTS = _NUM_WARP_EVENTS + 1 +ENDM + +def_bg_events: MACRO +if DEF(_NUM_BG_EVENTS) + PURGE _NUM_BG_EVENTS +endc +_NUM_BG_EVENTS EQUS "_NUM_BG_EVENTS_\@" + db _NUM_BG_EVENTS +_NUM_BG_EVENTS = 0 ENDM bg_event: MACRO db \2, \1 ; y, x db \3 ; function (unused?) db \4 ; text index +_NUM_BG_EVENTS = _NUM_BG_EVENTS + 1 +ENDM + +def_object_events: MACRO +if DEF(_NUM_OBJECT_EVENTS) + PURGE _NUM_OBJECT_EVENTS +endc +_NUM_OBJECT_EVENTS EQUS "_NUM_OBJECT_EVENTS_\@" + db _NUM_OBJECT_EVENTS +_NUM_OBJECT_EVENTS = 0 ENDM object_event: MACRO @@ -137,4 +166,5 @@ object_event: MACRO db \9 ; unknown 3 shift db \9 ; unknown 4 +_NUM_OBJECT_EVENTS = _NUM_OBJECT_EVENTS + 1 ENDM |