Adjust MAPSETUP_ENTERLEVEL (#4) and misc clean up

This commit is contained in:
xCrystal
2024-03-05 20:08:42 +01:00
parent ae992b01a3
commit f796199bab
16 changed files with 17 additions and 93 deletions

View File

@@ -122,8 +122,6 @@ endc
; engine_flag wDailyPhoneTimeOfDayFlags, 0 ; jack
; engine_flag wDailyPhoneTimeOfDayFlags, 1 ; huey
engine_flag wPlayerSpriteSetupFlags, PLAYERSPRITESETUP_FEMALE_TO_MALE_F
engine_flag wSwarmFlags, SWARMFLAGS_DUNSPARCE_SWARM_F
engine_flag wSwarmFlags, SWARMFLAGS_YANMA_SWARM_F

View File

@@ -11,7 +11,6 @@ MapSetupScripts:
dw MapSetupScript_LinkReturn
dw MapSetupScript_Train
dw MapSetupScript_Submenu
dw MapSetupScript_BadWarp
dw MapSetupScript_Fly
dw MapSetupScript_EnterLevel
dw MapSetupScript_ExitViewMap
@@ -43,7 +42,6 @@ MapSetupScript_EnterLevel:
mapsetup SpawnInFacingDown
mapsetup RefreshMapSprites
mapsetup PlayMapMusicBike
mapsetup FadeInToMusic
mapsetup FadeInFromWhite
mapsetup ConstructAndEnableOverworldHUD
mapsetup ActivateMapAnims
@@ -85,34 +83,6 @@ MapSetupScript_Warp:
mapsetup MapCallbackAtEndMapSetup
db -1 ; end
MapSetupScript_BadWarp:
mapsetup BackupMapObjects
mapsetup EnterMapSpawnPoint
mapsetup LoadMapAttributes
mapsetup HandleNewMap
mapsetup SpawnPlayer
mapsetup RefreshPlayerCoords
mapsetup GetMapScreenCoords
mapsetup LoadBlockData
mapsetup LoadDisabledSpaces
mapsetup BufferScreen
mapsetup DisableLCD
mapsetup LoadMapGraphics
mapsetup LoadMapTimeOfDay
mapsetup FadeOutMapMusic
mapsetup EnableLCD
mapsetup LoadMapObjects
mapsetup LoadMapPalettes
mapsetup SpawnInFacingDown
mapsetup RefreshMapSprites
mapsetup FadeToMapMusic
mapsetup FadeInFromWhite
mapsetup ActivateMapAnims
mapsetup LoadWildMonData
mapsetup AnchorPointAfterWarp
mapsetup MapCallbackAtEndMapSetup
db -1 ; end
MapSetupScript_Connection:
mapsetup SuspendMapAnims
mapsetup BackupMapObjects

View File

@@ -9,7 +9,6 @@ ChrisNameMenuHeader:
db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags
db 5 ; items
db "NEW NAME@"
MalePlayerNameArray:
db "CHRIS@"
db "MAT@"
db "ALLAN@"
@@ -28,7 +27,6 @@ KrisNameMenuHeader:
db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags
db 5 ; items
db "NEW NAME@"
FemalePlayerNameArray:
db "KRIS@"
db "AMANDA@"
db "JUANA@"