From 9fcd72af19d78f5cd521aa8ff20d03924b921f5d Mon Sep 17 00:00:00 2001
From: xCrystal <rgr.crystal@gmail.com>
Date: Mon, 23 Oct 2023 17:04:59 +0200
Subject: [PATCH] Mockup of Pokemon Space (#22); reorganize delays and sprite
 updating of regular spaces (#21)

---
 engine/board/spaces.asm     | 12 ++++++++----
 engine/menus/intro_menu.asm | 12 +++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/engine/board/spaces.asm b/engine/board/spaces.asm
index c1f651131..2c4d3ee70 100755
--- a/engine/board/spaces.asm
+++ b/engine/board/spaces.asm
@@ -31,6 +31,10 @@ ItemSpaceScript::
 PokemonSpaceScript::
 	scall ArriveToRegularSpaceScript
 	iftrue .not_landed
+	loadpikachudata
+	startbattle
+	reloadmapafterbattle
+	wait 100
 	scall LandedInRegularSpaceScript
 .not_landed
 	end
@@ -72,6 +76,9 @@ GreySpaceScript::
 ArriveToRegularSpaceScript:
 	playsound SFX_PRESENT
 	callasm ArriveToRegularSpace
+	iftrue .not_landed
+	wait 600
+.not_landed
 	end
 
 ArriveToRegularSpace:
@@ -90,10 +97,7 @@ ArriveToRegularSpace:
 	ld hl, wDisplaySecondarySprites
 	res SECONDARYSPRITES_SPACES_LEFT_F, [hl]
 .not_landed
-; if End Space, update sprites
-	ld a, [wPlayerTile]
-	cp COLL_END_SPACE
-	ret nz
+; update sprites
 	jp UpdateActiveSprites
 
 LandedInRegularSpaceScript:
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index 64c16f6ab..244c10bed 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -17,14 +17,16 @@ NewGame:
 	ld b, NAME_PLAYER
 	ld de, wPlayerName
 	farcall NamingScreen
-	ld de, .DefaultName
-	call InitName
+if DEF(_DEBUG)
+	ld a, MEW
+	ld [wCurPartySpecies], a
+	ld a, 100
+	ld [wCurPartyLevel], a
+	predef TryAddMonToParty
+endc
 	farcall AutoSaveGameOutsideOverworld
 	jp GameMenu
 
-.DefaultName:
-	db "DEBUG@@@@@@"
-
 ResetWRAM:
 	xor a
 	ldh [hBGMapMode], a