Add Ilex Forest gate objects.

4 files changed, 144 insertions, 9 deletions

diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index d9e56382..a893bad9 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -85,14 +85,6 @@ ENDM
 	map_const RUINS_OF_ALPH_AERODACTYL_CHAMBER,            5,  4 ; 26
 	map_const RUINS_OF_ALPH_INNER_CHAMBER,                14, 10 ; 27
 	map_const RUINS_OF_ALPH_RESEARCH_CENTER,               4,  4 ; 28
-	map_const RUINS_OF_ALPH_HO_OH_ITEM_ROOM,               5,  4 ; 29
-	map_const RUINS_OF_ALPH_KABUTO_ITEM_ROOM,              5,  4 ; 30
-	map_const RUINS_OF_ALPH_OMANYTE_ITEM_ROOM,             5,  4 ; 31
-	map_const RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM,          5,  4 ; 32
-	map_const RUINS_OF_ALPH_HO_OH_WORD_ROOM,              12, 10 ; 33
-	map_const RUINS_OF_ALPH_KABUTO_WORD_ROOM,              7, 10 ; 34
-	map_const RUINS_OF_ALPH_OMANYTE_WORD_ROOM,             8, 10 ; 35
-	map_const RUINS_OF_ALPH_AERODACTYL_WORD_ROOM,          7, 10 ; 36
 	map_const UNION_CAVE_1F,                              18, 10 ; 37
 	map_const UNION_CAVE_B1F,                             18, 10 ; 38
 	map_const UNION_CAVE_B2F,                             18, 10 ; 39
diff --git a/main.asm b/main.asm
index a3052d78..235b72c2 100644
--- a/main.asm
+++ b/main.asm
@@ -1588,8 +1588,10 @@ SECTION "bank56", ROMX, BANK[$56]
 	dr $158000, $15c000
 
 SECTION "bank57", ROMX, BANK[$57]
-	dr $15c000, $15f180
+	dr $15c000, $15ef24
 
+INCLUDE "maps/IlexForestAzaleaGate.asm"
+INCLUDE "maps/Route34IlexForestGate.asm"
 INCLUDE "maps/DayCare.asm"
 
 SECTION "bank58", ROMX, BANK[$58]
diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm
new file mode 100644
index 00000000..0e992960
--- /dev/null
+++ b/maps/IlexForestAzaleaGate.asm
@@ -0,0 +1,46 @@
+	const_def 2 ; object constants
+	const ILEXFORESTAZALEAGATE_OFFICER
+	const ILEXFORESTAZALEAGATE_GRANNY
+
+IlexForestAzaleaGate_MapScripts:
+	db 0 ; scene scripts
+
+	db 0 ; callbacks
+
+IlexForestAzaleaGateOfficerScript:
+	jumptextfaceplayer IlexForestAzaleaGateOfficerText
+
+IlexForestAzaleaGateGrannyScript:
+	jumptextfaceplayer IlexForestAzaleaGateGrannyText
+
+IlexForestAzaleaGateOfficerText:
+	text "ILEX FOREST is"
+	line "big. Be careful!"
+	cont "Don't get lost."
+	done
+
+IlexForestAzaleaGateGrannyText:
+	text "The FOREST is"
+	line "watched over by"
+	cont "its protector."
+
+	para "Stay out of"
+	line "mischief!"
+	done
+
+IlexForestAzaleaGate_MapEvents:
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  0,  4, ILEX_FOREST, 2
+	warp_event  0,  5, ILEX_FOREST, 3
+	warp_event  9,  4, AZALEA_TOWN, 7
+	warp_event  9,  5, AZALEA_TOWN, 8
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 2 ; object events
+	object_event  5,  2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateOfficerScript, -1
+	object_event  1,  3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, IlexForestAzaleaGateGrannyScript, -1
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
new file mode 100644
index 00000000..b6f546c0
--- /dev/null
+++ b/maps/Route34IlexForestGate.asm
@@ -0,0 +1,95 @@
+	const_def 2 ; object constants
+	const ROUTE34ILEXFORESTGATE_TEACHER1
+	const ROUTE34ILEXFORESTGATE_BUTTERFREE
+	const ROUTE34ILEXFORESTGATE_LASS
+	const ROUTE34ILEXFORESTGATE_TEACHER2
+
+Route34IlexForestGate_MapScripts:
+	db 0 ; scene scripts
+
+	db 0 ; callbacks
+
+Route34IlexForestGateTeacherScript:
+	faceplayer
+	opentext
+	checkevent EVENT_GOT_TM12_SWEET_SCENT
+	iftrue .GotSweetScent
+	writetext Route34IlexForestGateTeacherText
+	buttonsound
+	verbosegiveitem TM_SWEET_SCENT
+	iffalse .NoRoom
+	setevent EVENT_GOT_TM12_SWEET_SCENT
+.GotSweetScent:
+	writetext Route34IlexForestGateTeacher_GotSweetScent
+	waitbutton
+.NoRoom:
+	closetext
+	end
+
+Route34IlexForestGateButterfreeScript:
+	opentext
+	writetext Route34IlexForestGateButterfreeText
+	cry BUTTERFREE
+	waitbutton
+	closetext
+	end
+
+Route34IlexForestGateLassScript:
+	jumptextfaceplayer Route34IlexForestGateLassText
+
+Route34IlexForestGateTeacherText:
+	text "Oh, honey. You're"
+	line "making a #DEX?"
+
+	para "It must be hard if"
+	line "#MON won't"
+
+	para "appear. Try using"
+	line "this TM."
+	done
+
+Route34IlexForestGateTeacher_GotSweetScent:
+	text "It's SWEET SCENT."
+
+	para "Use it wherever"
+	line "#MON appear."
+
+	para "#MON will be"
+	line "enticed by it."
+	done
+
+Route34IlexForestGateButterfreeText:
+	text "BUTTERFREE: Freeh!"
+	done
+
+Route34IlexForestGateLassText:
+	text "Did you see the"
+	line "shrine honoring"
+	cont "the protector?"
+
+	para "It watches over"
+	line "the FOREST from"
+	cont "across time."
+
+	para "I think that it"
+	line "must be a grass-"
+	cont "type #MON."
+	done
+
+Route34IlexForestGate_MapEvents:
+	db 0, 0 ; filler
+
+	db 4 ; warp events
+	warp_event  4,  0, ROUTE_34, 1
+	warp_event  5,  0, ROUTE_34, 2
+	warp_event  4,  7, ILEX_FOREST, 1
+	warp_event  5,  7, ILEX_FOREST, 1
+
+	db 0 ; coord events
+
+	db 0 ; bg events
+
+	db 3 ; object events
+	object_event  9,  3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateTeacherScript, -1
+	object_event  9,  4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateButterfreeScript, -1
+	object_event  3,  4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, -1