Merge branch 'master' of https://github.com/ZetaNull/jep-hack

maps/CliffCave.asm

@@ -0,0 +1,54 @@
+	object_const_def
+	const CLIFFCAVE_MAN
+	const CLIFFCAVE_ROCK1
+	const CLIFFCAVE_ROCK2
+	const CLIFFCAVE_ROCK3
+	const CLIFFCAVE_ROCK4
+	const CLIFFCAVE_ROCK5
+	const CLIFFCAVE_ROCK6
+
+CliffCave_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+CliffCaveMan:
+	faceplayer
+	opentext
+	writetext CliffCaveManText
+	waitbutton
+	closetext
+	end
+
+CliffCaveManText:
+	text "Comment to be"
+	line "written."
+	done
+
+CliffCaveRock:
+	jumpstd SmashRockScript
+
+CliffCave_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event  5, 15, DEBUG_ROOM, 1 ; 1F Out
+	warp_event  7,  5, CLIFF_CAVE, 3 ; To 2F from 1F
+	warp_event 27,  7, CLIFF_CAVE, 2 ; To 1F from 2F
+	warp_event 23, 23, CLIFF_CAVE, 5 ; To 3F from 2F
+	warp_event 23,  7, CLIFF_CAVE, 4 ; To 2F from 3F
+	;warp_event  5, 15, DEBUG_ROOM, 1 ; 2F Out
+	;warp_event  5, 15, DEBUG_ROOM, 1 ; 3F Out
+
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
+	object_event 25,  4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveMan, -1
+	object_event  7, 15, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1
+	object_event  7, 13, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1
+	object_event  2, 13, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1
+	object_event  9,  3, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1
+	object_event  4,  3, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1
+	object_event  4,  2, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1

maps/DebugRoom.ablk

@@ -1,6 +1,6 @@
  ! ! !WW




E

 R
  !



-E
R





E
TvUXYG~IJ
+E
R





E
TvUXYG~IJ
 H





EF|}B




EJ~E
J
@AAB

 





D



BIIIIJ
HIB
TvU
DJ
X5Y
HIJ










|}


~E
E


E

maps/DebugRoom.asm

@@ -8,23 +8,23 @@ DebugRoom_MapScripts:
 
 DebugPokemon1Script:
 	opentext
-	getmonname STRING_BUFFER_3, BURGELA
+	getmonname STRING_BUFFER_3, PALSSIO
 	writetext ReceivedDebugPokemonText
 	playsound SFX_CAUGHT_MON
 	waitsfx
 	promptbutton
-	givepoke BURGELA, 42, DUSK_STONE
+	givepoke PALSSIO, 42, RARE_CANDY
 	closetext
 	end
 
 DebugPokemon2Script:
 	opentext
-	getmonname STRING_BUFFER_3, LICKITUNG
+	getmonname STRING_BUFFER_3, CUBBURN
 	writetext ReceivedDebugPokemonText
 	playsound SFX_CAUGHT_MON
 	waitsfx
 	promptbutton
-	givepoke LICKITUNG, 42, POISON_STONE
+	givepoke CUBBURN, 42, RARE_CANDY
 	closetext
 	end
 
@@ -101,7 +101,8 @@ DebugRoom_MapEvents:
 	warp_event  5, 35, VIRIDIAN_FOREST, 1 ; southwest warp
 	warp_event 19, 34, VIRIDIAN_FOREST, 1 ; southern warp
 	warp_event 33, 33, VIRIDIAN_FOREST, 1 ; southeast warp
-	warp_event  5,  3, AZALEA_TOWN, 1 
+	warp_event  5,  3, AZALEA_TOWN, 1
+	warp_event 34, 11, CLIFF_CAVE, 1 
 
 	def_coord_events
 

maps/LakeOfRagePrycesHouse.asm

@@ -12,7 +12,12 @@ LakeOfRagePrycesHouse_MapScripts:
 ;	jumpstd MagazineBookshelfScript
 
 PrycesHousePryce:
-	jumptext PrycesHousePryceText
+	faceplayer
+	opentext
+	writetext PrycesHousePryceText
+	waitbutton
+	closetext
+	end
 
 PrycesHousePryceText:
 	text "Thank you for"
@@ -38,6 +43,7 @@ PrycesHousePryceText:
 	done
 
 LakeOfRagePrycesHouseDelibirdScript:
+	faceplayer
 	opentext
 	writetext LakeOfRagePrycesHouseDelibirdText
 	cry DELIBIRD
@@ -50,6 +56,7 @@ LakeOfRagePrycesHouseDelibirdText:
 	done
 
 LakeOfRagePrycesHouseSwinubScript:
+	faceplayer
 	opentext
 	writetext LakeOfRagePrycesHouseSwinubText
 	cry SWINUB