pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add east/west connected map for testing

Browse Source
This commit is contained in:
xCrystal 2023-12-21 19:57:17 +01:00
parent 1cc65f4255
commit eafc71f4a2
18 changed files with 57 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
constants/map_constants.asm
View File

@ -51,6 +51,7 @@ if DEF(_DEBUG)
newgroup DEBUGLEVEL_2 newgroup DEBUGLEVEL_2
map_const DEBUGLEVEL_2_MAP_1, 15, 10 ; 1 map_const DEBUGLEVEL_2_MAP_1, 15, 10 ; 1
map_const DEBUGLEVEL_2_MAP_2, 5, 5 ; 2
endgroup endgroup
newgroup DEBUGLEVEL_3 newgroup DEBUGLEVEL_3

6
data/maps/attributes.asm
View File

@ -111,7 +111,11 @@ if DEF(_DEBUG)
connection south, DebugLevel1_Map1, DEBUGLEVEL_1_MAP_1, 0 connection south, DebugLevel1_Map1, DEBUGLEVEL_1_MAP_1, 0
connection north, DebugLevel1_Map1, DEBUGLEVEL_1_MAP_1, 0 connection north, DebugLevel1_Map1, DEBUGLEVEL_1_MAP_1, 0
map_attributes DebugLevel2_Map1, DEBUGLEVEL_2_MAP_1, $00, 0 map_attributes DebugLevel2_Map1, DEBUGLEVEL_2_MAP_1, $00, WEST
connection west, DebugLevel2_Map2, DEBUGLEVEL_2_MAP_2, 3
map_attributes DebugLevel2_Map2, DEBUGLEVEL_2_MAP_2, $00, EAST
connection east, DebugLevel2_Map1, DEBUGLEVEL_2_MAP_1, -3
map_attributes DebugLevel3_Map1, DEBUGLEVEL_3_MAP_1, $00, 0 map_attributes DebugLevel3_Map1, DEBUGLEVEL_3_MAP_1, $00, 0

3
data/maps/blocks.asm
View File

@ -10,6 +10,9 @@ INCBIN "maps/DebugLevel1_Map1.blk"
DebugLevel2_Map1_Blocks: DebugLevel2_Map1_Blocks:
INCBIN "maps/DebugLevel2_Map1.blk" INCBIN "maps/DebugLevel2_Map1.blk"
DebugLevel2_Map2_Blocks:
INCBIN "maps/DebugLevel2_Map2.blk"
DebugLevel3_Map1_Blocks: DebugLevel3_Map1_Blocks:
INCBIN "maps/DebugLevel3_Map1.blk" INCBIN "maps/DebugLevel3_Map1.blk"

1
data/maps/maps.asm
View File

@ -48,6 +48,7 @@ MapGroup_DebugLevel1:
MapGroup_DebugLevel2: MapGroup_DebugLevel2:
table_width MAP_LENGTH, MapGroup_DebugLevel2 table_width MAP_LENGTH, MapGroup_DebugLevel2
map DebugLevel2_Map1, TILESET_BOARD_DEBUG_2, INDOOR_CAVE, LANDMARK_DEBUGLEVEL_2, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_NITE, FISHGROUP_SHORE map DebugLevel2_Map1, TILESET_BOARD_DEBUG_2, INDOOR_CAVE, LANDMARK_DEBUGLEVEL_2, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_NITE, FISHGROUP_SHORE
map DebugLevel2_Map2, TILESET_BOARD_DEBUG_2, INDOOR_CAVE, LANDMARK_DEBUGLEVEL_2, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_NITE, FISHGROUP_SHORE
assert_table_length NUM_DEBUGLEVEL_2_MAPS assert_table_length NUM_DEBUGLEVEL_2_MAPS
MapGroup_DebugLevel3: MapGroup_DebugLevel3:

1
data/maps/scripts.asm
View File

@ -5,6 +5,7 @@ INCLUDE "maps/Level1_Map1.asm"
if DEF(_DEBUG) if DEF(_DEBUG)
INCLUDE "maps/DebugLevel1_Map1.asm" INCLUDE "maps/DebugLevel1_Map1.asm"
INCLUDE "maps/DebugLevel2_Map1.asm" INCLUDE "maps/DebugLevel2_Map1.asm"
INCLUDE "maps/DebugLevel2_Map2.asm"
INCLUDE "maps/DebugLevel3_Map1.asm" INCLUDE "maps/DebugLevel3_Map1.asm"
INCLUDE "maps/DebugLevel4_Map1.asm" INCLUDE "maps/DebugLevel4_Map1.asm"
INCLUDE "maps/DebugLevel5_Map1.asm" INCLUDE "maps/DebugLevel5_Map1.asm"

2
data/tilesets/board_debug_2_collision.asm
View File

@ -123,7 +123,7 @@
tilecoll WATER, WATER, WATER, WATER ; 7a tilecoll WATER, WATER, WATER, WATER ; 7a
tilecoll WALL, WALL, WALL, WALL ; 7b tilecoll WALL, WALL, WALL, WALL ; 7b
tilecoll WALL, WALL, WALL, WALL ; 7c tilecoll WALL, WALL, WALL, WALL ; 7c
tilecoll WALL, WALL, WALL, WALL ; 7d tilecoll BRANCH_SPACE, FLOOR, FLOOR, FLOOR ; 7d
tilecoll BRANCH_SPACE, FLOOR, FLOOR, FLOOR ; 7e tilecoll BRANCH_SPACE, FLOOR, FLOOR, FLOOR ; 7e
tilecoll UNION_SPACE, FLOOR, FLOOR, FLOOR ; 7f tilecoll UNION_SPACE, FLOOR, FLOOR, FLOOR ; 7f
tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 80 tilecoll BLUE_SPACE, FLOOR, FLOOR, FLOOR ; 80

2
data/tilesets/board_debug_2_metatiles.bin
View File

@ -3,4 +3,4 @@
&  &&67&&67&&&&$$$$*+:;$$$$"#23     ()89       !01     $$&&&&    @@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%' &&&&&&&&  &  &&67&&67&&&&$$$$*+:;$$$$"#23     ()89       !01     $$&&&&    @@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%' &&&&&&&& 
& &
67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&&  67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&& 
&&&$$()89IIIIJJJJNO^_JJJJNO^_JJZZZZYYYYZZZZYYYYJJZZZZYYYYLL;;;;====;;;;====;;;KLLL===LLLM;;;KLLL===LLLM\LLL===LLL];;;LLLLLLLL====;;;;LL>?E>?>?>?>?>?>?>?>?>?E>?>?>?>?>?>?>?>?E>?>?>?>?>?>?>?>?>?E>?;;<<;;<<;;<<;;<<<<==<<==<<==<<==<+,,+;<<;;<<;;<<,,-<<<=-<<==<<==;;<<;;<<;KLLKLLL<<==<<==LLM=LLLM<<<<<<<<LL<<L;<<<<<<<<<<<<LL<<=L,,,,<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<LLLLLLLL<<<<<<<<FGLLVWLL;KL囹=LLLMLLLL789:NO^_MK6666HHHHHHHHRRRR珮<01>粤<05>ﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁNOﾐﾑ^_ﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉNOﾘﾙ^_ﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾌﾍﾜﾝﾄﾅﾔﾕﾆﾇﾖﾗﾊﾋﾚﾛﾄﾅNOﾔﾕ^_ﾄﾅﾔﾕﾆﾇﾖﾗﾊﾋﾚﾛﾌﾍﾜﾝﾄﾅﾔﾕﾆﾇﾖﾗﾊﾋﾚﾛﾄﾅﾔﾕﾄﾅﾔﾕﾆﾇﾖﾗﾊﾋﾚﾛﾌﾍﾜﾝﾄﾅﾔﾕﾆﾇﾖﾗﾊﾋﾚﾛﾄﾅﾔﾕﾄﾅﾔﾕﾆﾇﾖﾗﾊﾋﾚﾛﾌﾍﾜﾝﾄﾅﾔﾕﾆﾇﾖﾗﾊﾋﾚﾛﾄﾅﾔﾕﾄﾅﾔﾕﾆﾇﾖﾗﾊﾋﾚﾛﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏNOﾞﾟ^_ﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟ &&&$$()89IIIIJJJJNO^_JJJJNO^_JJZZZZYYYYZZZZYYYYJJZZZZYYYYLL;;;;====;;;;====;;;KLLL===LLLM;;;KLLL===LLLM\LLL===LLL];;;LLLLLLLL====;;;;LL>?E>?>?>?>?>?>?>?>?>?E>?>?>?>?>?>?>?>?E>?>?>?>?>?>?>?>?>?E>?;;<<;;<<;;<<;;<<<<==<<==<<==<<==<+,,+;<<;;<<;;<<,,-<<<=-<<==<<==;;<<;;<<;KLLKLLL<<==<<==LLM=LLLM<<<<<<<<LL<<L;<<<<<<<<<<<<LL<<=L,,,,<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<LLLLLLLL<<<<<<<<FGLLVWLL;KL囹=LLLMLLLL789:NO^_MK6666HHHHHHHHRRRR蒟<01>珮<01>粤<05>ﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁNOﾐﾑ^_ﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾀﾁﾐﾑﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉNOﾘﾙ^_ﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾈﾉﾘﾙﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾂﾃﾒﾓﾌﾍﾜﾝﾄﾅﾔﾕﾆﾇﾖﾗﾊﾋﾚﾛﾄﾅNOﾔﾕ^_ﾄﾅﾔﾕﾆﾇﾖﾗﾊﾋﾚﾛﾌﾍﾜﾝﾄﾅﾔﾕﾆﾇﾖﾗﾊﾋﾚﾛﾄﾅﾔﾕﾄﾅﾔﾕﾆﾇﾖﾗﾊﾋﾚﾛﾌﾍﾜﾝﾄﾅﾔﾕﾆﾇﾖﾗﾊﾋﾚﾛﾄﾅﾔﾕﾄﾅﾔﾕﾆﾇﾖﾗﾊﾋﾚﾛﾌﾍﾜﾝﾄﾅﾔﾕﾆﾇﾖﾗﾊﾋﾚﾛﾄﾅﾔﾕﾄﾅﾔﾕﾆﾇﾖﾗﾊﾋﾚﾛﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏNOﾞﾟ^_ﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟﾎﾏﾞﾟ

0
engine/board/spaces.asm Normal file → Executable file
View File

BIN
gfx/tilesets/board_debug_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

4
gfx/tilesets/board_debug_1_palette_map.asm
View File

@ -26,7 +26,7 @@
tilepal 1, RED, RED, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY tilepal 1, RED, RED, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY
tilepal 1, WATER, WATER, RED, RED, GREEN, GREEN, BROWN, BROWN tilepal 1, WATER, WATER, RED, RED, GREEN, GREEN, BROWN, BROWN
tilepal 1, RED, RED, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY tilepal 1, RED, RED, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY
tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN tilepal 1, RED, RED, RED, RED, RED, RED, BROWN, BROWN
tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN tilepal 1, RED, RED, RED, RED, RED, RED, BROWN, BROWN
tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

BIN
gfx/tilesets/board_debug_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

4
gfx/tilesets/board_debug_2_palette_map.asm
View File

@ -26,8 +26,8 @@
tilepal 1, RED, RED, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY tilepal 1, RED, RED, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY
tilepal 1, WATER, WATER, RED, RED, GREEN, GREEN, BROWN, BROWN tilepal 1, WATER, WATER, RED, RED, GREEN, GREEN, BROWN, BROWN
tilepal 1, RED, RED, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY tilepal 1, RED, RED, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY
tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN tilepal 1, RED, RED, RED, RED, RED, RED, BROWN, BROWN
tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN tilepal 1, RED, RED, RED, RED, RED, RED, BROWN, BROWN
tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

BIN
gfx/tilesets/spaces/variable_spaces_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 424 B

After

Width:  |  Height:  |  Size: 475 B

4
gfx/tilesets/spaces/variable_spaces_1_palette_map.asm
View File

@ -1,4 +1,4 @@
tilepal 1, RED, RED, RED, RED, BROWN, BROWN, GRAY, GRAY tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY
tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
tilepal 1, RED, RED, RED, RED, BROWN, BROWN, GRAY, GRAY tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY
tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

11
maps/DebugLevel2_Map1.asm
View File

@ -30,7 +30,7 @@ DebugLevel2_Map1_MapEvents:
DebugLevel2_Map1_MapSpaces: DebugLevel2_Map1_MapSpaces:
space 6, 16, $0, 1 ; 0 space 6, 16, $0, 1 ; 0
space 6, 14, $0, 2 ; 1 space 6, 14, $0, 2 ; 1
space 6, 12, $0, 3 ; 2 space 6, 12, .BS1 ; 2 .BS1
space 6, 10, $0, GO_UP ; 3 space 6, 10, $0, GO_UP ; 3
space 20, 2, $0, 5 ; 4 space 20, 2, $0, 5 ; 4
space 22, 2, $0, 6 ; 5 space 22, 2, $0, 6 ; 5
@ -41,3 +41,12 @@ DebugLevel2_Map1_MapSpaces:
space 20, 14, $0, 11 ; 10 space 20, 14, $0, 11 ; 10
space 20, 16, $0, 12 ; 11 space 20, 16, $0, 12 ; 11
space 20, 18, $0, 12 ; 12 space 20, 18, $0, 12 ; 12
space 4, 12, $0, 14 ; 13
space 2, 12, $0, 15 ; 14
space 0, 12, $0, GO_LEFT ; 15
.BS1:
branchdir LEFT, 13, 0
branchdir UP, 3, 0
endbranch

BIN
maps/DebugLevel2_Map1.blk
View File

Binary file not shown.

27
maps/DebugLevel2_Map2.asm Executable file
View File

@ -0,0 +1,27 @@
object_const_def
DebugLevel2_Map2_MapScripts:
def_scene_scripts
def_callbacks
DebugLevel2_Map2_MapEvents:
db 0, 0 ; filler
def_warp_events
def_anchor_events
anchor_event 9, 6, 0
def_coord_events
def_bg_events
def_object_events
DebugLevel2_Map2_MapSpaces:
space 8, 6, $0, 1 ; 0
space 6, 6, $0, 2 ; 1
space 4, 6, $0, 3 ; 2
space 2, 6, $0, 4 ; 3
space 0, 6, $0, 4 ; 4

1
maps/DebugLevel2_Map2.blk Executable file
View File

@ -0,0 +1 @@
!!!!!À€€€€