mirror of
				https://github.com/thornAvery/jep-hack.git
				synced 2025-11-04 21:01:01 +13:00 
			
		
		
		
	Hey do you like this new gate. What do you mean it's 3 in the morning.
This commit is contained in:
		
							parent
							
								
									0161dc096d
								
							
						
					
					
						commit
						6c2a1d2707
					
				| 
						 | 
				
			
			@ -651,6 +651,7 @@ ENDM
 | 
			
		|||
	
 | 
			
		||||
	newgroup WHITE_CITY                                           ; 38
 | 
			
		||||
	map_const WHITE_CITY,                           	   30, 27 ; 1
 | 
			
		||||
	map_const ROUTE_66_WHITE_CITY_GATE,					    5,  4 ; 2
 | 
			
		||||
	endgroup
 | 
			
		||||
	
 | 
			
		||||
DEF NUM_MAP_GROUPS EQU const_value ; 38
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -836,6 +836,7 @@ ENDM
 | 
			
		|||
	map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
 | 
			
		||||
	
 | 
			
		||||
	map_attributes WhiteCity, WHITE_CITY, $01, 0 ; this is on its own for now. add connections later.
 | 
			
		||||
	map_attributes Route66WhiteCityGate, ROUTE_66_WHITE_CITY_GATE, $00, 0
 | 
			
		||||
	
 | 
			
		||||
	map_attributes SinjohRuinsExterior, SINJOH_RUINS_EXTERIOR, $00, 0
 | 
			
		||||
	map_attributes SinjohRuinsInterior, SINJOH_RUINS_EXTERIOR, $00, 0
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1224,9 +1224,6 @@ Route49OldCityGate1F_Blocks:
 | 
			
		|||
Route49OldCityGate2F_Blocks:
 | 
			
		||||
	INCBIN "maps/NihonGate2F.ablk" ; 4, 3
 | 
			
		||||
 | 
			
		||||
;InsertGateNameHere_Blocks:
 | 
			
		||||
;	INCBIN "maps/NihonGateWestEast.ablk"
 | 
			
		||||
 | 
			
		||||
OldCity_Blocks:
 | 
			
		||||
	INCBIN "maps/OldCity.ablk"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -1240,3 +1237,6 @@ SECTION "Map Blocks 4", ROMX
 | 
			
		|||
	
 | 
			
		||||
WhiteCity_Blocks:
 | 
			
		||||
	INCBIN "maps/WhiteCity.ablk"
 | 
			
		||||
	
 | 
			
		||||
Route66WhiteCityGate_Blocks:
 | 
			
		||||
	INCBIN "maps/NihonGateEastWest.ablk"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -713,5 +713,6 @@ MapGroup_BlueForest:
 | 
			
		|||
MapGroup_WhiteCity:
 | 
			
		||||
	table_width MAP_LENGTH, MapGroup_WhiteCity
 | 
			
		||||
	map WhiteCity, TILESET_NIHON_WHITECITY, TOWN, LANDMARK_WHITE_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 | 
			
		||||
	map Route66WhiteCityGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_66, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_NONE
 | 
			
		||||
	assert_table_length NUM_WHITE_CITY_MAPS
 | 
			
		||||
	
 | 
			
		||||
| 
						 | 
				
			
			@ -586,6 +586,7 @@ INCLUDE "maps/OldCityEarlsHouse.asm"
 | 
			
		|||
INCLUDE "maps/OldCityFamilyHouse.asm"
 | 
			
		||||
INCLUDE "maps/SepiaSchool.asm"
 | 
			
		||||
INCLUDE "maps/WhiteCity.asm"
 | 
			
		||||
INCLUDE "maps/Route66WhiteCityGate.asm"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
SECTION "Map Scripts 30", ROMX ; spillover
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											Binary file not shown.
										
									
								
							| 
						 | 
				
			
			@ -12,3 +12,6 @@
 | 
			
		|||
	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b
 | 
			
		||||
	tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0c
 | 
			
		||||
	tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0d
 | 
			
		||||
	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 0e
 | 
			
		||||
	tilecoll WALL, WALL, COUNTER, FLOOR ; 0f
 | 
			
		||||
	tilecoll WALL, WALL, FLOOR, COUNTER ; 10
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										2
									
								
								maps/NihonGateEastWest.ablk
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								maps/NihonGateEastWest.ablk
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
 | 
			
		||||
	
 | 
			
		||||
| 
						 | 
				
			
			@ -123,7 +123,7 @@ Route66_MapEvents:
 | 
			
		|||
	db 0, 0 ; filler
 | 
			
		||||
 | 
			
		||||
	def_warp_events
 | 
			
		||||
	warp_event 57,  9, WHITE_CITY, 1 ; Placeholder until route gate is set up
 | 
			
		||||
	warp_event 57,  9, ROUTE_66_WHITE_CITY_GATE, 1
 | 
			
		||||
 | 
			
		||||
	def_coord_events
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										21
									
								
								maps/Route66WhiteCityGate.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								maps/Route66WhiteCityGate.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,21 @@
 | 
			
		|||
	object_const_def
 | 
			
		||||
 | 
			
		||||
Route66WhiteCityGate_MapScripts:
 | 
			
		||||
	def_scene_scripts
 | 
			
		||||
 | 
			
		||||
	def_callbacks
 | 
			
		||||
 | 
			
		||||
Route66WhiteCityGate_MapEvents:
 | 
			
		||||
	db 0, 0 ; filler
 | 
			
		||||
 | 
			
		||||
	def_warp_events
 | 
			
		||||
	warp_event  0, 7, ROUTE_66, 1
 | 
			
		||||
	warp_event  1, 7, ROUTE_66, 1
 | 
			
		||||
	warp_event  8, 7, WHITE_CITY, 1
 | 
			
		||||
	warp_event  9, 7, WHITE_CITY, 1
 | 
			
		||||
 | 
			
		||||
	def_coord_events
 | 
			
		||||
 | 
			
		||||
	def_bg_events
 | 
			
		||||
 | 
			
		||||
	def_object_events
 | 
			
		||||
| 
						 | 
				
			
			@ -9,7 +9,7 @@ WhiteCity_MapEvents:
 | 
			
		|||
	db 0, 0 ; filler
 | 
			
		||||
 | 
			
		||||
	def_warp_events
 | 
			
		||||
	warp_event  6, 27, ROUTE_66, 1
 | 
			
		||||
	warp_event  6, 27, ROUTE_66_WHITE_CITY_GATE, 3
 | 
			
		||||
 | 
			
		||||
	def_coord_events
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue