Leahnaya/pokered
1
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2026-04-25 15:57:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Connected maps up to SSAnne2F

Browse Source
This commit is contained in:
thecodingbob 2025-12-13 15:36:50 +01:00
parent 03aeceac44
commit b4f12d5e3e
7 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/maps/objects/CeruleanCity.asm
View File

@ -16,6 +16,7 @@ CeruleanCity_Object:
def_warp_events
warp_event 9, 9, PEWTER_GYM, 4
warp_event 30, 19, CERULEAN_GYM, 1
def_bg_events
bg_event 23, 19, TEXT_CERULEANCITY_SIGN
@ -26,7 +27,7 @@ CeruleanCity_Object:
bg_event 27, 21, TEXT_CERULEANCITY_GYM_SIGN
def_object_events
object_event 20, 2, SPRITE_BLUE, STAY, DOWN, TEXT_CERULEANCITY_RIVAL
object_event 20, 4, SPRITE_BLUE, STAY, DOWN, TEXT_CERULEANCITY_RIVAL
object_event 30, 8, SPRITE_ROCKET, STAY, NONE, TEXT_CERULEANCITY_ROCKET, OPP_ROCKET, 5
object_event 31, 20, SPRITE_COOLTRAINER_M, STAY, DOWN, TEXT_CERULEANCITY_COOLTRAINER_M
object_event 15, 18, SPRITE_SUPER_NERD, WALK, UP_DOWN, TEXT_CERULEANCITY_SUPER_NERD1

6
data/maps/objects/CeruleanGym.asm
View File

@ -8,8 +8,10 @@ CeruleanGym_Object:
db $3 ; border block
def_warp_events
warp_event 4, 13, LAST_MAP, 4
warp_event 5, 13, LAST_MAP, 4
warp_event 4, 13, CERULEAN_CITY, 2
warp_event 5, 13, CERULEAN_CITY, 2
warp_event 4, 0, SS_ANNE_2F, 1
warp_event 5, 0, SS_ANNE_2F, 2
def_bg_events

12
data/maps/objects/SSAnne2F.asm
View File

@ -6,15 +6,9 @@ SSAnne2F_Object:
db $c ; border block
def_warp_events
warp_event 9, 11, SS_ANNE_2F_ROOMS, 1
warp_event 13, 11, SS_ANNE_2F_ROOMS, 3
warp_event 17, 11, SS_ANNE_2F_ROOMS, 5
warp_event 21, 11, SS_ANNE_2F_ROOMS, 7
warp_event 25, 11, SS_ANNE_2F_ROOMS, 9
warp_event 29, 11, SS_ANNE_2F_ROOMS, 11
warp_event 2, 4, SS_ANNE_1F, 9
warp_event 2, 12, SS_ANNE_3F, 2
warp_event 36, 4, SS_ANNE_CAPTAINS_ROOM, 1
warp_event 36, 13, CERULEAN_GYM, 3
warp_event 37, 13, CERULEAN_GYM, 4
def_bg_events

BIN
maps/CeruleanCity.blk
View File

Binary file not shown.

BIN
maps/CeruleanGym.blk
View File

Binary file not shown.

BIN
maps/SSAnne2F.blk
View File

Binary file not shown.

4
scripts/CeruleanCity.asm
View File

@ -107,8 +107,8 @@ CeruleanCityCoords1:
db -1 ; end
CeruleanCityCoords2:
dbmapcoord 20, 6
dbmapcoord 21, 6
dbmapcoord 20, 8
dbmapcoord 20, 9
db -1 ; end
CeruleanCityMovement1: