thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-17 02:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Kanto Safari Zone Area 2

Browse source
This commit is contained in:
Zeta_Null 2024-10-17 02:05:36 -04:00
parent 3949670f4f
commit 0d1b70ee56
9 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
constants/map_constants.asm
View file

@ -376,7 +376,9 @@ ENDM
map_const SUMMER_BEACH_HOUSE, 7, 4 ; 14
map_const KANTO_SAFARI_ZONE_CENTER, 15, 15 ; 15
map_const KANTO_SAFARI_ZONE_AREA1_SOUTH, 15, 9 ; 16
map_const KANTO_SAFARI_ZONE_AREA1_NORTH, 15, 4 ; 16
map_const KANTO_SAFARI_ZONE_AREA1_NORTH, 15, 4 ; 17
map_const KANTO_SAFARI_ZONE_AREA2_EAST, 11, 20 ; 18
map_const KANTO_SAFARI_ZONE_AREA2_WEST, 9, 18 ; 19
endgroup
newgroup LAVENDER ; 18

14
data/maps/attributes.asm
View file

@ -865,15 +865,25 @@ ENDM
map_attributes JackysHouse, JACKYS_HOUSE, $00, 0
map_attributes SummerBeachHouse, SUMMER_BEACH_HOUSE, $00, 0
map_attributes KantoSafariZoneCenter, KANTO_SAFARI_ZONE_CENTER, $05, EAST
map_attributes KantoSafariZoneCenter, KANTO_SAFARI_ZONE_CENTER, $05, NORTH | EAST
connection north, KantoSafariZoneArea2East, KANTO_SAFARI_ZONE_AREA2_EAST, 4
connection east, KantoSafariZoneArea1South, KANTO_SAFARI_ZONE_AREA1_SOUTH, -2
map_attributes KantoSafariZoneArea1South, KANTO_SAFARI_ZONE_AREA1_SOUTH, $05, NORTH | WEST
connection north, KantoSafariZoneArea1North, KANTO_SAFARI_ZONE_AREA1_NORTH, 0
connection west, KantoSafariZoneCenter, KANTO_SAFARI_ZONE_CENTER, 2
map_attributes KantoSafariZoneArea1North, KANTO_SAFARI_ZONE_AREA1_NORTH, $05, SOUTH
map_attributes KantoSafariZoneArea1North, KANTO_SAFARI_ZONE_AREA1_NORTH, $05, WEST | SOUTH
connection south, KantoSafariZoneArea1South, KANTO_SAFARI_ZONE_AREA1_SOUTH, 0
connection west, KantoSafariZoneArea2East, KANTO_SAFARI_ZONE_AREA2_EAST, -14
map_attributes KantoSafariZoneArea2East, KANTO_SAFARI_ZONE_AREA2_EAST, $05, SOUTH | WEST | EAST
connection south, KantoSafariZoneCenter, KANTO_SAFARI_ZONE_CENTER, -4
connection west, KantoSafariZoneArea2West, KANTO_SAFARI_ZONE_AREA2_WEST, 0
connection east, KantoSafariZoneArea1North, KANTO_SAFARI_ZONE_AREA1_NORTH, 14
map_attributes KantoSafariZoneArea2West, KANTO_SAFARI_ZONE_AREA2_WEST, $05, EAST
connection east, KantoSafariZoneArea2East, KANTO_SAFARI_ZONE_AREA2_EAST, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.

5
data/maps/blocks.asm
View file

@ -1300,4 +1300,9 @@ KantoSafariZoneArea1South_Blocks:
KantoSafariZoneArea1North_Blocks:
INCBIN "maps/KantoSafariZoneArea1North.ablk"
KantoSafariZoneArea2East_Blocks:
INCBIN "maps/KantoSafariZoneArea2East.ablk"
KantoSafariZoneArea2West_Blocks:
INCBIN "maps/KantoSafariZoneArea2West.ablk"

2
data/maps/maps.asm
View file

@ -416,6 +416,8 @@ MapGroup_Fuchsia:
map KantoSafariZoneCenter, TILESET_FOREST_KANTO, FOREST, LANDMARK_FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI
map KantoSafariZoneArea1South, TILESET_FOREST_KANTO, FOREST, LANDMARK_FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI
map KantoSafariZoneArea1North, TILESET_FOREST_KANTO, FOREST, LANDMARK_FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI
map KantoSafariZoneArea2East, TILESET_FOREST_KANTO, FOREST, LANDMARK_FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI
map KantoSafariZoneArea2West, TILESET_FOREST_KANTO, FOREST, LANDMARK_FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI
assert_table_length NUM_FUCHSIA_MAPS
MapGroup_Lavender:

4
data/maps/scripts.asm
View file

@ -629,4 +629,6 @@ INCLUDE "maps/SinjohRuinsExterior.asm"
INCLUDE "maps/SinjohRuinsInterior.asm"
INCLUDE "maps/KantoSafariZoneCenter.asm"
INCLUDE "maps/KantoSafariZoneArea1South.asm"
INCLUDE "maps/KantoSafariZoneArea1North.asm"
INCLUDE "maps/KantoSafariZoneArea1North.asm"
INCLUDE "maps/KantoSafariZoneArea2East.asm"
INCLUDE "maps/KantoSafariZoneArea2West.asm"

BIN
data/tilesets/forest_kanto_attributes.bin
View file

Binary file not shown.

13
data/tilesets/forest_kanto_collision.asm
View file

@ -76,9 +76,9 @@
tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 4b
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 4c
tilecoll WALL, WALL, WALL, WALL ; 4d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4f
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 50
tilecoll FLOOR, FLOOR, WALL, WALL ; 4e
tilecoll FLOOR, WALL, WALL, WALL ; 4f
tilecoll WALL, FLOOR, WALL, WALL ; 50
tilecoll WALL, WALL, WALL, DOOR ; 51
tilecoll WALL, WALL, WALL, WALL ; 52
tilecoll WATER, WATER, WATER, WATER ; 53
@ -106,7 +106,7 @@
tilecoll FLOOR, FLOOR, WALL, WALL ; 69
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6a
tilecoll FLOOR, WALL, WALL, WALL ; 6b
tilecoll FLOOR, WALL, FLOOR, WALL ; 6c
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6c
tilecoll TALL_GRASS, TALL_GRASS, WALL, WALL ; 6d
tilecoll FLOOR, WALL, WALL, WALL ; 6e
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 6f
@ -115,3 +115,8 @@
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 72
tilecoll WALL, WALL, FLOOR, FLOOR ; 73
tilecoll FLOOR, FLOOR, WALL, WALL ; 74
tilecoll WALL, WALL, FLOOR, WALL ; 75
tilecoll FLOOR, FLOOR, WALL, WALL ; 76
tilecoll WALL, WALL, WALL, FLOOR ; 77
tilecoll FLOOR, WALL, WALL, WALL ; 78
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 79

BIN
data/tilesets/forest_kanto_metatiles.bin
View file

Binary file not shown.

2
maps/KantoSafariZoneArea1North.ablk
View file

@ -1 +1 @@
s555qqqqqq5qqqHt??]]V)))+B]2acccgX)))+p5555`jirkXXYYA
s555qqqqqq5qqqHt??]]V)))+B]2acccgX)))+555`jirkXXYYA