Skip to content

Commit

Permalink
Melzars Maze, Wildy rework
Browse files Browse the repository at this point in the history
  • Loading branch information
Demonheadge committed Feb 7, 2024
1 parent 59fb4fd commit 1729608
Show file tree
Hide file tree
Showing 40 changed files with 420 additions and 24 deletions.
12 changes: 12 additions & 0 deletions data/event_scripts.s
Original file line number Diff line number Diff line change
Expand Up @@ -1764,3 +1764,15 @@ Common_EventScript_LegendaryFlewAway::
.include "data/maps/PortSarim_Lighthouse_2F/scripts.inc"

.include "data/maps/PortSarim_Lighthouse_3F/scripts.inc"

.include "data/maps/Melzars_Maze_1F/scripts.inc"

.include "data/maps/Melzars_Maze_2F/scripts.inc"

.include "data/maps/Melzars_Maze_3F/scripts.inc"

.include "data/maps/Melzars_Maze_B1F/scripts.inc"

.include "data/maps/Route48/scripts.inc"

.include "data/maps/Route49/scripts.inc"
1 change: 1 addition & 0 deletions data/layouts/Melzars_Maze_1F/border.bin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
����
Binary file added data/layouts/Melzars_Maze_1F/map.bin
Binary file not shown.
1 change: 1 addition & 0 deletions data/layouts/Melzars_Maze_2F/border.bin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
����
1 change: 1 addition & 0 deletions data/layouts/Melzars_Maze_2F/map.bin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
1 change: 1 addition & 0 deletions data/layouts/Melzars_Maze_3F/border.bin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
����
1 change: 1 addition & 0 deletions data/layouts/Melzars_Maze_3F/map.bin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
1 change: 1 addition & 0 deletions data/layouts/Melzars_Maze_B1F/border.bin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
����
1 change: 1 addition & 0 deletions data/layouts/Melzars_Maze_B1F/map.bin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
Binary file modified data/layouts/Route30/map.bin
Binary file not shown.
Binary file modified data/layouts/Route31/map.bin
Binary file not shown.
Binary file modified data/layouts/Route41/map.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion data/layouts/Route42/map.bin
Original file line number Diff line number Diff line change
@@ -1 +1 @@
          w 2  2 2 2 2  2 2 2  �2�2�2�2�2�2�222 2222222 �2�2�2�2g2�2�22  22222222 �2�2�2�2�22 22222222 �  2�2�222  222222222 2 � 2222222222222222222� 22 2$2)2)2)2)2)2)2)2)2)2)2)2)2)2)2)2)2��222 2"2 222A2A2222��2222222"22 :20082222 2 )2)2)2)2)2*2  :20 08222 v�2 t�22A2A2A2A2A2A2A221212222v}222�2:2000000@222222�}2222�2:2���� 0&0@222A2A222222��2:2&�����00082:2 082222v}��2:200����082:20'8222v}H2:20����0"#82212122�}2P 2222&00000002222 22X 2212121212121212 2  2 2 2222  2  
          w 2  2 2 2 2  2 2 2  �2�2�2�2�2�2�222 2222222 �2�2�2�2g2�2�22  22222222 �2�2�2�2�22 22222222 �  2�2�222  222222222 2 � 2222222222222222222� 22 2$2)2)2)2)2)2)2)2)2)2)2)2)2)2)2)2)2��222 2"2 222`2�2�20313�2�2�2:3=322222"22 2`2�222222��)2)2)2)2)2*2  2h2v2�22 2 �t�22A2A2A2A2A22^22h2�2222 v2���2:200000@222h2�222v}22���2:2���00822h2�222�}222���2:2'����0822h2�2222222�����2:200���0822h2~2�2222v}��22222���0822h222222v}�w2k2 22:2'0000822h22v2�2�}22�2j2 22121212121222h2�2222222�2j2 2222ps2~2�2�2�2��22j2     22h2}2222222j2     22pq2q2q2d2T0e2q2q2r
Expand Down
9 changes: 8 additions & 1 deletion data/layouts/Route43/map.bin
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
22 22 22 22 22 22 22 22 22 22vn�n�o�o�2���o�n�o���22
22O2W22_2O22 2�222 222222222222 22�2222 2$2)2)2)2)2)2)2)2#2"222� O222 2"22222222 2"222 �2222_ 2"22W222W2 2"2_22�22222 2"22222222 2"2222}2WW2 2"22222222 2"22_�2222222"22222222 22222)2)2)2)2)2)2#2"22W222W2(2)2)2)2)2�2;22; 2"222222222 222
�26OO6 2222222
2222 �23554(2)2)2#2"2_  222 2�2222 222 2"222  222 22~��2��o�� 2"2��n�o����2 2 2"22 2   2"2  22 2 2"2  222 2 2 2"2 222 2
2222 �23554(2)2)2#2"2_  222 2�2222 222 2"222  222 22~��2��o�� 2"2��n�o����2 2 2"22 2   2"2  22 2 2"2  22
2
 2 2
 2"2 2
22 2   
   2"2   
   
   2"2     
Expand Down
20 changes: 19 additions & 1 deletion data/layouts/Route44/map.bin
Original file line number Diff line number Diff line change
@@ -1 +1,19 @@
�2�2�2�2�2j2j22222222222222222222�2�2�2�2�2j2j2 2 2 2 2 2 2 2 2 2 2 222 2 2 2 2 2 2�2�2�2�2�2j2j22222222222222222222�2�2�2�2�2j2j2 2 222 2 2 222 2 2 2 2 2 2 2 2 2 2�2�2�2�2�2j2j22222222222222222222�2�2�2�2�2j2j2 2 22222 2 2 2 2 22 22 222 2 2�2�2�2�2�2j2a2b222 22222222 22 22 2 222�2�2�2�2�2j2k2r2 2 22222222 2222222 22�2�2�2�2�2j2j222��2 222222f2 2222f222 2�2�2�2�2�2j2j22 2222 2222 2222 2222 22�2�2�2�2�2j2j2 222 2�22222222222 222 2�2�2�2k2q2r2j222 22�22 222222�ow22 2 22�2�2�2j2 2k2r22222 2 22222 2"222|2�222f2�2�2k2r22j2222 2t2n2�2 22�0�0 2"2�0�022222�2�2j2k2q2r22 2�n22222^2�0�0 2"2�0�022�o��2�2j2j22222222222222222222222q2q2r2j2 2$2)2)2)2)2)2)2)2)2)2)2)2#2$2)2)2)2)2)2)2)2q2q2q2r2 2"222 2�ou2�w2�2�0�0 2"2�0�0^2222�2222 2"2 2 2222�22�22�0�0 2"2�0�02222222222"222 222�2 2�222^2 2"22222222)2)2)2)2)2*2 2 2 222~2�2|2�ow2 2"2v2�22��22 222222 2222222 2 222�2 2"2�22222 22 2 2 2 222 2 22 22 222222(2*2f2`2b2222 22222 222 2 2 2 2222<2D222^2`2a2j2]2]222 2 2 2 22 2 22222%2&2'2 2^222]2p2s2a2b22222222 222222 2-2.2/222]2`2b2]2p2q2r222^2 2 2 2 22 222 2222222 22p2r22f222222222222222 2222 2222^222222 22 2
�2�2�2�2�2j2j22 22 22 22 22 22 22 22 22 22�2�2�2�2�2j2j2 22 22 22 22 22 22 22 22 22 2�2�2�2�2�2j2j22 2222 2222 22 22 2
2 22 22�2�2�2�2�2j2j2 2222 22 2222 22 22 22 22 2�2�2�2�2�2j2j2222222222 222222222
2�2�2�2�2�2j2j2 2 22
222 22 22 22 2
2 222 2 2�2�2�2�2�2j2a2b2
22 2222 2222 22 22 2 222�2�2�2�2�2j2k2r2 2 22222222 2222222 22�2�2�2�2�2j2j22
2��2 222222f2 2222f222 2�2�2�2�2�2j2j22 2222 2222 2222 2222 22�2�2�2�2�2j2j2 222 2�22222222222 22
2 2�2�2�2k2q2r2j222 22�22 222222�ow22 2 22�2�2�2j2 2k2r22222 2 2
2222 2"222|2�222f2�2�2k2r22j2222 2t2n2�2 22�0�0 2"2�0�022222�2�2j2k2q2r22 2�n22222^2�0�0 2"2�0�022�o��2�2j2j22222222222222222222222q2q2r2j2 2$2)2)2)2)2)2)2)2)2)2)2)2#2$2)2)2)2)2)2)2)2q2q2q2r2 2"2
22 2�ou2�w2�2�0�0 2"2�0�0^2222�2222 2"2 2 2
222�22�22�0�0 2"2�0�02222222222"222 222�2 2�222^2 2"22222222)2)2)2)2)2*2 2 2 222~2�2|2�ow2 2"2v2�22��22 22
22222222
222 2 222�2 2"2�22222 2
2 2 22 222 2 22 22 222222(2*2f2`2b2222 222 22 22
2 2 2 2 2222<2D222^2`2a2j2]2]222222 2
2 2 2222
2%2&2'2 2^222]2p2s2a2b22222222 222222 2-2.2/222]2`2b2]2p2q2r222^2 22 222 222 2222222 22p2r22f2222222 22 222222 2
222 2
222^222222 22 2
Expand Down
1 change: 1 addition & 0 deletions data/layouts/Route48/border.bin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
����
1 change: 1 addition & 0 deletions data/layouts/Route48/map.bin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
22 22 22 22 22 22 22 222 22 22 22 22 2222222 22 22 22 22 222222222 22 22 22 22 2222222 22 22 22 22 2222222H22 22 22 22 22 222H2I2I2Q2 22 222222H2I2I2I2Q2Q2Q2Q22 22 22H2I2I2Q2Q2Q2Q2Q2Q2Q2Y2H2I2I2I2I2Q2Q2Q2Q2Q2Q2Q2Y2Y2Y22Q2Q2Q2Q2Q2Q2Q2Q2Y2Y2Y2Y22222Q2Q2Q2Q2Q2Y2Y2Y2222222 22Y2Y2Y2Y2Y222222222 22 222222222 22 22 22 222 22 22 22 22 22 22 22 2 22 22 22 22 22 22 22 222 22 22 22 22 22 22 22 2 22 22 22 22 22 22 22 222 22 22 22 22 22 22 22 2 22 22 22 22 22 22 22 222 22 22 22 22 22 22 22 2
1 change: 1 addition & 0 deletions data/layouts/Route49/border.bin
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
����
Binary file added data/layouts/Route49/map.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion data/layouts/Wilderness_Volcano_Lobby/border.bin
Original file line number Diff line number Diff line change
@@ -1 +1 @@
����
 
68 changes: 64 additions & 4 deletions data/layouts/layouts.json
Original file line number Diff line number Diff line change
Expand Up @@ -5064,7 +5064,7 @@
{
"id": "LAYOUT_ROUTE30",
"name": "Route30_Layout",
"width": 50,
"width": 48,
"height": 18,
"primary_tileset": "gTileset_PokeScapeOutdoors",
"secondary_tileset": "gTileset_Varrock",
Expand All @@ -5074,7 +5074,7 @@
{
"id": "LAYOUT_ROUTE31",
"name": "Route31_Layout",
"width": 54,
"width": 52,
"height": 26,
"primary_tileset": "gTileset_PokeScapeOutdoors",
"secondary_tileset": "gTileset_Wilderness",
Expand Down Expand Up @@ -6135,7 +6135,7 @@
"id": "LAYOUT_ROUTE42",
"name": "Route42_Layout",
"width": 22,
"height": 20,
"height": 22,
"primary_tileset": "gTileset_PokeScapeOutdoors",
"secondary_tileset": "gTileset_Wilderness",
"border_filepath": "data/layouts/Route42/border.bin",
Expand All @@ -6145,7 +6145,7 @@
"id": "LAYOUT_ROUTE43",
"name": "Route43_Layout",
"width": 20,
"height": 20,
"height": 22,
"primary_tileset": "gTileset_PokeScapeOutdoors",
"secondary_tileset": "gTileset_Wilderness",
"border_filepath": "data/layouts/Route43/border.bin",
Expand Down Expand Up @@ -7980,6 +7980,66 @@
"secondary_tileset": "gTileset_Yanille",
"border_filepath": "data/layouts/PortSarim_Lighthouse_3F/border.bin",
"blockdata_filepath": "data/layouts/PortSarim_Lighthouse_3F/map.bin"
},
{
"id": "LAYOUT_MELZARS_MAZE_1F",
"name": "Melzars_Maze_1F_Layout",
"width": 20,
"height": 20,
"primary_tileset": "gTileset_PokeScapeIndoors",
"secondary_tileset": "gTileset_DraynorManor",
"border_filepath": "data/layouts/Melzars_Maze_1F/border.bin",
"blockdata_filepath": "data/layouts/Melzars_Maze_1F/map.bin"
},
{
"id": "LAYOUT_MELZARS_MAZE_2F",
"name": "Melzars_Maze_2F_Layout",
"width": 20,
"height": 20,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_DraynorManor",
"border_filepath": "data/layouts/Melzars_Maze_2F/border.bin",
"blockdata_filepath": "data/layouts/Melzars_Maze_2F/map.bin"
},
{
"id": "LAYOUT_MELZARS_MAZE_3F",
"name": "Melzars_Maze_3F_Layout",
"width": 20,
"height": 20,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_DraynorManor",
"border_filepath": "data/layouts/Melzars_Maze_3F/border.bin",
"blockdata_filepath": "data/layouts/Melzars_Maze_3F/map.bin"
},
{
"id": "LAYOUT_MELZARS_MAZE_B1F",
"name": "Melzars_Maze_B1F_Layout",
"width": 20,
"height": 20,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_DraynorManor",
"border_filepath": "data/layouts/Melzars_Maze_B1F/border.bin",
"blockdata_filepath": "data/layouts/Melzars_Maze_B1F/map.bin"
},
{
"id": "LAYOUT_ROUTE48",
"name": "Route48_Layout",
"width": 16,
"height": 20,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Wilderness",
"border_filepath": "data/layouts/Route48/border.bin",
"blockdata_filepath": "data/layouts/Route48/map.bin"
},
{
"id": "LAYOUT_ROUTE49",
"name": "Route49_Layout",
"width": 30,
"height": 38,
"primary_tileset": "gTileset_PokeScapeOutdoors",
"secondary_tileset": "gTileset_Wilderness",
"border_filepath": "data/layouts/Route49/border.bin",
"blockdata_filepath": "data/layouts/Route49/map.bin"
}
]
}
28 changes: 28 additions & 0 deletions data/maps/Melzars_Maze_1F/map.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"id": "MAP_MELZARS_MAZE_1F",
"name": "Melzars_Maze_1F",
"layout": "LAYOUT_MELZARS_MAZE_1F",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_RIMMINGTON",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",
"allow_cycling": false,
"allow_escaping": true,
"allow_running": true,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": 0,
"object_events": [

],
"warp_events": [

],
"coord_events": [

],
"bg_events": [

]
}
2 changes: 2 additions & 0 deletions data/maps/Melzars_Maze_1F/scripts.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Melzars_Maze_1F_MapScripts::
.byte 0
28 changes: 28 additions & 0 deletions data/maps/Melzars_Maze_2F/map.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"id": "MAP_MELZARS_MAZE_2F",
"name": "Melzars_Maze_2F",
"layout": "LAYOUT_MELZARS_MAZE_2F",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_RIMMINGTON",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",
"allow_cycling": false,
"allow_escaping": true,
"allow_running": true,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": 0,
"object_events": [

],
"warp_events": [

],
"coord_events": [

],
"bg_events": [

]
}
2 changes: 2 additions & 0 deletions data/maps/Melzars_Maze_2F/scripts.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Melzars_Maze_2F_MapScripts::
.byte 0
28 changes: 28 additions & 0 deletions data/maps/Melzars_Maze_3F/map.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"id": "MAP_MELZARS_MAZE_3F",
"name": "Melzars_Maze_3F",
"layout": "LAYOUT_MELZARS_MAZE_3F",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_RIMMINGTON",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",
"allow_cycling": false,
"allow_escaping": true,
"allow_running": true,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": 0,
"object_events": [

],
"warp_events": [

],
"coord_events": [

],
"bg_events": [

]
}
2 changes: 2 additions & 0 deletions data/maps/Melzars_Maze_3F/scripts.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Melzars_Maze_3F_MapScripts::
.byte 0
28 changes: 28 additions & 0 deletions data/maps/Melzars_Maze_B1F/map.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"id": "MAP_MELZARS_MAZE_B1F",
"name": "Melzars_Maze_B1F",
"layout": "LAYOUT_MELZARS_MAZE_B1F",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_RIMMINGTON",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",
"allow_cycling": false,
"allow_escaping": true,
"allow_running": true,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": 0,
"object_events": [

],
"warp_events": [

],
"coord_events": [

],
"bg_events": [

]
}
2 changes: 2 additions & 0 deletions data/maps/Melzars_Maze_B1F/scripts.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Melzars_Maze_B1F_MapScripts::
.byte 0
10 changes: 10 additions & 0 deletions data/maps/Route31/map.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@
"direction": "up",
"offset": 6,
"map": "MAP_ROUTE47"
},
{
"direction": "up",
"offset": 36,
"map": "MAP_ROUTE48"
},
{
"direction": "right",
"offset": -12,
"map": "MAP_ROUTE49"
}
],
"object_events": [
Expand Down
Loading

0 comments on commit 1729608

Please sign in to comment.