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

maps/PlayersHouse2F.asm

@@ -111,6 +111,35 @@ PlayersRadioText4:
 	text "#MON!"
 	line "#MON CHANNEL…"
 	done
+	
+DebugPokemon1Script:
+	opentext
+	getmonname STRING_BUFFER_3, BLASTYKE
+	writetext ReceivedDebugPokemonText
+	playsound SFX_CAUGHT_MON
+	waitsfx
+	promptbutton
+	givepoke BLASTYKE, 35, RARE_CANDY
+	closetext
+	end
+
+DebugPokemon2Script:
+	opentext
+	getmonname STRING_BUFFER_3, WARTORTLE
+	writetext ReceivedDebugPokemonText
+	playsound SFX_CAUGHT_MON
+	waitsfx
+	promptbutton
+	givepoke WARTORTLE, 35, RARE_CANDY
+	closetext
+	end
+
+ReceivedDebugPokemonText:
+	text "<PLAYER> received"
+	line "@"
+	text_ram wStringBuffer3
+	text "!"
+	done
 
 PlayersHouse2F_MapEvents:
 	db 0, 0 ; filler
@@ -131,3 +160,6 @@ PlayersHouse2F_MapEvents:
 	object_event  4,  4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1
 	object_event  5,  4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2
 	object_event  0,  1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseBigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
+	object_event  2,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugPokemon1Script, -1
+	object_event  7,  5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugPokemon2Script, -1
+