Remove original maps and object events (#1)

This commit is contained in:
xCrystal
2023-07-25 15:33:08 +02:00
parent 60cacea4b0
commit 5147904f78
790 changed files with 175 additions and 88149 deletions

View File

@@ -6038,13 +6038,6 @@ LoadEnemyMon:
jr nc, .GenerateDVs
.CheckMagikarpArea:
; BUG: Magikarp in Lake of Rage are shorter, not longer (see docs/bugs_and_glitches.md)
ld a, [wMapGroup]
cp GROUP_LAKE_OF_RAGE
jr z, .Happiness
ld a, [wMapNumber]
cp MAP_LAKE_OF_RAGE
jr z, .Happiness
; 40% chance of not flooring
call Random
cp 39 percent + 1

View File

@@ -70,11 +70,6 @@ PlayBattleMusic:
and a
jr nz, .trainermusic
farcall RegionCheck
ld a, e
and a
jr nz, .kantowild
ld de, MUSIC_JOHTO_WILD_BATTLE
ld a, [wTimeOfDay]
cp NITE_F
@@ -82,10 +77,6 @@ PlayBattleMusic:
ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT
jr .done
.kantowild
ld de, MUSIC_KANTO_WILD_BATTLE
jr .done
.trainermusic
ld de, MUSIC_CHAMPION_BATTLE
cp CHAMPION
@@ -124,21 +115,7 @@ PlayBattleMusic:
jr .done
.othertrainer
ld a, [wLinkMode]
and a
jr nz, .johtotrainer
farcall RegionCheck
ld a, e
and a
jr nz, .kantotrainer
.johtotrainer
ld de, MUSIC_JOHTO_TRAINER_BATTLE
jr .done
.kantotrainer
ld de, MUSIC_KANTO_TRAINER_BATTLE
.done
call PlayMusic

View File

@@ -1,32 +0,0 @@
_BasementKey:
; Are we even in the right map to use this?
ld a, [wMapGroup]
cp GROUP_GOLDENROD_UNDERGROUND
jr nz, .nope
ld a, [wMapNumber]
cp MAP_GOLDENROD_UNDERGROUND
jr nz, .nope
; Are we on the tile in front of the door?
call GetFacingTileCoord
ld a, d
cp 22
jr nz, .nope
ld a, e
cp 10
jr nz, .nope
; Let's use the Basement Key
ld hl, .BasementKeyScript
call QueueScript
ld a, TRUE
ld [wItemEffectSucceeded], a
ret
.nope
ld a, FALSE
ld [wItemEffectSucceeded], a
ret
.BasementKeyScript:
closetext
farsjump BasementDoorScript

View File

@@ -1,37 +0,0 @@
_CardKey:
; Are we even in the right map to use this?
ld a, [wMapGroup]
cp GROUP_RADIO_TOWER_3F
jr nz, .nope
ld a, [wMapNumber]
cp MAP_RADIO_TOWER_3F
jr nz, .nope
; Are we facing the slot?
ld a, [wPlayerDirection]
and %1100
cp OW_UP
jr nz, .nope
call GetFacingTileCoord
ld a, d
cp 18
jr nz, .nope
ld a, e
cp 6
jr nz, .nope
; Let's use the Card Key.
ld hl, .CardKeyScript
call QueueScript
ld a, TRUE
ld [wItemEffectSucceeded], a
ret
.nope
ld a, FALSE
ld [wItemEffectSucceeded], a
ret
.CardKeyScript:
closetext
farsjump CardKeySlotScript

View File

@@ -7,7 +7,7 @@ HallOfFame::
ld a, 1
ld [wGameLogicPaused], a
call DisableSpriteUpdates
ld a, SPAWN_LANCE
ld a, SPAWN_LEVEL_1
ld [wSpawnAfterChampion], a
; Enable the Pokégear map to cycle through all of Kanto
@@ -49,7 +49,7 @@ RedCredits::
ld c, 8
call DelayFrames
call DisableSpriteUpdates
ld a, SPAWN_RED
ld a, SPAWN_LEVEL_1
ld [wSpawnAfterChampion], a
ld a, [wStatusFlags]
ld b, a

View File

@@ -14,8 +14,6 @@ InitMapNameSign::
ld c, a
call GetWorldMapLocation
ld [wCurLandmark], a
call .CheckNationalParkGate
jr z, .gate
call GetMapEnvironment
cp GATE
@@ -72,30 +70,10 @@ InitMapNameSign::
ret z
cp LANDMARK_SPECIAL ; redundant check
ret z
cp LANDMARK_RADIO_TOWER
ret z
cp LANDMARK_LAV_RADIO_TOWER
ret z
cp LANDMARK_UNDERGROUND_PATH
ret z
cp LANDMARK_INDIGO_PLATEAU
ret z
cp LANDMARK_POWER_PLANT
ret z
ld a, 1
and a
ret
.CheckNationalParkGate:
ld a, [wMapGroup]
cp GROUP_ROUTE_35_NATIONAL_PARK_GATE
ret nz
ld a, [wMapNumber]
cp MAP_ROUTE_35_NATIONAL_PARK_GATE
ret z
cp MAP_ROUTE_36_NATIONAL_PARK_GATE
ret
PlaceMapNameSign::
ld hl, wLandmarkSignTimer
ld a, [hl]

View File

@@ -1,45 +0,0 @@
_Squirtbottle:
ld hl, .SquirtbottleScript
call QueueScript
ld a, $1
ld [wItemEffectSucceeded], a
ret
.SquirtbottleScript:
reloadmappart
special UpdateTimePals
callasm .CheckCanUseSquirtbottle
iffalse .SquirtbottleNothingScript
farsjump WateredWeirdTreeScript
.SquirtbottleNothingScript:
jumptext .SquirtbottleNothingText
.SquirtbottleNothingText:
text_far _SquirtbottleNothingText
text_end
.CheckCanUseSquirtbottle:
ld a, [wMapGroup]
cp GROUP_ROUTE_36
jr nz, .nope
ld a, [wMapNumber]
cp MAP_ROUTE_36
jr nz, .nope
farcall GetFacingObject
jr c, .nope
ld a, d
cp SPRITEMOVEDATA_SUDOWOODO
jr nz, .nope
ld a, 1
ld [wScriptVar], a
ret
.nope
xor a
ld [wScriptVar], a
ret

View File

@@ -162,7 +162,6 @@ PokecenterNurseScript:
.pokerus_done
setflag ENGINE_CAUGHT_POKERUS
specialphonecall SPECIALCALL_POKERUS
end
DifficultBookshelfScript:
@@ -300,8 +299,6 @@ RadioTowerRocketsScript:
clearevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER
clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
specialphonecall SPECIALCALL_WEIRDBROADCAST
setmapscene MAHOGANY_TOWN, SCENE_MAHOGANYTOWN_NOOP
end
BugContestResultsWarpScript:
@@ -310,7 +307,6 @@ BugContestResultsWarpScript:
setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
setevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
warp ROUTE_36_NATIONAL_PARK_GATE, 0, 4
applymovement PLAYER, Movement_ContestResults_WalkAfterWarp
BugContestResultsScript:
@@ -358,8 +354,6 @@ BugContestResults_DidNotLeaveMons:
waitbutton
BugContestResults_CleanUp:
closetext
setscene SCENE_ROUTE36NATIONALPARKGATE_NOOP
setmapscene ROUTE_35_NATIONAL_PARK_GATE, SCENE_ROUTE35NATIONALPARKGATE_NOOP
setevent EVENT_BUG_CATCHING_CONTESTANT_1A
setevent EVENT_BUG_CATCHING_CONTESTANT_2A
setevent EVENT_BUG_CATCHING_CONTESTANT_3A

View File

@@ -55,25 +55,11 @@ SpecialAerodactylChamber:
push de
push bc
call GetMapAttributesPointer
ld a, h
cp HIGH(RuinsOfAlphAerodactylChamber_MapAttributes)
jr nz, .nope
ld a, l
cp LOW(RuinsOfAlphAerodactylChamber_MapAttributes)
jr nz, .nope
ld de, EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
ld b, SET_FLAG
call EventFlagAction
scf
jr .done
.nope
and a
.done
pop bc
pop de
ret
@@ -82,19 +68,10 @@ SpecialKabutoChamber:
push hl
push de
call GetMapAttributesPointer
ld a, h
cp HIGH(RuinsOfAlphKabutoChamber_MapAttributes)
jr nz, .done
ld a, l
cp LOW(RuinsOfAlphKabutoChamber_MapAttributes)
jr nz, .done
ld de, EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
ld b, SET_FLAG
call EventFlagAction
.done
pop de
pop hl
ret

View File

@@ -64,7 +64,7 @@ GetWhiteoutSpawn:
farcall IsSpawnPoint
ld a, c
jr c, .yes
xor a ; SPAWN_HOME
xor a ; SPAWN_LEVEL_1
.yes
ld [wDefaultSpawnpoint], a

View File

@@ -2531,15 +2531,12 @@ PPRestoredText:
text_end
SquirtbottleEffect:
farcall _Squirtbottle
ret
CardKeyEffect:
farcall _CardKey
ret
BasementKeyEffect:
farcall _BasementKey
ret
SacredAshEffect:

View File

@@ -61,10 +61,10 @@ NewGame:
call OakSpeech
call InitializeWorld
ld a, LANDMARK_NEW_BARK_TOWN
ld a, LANDMARK_LEVEL_1
ld [wPrevLandmark], a
ld a, SPAWN_HOME
ld a, SPAWN_LEVEL_1
ld [wDefaultSpawnpoint], a
ld a, MAPSETUP_WARP
@@ -347,7 +347,7 @@ Continue:
farcall JumpRoamMons
farcall ClockContinue
ld a, [wSpawnAfterChampion]
cp SPAWN_LANCE
cp SPAWN_LEVEL_1
jr z, .SpawnAfterE4
ld a, MAPSETUP_CONTINUE
ldh [hMapEntryMethod], a
@@ -357,13 +357,13 @@ Continue:
ret
.SpawnAfterE4:
ld a, SPAWN_NEW_BARK
ld a, SPAWN_LEVEL_1
ld [wDefaultSpawnpoint], a
call PostCreditsSpawn
jp FinishContinueFunction
SpawnAfterRed:
ld a, SPAWN_MT_SILVER
ld a, SPAWN_LEVEL_1
ld [wDefaultSpawnpoint], a
PostCreditsSpawn:
@@ -415,7 +415,7 @@ FinishContinueFunction:
set 1, [hl]
farcall OverworldLoop
ld a, [wSpawnAfterChampion]
cp SPAWN_RED
cp SPAWN_LEVEL_1
jr z, .AfterRed
jp Reset

View File

@@ -158,7 +158,6 @@ CmdQueue_Null:
ret
CmdQueue_Type1:
call SetXYCompareFlags
ret
CmdQueue_Type4:

View File

@@ -245,8 +245,6 @@ PlayerEvents:
and a
ret nz
call Dummy_CheckScriptFlags2Bit5 ; This is a waste of time
call CheckTrainerBattle_GetPlayerEvent
jr c, .ok
@@ -392,12 +390,6 @@ SetMinTwoStepWildEncounterCooldown:
ld [wWildEncounterCooldown], a
ret
Dummy_CheckScriptFlags2Bit5:
call CheckBit5_ScriptFlags2
ret z
call SetXYCompareFlags
ret
RunSceneScript:
ld a, [wCurMapSceneScriptCount]
and a
@@ -1279,25 +1271,23 @@ TryWildEncounter_BugContest:
INCLUDE "data/wild/bug_contest_mons.asm"
DoBikeStep::
nop
nop
; If the bike shop owner doesn't have our number, or
; if we've already gotten the call, we don't have to
; be here.
ld hl, wStatusFlags2
bit STATUSFLAGS2_BIKE_SHOP_CALL_F, [hl]
jr z, .NoCall
jr z, .dont_increment
; If we're not on the bike, we don't have to be here.
ld a, [wPlayerState]
cp PLAYER_BIKE
jr nz, .NoCall
jr nz, .dont_increment
; If we're not in an area of phone service, we don't
; have to be here.
call GetMapPhoneService
and a
jr nz, .NoCall
jr nz, .dont_increment
; Check the bike step count and check whether we've
; taken 65536 of them yet.
@@ -1318,29 +1308,6 @@ DoBikeStep::
ld [hl], d
.dont_increment
; If we've taken at least 1024 steps, have the bike
; shop owner try to call us.
ld a, d
cp HIGH(1024)
jr c, .NoCall
; If a call has already been queued, don't overwrite
; that call.
ld a, [wSpecialPhoneCallID]
and a
jr nz, .NoCall
; Queue the call.
ld a, SPECIALCALL_BIKESHOP
ld [wSpecialPhoneCallID], a
xor a
ld [wSpecialPhoneCallID + 1], a
ld hl, wStatusFlags2
res STATUSFLAGS2_BIKE_SHOP_CALL_F, [hl]
scf
ret
.NoCall:
xor a
ret

View File

@@ -44,39 +44,3 @@ GetLandmarkName::
ret
INCLUDE "data/maps/landmarks.asm"
RegionCheck:
; Checks if the player is in Kanto or Johto.
; If in Johto, returns 0 in e.
; If in Kanto, returns 1 in e.
ld a, [wMapGroup]
ld b, a
ld a, [wMapNumber]
ld c, a
call GetWorldMapLocation
cp LANDMARK_FAST_SHIP ; S.S. Aqua
jr z, .johto
cp LANDMARK_SPECIAL
jr nz, .checkagain
; In a special map, get the backup map group / map id
ld a, [wBackupMapGroup]
ld b, a
ld a, [wBackupMapNumber]
ld c, a
call GetWorldMapLocation
.checkagain
cp KANTO_LANDMARK
jr c, .johto
; Victory Road area is considered to be Johto.
cp LANDMARK_VICTORY_ROAD
jr c, .kanto
.johto
ld e, JOHTO_REGION
ret
.kanto
ld e, KANTO_REGION
ret

View File

@@ -172,19 +172,6 @@ EnterMapWarp:
call CheckIndoorMap
ret nz
; MOUNT_MOON_SQUARE and TIN_TOWER_ROOF are outdoor maps within indoor maps.
; Dig and Escape Rope should not take you to them.
ld a, [wPrevMapGroup]
cp GROUP_MOUNT_MOON_SQUARE
jr nz, .not_mt_moon_square_or_tin_tower_roof
assert GROUP_MOUNT_MOON_SQUARE == GROUP_TIN_TOWER_ROOF
ld a, [wPrevMapNumber]
cp MAP_MOUNT_MOON_SQUARE
ret z
cp MAP_TIN_TOWER_ROOF
ret z
.not_mt_moon_square_or_tin_tower_roof
ld a, [wPrevWarp]
ld [wDigWarpNumber], a
ld a, [wPrevMapGroup]

View File

@@ -387,8 +387,6 @@ _GrassWildmonLookup:
call _SwarmWildmonCheck
ret c
ld hl, JohtoGrassWildMons
ld de, KantoGrassWildMons
call _JohtoWildmonCheck
ld bc, GRASS_WILDDATA_LENGTH
jr _NormalWildmonOK
@@ -398,19 +396,9 @@ _WaterWildmonLookup:
call _SwarmWildmonCheck
ret c
ld hl, JohtoWaterWildMons
ld de, KantoWaterWildMons
call _JohtoWildmonCheck
ld bc, WATER_WILDDATA_LENGTH
jr _NormalWildmonOK
_JohtoWildmonCheck:
call IsInJohto
and a
ret z
ld h, d
ld l, e
ret
_SwarmWildmonCheck:
call CopyCurrMapDE
push hl
@@ -505,15 +493,15 @@ InitRoamMons:
ld [wRoamMon2Level], a
; raikou starting map
ld a, GROUP_ROUTE_42
ld a, GROUP_N_A
ld [wRoamMon1MapGroup], a
ld a, MAP_ROUTE_42
ld a, MAP_N_A
ld [wRoamMon1MapNumber], a
; entei starting map
ld a, GROUP_ROUTE_37
ld a, GROUP_N_A
ld [wRoamMon2MapGroup], a
ld a, MAP_ROUTE_37
ld a, MAP_N_A
ld [wRoamMon2MapNumber], a
; hp

View File

@@ -1,60 +0,0 @@
AlanPhoneCalleeScript:
gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
checkflag ENGINE_ALAN_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
iftrue .NotWednesday
checkflag ENGINE_ALAN_HAS_FIRE_STONE
iftrue .FireStone
readvar VAR_WEEKDAY
ifnotequal WEDNESDAY, .NotWednesday
checktime DAY
iftrue AlanWednesdayDay
.NotWednesday:
farsjump AlanHangUpScript
.WantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_36
farsjump AlanReminderScript
.FireStone:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_36
farsjump AlanComePickUpScript
AlanPhoneCallerScript:
gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_ALAN_READY_FOR_REMATCH
iftrue .Generic
checkflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
iftrue .Generic
checkflag ENGINE_ALAN_HAS_FIRE_STONE
iftrue .Generic
farscall PhoneScript_Random3
ifequal 0, AlanWantsBattle
checkevent EVENT_ALAN_GAVE_FIRE_STONE
iftrue .FireStone
farscall PhoneScript_Random2
ifequal 0, AlanHasFireStone
.FireStone:
farscall PhoneScript_Random11
ifequal 0, AlanHasFireStone
.Generic:
farsjump Phone_GenericCall_Male
AlanWednesdayDay:
setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
AlanWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_36
setflag ENGINE_ALAN_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
AlanHasFireStone:
setflag ENGINE_ALAN_HAS_FIRE_STONE
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_36
farsjump PhoneScript_FoundItem_Male

View File

@@ -1,61 +0,0 @@
AnthonyPhoneCalleeScript:
gettrainername STRING_BUFFER_3, HIKER, ANTHONY2
checkflag ENGINE_ANTHONY_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_ANTHONY_FRIDAY_NIGHT
iftrue .NotFriday
readvar VAR_WEEKDAY
ifnotequal FRIDAY, .NotFriday
checktime NITE
iftrue AnthonyFridayNight
.NotFriday:
checkflag ENGINE_DUNSPARCE_SWARM
iftrue .AlreadySwarming
farsjump AnthonyHangUpScript
.WantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_33
farsjump AnthonyReminderScript
.AlreadySwarming:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_33
farsjump AnthonyHurryScript
AnthonyPhoneCallerScript:
gettrainername STRING_BUFFER_3, HIKER, ANTHONY2
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_FLYPOINT_GOLDENROD
iffalse .TriesSwarm
checkflag ENGINE_ANTHONY_READY_FOR_REMATCH
iftrue .TriesSwarm
checkflag ENGINE_ANTHONY_FRIDAY_NIGHT
iftrue .TriesSwarm
farscall PhoneScript_Random2
ifequal 0, AnthonyWantsBattle
.TriesSwarm:
farscall PhoneScript_Random5
ifequal 0, AnthonyTriesDunsparceSwarm
farsjump Phone_GenericCall_Male
AnthonyFridayNight:
setflag ENGINE_ANTHONY_FRIDAY_NIGHT
AnthonyWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_33
setflag ENGINE_ANTHONY_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
AnthonyTriesDunsparceSwarm:
checkflag ENGINE_DUNSPARCE_SWARM
iftrue .Generic
setflag ENGINE_DUNSPARCE_SWARM
getmonname STRING_BUFFER_4, DUNSPARCE
swarm SWARM_DUNSPARCE, DARK_CAVE_VIOLET_ENTRANCE
getlandmarkname STRING_BUFFER_5, LANDMARK_DARK_CAVE
farsjump AnthonySwarmScript
.Generic:
farsjump Phone_GenericCall_Male

View File

@@ -1,64 +0,0 @@
ArniePhoneCalleeScript:
gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1
checkflag ENGINE_ARNIE_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_ARNIE_TUESDAY_MORNING
iftrue .NotTuesday
readvar VAR_WEEKDAY
ifnotequal TUESDAY, .NotTuesday
checktime MORN
iftrue ArnieTuesdayMorning
.NotTuesday:
checkflag ENGINE_YANMA_SWARM
iftrue .AlreadySwarming
farsjump ArnieHangUpScript
.WantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_35
farsjump ArnieReminderScript
.AlreadySwarming:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_35
farsjump ArnieHurryScript
ArniePhoneCallerScript:
gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_ARNIE_READY_FOR_REMATCH
iftrue .Swarm
checkflag ENGINE_ARNIE_TUESDAY_MORNING
iftrue .Swarm
farscall PhoneScript_Random2
ifequal 0, ArnieWantsBattle
.Swarm:
farscall PhoneScript_Random5
ifequal 0, ArnieYanmaSwarm
farscall PhoneScript_Random3
ifequal 0, ArnieFoundRare
farsjump Phone_GenericCall_Male
ArnieTuesdayMorning:
setflag ENGINE_ARNIE_TUESDAY_MORNING
ArnieWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_35
setflag ENGINE_ARNIE_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
ArnieYanmaSwarm: ; start swarm
checkflag ENGINE_YANMA_SWARM
iftrue ArnieYanmaAlreadySwarming
setflag ENGINE_YANMA_SWARM
getmonname STRING_BUFFER_4, YANMA
swarm SWARM_YANMA, ROUTE_35
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_35
farsjump ArnieSwarmScript
ArnieFoundRare:
farsjump Phone_CheckIfUnseenRare_Male
ArnieYanmaAlreadySwarming:
farsjump Phone_GenericCall_Male

Some files were not shown because too many files have changed in this diff Show More