From aae999f72bd81a3156c7e00da4ebf499f52da5a6 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 4 Nov 2020 15:16:20 -0500 Subject: Start reorganizing pokeyellow --- data/maps/objects/BeachHouse.asm | 18 ------------------ data/maps/objects/Route19.asm | 2 +- data/maps/objects/Route2.asm | 3 +-- data/maps/objects/SummerBeachHouse.asm | 18 ++++++++++++++++++ 4 files changed, 20 insertions(+), 21 deletions(-) delete mode 100644 data/maps/objects/BeachHouse.asm create mode 100644 data/maps/objects/SummerBeachHouse.asm (limited to 'data/maps/objects') diff --git a/data/maps/objects/BeachHouse.asm b/data/maps/objects/BeachHouse.asm deleted file mode 100644 index 1ba99f87..00000000 --- a/data/maps/objects/BeachHouse.asm +++ /dev/null @@ -1,18 +0,0 @@ -BeachHouse_Object: - db $a ; border block - - def_warps - warp 2, 7, 0, LAST_MAP - warp 3, 7, 0, LAST_MAP - - def_signs - sign 3, 0, 3 - sign 7, 0, 4 - sign 11, 0, 5 - sign 13, 1, 6 - - def_objects - object SPRITE_FISHING_GURU, 2, 3, STAY, DOWN, 1 ; surfin' dude - object SPRITE_PIKACHU, 5, 3, WALK, 1, 2 ; pikachu - - def_warps_to BEACH_HOUSE diff --git a/data/maps/objects/Route19.asm b/data/maps/objects/Route19.asm index 340c48f0..55511b21 100755 --- a/data/maps/objects/Route19.asm +++ b/data/maps/objects/Route19.asm @@ -2,7 +2,7 @@ Route19_Object: db $43 ; border block def_warps - warp 5, 9, 0, BEACH_HOUSE + warp 5, 9, 0, SUMMER_BEACH_HOUSE def_signs sign 11, 11, 11 diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index e939b0dd..6977133b 100755 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -22,8 +22,7 @@ Route2_Object: ; unused warp_to 2, 7, 4 - dw $c712 - db $9, $7 + db $12, $c7, $9, $7 warp_to 2, 7, 4 warp_to 2, 7, 4 warp_to 2, 7, 4 diff --git a/data/maps/objects/SummerBeachHouse.asm b/data/maps/objects/SummerBeachHouse.asm new file mode 100644 index 00000000..c503b8a7 --- /dev/null +++ b/data/maps/objects/SummerBeachHouse.asm @@ -0,0 +1,18 @@ +SummerBeachHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 0, LAST_MAP + warp 3, 7, 0, LAST_MAP + + def_signs + sign 3, 0, 3 + sign 7, 0, 4 + sign 11, 0, 5 + sign 13, 1, 6 + + def_objects + object SPRITE_FISHING_GURU, 2, 3, STAY, DOWN, 1 ; surfin' dude + object SPRITE_PIKACHU, 5, 3, WALK, 1, 2 ; pikachu + + def_warps_to SUMMER_BEACH_HOUSE -- cgit v1.2.3