last of the new areas for really real, just need graphics and to twea…

…k a few mons stats before release

constants/event_constants.asm

@@ -785,6 +785,7 @@ DEF INDIGO_PLATEAU_EVENTS_END EQU const_value - 1
 	const EVENT_BEAT_VILLA_5F_TRAINER_0
 	const EVENT_BEAT_FLEWNICORN
 	const EVENT_BEAT_ANGEL
+	const EVENT_BEAT_DEVIL
 
 ; End of events
 	const_next $A00

constants/hide_show_constants.asm

@@ -246,5 +246,6 @@ DEF SHOW EQU $15
 	const HS_FLEWNICORN
 	const HS_DIGLETTS_CAVE_BOULDER_1
 	const HS_DIGLETTS_CAVE_BOULDER_2
-	const HS_ANGEL	
+	const HS_ANGEL
+	const HS_DEVIL
 DEF NUM_HS_OBJECTS EQU const_value

constants/map_constants.asm

@@ -268,6 +268,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
 	map_const BRUNOS_ROOM,                    5,  6 ; $F6
 	map_const AGATHAS_ROOM,                   5,  6 ; $F7
 	map_const ANCIENT_CAVE,                   3,  3 ; $F8
+	map_const DEVILS_CANYON,                  3,  3 ; $F8
 DEF NUM_MAPS EQU const_value
 
 ; Indoor maps, such as houses, use this as the Map ID in their exit warps

data/maps/headers/DevilsCanyon.asm

@@ -0,0 +1,2 @@
+	map_header DevilsCanyon, DEVILS_CANYON, CAVERN, 0
+	end_map_header

data/maps/hide_show_data.asm

@@ -252,6 +252,7 @@ MapHSPointers:
 	dw NoHS
 	dw NoHS
 	dw AncientCaveHS
+	dw DevilsCanyonHS
 	assert_table_length NUM_MAPS
 	dw -1 ; end
 
@@ -582,5 +583,7 @@ DiglettsCaveHS:
 	db DIGLETTS_CAVE, $02, SHOW ; immovable boulder
 AncientCaveHS:
 	db ANCIENT_CAVE, $01, SHOW ; angel, angel
+DevilsCanyonHS:
+	db DEVILS_CANYON, $01, SHOW ; muahaha
 	db $FF, $01, SHOW ; end
 	assert_table_length NUM_HS_OBJECTS + 1

data/maps/map_header_banks.asm

@@ -250,4 +250,5 @@ MapHeaderBanks::
 	db BANK(BrunosRoom_h)
 	db BANK(AgathasRoom_h)
 	db BANK(AncientCave_h)
+	db BANK(DevilsCanyon_h)
 	assert_table_length NUM_MAPS

data/maps/map_header_pointers.asm

@@ -250,4 +250,5 @@ MapHeaderPointers::
 	dw BrunosRoom_h
 	dw AgathasRoom_h
 	dw AncientCave_h
+	dw DevilsCanyon_h
 	assert_table_length NUM_MAPS

data/maps/objects/AncientCave.asm

@@ -2,12 +2,12 @@ AncientCave_Object:
 	db $7d ; border block
 
 	def_warp_events
-	warp_event  3,  5, LAST_MAP, 3
-	warp_event  2,  5, LAST_MAP, 3
+	warp_event  3,  5, DIGLETTS_CAVE, 3
+	warp_event  2,  5, DIGLETTS_CAVE, 3
 
 	def_bg_events
 
 	def_object_events
-	object_event  3,  1, SPRITE_MONSTER, STAY, DOWN, 1, KABUTO, 39 | OW_POKEMON
+	object_event  3,  1, SPRITE_FAIRY, STAY, DOWN, 1, KABUTO, 39 | OW_POKEMON
 
 	def_warps_to ANCIENT_CAVE

data/maps/objects/DevilsCanyon.asm

@@ -0,0 +1,13 @@
+DevilsCanyon_Object:
+	db $7d ; border block
+
+	def_warp_events
+	warp_event  3,  5, DIGLETTS_CAVE, 4
+	warp_event  2,  5, DIGLETTS_CAVE, 4
+
+	def_bg_events
+
+	def_object_events
+	object_event  3,  1, SPRITE_MONSTER, STAY, DOWN, 1, OMANYTE, 39 | OW_POKEMON
+
+	def_warps_to DEVILS_CANYON

data/maps/objects/DiglettsCave.asm

@@ -5,6 +5,7 @@ DiglettsCave_Object:
 	warp_event  5,  5, DIGLETTS_CAVE_ROUTE_2, 3
 	warp_event 37, 31, DIGLETTS_CAVE_ROUTE_11, 3
 	warp_event 24,  8, ANCIENT_CAVE, 1
+	warp_event 24,  12, DEVILS_CANYON, 1
 
 	def_bg_events
 

data/maps/songs.asm

@@ -248,5 +248,6 @@ MapSongBanks::
 	db MUSIC_SILPH_CO, 0 ; SABRINAS ROOM E4
 	db MUSIC_ACADEMY, 0 ; BRUNOS_ROOM
 	db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM
-	db MUSIC_POKEMON_TOWER, 0 ; ANCIENT_CAVE
+	db MUSIC_EZIO, 0 ; ANCIENT_CAVE
+	db MUSIC_DUNGEON1, 0 ; DEVILS_CANYON
 	assert_table_length NUM_MAPS

data/pokemon/base_stats/kabutops.asm

@@ -1,9 +1,9 @@
 	db DEX_KABUTOPS ; pokedex id
 
-	db  77, 140, 77,  105,  77
+	db  93, 132,  93,  93,  93
 	;   hp  atk  def  spd  spc
 
-	db FLYING, FIGHTING ; type
+	db FLYING, FLYING ; type
 	db 45 ; catch rate
 	db 201 ; base exp
 

data/pokemon/menu_icons.asm

@@ -137,11 +137,11 @@ MonPartyData:
 	nybble ICON_QUADRUPED ; Jolteon
 	nybble ICON_QUADRUPED ; Flareon
 	nybble ICON_BALL      ; Porygon
-	nybble ICON_HELIX     ; Omanyte
-	nybble ICON_HELIX     ; Omastar
-	nybble ICON_HELIX     ; Kabuto
-	nybble ICON_HELIX     ; Kabutops
-	nybble ICON_HELIX     ; Aerodactyl
+	nybble ICON_MON       ; Omanyte
+	nybble ICON_MON       ; Omastar
+	nybble ICON_FAIRY     ; Kabuto
+	nybble ICON_FAIRY     ; Kabutops
+	nybble ICON_QUADRUPED ; Aerodactyl
 	nybble ICON_MON       ; Snorlax
 	nybble ICON_BIRD      ; Articuno
 	nybble ICON_BIRD      ; Zapdos

data/wild/grass_water.asm

@@ -248,7 +248,8 @@ WildDataPointers:
 	dw NothingWildMons
 	dw NothingWildMons
 	dw NothingWildMons
-	dw NothingWildMons
+	dw AncientCaveWildMons
+	dw DevilsCanyonWildMons
 	assert_table_length NUM_MAPS
 	dw -1 ; end
 
@@ -326,4 +327,8 @@ INCLUDE "data/wild/maps/Villa3F.asm"
 INCLUDE "data/wild/maps/SecretGarden.asm"
 INCLUDE "data/wild/maps/MoleHole.asm"
 INCLUDE "data/wild/maps/VultMaze.asm"
+INCLUDE "data/wild/maps/AncientCave.asm"
+INCLUDE "data/wild/maps/DevilsCanyon.asm"
+
+
 

data/wild/maps/DevilsCanyon.asm

@@ -0,0 +1,16 @@
+DevilsCanyonWildMons:
+	def_grass_wildmons 25 ; encounter rate
+	db 18, FARFETCHD
+	db 19, FARFETCHD
+	db 17, FARFETCHD
+	db 20, FARFETCHD
+	db 16, FARFETCHD
+	db 15, FARFETCHD
+	db 21, FARFETCHD
+	db 22, FARFETCHD
+	db 30, STARYU
+	db 31, DUGTRIO
+	end_grass_wildmons
+
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons

maps.asm

@@ -1302,4 +1302,8 @@ INCLUDE "scripts/AncientCave.asm"
 INCLUDE "data/maps/objects/AncientCave.asm"
 AncientCave_Blocks: INCBIN "maps/AncientCave.blk"
 
+INCLUDE "data/maps/headers/DevilsCanyon.asm"
+INCLUDE "scripts/DevilsCanyon.asm"
+INCLUDE "data/maps/objects/DevilsCanyon.asm"
+DevilsCanyon_Blocks: INCBIN "maps/DevilsCanyon.blk"
 

maps/DevilsCanyon.blk

@@ -0,0 +1 @@
+
$

ram/wram.asm

@@ -2061,7 +2061,8 @@ wCeruleanCaveB1FCurScript:: db
 wVictoryRoad1FCurScript:: db
 	ds 1
 wLancesRoomCurScript:: db
-	ds 4
+wDevilsCanyonCurScript:: db
+	ds 3
 wSilphCo10FCurScript:: db
 wSilphCo11FCurScript:: db
 	ds 1

scripts/DevilsCanyon.asm

@@ -0,0 +1,36 @@
+DevilsCanyon_Script:
+	call EnableAutoTextBoxDrawing
+	ld hl, DevilTrainerHeader
+	ld de, DevilsCanyon_ScriptPointers
+	ld a, [wDevilsCanyonCurScript]
+	call ExecuteCurMapScriptInTable
+	ld [wDevilsCanyonCurScript], a
+	ret
+
+DevilsCanyon_ScriptPointers:
+	dw CheckFightingMapTrainers
+	dw DisplayEnemyTrainerTextAndStartBattle
+	dw EndTrainerBattle
+
+DevilsCanyon_TextPointers:
+	dw DevilText
+
+DevilsCanyonTrainerHeaders:
+	def_trainers 0
+DevilTrainerHeader:
+	trainer EVENT_BEAT_DEVIL, 0, DevilBattleText, DevilBattleText, DevilBattleText
+	db -1 ; end
+
+DevilText:
+	text_asm
+	ld hl, DevilsCanyonTrainerHeaders
+	call TalkToTrainer
+	jp TextScriptEnd
+
+DevilBattleText:
+	text_far _DevilBattleText
+	text_asm
+	ld a, OMANYTE
+	call PlayCry
+	call WaitForSoundToFinish
+	jp TextScriptEnd

text.asm

@@ -283,6 +283,7 @@ INCLUDE "text/Villa5F.asm"
 INCLUDE "text/SecretGarden.asm"
 INCLUDE "text/SecretPath.asm"
 INCLUDE "text/AncientCave.asm"
+INCLUDE "text/DevilsCanyon.asm"
 
 SECTION "Pokédex Text", ROMX
 

text/AncientCave.asm

@@ -1,14 +1,13 @@
 _AngelBattleText::
-	text "ANGEL"
-	line "insect seems to"
-	cont "have gotten lost"
-	cont "and dug this cave"
-	cont "in an attempt to"
-	cont "get back home."
+	text "Before you is"
+	line "some sort of"
+	cont "ANGEL from an era"
+	cont "long forgotten."
 
-	para "In a desperate"
-	line "frenzy, it lunges"
-	cont "at you!"
+	para "It spots you and"
+	line "panics, taking"
+	cont "up a defensive"
+	cont "stance!"
 
-	para "Griikii!@"
+	para "Kiirii!!@"
 	text_end

text/DevilsCanyon.asm

@@ -0,0 +1,13 @@
+_DevilBattleText::
+	text "Before you is"
+	line "some sort of"
+	cont "FIEND from an era"
+	cont "long forgotten."
+
+	para "It spots you and"
+	line "growls, taking"
+	cont "up a fighting"
+	cont "stance!"
+
+	para "Grrarrr!!@"
+	text_end