You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Add new map setup script MAPSETUP_ENTERLEVEL (#4), and integrate overworld HUD setup in the corresponding setup scripts (#15)
This commit is contained in:
@@ -327,7 +327,7 @@ Continue:
|
||||
call DelayFrames
|
||||
farcall JumpRoamMons
|
||||
ld a, [wSpawnAfterChampion]
|
||||
cp SPAWN_LEVEL_1
|
||||
cp SPAWN_N_A
|
||||
jr z, .SpawnAfterE4
|
||||
ld a, MAPSETUP_CONTINUE
|
||||
ldh [hMapEntryMethod], a
|
||||
@@ -378,7 +378,7 @@ FinishContinueFunction:
|
||||
res GAME_TIMER_MOBILE_F, [hl]
|
||||
farcall OverworldLoop
|
||||
ld a, [wSpawnAfterChampion]
|
||||
cp SPAWN_LEVEL_1
|
||||
cp SPAWN_N_A
|
||||
jr z, .AfterRed
|
||||
jp Reset
|
||||
|
||||
|
@@ -141,7 +141,7 @@ LevelSelectionMenu::
|
||||
ld a, [wLevelSelectionMenuCurrentLandmark]
|
||||
call LevelSelectionMenu_GetLandmarkSpawnPoint
|
||||
ld [wDefaultSpawnpoint], a
|
||||
ld a, MAPSETUP_WARP
|
||||
ld a, MAPSETUP_ENTERLEVEL
|
||||
ld [hMapEntryMethod], a
|
||||
xor a
|
||||
ld [wDontPlayMapMusicOnReload], a ; play map music
|
||||
|
@@ -110,8 +110,6 @@ EnterMap:
|
||||
ld [wXYComparePointer], a
|
||||
ld [wXYComparePointer + 1], a
|
||||
call SetUpFiveStepWildEncounterCooldown
|
||||
ld hl, wTextboxFlags
|
||||
set TEXT_2BPP_F, [hl]
|
||||
farcall RunMapSetupScript
|
||||
call DisableEvents
|
||||
|
||||
@@ -128,9 +126,6 @@ EnterMap:
|
||||
ld [wPoisonStepCount], a
|
||||
.dontresetpoison
|
||||
|
||||
call ConstructOverworldHUDTilemap
|
||||
call EnableOverworldHUD
|
||||
|
||||
xor a ; end map entry
|
||||
ldh [hMapEntryMethod], a
|
||||
ld a, MAPSTATUS_HANDLE
|
||||
|
Reference in New Issue
Block a user