diff options
| author | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-22 15:12:27 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-22 15:12:27 -0400 |
| commit | 95a66c71107ef2b17622ac723b53473f094c3feb (patch) | |
| tree | 17df3e1c64e1437162f252abdb39e66d802a7cb5 /data | |
| parent | e6a99b8f9e20f7058a140fe7f0668b17ce49c6eb (diff) | |
Simplify bg_event usage, and document map event macro arguments
Diffstat (limited to 'data')
59 files changed, 260 insertions, 259 deletions
diff --git a/data/maps/objects/Baadon.asm b/data/maps/objects/Baadon.asm index d7feab5..f17352d 100644 --- a/data/maps/objects/Baadon.asm +++ b/data/maps/objects/Baadon.asm @@ -22,10 +22,10 @@ Baadon_MapEvents:: warp_event 9, 5, FONTO_ROUTE_GATE_2, 2, 53 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 4, 4, 1 + bg_event 16, 4, 2 + bg_event 11, 10, 3 + bg_event 6, 14, 4 def_object_events object_event 14, 8, SPRITE_SUPER_NERD, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/BullForest.asm b/data/maps/objects/BullForest.asm index 6846205..b7aa6f2 100644 --- a/data/maps/objects/BullForest.asm +++ b/data/maps/objects/BullForest.asm @@ -21,9 +21,9 @@ BullForest_MapEvents:: warp_event 3, 22, BULL_HOUSE_4, 1, 314 def_bg_events - bg_event 26, 6, 0, 1 - bg_event 2, 16, 0, 2 - bg_event 14, 18, 0, 3 + bg_event 26, 6, 1 + bg_event 2, 16, 2 + bg_event 14, 18, 3 def_object_events object_event 21, 9, SPRITE_TWIN, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/Fonto.asm b/data/maps/objects/Fonto.asm index cae0c45..09fcf84 100644 --- a/data/maps/objects/Fonto.asm +++ b/data/maps/objects/Fonto.asm @@ -18,11 +18,11 @@ Fonto_MapEvents:: warp_event 16, 13, FONTO_LAB, 1, 121 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 + bg_event 15, 4, 1 + bg_event 14, 6, 2 + bg_event 4, 12, 3 + bg_event 6, 12, 4 + bg_event 10, 12, 5 def_object_events object_event 2, 4, SPRITE_36, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/Haiteku.asm b/data/maps/objects/Haiteku.asm index e2ce022..dbae101 100644 --- a/data/maps/objects/Haiteku.asm +++ b/data/maps/objects/Haiteku.asm @@ -20,14 +20,14 @@ Haiteku_MapEvents:: warp_event 7, 27, HAITEKU_AQUARIUM_1F, 2, 368 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 - bg_event 32, 16, 0, 5 - bg_event 10, 27, 0, 6 - bg_event 30, 25, 0, 7 - bg_event 24, 28, 0, 8 + bg_event 24, 7, 1 + bg_event 12, 12, 2 + bg_event 32, 10, 3 + bg_event 10, 17, 4 + bg_event 32, 16, 5 + bg_event 10, 27, 6 + bg_event 30, 25, 7 + bg_event 24, 28, 8 def_object_events object_event 22, 15, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/Kanto.asm b/data/maps/objects/Kanto.asm index c6b49e1..35ff687 100644 --- a/data/maps/objects/Kanto.asm +++ b/data/maps/objects/Kanto.asm @@ -42,18 +42,18 @@ Kanto_MapEvents:: warp_event 21, 13, KANTO_GAMEFREAK_HQ_1, 5, 263 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 16, 38, 0, 9 - bg_event 6, 41, 0, 10 - bg_event 12, 45, 0, 11 - bg_event 50, 30, 0, 12 + bg_event 14, 4, 1 + bg_event 42, 4, 2 + bg_event 54, 8, 3 + bg_event 4, 18, 4 + bg_event 18, 18, 5 + bg_event 26, 19, 6 + bg_event 46, 18, 7 + bg_event 8, 38, 8 + bg_event 16, 38, 9 + bg_event 6, 41, 10 + bg_event 12, 45, 11 + bg_event 50, 30, 12 def_object_events diff --git a/data/maps/objects/Newtype.asm b/data/maps/objects/Newtype.asm index da333e3..6d2c8bb 100644 --- a/data/maps/objects/Newtype.asm +++ b/data/maps/objects/Newtype.asm @@ -26,11 +26,11 @@ Newtype_MapEvents:: warp_event 19, 5, SUGAR_ROUTE_GATE, 2, 88 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 + bg_event 0, 8, 1 + bg_event 8, 8, 2 + bg_event 8, 14, 3 + bg_event 30, 15, 4 + bg_event 30, 21, 5 def_object_events object_event 5, 10, SPRITE_SILVER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/North.asm b/data/maps/objects/North.asm index 312af28..f4aa424 100644 --- a/data/maps/objects/North.asm +++ b/data/maps/objects/North.asm @@ -15,10 +15,10 @@ North_MapEvents:: warp_event 13, 10, NORTH_POKECENTER_1F, 1, 103 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 12, 4, 1 + bg_event 16, 6, 2 + bg_event 14, 10, 3 + bg_event 8, 12, 4 def_object_events object_event 9, 6, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/OldCity.asm b/data/maps/objects/OldCity.asm index 0f32a33..ac0e513 100644 --- a/data/maps/objects/OldCity.asm +++ b/data/maps/objects/OldCity.asm @@ -26,18 +26,18 @@ OldCity_MapEvents:: warp_event 22, 26, OLD_CITY_SCHOOL, 1, 376 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 28, 28, 0, 7 - bg_event 20, 29, 0, 8 - 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 8, 14, 1 + bg_event 8, 16, 2 + bg_event 28, 16, 3 + bg_event 20, 22, 4 + bg_event 26, 22, 5 + bg_event 8, 26, 6 + bg_event 28, 28, 7 + bg_event 20, 29, 8 + bg_event 4, 32, 9 + bg_event 30, 22, 10 + bg_event 4, 14, 11 + bg_event 5, 14, 11 def_object_events object_event 8, 30, SPRITE_TWIN, 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 a620e44..c39136d 100644 --- a/data/maps/objects/OldCityBillsHouse.asm +++ b/data/maps/objects/OldCityBillsHouse.asm @@ -12,12 +12,12 @@ OldCityBillsHouse_MapEvents:: warp_event 4, 7, OLD_CITY, 7, 43 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 + bg_event 2, 1, 1 + bg_event 3, 1, 2 + bg_event 4, 1, 3 + bg_event 6, 1, 4 + bg_event 7, 1, 5 + bg_event 1, 1, 6 def_object_events object_event 5, 4, SPRITE_MASAKI, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/OldCityGym.asm b/data/maps/objects/OldCityGym.asm index 674e1dd..77b19a2 100644 --- a/data/maps/objects/OldCityGym.asm +++ b/data/maps/objects/OldCityGym.asm @@ -12,8 +12,8 @@ OldCityGym_MapEvents:: warp_event 5, 17, OLD_CITY, 4, 102 def_bg_events - bg_event 3, 15, 0, 1 - bg_event 6, 15, 0, 1 + bg_event 3, 15, 1 + bg_event 6, 15, 1 def_object_events object_event 4, 5, SPRITE_HAYATO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/OldCityHouse.asm b/data/maps/objects/OldCityHouse.asm index 8c6f767..83aeaa9 100644 --- a/data/maps/objects/OldCityHouse.asm +++ b/data/maps/objects/OldCityHouse.asm @@ -12,10 +12,10 @@ OldCityHouse_MapEvents:: warp_event 4, 7, OLD_CITY, 9, 43 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 + bg_event 0, 1, 1 + bg_event 1, 1, 2 + bg_event 2, 1, 3 + bg_event 7, 1, 4 def_object_events object_event 2, 3, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/OldCityKurtsHouse.asm b/data/maps/objects/OldCityKurtsHouse.asm index 65c2988..9a679ca 100644 --- a/data/maps/objects/OldCityKurtsHouse.asm +++ b/data/maps/objects/OldCityKurtsHouse.asm @@ -12,11 +12,11 @@ OldCityKurtsHouse_MapEvents:: warp_event 4, 7, OLD_CITY, 11, 59 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 + bg_event 4, 1, 1 + bg_event 5, 1, 2 + bg_event 12, 1, 3 + bg_event 14, 0, 4 + bg_event 15, 0, 4 def_object_events object_event 2, 2, SPRITE_GANTETSU, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/OldCityMart.asm b/data/maps/objects/OldCityMart.asm index 6749b32..a3e880f 100644 --- a/data/maps/objects/OldCityMart.asm +++ b/data/maps/objects/OldCityMart.asm @@ -12,7 +12,7 @@ OldCityMart_MapEvents:: warp_event 5, 7, OLD_CITY, 8, 51 def_bg_events - bg_event 0, 7, 0, 1 + bg_event 0, 7, 1 def_object_events object_event 1, 3, SPRITE_CLERK, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/OldCityMuseum.asm b/data/maps/objects/OldCityMuseum.asm index ece18c0..494dfeb 100644 --- a/data/maps/objects/OldCityMuseum.asm +++ b/data/maps/objects/OldCityMuseum.asm @@ -12,10 +12,10 @@ OldCityMuseum_MapEvents:: warp_event 3, 7, OLD_CITY, 2, 58 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 + bg_event 2, 3, 1 + bg_event 5, 4, 2 + bg_event 9, 4, 3 + bg_event 13, 4, 4 def_object_events object_event 1, 5, SPRITE_FISHER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/OldCityPokecenter1F.asm b/data/maps/objects/OldCityPokecenter1F.asm index 3ffaa89..deaff19 100644 --- a/data/maps/objects/OldCityPokecenter1F.asm +++ b/data/maps/objects/OldCityPokecenter1F.asm @@ -13,7 +13,7 @@ OldCityPokecenter1F_MapEvents:: warp_event 0, 7, OLD_CITY_POKECENTER_2F, 1, 57 def_bg_events - bg_event 13, 1, 0, 1 + bg_event 13, 1, 1 def_object_events object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/OldCityPokecenter2F.asm b/data/maps/objects/OldCityPokecenter2F.asm index b7c12e3..e32eb35 100644 --- a/data/maps/objects/OldCityPokecenter2F.asm +++ b/data/maps/objects/OldCityPokecenter2F.asm @@ -14,7 +14,7 @@ OldCityPokecenter2F_MapEvents:: warp_event 13, 2, OLD_CITY_POKECENTER_TIME_MACHINE, 1, 35 def_bg_events - bg_event 1, 1, 0, 1 + bg_event 1, 1, 1 def_object_events object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/OldCityPokecenterTimeMachine.asm b/data/maps/objects/OldCityPokecenterTimeMachine.asm index 8904a6d..bebb729 100644 --- a/data/maps/objects/OldCityPokecenterTimeMachine.asm +++ b/data/maps/objects/OldCityPokecenterTimeMachine.asm @@ -12,7 +12,7 @@ OldCityPokecenterTimeMachine_MapEvents:: warp_event 3, 7, OLD_CITY_POKECENTER_2F, 4, 58 def_bg_events - bg_event 15, 3, 0, 1 + bg_event 15, 3, 1 def_object_events object_event 13, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/OldCitySchool.asm b/data/maps/objects/OldCitySchool.asm index c782c22..1bd8c0a 100644 --- a/data/maps/objects/OldCitySchool.asm +++ b/data/maps/objects/OldCitySchool.asm @@ -12,10 +12,10 @@ OldCitySchool_MapEvents:: warp_event 4, 15, OLD_CITY, 14, 83 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 + bg_event 0, 1, 1 + bg_event 1, 1, 1 + bg_event 3, 0, 2 + bg_event 4, 0, 2 def_object_events object_event 2, 5, SPRITE_GIRL, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/OldCityTower1F.asm b/data/maps/objects/OldCityTower1F.asm index 09dbc35..397abae 100644 --- a/data/maps/objects/OldCityTower1F.asm +++ b/data/maps/objects/OldCityTower1F.asm @@ -13,9 +13,9 @@ OldCityTower1F_MapEvents:: warp_event 0, 1, OLD_CITY_TOWER_2F, 1, 11 def_bg_events - bg_event 2, 6, 0, 1 - bg_event 5, 6, 0, 2 - bg_event 4, 1, 0, 3 + bg_event 2, 6, 1 + bg_event 5, 6, 2 + bg_event 4, 1, 3 def_object_events object_event 0, 2, SPRITE_SAGE, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 diff --git a/data/maps/objects/OldCityTower2F.asm b/data/maps/objects/OldCityTower2F.asm index e5da8c0..8c0c3fa 100644 --- a/data/maps/objects/OldCityTower2F.asm +++ b/data/maps/objects/OldCityTower2F.asm @@ -12,8 +12,8 @@ OldCityTower2F_MapEvents:: warp_event 7, 7, OLD_CITY_TOWER_3F, 2, 44 def_bg_events - bg_event 3, 0, 0, 1 - bg_event 4, 1, 0, 2 + bg_event 3, 0, 1 + bg_event 4, 1, 2 def_object_events object_event 2, 3, SPRITE_MEDIUM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 diff --git a/data/maps/objects/OldCityTower3F.asm b/data/maps/objects/OldCityTower3F.asm index 6e4bb01..09117b3 100644 --- a/data/maps/objects/OldCityTower3F.asm +++ b/data/maps/objects/OldCityTower3F.asm @@ -12,8 +12,8 @@ OldCityTower3F_MapEvents:: warp_event 7, 7, OLD_CITY_TOWER_2F, 2, 44 def_bg_events - bg_event 3, 0, 0, 1 - bg_event 4, 1, 0, 2 + bg_event 3, 0, 1 + bg_event 4, 1, 2 def_object_events object_event 2, 3, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 diff --git a/data/maps/objects/OldCityTower4F.asm b/data/maps/objects/OldCityTower4F.asm index e683db5..69d9950 100644 --- a/data/maps/objects/OldCityTower4F.asm +++ b/data/maps/objects/OldCityTower4F.asm @@ -12,8 +12,8 @@ OldCityTower4F_MapEvents:: warp_event 7, 7, OLD_CITY_TOWER_5F, 1, 44 def_bg_events - bg_event 3, 0, 0, 1 - bg_event 4, 1, 0, 2 + bg_event 3, 0, 1 + bg_event 4, 1, 2 def_object_events object_event 3, 2, SPRITE_SAGE, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 diff --git a/data/maps/objects/OldCityTower5F.asm b/data/maps/objects/OldCityTower5F.asm index db0d13b..21da9c3 100644 --- a/data/maps/objects/OldCityTower5F.asm +++ b/data/maps/objects/OldCityTower5F.asm @@ -11,9 +11,9 @@ OldCityTower5F_MapEvents:: warp_event 5, 5, OLD_CITY_TOWER_4F, 2, 30 def_bg_events - bg_event 2, 0, 0, 1 - bg_event 3, 0, 0, 2 - bg_event 4, 1, 0, 3 + bg_event 2, 0, 1 + bg_event 3, 0, 2 + bg_event 4, 1, 3 def_object_events object_event 2, 3, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/PlayerHouse1F.asm b/data/maps/objects/PlayerHouse1F.asm index 3218ec8..bb2e245 100644 --- a/data/maps/objects/PlayerHouse1F.asm +++ b/data/maps/objects/PlayerHouse1F.asm @@ -13,11 +13,11 @@ PlayerHouse1F_MapEvents:: warp_event 9, 0, PLAYER_HOUSE_2F, 1, 16 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 + bg_event 0, 1, 1 + bg_event 1, 1, 2 + bg_event 2, 1, 3 + bg_event 4, 1, 4 + bg_event 5, 1, 5 def_object_events object_event 7, 3, SPRITE_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/PlayerHouse2F.asm b/data/maps/objects/PlayerHouse2F.asm index 26f9aa1..0c2a394 100644 --- a/data/maps/objects/PlayerHouse2F.asm +++ b/data/maps/objects/PlayerHouse2F.asm @@ -11,11 +11,11 @@ PlayerHouse2F_MapEvents:: warp_event 9, 0, PLAYER_HOUSE_1F, 3, 16 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 + bg_event 1, 1, 1 + bg_event 2, 1, 2 + bg_event 3, 1, 3 + bg_event 5, 1, 4 + bg_event 7, 2, 5 def_object_events object_event 8, 1, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/Route1Gate2F.asm b/data/maps/objects/Route1Gate2F.asm index 198ed0a..da89d52 100644 --- a/data/maps/objects/Route1Gate2F.asm +++ b/data/maps/objects/Route1Gate2F.asm @@ -11,8 +11,8 @@ Route1Gate2F_MapEvents:: warp_event 5, 0, ROUTE_1_GATE_1F, 5, 13 def_bg_events - bg_event 1, 0, 0, 1 - bg_event 3, 0, 0, 2 + bg_event 1, 0, 1 + bg_event 3, 0, 2 def_object_events object_event 3, 3, SPRITE_LASS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/Route1P1.asm b/data/maps/objects/Route1P1.asm index dda9717..25d46c7 100644 --- a/data/maps/objects/Route1P1.asm +++ b/data/maps/objects/Route1P1.asm @@ -14,8 +14,8 @@ Route1P1_MapEvents:: warp_event 8, 9, SHIZUKANA_OKA, 3, 110 def_bg_events - bg_event 12, 7, 0, 1 - bg_event 20, 8, 0, 2 + bg_event 12, 7, 1 + bg_event 20, 8, 2 def_object_events object_event 20, 5, SPRITE_SUPER_NERD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/Route1P2.asm b/data/maps/objects/Route1P2.asm index dfd4a23..1949ed9 100644 --- a/data/maps/objects/Route1P2.asm +++ b/data/maps/objects/Route1P2.asm @@ -16,7 +16,7 @@ Route1P2_MapEvents:: warp_event 9, 25, SHIZUKANA_OKA, 9, 213 def_bg_events - bg_event 10, 20, 0, 1 + bg_event 10, 20, 1 def_object_events object_event 8, 6, SPRITE_SILVER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index ab400d0..be556b7 100644 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -14,9 +14,9 @@ Route2_MapEvents:: warp_event 15, 4, ROUTE_2_HOUSE, 1, 71 def_bg_events - bg_event 15, 4, 0, 3 - bg_event 14, 5, 0, 1 - bg_event 24, 10, 0, 2 + bg_event 15, 4, 3 + bg_event 14, 5, 1 + bg_event 24, 10, 2 def_object_events object_event 19, 11, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 diff --git a/data/maps/objects/Route2Gate2F.asm b/data/maps/objects/Route2Gate2F.asm index 56c99fd..d7acb82 100644 --- a/data/maps/objects/Route2Gate2F.asm +++ b/data/maps/objects/Route2Gate2F.asm @@ -11,8 +11,8 @@ Route2Gate2F_MapEvents:: warp_event 5, 0, ROUTE_2_GATE_1F, 5, 13 def_bg_events - bg_event 1, 0, 0, 1 - bg_event 3, 0, 0, 2 + bg_event 1, 0, 1 + bg_event 3, 0, 2 def_object_events object_event 2, 2, SPRITE_LASS, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/Route2House.asm b/data/maps/objects/Route2House.asm index e8010d1..d16a85c 100644 --- a/data/maps/objects/Route2House.asm +++ b/data/maps/objects/Route2House.asm @@ -12,12 +12,12 @@ Route2House_MapEvents:: warp_event 5, 7, ROUTE_2, 2, 43 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 + bg_event 0, 0, 1 + bg_event 2, 0, 1 + bg_event 4, 0, 1 + bg_event 6, 0, 1 + bg_event 0, 3, 2 + bg_event 4, 3, 3 def_object_events object_event 6, 6, SPRITE_SCIENTIST, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/ShizukanaOka.asm b/data/maps/objects/ShizukanaOka.asm index b7f8e46..8e6d4fd 100644 --- a/data/maps/objects/ShizukanaOka.asm +++ b/data/maps/objects/ShizukanaOka.asm @@ -20,8 +20,8 @@ ShizukanaOka_MapEvents:: warp_event 9, 0, ROUTE_1_P2, 4, 36 def_bg_events - bg_event 9, 2, 0, 1 - bg_event 47, 28, 0, 2 + bg_event 9, 2, 1 + bg_event 47, 28, 2 def_object_events object_event 41, 28, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/SilentHill.asm b/data/maps/objects/SilentHill.asm index 231b31c..a2850ad 100644 --- a/data/maps/objects/SilentHill.asm +++ b/data/maps/objects/SilentHill.asm @@ -18,11 +18,11 @@ SilentHill_MapEvents:: warp_event 15, 11, SILENT_HILL_LAB_FRONT, 2, 104 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 8, 4, 1 + bg_event 14, 4, 2 + bg_event 16, 5, 3 + bg_event 10, 11, 4 + bg_event 6, 12, 5 def_object_events object_event 6, 10, SPRITE_SILVER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/SilentHillHouse.asm b/data/maps/objects/SilentHillHouse.asm index 1ada160..6f28ce5 100644 --- a/data/maps/objects/SilentHillHouse.asm +++ b/data/maps/objects/SilentHillHouse.asm @@ -12,12 +12,12 @@ SilentHillHouse_MapEvents:: warp_event 5, 7, SILENT_HILL, 3, 47 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 + bg_event 0, 1, 1 + bg_event 4, 1, 2 + bg_event 5, 1, 3 + bg_event 9, 1, 4 + bg_event 8, 1, 5 + bg_event 2, 0, 6 def_object_events object_event 5, 3, SPRITE_SILVERS_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/SilentHillLabBack.asm b/data/maps/objects/SilentHillLabBack.asm index 56f248e..0601f56 100644 --- a/data/maps/objects/SilentHillLabBack.asm +++ b/data/maps/objects/SilentHillLabBack.asm @@ -12,11 +12,11 @@ SilentHillLabBack_MapEvents:: warp_event 4, 7, SILENT_HILL_LAB_FRONT, 3, 43 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 + bg_event 0, 1, 1 + bg_event 1, 1, 2 + bg_event 2, 1, 3 + bg_event 3, 1, 4 + bg_event 6, 0, 5 def_object_events object_event 4, 2, SPRITE_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/SilentHillLabFront.asm b/data/maps/objects/SilentHillLabFront.asm index 564d6e3..e890fe7 100644 --- a/data/maps/objects/SilentHillLabFront.asm +++ b/data/maps/objects/SilentHillLabFront.asm @@ -13,21 +13,21 @@ SilentHillLabFront_MapEvents:: warp_event 4, 0, SILENT_HILL_LAB_BACK, 2, 13 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 + bg_event 6, 1, 1 + bg_event 2, 0, 2 + bg_event 0, 7, 3 + bg_event 1, 7, 4 + bg_event 2, 7, 5 + bg_event 5, 7, 6 + bg_event 6, 7, 7 + bg_event 7, 7, 8 + bg_event 0, 11, 9 + bg_event 1, 11, 10 + bg_event 2, 11, 11 + bg_event 5, 11, 12 + bg_event 6, 11, 13 + bg_event 7, 11, 14 + bg_event 4, 0, 15 def_object_events object_event 4, 2, SPRITE_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/SilentHillPokecenter.asm b/data/maps/objects/SilentHillPokecenter.asm index c7e3392..97b21d6 100644 --- a/data/maps/objects/SilentHillPokecenter.asm +++ b/data/maps/objects/SilentHillPokecenter.asm @@ -12,7 +12,7 @@ SilentHillPokecenter_MapEvents:: warp_event 6, 7, SILENT_HILL, 2, 60 def_bg_events - bg_event 13, 1, 0, 1 + bg_event 13, 1, 1 def_object_events object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/South.asm b/data/maps/objects/South.asm index f3c9f32..0c57e06 100644 --- a/data/maps/objects/South.asm +++ b/data/maps/objects/South.asm @@ -22,11 +22,11 @@ South_MapEvents:: warp_event 31, 30, HAITEKU_WEST_ROUTE_GATE, 4, 432 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 + bg_event 30, 14, 1 + bg_event 34, 14, 2 + bg_event 28, 17, 3 + bg_event 16, 22, 4 + bg_event 20, 22, 5 def_object_events object_event 25, 21, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/Stand.asm b/data/maps/objects/Stand.asm index b40dd40..899a41c 100644 --- a/data/maps/objects/Stand.asm +++ b/data/maps/objects/Stand.asm @@ -22,16 +22,16 @@ Stand_MapEvents:: warp_event 31, 13, BULL_FOREST_ROUTE_GATE_STAND, 2, 198 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 - bg_event 18, 21, 0, 6 - bg_event 24, 20, 0, 7 - bg_event 34, 20, 0, 8 - bg_event 36, 26, 0, 9 - bg_event 32, 35, 0, 10 + bg_event 8, 8, 1 + bg_event 14, 8, 2 + bg_event 20, 10, 3 + bg_event 16, 16, 4 + bg_event 10, 20, 5 + bg_event 18, 21, 6 + bg_event 24, 20, 7 + bg_event 34, 20, 8 + bg_event 36, 26, 9 + bg_event 32, 35, 10 def_object_events object_event 10, 10, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/Sugar.asm b/data/maps/objects/Sugar.asm index 61616d5..6b7cacd 100644 --- a/data/maps/objects/Sugar.asm +++ b/data/maps/objects/Sugar.asm @@ -15,10 +15,10 @@ Sugar_MapEvents:: warp_event 9, 10, SUGAR_POKECENTER_1F, 1, 101 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 + bg_event 14, 6, 1 + bg_event 6, 10, 2 + bg_event 10, 10, 3 + bg_event 10, 14, 4 def_object_events object_event 8, 12, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/UnusedMap13.asm b/data/maps/objects/UnusedMap13.asm index f5564e3..5802e4d 100644 --- a/data/maps/objects/UnusedMap13.asm +++ b/data/maps/objects/UnusedMap13.asm @@ -5,5 +5,6 @@ SECTION "data/maps/objects/UnusedMap13.asm", ROMX map_attributes UnusedMap13, UNUSED_MAP_13, 0 UnusedMap13_MapEvents:: + UnusedMap13_Blocks:: INCBIN "maps/UnusedMap13.blk" diff --git a/data/maps/objects/West.asm b/data/maps/objects/West.asm index 72de676..8f65773 100644 --- a/data/maps/objects/West.asm +++ b/data/maps/objects/West.asm @@ -25,12 +25,12 @@ West_MapEvents:: warp_event 35, 15, ROUTE_2_GATE_1F, 1, 226 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 + bg_event 16, 7, 1 + bg_event 28, 9, 2 + bg_event 12, 10, 3 + bg_event 32, 12, 4 + bg_event 26, 14, 5 + bg_event 18, 20, 6 def_object_events object_event 6, 8, SPRITE_SAILOR, 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 0d63c5b..74e9be9 100644 --- a/data/maps/objects/WestGym.asm +++ b/data/maps/objects/WestGym.asm @@ -12,8 +12,8 @@ WestGym_MapEvents:: warp_event 5, 17, WEST, 8, 102 def_bg_events - bg_event 3, 15, 0, 1 - bg_event 6, 15, 0, 1 + bg_event 3, 15, 1 + bg_event 6, 15, 1 def_object_events object_event 4, 4, SPRITE_TSUKUSHI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestHouse1.asm b/data/maps/objects/WestHouse1.asm index d6cd067..80eb8e2 100644 --- a/data/maps/objects/WestHouse1.asm +++ b/data/maps/objects/WestHouse1.asm @@ -12,10 +12,10 @@ WestHouse1_MapEvents:: warp_event 5, 7, WEST, 9, 47 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 + bg_event 0, 1, 1 + bg_event 1, 1, 2 + bg_event 5, 1, 3 + bg_event 8, 0, 4 def_object_events object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestHouse2.asm b/data/maps/objects/WestHouse2.asm index cb3f699..49337e6 100644 --- a/data/maps/objects/WestHouse2.asm +++ b/data/maps/objects/WestHouse2.asm @@ -12,10 +12,10 @@ WestHouse2_MapEvents:: warp_event 5, 7, WEST, 10, 47 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 + bg_event 0, 1, 1 + bg_event 1, 1, 2 + bg_event 5, 1, 3 + bg_event 8, 0, 4 def_object_events object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestMart1F.asm b/data/maps/objects/WestMart1F.asm index 5055ae9..7d5a3ba 100644 --- a/data/maps/objects/WestMart1F.asm +++ b/data/maps/objects/WestMart1F.asm @@ -14,8 +14,8 @@ WestMart1F_MapEvents:: warp_event 2, 0, WEST_MART_ELEVATOR, 1, 16 def_bg_events - bg_event 14, 0, 0, 1 - bg_event 3, 0, 0, 2 + bg_event 14, 0, 1 + bg_event 3, 0, 2 def_object_events object_event 7, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestMart2F.asm b/data/maps/objects/WestMart2F.asm index 2525e73..d453525 100644 --- a/data/maps/objects/WestMart2F.asm +++ b/data/maps/objects/WestMart2F.asm @@ -13,22 +13,22 @@ WestMart2F_MapEvents:: warp_event 2, 0, WEST_MART_ELEVATOR, 1, 16 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 + bg_event 14, 0, 1 + bg_event 3, 0, 2 + bg_event 3, 4, 3 + bg_event 3, 5, 3 + bg_event 3, 6, 3 + bg_event 3, 7, 3 + bg_event 7, 4, 3 + bg_event 7, 5, 3 + bg_event 7, 6, 3 + bg_event 7, 7, 3 + bg_event 4, 1, 3 + bg_event 5, 1, 3 + bg_event 6, 1, 3 + bg_event 7, 1, 3 + bg_event 8, 1, 3 + bg_event 9, 1, 3 def_object_events object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestMart3F.asm b/data/maps/objects/WestMart3F.asm index 955b6f7..c104329 100644 --- a/data/maps/objects/WestMart3F.asm +++ b/data/maps/objects/WestMart3F.asm @@ -13,20 +13,20 @@ WestMart3F_MapEvents:: warp_event 2, 0, WEST_MART_ELEVATOR, 1, 16 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 + bg_event 14, 0, 1 + bg_event 3, 0, 2 + bg_event 1, 4, 3 + bg_event 1, 5, 3 + bg_event 1, 6, 3 + bg_event 1, 7, 3 + bg_event 5, 4, 3 + bg_event 5, 5, 3 + bg_event 5, 6, 3 + bg_event 5, 7, 3 + bg_event 9, 4, 3 + bg_event 9, 5, 3 + bg_event 9, 6, 3 + bg_event 9, 7, 3 def_object_events object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestMart4F.asm b/data/maps/objects/WestMart4F.asm index d1d597c..101a3fe 100644 --- a/data/maps/objects/WestMart4F.asm +++ b/data/maps/objects/WestMart4F.asm @@ -13,20 +13,20 @@ WestMart4F_MapEvents:: warp_event 2, 0, WEST_MART_ELEVATOR, 1, 16 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 + bg_event 14, 0, 1 + bg_event 3, 0, 2 + bg_event 2, 5, 3 + bg_event 3, 5, 3 + bg_event 4, 5, 3 + bg_event 5, 5, 3 + bg_event 6, 5, 3 + bg_event 7, 5, 3 + bg_event 8, 5, 3 + bg_event 9, 5, 3 + bg_event 6, 1, 3 + bg_event 7, 1, 3 + bg_event 8, 1, 3 + bg_event 9, 1, 3 def_object_events object_event 13, 5, SPRITE_CLERK, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestMart5F.asm b/data/maps/objects/WestMart5F.asm index 86facb2..bc84abd 100644 --- a/data/maps/objects/WestMart5F.asm +++ b/data/maps/objects/WestMart5F.asm @@ -13,8 +13,8 @@ WestMart5F_MapEvents:: warp_event 2, 0, WEST_MART_ELEVATOR, 1, 16 def_bg_events - bg_event 14, 0, 0, 1 - bg_event 3, 0, 0, 2 + bg_event 14, 0, 1 + bg_event 3, 0, 2 def_object_events object_event 8, 5, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestMart6F.asm b/data/maps/objects/WestMart6F.asm index d843b9e..6a6af8b 100644 --- a/data/maps/objects/WestMart6F.asm +++ b/data/maps/objects/WestMart6F.asm @@ -11,11 +11,11 @@ WestMart6F_MapEvents:: warp_event 15, 0, WEST_MART_5F, 2, 22 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 + bg_event 8, 1, 1 + bg_event 9, 1, 2 + bg_event 10, 1, 3 + bg_event 11, 1, 4 + bg_event 14, 0, 5 def_object_events object_event 12, 3, SPRITE_OFFICER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestPokecenter1F.asm b/data/maps/objects/WestPokecenter1F.asm index 0da7c23..c00e631 100644 --- a/data/maps/objects/WestPokecenter1F.asm +++ b/data/maps/objects/WestPokecenter1F.asm @@ -13,7 +13,7 @@ WestPokecenter1F_MapEvents:: warp_event 0, 7, WEST_POKECENTER_2F, 1, 57 def_bg_events - bg_event 13, 1, 0, 1 + bg_event 13, 1, 1 def_object_events object_event 5, 1, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestPokecenter2F.asm b/data/maps/objects/WestPokecenter2F.asm index 3487cf2..3742823 100644 --- a/data/maps/objects/WestPokecenter2F.asm +++ b/data/maps/objects/WestPokecenter2F.asm @@ -11,7 +11,7 @@ WestPokecenter2F_MapEvents:: warp_event 0, 7, WEST_POKECENTER_1F, 3, 57 def_bg_events - bg_event 1, 1, 0, 1 + bg_event 1, 1, 1 def_object_events object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestRadioTower1F.asm b/data/maps/objects/WestRadioTower1F.asm index 7f5796a..d7bbd83 100644 --- a/data/maps/objects/WestRadioTower1F.asm +++ b/data/maps/objects/WestRadioTower1F.asm @@ -13,8 +13,8 @@ WestRadioTower1F_MapEvents:: warp_event 7, 0, WEST_RADIO_TOWER_2F, 2, 14 def_bg_events - bg_event 5, 0, 0, 1 - bg_event 0, 1, 0, 2 + bg_event 5, 0, 1 + bg_event 0, 1, 2 def_object_events object_event 6, 6, SPRITE_RECEPTIONIST, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestRadioTower2F.asm b/data/maps/objects/WestRadioTower2F.asm index 475cb84..19d3f3f 100644 --- a/data/maps/objects/WestRadioTower2F.asm +++ b/data/maps/objects/WestRadioTower2F.asm @@ -12,7 +12,7 @@ WestRadioTower2F_MapEvents:: warp_event 7, 0, WEST_RADIO_TOWER_1F, 3, 14 def_bg_events - bg_event 5, 0, 0, 1 + bg_event 5, 0, 1 def_object_events object_event 4, 6, SPRITE_GYM_GUY, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestRadioTower3F.asm b/data/maps/objects/WestRadioTower3F.asm index d47a328..bd58ed9 100644 --- a/data/maps/objects/WestRadioTower3F.asm +++ b/data/maps/objects/WestRadioTower3F.asm @@ -12,7 +12,7 @@ WestRadioTower3F_MapEvents:: warp_event 7, 0, WEST_RADIO_TOWER_4F, 2, 14 def_bg_events - bg_event 5, 0, 0, 1 + bg_event 5, 0, 1 def_object_events object_event 4, 6, SPRITE_SUPER_NERD, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestRadioTower4F.asm b/data/maps/objects/WestRadioTower4F.asm index 0429dbd..3eaca67 100644 --- a/data/maps/objects/WestRadioTower4F.asm +++ b/data/maps/objects/WestRadioTower4F.asm @@ -12,7 +12,7 @@ WestRadioTower4F_MapEvents:: warp_event 7, 0, WEST_RADIO_TOWER_3F, 2, 14 def_bg_events - bg_event 5, 0, 0, 1 + bg_event 5, 0, 1 def_object_events object_event 2, 6, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestRadioTower5F.asm b/data/maps/objects/WestRadioTower5F.asm index 656470e..3409300 100644 --- a/data/maps/objects/WestRadioTower5F.asm +++ b/data/maps/objects/WestRadioTower5F.asm @@ -11,9 +11,9 @@ WestRadioTower5F_MapEvents:: warp_event 0, 0, WEST_RADIO_TOWER_4F, 1, 11 def_bg_events - bg_event 3, 0, 0, 1 - bg_event 6, 4, 0, 2 - bg_event 7, 4, 0, 2 + bg_event 3, 0, 1 + bg_event 6, 4, 2 + bg_event 7, 4, 2 def_object_events object_event 6, 6, SPRITE_SCIENTIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 diff --git a/data/maps/objects/WestRocketRaidedHouse.asm b/data/maps/objects/WestRocketRaidedHouse.asm index 6c88ac7..b72e447 100644 --- a/data/maps/objects/WestRocketRaidedHouse.asm +++ b/data/maps/objects/WestRocketRaidedHouse.asm @@ -12,13 +12,13 @@ WestRocketRaidedHouse_MapEvents:: warp_event 5, 7, WEST, 5, 47 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 + bg_event 0, 1, 1 + bg_event 1, 1, 2 + bg_event 2, 1, 3 + bg_event 4, 1, 4 + bg_event 5, 1, 4 + bg_event 7, 1, 5 + bg_event 8, 0, 6 def_object_events object_event 8, 1, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 |