pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Mockup of Pokemon Space (#22); reorganize delays and sprite updating of regular spaces (#21)

Browse Source
This commit is contained in:
xCrystal 2023-10-23 17:04:59 +02:00
parent 469537e2b8
commit 9fcd72af19
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engine/board/spaces.asm
View File

@ -31,6 +31,10 @@ ItemSpaceScript::
PokemonSpaceScript:: PokemonSpaceScript::
scall ArriveToRegularSpaceScript scall ArriveToRegularSpaceScript
iftrue .not_landed iftrue .not_landed
loadpikachudata
startbattle
reloadmapafterbattle
wait 100
scall LandedInRegularSpaceScript scall LandedInRegularSpaceScript
.not_landed .not_landed
end end
@ -72,6 +76,9 @@ GreySpaceScript::
ArriveToRegularSpaceScript: ArriveToRegularSpaceScript:
playsound SFX_PRESENT playsound SFX_PRESENT
callasm ArriveToRegularSpace callasm ArriveToRegularSpace
iftrue .not_landed
wait 600
.not_landed
end end
ArriveToRegularSpace: ArriveToRegularSpace:
@ -90,10 +97,7 @@ ArriveToRegularSpace:
ld hl, wDisplaySecondarySprites ld hl, wDisplaySecondarySprites
res SECONDARYSPRITES_SPACES_LEFT_F, [hl] res SECONDARYSPRITES_SPACES_LEFT_F, [hl]
.not_landed .not_landed
; if End Space, update sprites ; update sprites
ld a, [wPlayerTile]
cp COLL_END_SPACE
ret nz
jp UpdateActiveSprites jp UpdateActiveSprites
LandedInRegularSpaceScript: LandedInRegularSpaceScript:

12
engine/menus/intro_menu.asm
View File

@ -17,14 +17,16 @@ NewGame:
ld b, NAME_PLAYER ld b, NAME_PLAYER
ld de, wPlayerName ld de, wPlayerName
farcall NamingScreen farcall NamingScreen
ld de, .DefaultName if DEF(_DEBUG)
call InitName ld a, MEW
ld [wCurPartySpecies], a
ld a, 100
ld [wCurPartyLevel], a
predef TryAddMonToParty
endc
farcall AutoSaveGameOutsideOverworld farcall AutoSaveGameOutsideOverworld
jp GameMenu jp GameMenu
.DefaultName:
db "DEBUG@@@@@@"
ResetWRAM: ResetWRAM:
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a