Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more accurate script names: refreshscreen -> reanchormap, and reloadmappart -> refreshmap (#1078)

Browse Source
This commit is contained in:
xCrystal
2024-01-07 14:37:46 +01:00
parent f72f078c0e
commit 7f3b87950a
42 changed files with 115 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maps/BrunosRoom.asm
View File

@@ -29,11 +29,11 @@ BrunosRoomDoorsCallback:
BrunosRoomDoorLocksBehindYouScript:
applymovement PLAYER, BrunosRoom_EnterMovement
refreshscreen $86
reanchormap $86
playsound SFX_STRENGTH
earthquake 80
changeblock 4, 14, $2a ; wall
reloadmappart
refreshmap
closetext
setscene SCENE_BRUNOSROOM_NOOP
setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
@@ -59,7 +59,7 @@ BrunoScript_Battle:
closetext
playsound SFX_ENTER_DOOR
changeblock 4, 2, $16 ; open door
reloadmappart
refreshmap
closetext
setevent EVENT_BRUNOS_ROOM_EXIT_OPEN
waitsfx

2
maps/BurnedTower1F.asm
View File

@@ -105,7 +105,7 @@ BurnedTowerRivalBattleScript:
playsound SFX_ENTER_DOOR
waitsfx
changeblock 10, 8, $25 ; hole
reloadmappart
refreshmap
pause 15
applymovement PLAYER, BurnedTower1FMovement_PlayerStartsToFall
playsound SFX_KINESIS

4
maps/BurnedTowerB1F.asm
View File

@@ -90,9 +90,9 @@ ReleaseTheBeasts:
setevent EVENT_BURNED_TOWER_MORTY
setevent EVENT_BURNED_TOWER_1F_EUSINE
appear BURNEDTOWERB1F_EUSINE
refreshscreen
reanchormap
changeblock 6, 14, $1b ; ladder
reloadmappart
refreshmap
closetext
setscene SCENE_BURNEDTOWERB1F_NOOP
end

6
maps/CeladonGameCorner.asm
View File

@@ -111,21 +111,21 @@ CeladonGameCornerPoster2Script:
CeladonGameCornerLuckySlotMachineScript:
random 6
ifequal 0, CeladonGameCornerSlotMachineScript
refreshscreen
reanchormap
setval FALSE
special SlotMachine
closetext
end
CeladonGameCornerSlotMachineScript:
refreshscreen
reanchormap
setval TRUE
special SlotMachine
closetext
end
CeladonGameCornerCardFlipScript:
refreshscreen
reanchormap
special CardFlip
closetext
end

6
maps/ElmsLab.asm
View File

@@ -160,7 +160,7 @@ CyndaquilPokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
turnobject ELMSLAB_ELM, DOWN
refreshscreen
reanchormap
pokepic CYNDAQUIL
cry CYNDAQUIL
waitbutton
@@ -190,7 +190,7 @@ TotodilePokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
turnobject ELMSLAB_ELM, DOWN
refreshscreen
reanchormap
pokepic TOTODILE
cry TOTODILE
waitbutton
@@ -218,7 +218,7 @@ ChikoritaPokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
turnobject ELMSLAB_ELM, DOWN
refreshscreen
reanchormap
pokepic CHIKORITA
cry CHIKORITA
waitbutton

6
maps/GoldenrodGameCorner.asm
View File

@@ -300,21 +300,21 @@ GoldenrodGameCornerLeftTheirDrinkScript:
GoldenrodGameCornerSlotsMachineScript:
random 6
ifequal 0, GoldenrodGameCornerLuckySlotsMachineScript
refreshscreen
reanchormap
setval FALSE
special SlotMachine
closetext
end
GoldenrodGameCornerLuckySlotsMachineScript:
refreshscreen
reanchormap
setval TRUE
special SlotMachine
closetext
end
GoldenrodGameCornerCardFlipMachineScript:
refreshscreen
reanchormap
special CardFlip
closetext
end

2
maps/GoldenrodUnderground.asm
View File

@@ -386,7 +386,7 @@ BasementDoorScript::
waitbutton
closetext
changeblock 18, 6, $2e ; unlocked door
reloadmappart
refreshmap
closetext
setevent EVENT_USED_BASEMENT_KEY
end

16
maps/GoldenrodUndergroundSwitchRoomEntrances.asm
View File

@@ -402,7 +402,7 @@ GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
scall .Clear12
scall .Clear13
scall .Clear14
reloadmappart
refreshmap
closetext
end
@@ -415,7 +415,7 @@ GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
scall .Clear11
scall .Clear12
scall .Clear14
reloadmappart
refreshmap
closetext
end
@@ -428,7 +428,7 @@ GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
scall .Clear10
scall .Clear13
scall .Clear14
reloadmappart
refreshmap
closetext
end
@@ -441,7 +441,7 @@ GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
scall .Clear11
scall .Clear12
scall .Clear14
reloadmappart
refreshmap
closetext
end
@@ -454,7 +454,7 @@ GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
scall .Clear10
scall .Clear13
scall .Clear14
reloadmappart
refreshmap
closetext
end
@@ -467,7 +467,7 @@ GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
scall .Clear11
scall .Clear12
scall .Clear14
reloadmappart
refreshmap
closetext
end
@@ -480,7 +480,7 @@ GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
scall .Clear4
scall .Clear10
scall .Clear13
reloadmappart
refreshmap
closetext
end
@@ -497,7 +497,7 @@ GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors:
scall .Set12
scall .Clear13
scall .Set14
reloadmappart
refreshmap
closetext
setval 6
writemem wUndergroundSwitchPositions

6
maps/KarensRoom.asm
View File

@@ -29,11 +29,11 @@ KarensRoomDoorsCallback:
KarensRoomDoorLocksBehindYouScript:
applymovement PLAYER, KarensRoom_EnterMovement
refreshscreen $86
reanchormap $86
playsound SFX_STRENGTH
earthquake 80
changeblock 4, 14, $2a ; wall
reloadmappart
refreshmap
closetext
setscene SCENE_KARENSROOM_NOOP
setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
@@ -59,7 +59,7 @@ KarenScript_Battle:
closetext
playsound SFX_ENTER_DOOR
changeblock 4, 2, $16 ; open door
reloadmappart
refreshmap
closetext
setevent EVENT_KARENS_ROOM_EXIT_OPEN
waitsfx

6
maps/KogasRoom.asm
View File

@@ -29,11 +29,11 @@ KogasRoomDoorsCallback:
KogasRoomDoorLocksBehindYouScript:
applymovement PLAYER, KogasRoom_EnterMovement
refreshscreen $86
reanchormap $86
playsound SFX_STRENGTH
earthquake 80
changeblock 4, 14, $2a ; wall
reloadmappart
refreshmap
closetext
setscene SCENE_KOGASROOM_NOOP
setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
@@ -59,7 +59,7 @@ KogaScript_Battle:
closetext
playsound SFX_ENTER_DOOR
changeblock 4, 2, $16 ; open door
reloadmappart
refreshmap
closetext
setevent EVENT_KOGAS_ROOM_EXIT_OPEN
waitsfx

6
maps/LancesRoom.asm
View File

@@ -31,11 +31,11 @@ LancesRoomDoorsCallback:
LancesRoomDoorLocksBehindYouScript:
applymovement PLAYER, LancesRoom_EnterMovement
refreshscreen $86
reanchormap $86
playsound SFX_STRENGTH
earthquake 80
changeblock 4, 22, $34 ; wall
reloadmappart
refreshmap
closetext
setscene SCENE_LANCESROOM_APPROACH_LANCE
setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
@@ -68,7 +68,7 @@ LancesRoomLanceScript:
closetext
playsound SFX_ENTER_DOOR
changeblock 4, 0, $0b ; open door
reloadmappart
refreshmap
closetext
setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
musicfadeout MUSIC_BEAUTY_ENCOUNTER, 16

2
maps/MahoganyMart1F.asm
View File

@@ -88,7 +88,7 @@ MahoganyMart1FLanceUncoversStaircaseScript:
showemote EMOTE_SHOCK, MAHOGANYMART1F_PHARMACIST, 10
playsound SFX_FAINT
changeblock 6, 2, $1e ; stairs
reloadmappart
refreshmap
closetext
setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
turnobject MAHOGANYMART1F_LANCE, LEFT

6
maps/MobileBattleRoom.asm
View File

@@ -18,7 +18,7 @@ MobileBattleRoomInitializeAndPreparePokecenter2FScript:
end
MobileBattleRoomConsoleScript:
refreshscreen
reanchormap
special Function1037c2
ifequal $1, .one
special Function1037eb
@@ -37,7 +37,7 @@ MobileBattleRoomConsoleScript:
pause 60
special FadeInFromWhite
special RestartMapMusic
refreshscreen
reanchormap
.two_
special StubbedTrainerRankings_Healings
special HealParty
@@ -47,7 +47,7 @@ MobileBattleRoomConsoleScript:
special Function10387b
writetext MobileBattleRoom_EstablishingCommsText
waitbutton
reloadmappart
refreshmap
special Function101225
.false
closetext

4
maps/MobileTradeRoom.asm
View File

@@ -18,11 +18,11 @@ MobileTradeRoomInitializeAndPreparePokecenter2FScript:
end
MobileTradeRoomConsoleScript:
refreshscreen
reanchormap
special Function1037c2
writetext MobileTradeRoom_EstablishingCommsText
waitbutton
reloadmappart
refreshmap
special Function101231
closetext
end

2
maps/Pokecenter2F.asm
View File

@@ -581,7 +581,7 @@ Script_LeftTimeCapsule:
end
Pokecenter2FLinkRecordSign:
refreshscreen
reanchormap
special DisplayLinkRecord
closetext
end

4
maps/PokecomCenterAdminOfficeMobile.asm
View File

@@ -22,7 +22,7 @@ PokecomCenterAdminOfficeMobileComputer1:
writetext PokecomCenterAdminOfficeMobileComputer1Text
waitbutton
.loop:
reloadmappart
refreshmap
loadmenu .Computer1MenuHeader
verticalmenu
closewindow
@@ -64,7 +64,7 @@ PokecomCenterAdminOfficeMobileComputer2:
writetext PokecomCenterAdminOfficeMobileComputer2Text
waitbutton
.loop:
reloadmappart
refreshmap
loadmenu .Computer2MenuHeader
verticalmenu
closewindow

2
maps/RadioTower2F.asm
View File

@@ -133,7 +133,7 @@ Buena:
waitbutton
closetext
turnobject RADIOTOWER2F_BUENA, DOWN
refreshscreen
reanchormap
special BuenasPassword
closetext
iffalse .WrongAnswer

2
maps/RadioTower3F.asm
View File

@@ -143,7 +143,7 @@ CardKeySlotScript::
playsound SFX_ENTER_DOOR
changeblock 14, 2, $2a ; open shutter
changeblock 14, 4, $01 ; floor
reloadmappart
refreshmap
closetext
waitsfx
end

6
maps/RuinsOfAlphAerodactylChamber.asm
View File

@@ -39,14 +39,14 @@ RuinsOfAlphAerodactylChamberWallOpenScript:
pause 30
playsound SFX_STRENGTH
changeblock 4, 0, $30 ; open wall
reloadmappart
refreshmap
earthquake 50
setscene SCENE_RUINSOFALPHAERODACTYLCHAMBER_NOOP
closetext
end
RuinsOfAlphAerodactylChamberPuzzle:
refreshscreen
reanchormap
setval UNOWNPUZZLE_AERODACTYL
special UnownPuzzle
closetext
@@ -62,7 +62,7 @@ RuinsOfAlphAerodactylChamberPuzzle:
showemote EMOTE_SHOCK, PLAYER, 15
changeblock 2, 2, $18 ; left hole
changeblock 4, 2, $19 ; right hole
reloadmappart
refreshmap
playsound SFX_STRENGTH
earthquake 80
applymovement PLAYER, RuinsOfAlphAerodactylChamberSkyfallTopMovement

6
maps/RuinsOfAlphHoOhChamber.asm
View File

@@ -40,14 +40,14 @@ RuinsOfAlphHoOhChamberWallOpenScript:
pause 30
playsound SFX_STRENGTH
changeblock 4, 0, $30 ; open wall
reloadmappart
refreshmap
earthquake 50
setscene SCENE_RUINSOFALPHHOOHCHAMBER_NOOP
closetext
end
RuinsOfAlphHoOhChamberPuzzle:
refreshscreen
reanchormap
setval UNOWNPUZZLE_HO_OH
special UnownPuzzle
closetext
@@ -63,7 +63,7 @@ RuinsOfAlphHoOhChamberPuzzle:
showemote EMOTE_SHOCK, PLAYER, 15
changeblock 2, 2, $18 ; left hole
changeblock 4, 2, $19 ; right hole
reloadmappart
refreshmap
playsound SFX_STRENGTH
earthquake 80
applymovement PLAYER, RuinsOfAlphHoOhChamberSkyfallTopMovement

6
maps/RuinsOfAlphKabutoChamber.asm
View File

@@ -43,7 +43,7 @@ RuinsOfAlphKabutoChamberWallOpenScript:
pause 30
playsound SFX_STRENGTH
changeblock 4, 0, $30 ; open wall
reloadmappart
refreshmap
earthquake 50
setscene SCENE_RUINSOFALPHKABUTOCHAMBER_NOOP
closetext
@@ -53,7 +53,7 @@ RuinsOfAlphKabutoChamberReceptionistScript:
jumptextfaceplayer RuinsOfAlphKabutoChamberReceptionistText
RuinsOfAlphKabutoChamberPuzzle:
refreshscreen
reanchormap
setval UNOWNPUZZLE_KABUTO
special UnownPuzzle
closetext
@@ -70,7 +70,7 @@ RuinsOfAlphKabutoChamberPuzzle:
showemote EMOTE_SHOCK, PLAYER, 15
changeblock 2, 2, $18 ; left hole
changeblock 4, 2, $19 ; right hole
reloadmappart
refreshmap
playsound SFX_STRENGTH
earthquake 80
applymovement PLAYER, RuinsOfAlphKabutoChamberSkyfallTopMovement

6
maps/RuinsOfAlphOmanyteChamber.asm
View File

@@ -40,14 +40,14 @@ RuinsOfAlphOmanyteChamberWallOpenScript:
pause 30
playsound SFX_STRENGTH
changeblock 4, 0, $30 ; open wall
reloadmappart
refreshmap
earthquake 50
setscene SCENE_RUINSOFALPHOMANYTECHAMBER_NOOP
closetext
end
RuinsOfAlphOmanyteChamberPuzzle:
refreshscreen
reanchormap
setval UNOWNPUZZLE_OMANYTE
special UnownPuzzle
closetext
@@ -63,7 +63,7 @@ RuinsOfAlphOmanyteChamberPuzzle:
showemote EMOTE_SHOCK, PLAYER, 15
changeblock 2, 2, $18 ; left hole
changeblock 4, 2, $19 ; right hole
reloadmappart
refreshmap
playsound SFX_STRENGTH
earthquake 80
applymovement PLAYER, RuinsOfAlphOmanyteChamberSkyfallTopMovement

2
maps/SilverCaveRoom3.asm
View File

@@ -30,7 +30,7 @@ Red:
special FadeInFromBlack
pause 30
special HealParty
refreshscreen
reanchormap
credits
end

2
maps/TeamRocketBaseB2F.asm
View File

@@ -329,7 +329,7 @@ TeamRocketBaseB2FLockedDoor:
waitbutton
playsound SFX_ENTER_DOOR
changeblock 14, 12, $07 ; floor
reloadmappart
refreshmap
closetext
setevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
waitsfx

2
maps/TeamRocketBaseB3F.asm
View File

@@ -193,7 +193,7 @@ TeamRocketBaseB3FLockedDoor:
waitbutton
playsound SFX_ENTER_DOOR
changeblock 10, 8, $07 ; floor
reloadmappart
refreshmap
closetext
setevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE
waitsfx

4
maps/TinTower1F.asm
View File

@@ -195,12 +195,12 @@ TinTower1FSage5Script:
promptbutton
verbosegiveitem RAINBOW_WING
closetext
refreshscreen
reanchormap
earthquake 72
waitsfx
playsound SFX_STRENGTH
changeblock 10, 2, $20 ; stairs
reloadmappart
refreshmap
setevent EVENT_GOT_RAINBOW_WING
closetext
opentext

6
maps/WillsRoom.asm
View File

@@ -29,11 +29,11 @@ WillsRoomDoorsCallback:
WillsRoomDoorLocksBehindYouScript:
applymovement PLAYER, WillsRoom_EnterMovement
refreshscreen $86
reanchormap $86
playsound SFX_STRENGTH
earthquake 80
changeblock 4, 14, $2a ; wall
reloadmappart
refreshmap
closetext
setscene SCENE_WILLSROOM_NOOP
setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
@@ -59,7 +59,7 @@ WillScript_Battle:
closetext
playsound SFX_ENTER_DOOR
changeblock 4, 2, $16 ; open door
reloadmappart
refreshmap
closetext
setevent EVENT_WILLS_ROOM_EXIT_OPEN
waitsfx