pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove original maps and object events (#1)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

32
engine/events/basement_key.asm
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

37
engine/events/card_key.asm
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

4
engine/events/halloffame.asm
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

22
engine/events/map_name_sign.asm
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]

45
engine/events/squirtbottle.asm
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

6
engine/events/std_scripts.asm
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

23
engine/events/unown_walls.asm
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

2
engine/events/whiteout.asm
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