mirror of
				https://github.com/thornAvery/kep-hack.git
				synced 2025-11-04 20:51:02 +13:00 
			
		
		
		
	Finishing the Gauntlet maps
All the trainers are still missing, as is the guard. But the maps themselves are accessible, and the wild encounters work too.
This commit is contained in:
		
							parent
							
								
									a8f7c62ffe
								
							
						
					
					
						commit
						c3fd568b7b
					
				| 
						 | 
				
			
			@ -124,14 +124,14 @@ DEF FIRST_INDOOR_MAP EQU const_value
 | 
			
		|||
	mapconst SS_ANNE_1F_ROOMS,               8, 12 ; $66
 | 
			
		||||
	mapconst SS_ANNE_2F_ROOMS,               8, 12 ; $67
 | 
			
		||||
	mapconst SS_ANNE_B1F_ROOMS,              8, 12 ; $68
 | 
			
		||||
	mapconst UNUSED_MAP_69,                  0,  0 ; $69	; Gauntlet Floor 1: Viridian Forest
 | 
			
		||||
	mapconst UNUSED_MAP_6A,                  0,  0 ; $6A	; Gauntlet Floor 2: Mt. Moon
 | 
			
		||||
	mapconst UNUSED_MAP_6B,                  0,  0 ; $6B	; Gauntlet Floor 3: S.S. Anne
 | 
			
		||||
	mapconst SILPH_GAUNTLET_1F,              9, 10 ; $69	; Gauntlet Floor 1: Viridian Forest
 | 
			
		||||
	mapconst SILPH_GAUNTLET_2F,             10, 13 ; $6A	; Gauntlet Floor 2: Mt. Moon
 | 
			
		||||
	mapconst SILPH_GAUNTLET_3F,             13, 17 ; $6B	; Gauntlet Floor 3: S.S. Anne
 | 
			
		||||
	mapconst VICTORY_ROAD_1F,                9, 10 ; $6C
 | 
			
		||||
	mapconst UNUSED_MAP_6D,                  0,  0 ; $6D	; Gauntlet Floor 4: Lavender Tower
 | 
			
		||||
	mapconst UNUSED_MAP_6E,                  0,  0 ; $6E	; Gauntlet Floor 5: Safari Zone
 | 
			
		||||
	mapconst UNUSED_MAP_6F,                  0,  0 ; $6F	; Gauntlet Floor 6: Pokemon Mansion
 | 
			
		||||
	mapconst UNUSED_MAP_70,                  0,  0 ; $70	; Gauntlet Floor 7: Chief's Office
 | 
			
		||||
	mapconst SILPH_GAUNTLET_4F,              9, 10 ; $6D	; Gauntlet Floor 4: Lavender Tower
 | 
			
		||||
	mapconst SILPH_GAUNTLET_5F,              9, 10 ; $6E	; Gauntlet Floor 5: Safari Zone
 | 
			
		||||
	mapconst SILPH_GAUNTLET_6F,             12, 12 ; $6F	; Gauntlet Floor 6: Pokemon Mansion
 | 
			
		||||
	mapconst SILPH_GAUNTLET_7F,              5,  6 ; $70	; Gauntlet Floor 7: Chief's Office
 | 
			
		||||
	mapconst LANCES_ROOM,                   13, 13 ; $71
 | 
			
		||||
	mapconst UNUSED_MAP_72,                  0,  0 ; $72	; Unused
 | 
			
		||||
	mapconst UNUSED_MAP_73,                  0,  0 ; $73	; Unused
 | 
			
		||||
| 
						 | 
				
			
			@ -224,8 +224,8 @@ DEF FIRST_INDOOR_MAP EQU const_value
 | 
			
		|||
	mapconst ROCKET_HIDEOUT_B4F,            12, 15 ; $CA	; Unused, Citrine House 1?
 | 
			
		||||
	mapconst ROCKET_HIDEOUT_ELEVATOR,        4,  3 ; $CB	; Unused, Citrine House 2?
 | 
			
		||||
	mapconst UNUSED_MAP_CC,                  0,  0 ; $CC	; Unused, Citrine Dock?
 | 
			
		||||
	mapconst UNUSED_MAP_CD,                  0,  0 ; $CD	; Unused, Citrine Cave?
 | 
			
		||||
	mapconst UNUSED_MAP_CE,                  0,  0 ; $CE	; Unused
 | 
			
		||||
	mapconst UNUSED_MAP_CD,                  0,  0 ; $CD	; Unused, Citrine Cave 1F?
 | 
			
		||||
	mapconst UNUSED_MAP_CE,                  0,  0 ; $CE	; Unused, Citrine Cave B1F?
 | 
			
		||||
	mapconst SILPH_CO_2F,                    9, 15 ; $CF
 | 
			
		||||
	mapconst SILPH_CO_3F,                    9, 15 ; $D0
 | 
			
		||||
	mapconst SILPH_CO_4F,                    9, 15 ; $D1
 | 
			
		||||
| 
						 | 
				
			
			@ -256,8 +256,8 @@ DEF FIRST_INDOOR_MAP EQU const_value
 | 
			
		|||
	mapconst SILPH_CO_10F,                   9,  8 ; $EA
 | 
			
		||||
	mapconst SILPH_CO_11F,                   9,  9 ; $EB
 | 
			
		||||
	mapconst SILPH_CO_ELEVATOR,              2,  2 ; $EC
 | 
			
		||||
	mapconst UNUSED_MAP_ED,                  0,  0 ; $ED
 | 
			
		||||
	mapconst UNUSED_MAP_EE,                  0,  0 ; $EE
 | 
			
		||||
	mapconst UNUSED_MAP_ED,                  0,  0 ; $ED	; Unused
 | 
			
		||||
	mapconst UNUSED_MAP_EE,                  0,  0 ; $EE	; Unused
 | 
			
		||||
	mapconst TRADE_CENTER,                   4,  5 ; $EF
 | 
			
		||||
	mapconst COLOSSEUM,                      4,  5 ; $F0
 | 
			
		||||
	mapconst CELADON_UNIVERSITY_OUTSIDE,    20, 21 ; $F1 - was UNUSED_MAP_F1
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -38,7 +38,6 @@ HiddenItemCoords:
 | 
			
		|||
	hidden_item ROUTE_23,                       8,  90
 | 
			
		||||
	hidden_item VICTORY_ROAD_2F,                5,   2
 | 
			
		||||
	hidden_item VICTORY_ROAD_2F,               26,   7
 | 
			
		||||
	hidden_item UNUSED_MAP_6F,                 14,  11
 | 
			
		||||
	hidden_item VIRIDIAN_CITY,                 14,   4
 | 
			
		||||
	hidden_item ROUTE_11,                      48,   5
 | 
			
		||||
	hidden_item ROUTE_12,                       2,  63
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -57,7 +57,6 @@ HiddenObjectMaps:
 | 
			
		|||
	db POKEMON_MANSION_3F
 | 
			
		||||
	db ROUTE_23
 | 
			
		||||
	db VICTORY_ROAD_2F
 | 
			
		||||
	db UNUSED_MAP_6F
 | 
			
		||||
	db BILLS_HOUSE
 | 
			
		||||
	db VIRIDIAN_CITY
 | 
			
		||||
	db SAFARI_ZONE_WEST_REST_HOUSE
 | 
			
		||||
| 
						 | 
				
			
			@ -147,7 +146,6 @@ HiddenObjectPointers:
 | 
			
		|||
	dw Mansion3HiddenObjects
 | 
			
		||||
	dw Route23HiddenObjects
 | 
			
		||||
	dw VictoryRoad2HiddenObjects
 | 
			
		||||
	dw Unused6FHiddenObjects
 | 
			
		||||
	dw BillsHouseHiddenObjects
 | 
			
		||||
	dw ViridianCityHiddenObjects
 | 
			
		||||
	dw SafariZoneRestHouse2HiddenObjects
 | 
			
		||||
| 
						 | 
				
			
			@ -551,10 +549,6 @@ VictoryRoad2HiddenObjects:
 | 
			
		|||
	hidden_object 26,  7, FULL_RESTORE, HiddenItems
 | 
			
		||||
	db -1 ; end
 | 
			
		||||
 | 
			
		||||
Unused6FHiddenObjects:
 | 
			
		||||
	hidden_object 14, 11, MAX_ELIXER, HiddenItems
 | 
			
		||||
	db -1 ; end
 | 
			
		||||
 | 
			
		||||
BillsHouseHiddenObjects:
 | 
			
		||||
	hidden_object  1,  4, SPRITE_FACING_UP, BillsHousePC
 | 
			
		||||
	db -1 ; end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								data/maps/headers/SilphGauntlet1F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								data/maps/headers/SilphGauntlet1F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
	map_header SilphGauntlet1F, SILPH_GAUNTLET_1F, FOREST, 0
 | 
			
		||||
	end_map_header
 | 
			
		||||
							
								
								
									
										2
									
								
								data/maps/headers/SilphGauntlet2F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								data/maps/headers/SilphGauntlet2F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
	map_header SilphGauntlet2F, SILPH_GAUNTLET_2F, CAVERN, 0
 | 
			
		||||
	end_map_header
 | 
			
		||||
							
								
								
									
										2
									
								
								data/maps/headers/SilphGauntlet3F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								data/maps/headers/SilphGauntlet3F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
	map_header SilphGauntlet3F, SILPH_GAUNTLET_3F, SHIP, 0
 | 
			
		||||
	end_map_header
 | 
			
		||||
							
								
								
									
										2
									
								
								data/maps/headers/SilphGauntlet4F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								data/maps/headers/SilphGauntlet4F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
	map_header SilphGauntlet4F, SILPH_GAUNTLET_4F, CEMETERY, 0
 | 
			
		||||
	end_map_header
 | 
			
		||||
							
								
								
									
										2
									
								
								data/maps/headers/SilphGauntlet5F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								data/maps/headers/SilphGauntlet5F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
	map_header SilphGauntlet5F, SILPH_GAUNTLET_5F, FOREST, 0
 | 
			
		||||
	end_map_header
 | 
			
		||||
							
								
								
									
										2
									
								
								data/maps/headers/SilphGauntlet6F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								data/maps/headers/SilphGauntlet6F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
	map_header SilphGauntlet6F, SILPH_GAUNTLET_6F, FACILITY, 0
 | 
			
		||||
	end_map_header
 | 
			
		||||
							
								
								
									
										2
									
								
								data/maps/headers/SilphGauntlet7F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								data/maps/headers/SilphGauntlet7F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
	map_header SilphGauntlet7F, SILPH_GAUNTLET_7F, INTERIOR, 0
 | 
			
		||||
	end_map_header
 | 
			
		||||
| 
						 | 
				
			
			@ -106,14 +106,14 @@ MapHeaderBanks::
 | 
			
		|||
	db BANK(SSAnne1FRooms_h)
 | 
			
		||||
	db BANK(SSAnne2FRooms_h)
 | 
			
		||||
	db BANK(SSAnneB1FRooms_h)
 | 
			
		||||
	db $1D ; UNUSED_MAP_69
 | 
			
		||||
	db $1D ; UNUSED_MAP_6A
 | 
			
		||||
	db $1D ; UNUSED_MAP_6B
 | 
			
		||||
	db BANK(SilphGauntlet1F_h)
 | 
			
		||||
	db BANK(SilphGauntlet2F_h)
 | 
			
		||||
	db BANK(SilphGauntlet3F_h)
 | 
			
		||||
	db BANK(VictoryRoad1F_h)
 | 
			
		||||
	db $1D ; UNUSED_MAP_6D
 | 
			
		||||
	db $1D ; UNUSED_MAP_6E
 | 
			
		||||
	db $1D ; UNUSED_MAP_6F
 | 
			
		||||
	db $1D ; UNUSED_MAP_70
 | 
			
		||||
	db BANK(SilphGauntlet4F_h)
 | 
			
		||||
	db BANK(SilphGauntlet5F_h)
 | 
			
		||||
	db BANK(SilphGauntlet6F_h)
 | 
			
		||||
	db BANK(SilphGauntlet7F_h)
 | 
			
		||||
	db BANK(LancesRoom_h)
 | 
			
		||||
	db $1D ; UNUSED_MAP_72
 | 
			
		||||
	db $1D ; UNUSED_MAP_73
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -106,14 +106,14 @@ MapHeaderPointers::
 | 
			
		|||
	dw SSAnne1FRooms_h
 | 
			
		||||
	dw SSAnne2FRooms_h
 | 
			
		||||
	dw SSAnneB1FRooms_h
 | 
			
		||||
	dw LancesRoom_h ; UNUSED_MAP_69
 | 
			
		||||
	dw LancesRoom_h ; UNUSED_MAP_6A
 | 
			
		||||
	dw LancesRoom_h ; UNUSED_MAP_6B
 | 
			
		||||
	dw SilphGauntlet1F_h
 | 
			
		||||
	dw SilphGauntlet2F_h
 | 
			
		||||
	dw SilphGauntlet3F_h
 | 
			
		||||
	dw VictoryRoad1F_h
 | 
			
		||||
	dw LancesRoom_h ; UNUSED_MAP_6D
 | 
			
		||||
	dw LancesRoom_h ; UNUSED_MAP_6E
 | 
			
		||||
	dw LancesRoom_h ; UNUSED_MAP_6F
 | 
			
		||||
	dw LancesRoom_h ; UNUSED_MAP_70
 | 
			
		||||
	dw SilphGauntlet4F_h
 | 
			
		||||
	dw SilphGauntlet5F_h
 | 
			
		||||
	dw SilphGauntlet6F_h
 | 
			
		||||
	dw SilphGauntlet7F_h
 | 
			
		||||
	dw LancesRoom_h
 | 
			
		||||
	dw LancesRoom_h ; UNUSED_MAP_72
 | 
			
		||||
	dw LancesRoom_h ; UNUSED_MAP_73
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,9 +8,9 @@ PokemonTower6F_Object:
 | 
			
		|||
	def_bg_events
 | 
			
		||||
 | 
			
		||||
	def_object_events
 | 
			
		||||
	object_event  9, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 19
 | 
			
		||||
	object_event  9, 10, SPRITE_CHANNELER, STAY, LEFT, 1, OPP_CHANNELER, 19
 | 
			
		||||
	object_event 12,  5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20
 | 
			
		||||
	object_event  5,  5, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 21
 | 
			
		||||
	object_event  5,  5, SPRITE_CHANNELER, STAY, RIGHT, 3, OPP_CHANNELER, 21
 | 
			
		||||
	object_event 15,  8, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
 | 
			
		||||
	object_event  7, 14, SPRITE_POKE_BALL, STAY, NONE, 5, X_ACCURACY
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,7 +5,7 @@ SilphCo1F_Object:
 | 
			
		|||
	warp_event 10, 17, LAST_MAP, 6
 | 
			
		||||
	warp_event 11, 17, LAST_MAP, 6
 | 
			
		||||
	warp_event 26,  0, SILPH_CO_2F, 1
 | 
			
		||||
	;warp_event 20,  0, SILPH_CO_ELEVATOR, 1
 | 
			
		||||
	warp_event 14,  0, SILPH_GAUNTLET_1F, 1
 | 
			
		||||
	warp_event 16, 10, SILPH_CO_3F, 7
 | 
			
		||||
 | 
			
		||||
	def_bg_events
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										12
									
								
								data/maps/objects/SilphGauntlet1F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								data/maps/objects/SilphGauntlet1F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,12 @@
 | 
			
		|||
SilphGauntlet1F_Object:
 | 
			
		||||
	db $3 ; border block
 | 
			
		||||
 | 
			
		||||
	def_warp_events
 | 
			
		||||
	warp_event  14,  1, SILPH_CO_1F, 4
 | 
			
		||||
	warp_event  8,  9, SILPH_GAUNTLET_2F, 1
 | 
			
		||||
 | 
			
		||||
	def_bg_events
 | 
			
		||||
 | 
			
		||||
	def_object_events
 | 
			
		||||
 | 
			
		||||
	def_warps_to SILPH_GAUNTLET_1F
 | 
			
		||||
							
								
								
									
										12
									
								
								data/maps/objects/SilphGauntlet2F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								data/maps/objects/SilphGauntlet2F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,12 @@
 | 
			
		|||
SilphGauntlet2F_Object:
 | 
			
		||||
	db $3 ; border block
 | 
			
		||||
 | 
			
		||||
	def_warp_events
 | 
			
		||||
	warp_event  7,  5, SILPH_GAUNTLET_1F, 2
 | 
			
		||||
	warp_event  3,  13, SILPH_GAUNTLET_3F, 1
 | 
			
		||||
 | 
			
		||||
	def_bg_events
 | 
			
		||||
 | 
			
		||||
	def_object_events
 | 
			
		||||
 | 
			
		||||
	def_warps_to SILPH_GAUNTLET_2F
 | 
			
		||||
							
								
								
									
										26
									
								
								data/maps/objects/SilphGauntlet3F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								data/maps/objects/SilphGauntlet3F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,26 @@
 | 
			
		|||
SilphGauntlet3F_Object:
 | 
			
		||||
	db $c ; border block
 | 
			
		||||
 | 
			
		||||
	def_warp_events
 | 
			
		||||
	warp_event  6, 12, SILPH_GAUNTLET_2F, 2
 | 
			
		||||
	warp_event 16,  2, SILPH_GAUNTLET_4F, 1
 | 
			
		||||
	warp_event 11, 11, SILPH_GAUNTLET_3F, 4
 | 
			
		||||
	warp_event  2, 25, SILPH_GAUNTLET_3F, 3
 | 
			
		||||
	warp_event  3, 25, SILPH_GAUNTLET_3F, 3
 | 
			
		||||
	warp_event 15, 11, SILPH_GAUNTLET_3F, 7
 | 
			
		||||
	warp_event 12, 25, SILPH_GAUNTLET_3F, 6
 | 
			
		||||
	warp_event 13, 25, SILPH_GAUNTLET_3F, 6
 | 
			
		||||
	warp_event 19, 11, SILPH_GAUNTLET_3F, 10
 | 
			
		||||
	warp_event 22, 25, SILPH_GAUNTLET_3F, 9
 | 
			
		||||
	warp_event 23, 25, SILPH_GAUNTLET_3F, 9
 | 
			
		||||
	warp_event 23, 11, SILPH_GAUNTLET_3F, 13
 | 
			
		||||
	warp_event 32, 25, SILPH_GAUNTLET_3F, 12
 | 
			
		||||
	warp_event 33, 25, SILPH_GAUNTLET_3F, 12
 | 
			
		||||
	warp_event 32, 20, SILPH_GAUNTLET_3F, 16
 | 
			
		||||
	warp_event 25,  4, SILPH_GAUNTLET_3F, 15
 | 
			
		||||
 | 
			
		||||
	def_bg_events
 | 
			
		||||
 | 
			
		||||
	def_object_events
 | 
			
		||||
 | 
			
		||||
	def_warps_to SILPH_GAUNTLET_3F
 | 
			
		||||
							
								
								
									
										12
									
								
								data/maps/objects/SilphGauntlet4F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								data/maps/objects/SilphGauntlet4F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,12 @@
 | 
			
		|||
SilphGauntlet4F_Object:
 | 
			
		||||
	db $1 ; border block
 | 
			
		||||
 | 
			
		||||
	def_warp_events
 | 
			
		||||
	warp_event  1,  5, SILPH_GAUNTLET_3F, 2
 | 
			
		||||
	warp_event  3,  16, SILPH_GAUNTLET_5F, 1
 | 
			
		||||
 | 
			
		||||
	def_bg_events
 | 
			
		||||
 | 
			
		||||
	def_object_events
 | 
			
		||||
 | 
			
		||||
	def_warps_to SILPH_GAUNTLET_4F
 | 
			
		||||
							
								
								
									
										12
									
								
								data/maps/objects/SilphGauntlet5F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								data/maps/objects/SilphGauntlet5F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,12 @@
 | 
			
		|||
SilphGauntlet5F_Object:
 | 
			
		||||
	db $0 ; border block
 | 
			
		||||
 | 
			
		||||
	def_warp_events
 | 
			
		||||
	warp_event  2,  15, SILPH_GAUNTLET_4F, 2
 | 
			
		||||
	warp_event  2,  3, SILPH_GAUNTLET_6F, 1
 | 
			
		||||
 | 
			
		||||
	def_bg_events
 | 
			
		||||
 | 
			
		||||
	def_object_events
 | 
			
		||||
 | 
			
		||||
	def_warps_to SILPH_GAUNTLET_5F
 | 
			
		||||
							
								
								
									
										11
									
								
								data/maps/objects/SilphGauntlet6F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								data/maps/objects/SilphGauntlet6F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,11 @@
 | 
			
		|||
SilphGauntlet6F_Object:
 | 
			
		||||
	db $2e ; border block
 | 
			
		||||
 | 
			
		||||
	def_warp_events
 | 
			
		||||
	warp_event  2,  3, SILPH_GAUNTLET_5F, 2
 | 
			
		||||
 | 
			
		||||
	def_bg_events
 | 
			
		||||
 | 
			
		||||
	def_object_events
 | 
			
		||||
 | 
			
		||||
	def_warps_to SILPH_GAUNTLET_6F
 | 
			
		||||
							
								
								
									
										10
									
								
								data/maps/objects/SilphGauntlet7F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								data/maps/objects/SilphGauntlet7F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,10 @@
 | 
			
		|||
SilphGauntlet7F_Object:
 | 
			
		||||
	db $d ; border block
 | 
			
		||||
 | 
			
		||||
	def_warp_events
 | 
			
		||||
 | 
			
		||||
	def_bg_events
 | 
			
		||||
 | 
			
		||||
	def_object_events
 | 
			
		||||
 | 
			
		||||
	def_warps_to SILPH_GAUNTLET_7F
 | 
			
		||||
| 
						 | 
				
			
			@ -105,14 +105,14 @@ MapSongBanks::
 | 
			
		|||
	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_1F_ROOMS
 | 
			
		||||
	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_2F_ROOMS
 | 
			
		||||
	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_B1F_ROOMS
 | 
			
		||||
	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_69
 | 
			
		||||
	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_6A
 | 
			
		||||
	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_6B
 | 
			
		||||
	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_69	/ Gauntlet 1F
 | 
			
		||||
	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; UNUSED_MAP_6A	/ Gauntlet 2F
 | 
			
		||||
	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_6B	/ Gauntlet 3F
 | 
			
		||||
	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VICTORY_ROAD_1F
 | 
			
		||||
	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; UNUSED_MAP_6D
 | 
			
		||||
	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_6E
 | 
			
		||||
	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_6F
 | 
			
		||||
	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_70
 | 
			
		||||
	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; UNUSED_MAP_6D	/ Gauntlet 4F
 | 
			
		||||
	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; UNUSED_MAP_6E	/ Gauntlet 5F
 | 
			
		||||
	db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; UNUSED_MAP_6F	/ Gauntlet 6F
 | 
			
		||||
	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_70	/ Gauntlet 7F
 | 
			
		||||
	db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; LANCES_ROOM
 | 
			
		||||
	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_72
 | 
			
		||||
	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_73
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -76,7 +76,9 @@ InternalMapEntries:
 | 
			
		|||
	internal_map BILLS_HOUSE,                   12,  0, SeaCottageName
 | 
			
		||||
	internal_map VERMILION_DOCK,                10,  9, VermilionCityName
 | 
			
		||||
	internal_map SS_ANNE_B1F_ROOMS,              9, 10, SSAnneName
 | 
			
		||||
	internal_map SILPH_GAUNTLET_3F,             10,  5, SilphCoName
 | 
			
		||||
	internal_map VICTORY_ROAD_1F,                0,  4, VictoryRoadName
 | 
			
		||||
	internal_map SILPH_GAUNTLET_7F,             10,  5, SilphCoName
 | 
			
		||||
	internal_map HALL_OF_FAME,                   0,  2, PokemonLeagueName
 | 
			
		||||
	internal_map UNDERGROUND_PATH_NORTH_SOUTH,  10,  5, UndergroundPathName
 | 
			
		||||
	internal_map CHAMPIONS_ROOM,                 0,  2, PokemonLeagueName
 | 
			
		||||
| 
						 | 
				
			
			@ -92,7 +94,7 @@ InternalMapEntries:
 | 
			
		|||
	internal_map VERMILION_OLD_ROD_HOUSE,       10,  9, VermilionCityName
 | 
			
		||||
	internal_map FUCHSIA_GOOD_ROD_HOUSE,         8, 13, FuchsiaCityName
 | 
			
		||||
	internal_map POKEMON_MANSION_1F,             2, 15, PokemonMansionName
 | 
			
		||||
	internal_map CINNABAR_MART_COPY,             2, 15, CinnabarIslandName
 | 
			
		||||
	internal_map CINNABAR_MART,           	     2, 15, CinnabarIslandName
 | 
			
		||||
	internal_map INDIGO_PLATEAU_LOBBY,           0,  2, IndigoPlateauName
 | 
			
		||||
	internal_map MR_PSYCHICS_HOUSE,             10,  5, SaffronCityName
 | 
			
		||||
	internal_map ROUTE_15_GATE_2F,               9, 13, Route15Name
 | 
			
		||||
| 
						 | 
				
			
			@ -106,18 +108,17 @@ InternalMapEntries:
 | 
			
		|||
	internal_map VERMILION_TRADE_HOUSE,         10,  9, VermilionCityName
 | 
			
		||||
	internal_map DIGLETTS_CAVE,                  3,  4, DiglettsCaveName
 | 
			
		||||
	internal_map VICTORY_ROAD_3F,                0,  4, VictoryRoadName
 | 
			
		||||
	internal_map UNUSED_MAP_CE,                  7,  5, RocketHQName
 | 
			
		||||
	internal_map ROCKET_HIDEOUT_B1F,             7,  5, RocketHQName
 | 
			
		||||
	internal_map UNUSED_MAP_CE,   	   	     	7,  10, CitrineCityName
 | 
			
		||||
	internal_map SILPH_CO_8F,                   10,  5, SilphCoName
 | 
			
		||||
	internal_map POKEMON_MANSION_B1F,            2, 15, PokemonMansionName
 | 
			
		||||
	internal_map SAFARI_ZONE_NORTH_REST_HOUSE,   8, 12, SafariZoneName
 | 
			
		||||
	internal_map CERULEAN_CAVE_1F,               9,  1, CeruleanCaveName
 | 
			
		||||
	internal_map NAME_RATERS_HOUSE,             14,  5, LavenderTownName
 | 
			
		||||
	internal_map CINNABAR_VOLCANO, 	             3, 14, CinnabarVolcanoName
 | 
			
		||||
	internal_map CERULEAN_BADGE_HOUSE,          10,  2, CeruleanCityName
 | 
			
		||||
	internal_map CINNABAR_VOLCANO, 	             3, 14, CinnabarVolcanoName
 | 
			
		||||
	internal_map ROCK_TUNNEL_B1F,               14,  3, RockTunnelName
 | 
			
		||||
	internal_map SILPH_CO_ELEVATOR,             10,  5, SilphCoName
 | 
			
		||||
	internal_map CELADON_UNIVERSITY_OUTSIDE,      7, 4, CeladonCityName
 | 
			
		||||
	internal_map CELADON_UNIVERSITY_INSIDE, 	  7, 4, CeladonCityName
 | 
			
		||||
	internal_map CELADON_UNIVERSITY_POKECENTER,   7, 4, CeladonCityName
 | 
			
		||||
	internal_map AGATHAS_ROOM,                   0,  2, PokemonLeagueName
 | 
			
		||||
	db -1 ; end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,41 +1,41 @@
 | 
			
		|||
; super rod encounters
 | 
			
		||||
SuperRodData:
 | 
			
		||||
	; map, fishing group
 | 
			
		||||
	dbw PALLET_TOWN,         .Group1
 | 
			
		||||
	dbw VIRIDIAN_CITY,       .Group1
 | 
			
		||||
	dbw CERULEAN_CITY,       .Group3
 | 
			
		||||
	dbw VERMILION_CITY,      .Group4
 | 
			
		||||
	dbw CELADON_CITY,        .Group5
 | 
			
		||||
	dbw FUCHSIA_CITY,        .Group7
 | 
			
		||||
	dbw CINNABAR_ISLAND,     .Group8
 | 
			
		||||
	dbw ROUTE_4,             .Group3
 | 
			
		||||
	dbw ROUTE_6,             .Group4
 | 
			
		||||
	dbw ROUTE_10,            .Group5
 | 
			
		||||
	dbw ROUTE_11,            .Group4
 | 
			
		||||
	dbw ROUTE_12,            .Group7
 | 
			
		||||
	dbw ROUTE_13,            .Group7
 | 
			
		||||
	dbw ROUTE_17,            .Group7
 | 
			
		||||
	dbw ROUTE_18,            .Group7
 | 
			
		||||
	dbw ROUTE_19,            .Group8
 | 
			
		||||
	dbw ROUTE_20,            .Group8
 | 
			
		||||
	dbw ROUTE_21,            .Group8
 | 
			
		||||
	dbw ROUTE_22,            .Group2
 | 
			
		||||
	dbw ROUTE_23,            .Group9
 | 
			
		||||
	dbw ROUTE_24,            .Group3
 | 
			
		||||
	dbw ROUTE_25,            .Group3
 | 
			
		||||
	dbw CERULEAN_GYM,        .Group3
 | 
			
		||||
	dbw VERMILION_DOCK,      .Group4
 | 
			
		||||
	dbw SEAFOAM_ISLANDS_B3F, .Group8
 | 
			
		||||
	dbw SEAFOAM_ISLANDS_B4F, .Group8
 | 
			
		||||
	dbw SAFARI_ZONE_EAST,    .Group6
 | 
			
		||||
	dbw SAFARI_ZONE_NORTH,   .Group6
 | 
			
		||||
	dbw SAFARI_ZONE_WEST,    .Group6
 | 
			
		||||
	dbw SAFARI_ZONE_CENTER,  .Group6
 | 
			
		||||
	dbw CERULEAN_CAVE_2F,    .Group9
 | 
			
		||||
	dbw CERULEAN_CAVE_B1F,   .Group10
 | 
			
		||||
	dbw CERULEAN_CAVE_1F,    .Group9
 | 
			
		||||
	dbw ROCK_TUNNEL_1F,      .Group5
 | 
			
		||||
	dbw ROCK_TUNNEL_1F,      .Group5
 | 
			
		||||
	dbw PALLET_TOWN,         		.Group1
 | 
			
		||||
	dbw VIRIDIAN_CITY,       		.Group1
 | 
			
		||||
	dbw CERULEAN_CITY,       		.Group3
 | 
			
		||||
	dbw VERMILION_CITY,      		.Group4
 | 
			
		||||
	dbw CELADON_CITY,        		.Group5
 | 
			
		||||
	dbw FUCHSIA_CITY,        		.Group7
 | 
			
		||||
	dbw CINNABAR_ISLAND,     		.Group8
 | 
			
		||||
	dbw ROUTE_4,             		.Group3
 | 
			
		||||
	dbw ROUTE_6,             		.Group4
 | 
			
		||||
	dbw ROUTE_10,            		.Group5
 | 
			
		||||
	dbw ROUTE_11,            		.Group4
 | 
			
		||||
	dbw ROUTE_12,            		.Group7
 | 
			
		||||
	dbw ROUTE_13,            		.Group7
 | 
			
		||||
	dbw ROUTE_17,            		.Group7
 | 
			
		||||
	dbw ROUTE_18,            		.Group7
 | 
			
		||||
	dbw ROUTE_19,            		.Group8
 | 
			
		||||
	dbw ROUTE_20,            		.Group8
 | 
			
		||||
	dbw ROUTE_21,            		.Group8
 | 
			
		||||
	dbw ROUTE_22,            		.Group2
 | 
			
		||||
	dbw ROUTE_23,            		.Group9
 | 
			
		||||
	dbw ROUTE_24,            		.Group3
 | 
			
		||||
	dbw ROUTE_25,            		.Group3
 | 
			
		||||
	dbw CERULEAN_GYM,        		.Group3
 | 
			
		||||
	dbw VERMILION_DOCK,      		.Group4
 | 
			
		||||
	dbw SEAFOAM_ISLANDS_B3F, 		.Group8
 | 
			
		||||
	dbw SEAFOAM_ISLANDS_B4F, 		.Group8
 | 
			
		||||
	dbw SAFARI_ZONE_EAST,    		.Group6
 | 
			
		||||
	dbw SAFARI_ZONE_NORTH,   		.Group6
 | 
			
		||||
	dbw SAFARI_ZONE_WEST,    		.Group6
 | 
			
		||||
	dbw SAFARI_ZONE_CENTER,  		.Group6
 | 
			
		||||
	dbw CERULEAN_CAVE_2F,   		.Group9
 | 
			
		||||
	dbw CERULEAN_CAVE_B1F,  		.Group10
 | 
			
		||||
	dbw CERULEAN_CAVE_1F,   		.Group9
 | 
			
		||||
	dbw SILPH_GAUNTLET_5F,   		.Group10
 | 
			
		||||
	dbw ROCK_TUNNEL_1F,     		.Group5
 | 
			
		||||
	dbw CELADON_UNIVERSITY_OUTSIDE, .Group11
 | 
			
		||||
	db -1 ; end
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -131,4 +131,4 @@ SuperRodData:
 | 
			
		|||
	db 25, MAGIKARP
 | 
			
		||||
	db 20, MAGIKARP
 | 
			
		||||
	db 20, GYARADOS
 | 
			
		||||
	db 20, GRIMER 
 | 
			
		||||
	db 20, GRIMER
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										35
									
								
								maps.asm
									
									
									
									
									
								
							
							
						
						
									
										35
									
								
								maps.asm
									
									
									
									
									
								
							| 
						 | 
				
			
			@ -1135,6 +1135,41 @@ INCLUDE "data/maps/headers/CeruleanBadgeHouse.asm"
 | 
			
		|||
INCLUDE "scripts/CeruleanBadgeHouse.asm"
 | 
			
		||||
INCLUDE "data/maps/objects/CeruleanBadgeHouse.asm"
 | 
			
		||||
 | 
			
		||||
INCLUDE "data/maps/headers/SilphGauntlet1F.asm"
 | 
			
		||||
INCLUDE "scripts/SilphGauntlet1F.asm"
 | 
			
		||||
INCLUDE "data/maps/objects/SilphGauntlet1F.asm"
 | 
			
		||||
SilphGauntlet1F_Blocks: INCBIN "maps/SilphGauntlet1F.blk"
 | 
			
		||||
 | 
			
		||||
INCLUDE "data/maps/headers/SilphGauntlet2F.asm"
 | 
			
		||||
INCLUDE "scripts/SilphGauntlet2F.asm"
 | 
			
		||||
INCLUDE "data/maps/objects/SilphGauntlet2F.asm"
 | 
			
		||||
SilphGauntlet2F_Blocks: INCBIN "maps/SilphGauntlet2F.blk"
 | 
			
		||||
 | 
			
		||||
INCLUDE "data/maps/headers/SilphGauntlet3F.asm"
 | 
			
		||||
INCLUDE "scripts/SilphGauntlet3F.asm"
 | 
			
		||||
INCLUDE "data/maps/objects/SilphGauntlet3F.asm"
 | 
			
		||||
SilphGauntlet3F_Blocks: INCBIN "maps/SilphGauntlet3F.blk"
 | 
			
		||||
 | 
			
		||||
INCLUDE "data/maps/headers/SilphGauntlet4F.asm"
 | 
			
		||||
INCLUDE "scripts/SilphGauntlet4F.asm"
 | 
			
		||||
INCLUDE "data/maps/objects/SilphGauntlet4F.asm"
 | 
			
		||||
SilphGauntlet4F_Blocks: INCBIN "maps/SilphGauntlet4F.blk"
 | 
			
		||||
 | 
			
		||||
INCLUDE "data/maps/headers/SilphGauntlet5F.asm"
 | 
			
		||||
INCLUDE "scripts/SilphGauntlet5F.asm"
 | 
			
		||||
INCLUDE "data/maps/objects/SilphGauntlet5F.asm"
 | 
			
		||||
SilphGauntlet5F_Blocks: INCBIN "maps/SilphGauntlet5F.blk"
 | 
			
		||||
 | 
			
		||||
INCLUDE "data/maps/headers/SilphGauntlet6F.asm"
 | 
			
		||||
INCLUDE "scripts/SilphGauntlet6F.asm"
 | 
			
		||||
INCLUDE "data/maps/objects/SilphGauntlet6F.asm"
 | 
			
		||||
SilphGauntlet6F_Blocks: INCBIN "maps/SilphGauntlet6F.blk"
 | 
			
		||||
 | 
			
		||||
INCLUDE "data/maps/headers/SilphGauntlet7F.asm"
 | 
			
		||||
INCLUDE "scripts/SilphGauntlet7F.asm"
 | 
			
		||||
INCLUDE "data/maps/objects/SilphGauntlet7F.asm"
 | 
			
		||||
SilphGauntlet7F_Blocks: INCBIN "maps/SilphGauntlet7F.blk"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
SECTION "Maps 21", ROMX
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											Binary file not shown.
										
									
								
							| 
						 | 
				
			
			@ -1 +1 @@
 | 
			
		|||
7878787<;9;9;9;9
 | 
			
		||||
7878787<;9;9;9;9
 | 
			
		||||
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										6
									
								
								scripts/SilphGauntlet1F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								scripts/SilphGauntlet1F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,6 @@
 | 
			
		|||
SilphGauntlet1F_Script:
 | 
			
		||||
	jp EnableAutoTextBoxDrawing
 | 
			
		||||
 | 
			
		||||
SilphGauntlet1F_TextPointers:
 | 
			
		||||
 | 
			
		||||
	text_end
 | 
			
		||||
							
								
								
									
										6
									
								
								scripts/SilphGauntlet2F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								scripts/SilphGauntlet2F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,6 @@
 | 
			
		|||
SilphGauntlet2F_Script:
 | 
			
		||||
	jp EnableAutoTextBoxDrawing
 | 
			
		||||
 | 
			
		||||
SilphGauntlet2F_TextPointers:
 | 
			
		||||
 | 
			
		||||
	text_end
 | 
			
		||||
							
								
								
									
										6
									
								
								scripts/SilphGauntlet3F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								scripts/SilphGauntlet3F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,6 @@
 | 
			
		|||
SilphGauntlet3F_Script:
 | 
			
		||||
	jp EnableAutoTextBoxDrawing
 | 
			
		||||
 | 
			
		||||
SilphGauntlet3F_TextPointers:
 | 
			
		||||
 | 
			
		||||
	text_end
 | 
			
		||||
							
								
								
									
										6
									
								
								scripts/SilphGauntlet4F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								scripts/SilphGauntlet4F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,6 @@
 | 
			
		|||
SilphGauntlet4F_Script:
 | 
			
		||||
	jp EnableAutoTextBoxDrawing
 | 
			
		||||
 | 
			
		||||
SilphGauntlet4F_TextPointers:
 | 
			
		||||
 | 
			
		||||
	text_end
 | 
			
		||||
							
								
								
									
										6
									
								
								scripts/SilphGauntlet5F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								scripts/SilphGauntlet5F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,6 @@
 | 
			
		|||
SilphGauntlet5F_Script:
 | 
			
		||||
	jp EnableAutoTextBoxDrawing
 | 
			
		||||
 | 
			
		||||
SilphGauntlet5F_TextPointers:
 | 
			
		||||
 | 
			
		||||
	text_end
 | 
			
		||||
							
								
								
									
										6
									
								
								scripts/SilphGauntlet6F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								scripts/SilphGauntlet6F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,6 @@
 | 
			
		|||
SilphGauntlet6F_Script:
 | 
			
		||||
	jp EnableAutoTextBoxDrawing
 | 
			
		||||
 | 
			
		||||
SilphGauntlet6F_TextPointers:
 | 
			
		||||
 | 
			
		||||
	text_end
 | 
			
		||||
							
								
								
									
										6
									
								
								scripts/SilphGauntlet7F.asm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								scripts/SilphGauntlet7F.asm
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,6 @@
 | 
			
		|||
SilphGauntlet7F_Script:
 | 
			
		||||
	jp EnableAutoTextBoxDrawing
 | 
			
		||||
 | 
			
		||||
SilphGauntlet7F_TextPointers:
 | 
			
		||||
 | 
			
		||||
	text_end
 | 
			
		||||
		Loading…
	
		Reference in a new issue