diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-11-04 20:11:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 20:11:52 -0500 |
| commit | ed03fc4f4a3287a01647e528abba27aac1937de0 (patch) | |
| tree | 32fef70a31af3a0b5ad2b0d34042c312574fb42d /data/maps/objects | |
| parent | 87131eaa1ba5dc898e64c7415b5bce61c6aa146d (diff) | |
| parent | aae999f72bd81a3156c7e00da4ebf499f52da5a6 (diff) | |
Merge pull request #59 from Rangi42/master
Start reorganizing pokeyellow
Diffstat (limited to 'data/maps/objects')
| -rwxr-xr-x | data/maps/objects/Route19.asm | 2 | ||||
| -rwxr-xr-x | data/maps/objects/Route2.asm | 3 | ||||
| -rw-r--r-- | data/maps/objects/SummerBeachHouse.asm (renamed from data/maps/objects/BeachHouse.asm) | 4 |
3 files changed, 4 insertions, 5 deletions
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/BeachHouse.asm b/data/maps/objects/SummerBeachHouse.asm index 1ba99f87..c503b8a7 100644 --- a/data/maps/objects/BeachHouse.asm +++ b/data/maps/objects/SummerBeachHouse.asm @@ -1,4 +1,4 @@ -BeachHouse_Object: +SummerBeachHouse_Object: db $a ; border block def_warps @@ -15,4 +15,4 @@ BeachHouse_Object: 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 + def_warps_to SUMMER_BEACH_HOUSE |