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

4
docs/event_commands.md
View File

@@ -257,7 +257,7 @@ If <code><i>item_id</i></code> = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
## `$47`: `opentext` ## `$47`: `opentext`
## `$48`: <code>refreshscreen [<i>dummy</i>=0]</code> ## `$48`: <code>reanchormap [<i>dummy</i>=0]</code>
## `$49`: `closetext` ## `$49`: `closetext`
@@ -419,7 +419,7 @@ If <code><i>item_id</i></code> = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
## `$7B`: `reloadmap` ## `$7B`: `reloadmap`
## `$7C`: `reloadmappart` ## `$7C`: `refreshmap`
## `$7D`: <code>writecmdqueue <i>queue_pointer</i></code> ## `$7D`: <code>writecmdqueue <i>queue_pointer</i></code>

4
engine/events/itemfinder.asm
View File

@@ -27,7 +27,7 @@ ItemFinder:
ret ret
.Script_FoundSomething: .Script_FoundSomething:
reloadmappart refreshmap
special UpdateTimePals special UpdateTimePals
callasm .ItemfinderSound callasm .ItemfinderSound
writetext .ItemfinderItemNearbyText writetext .ItemfinderItemNearbyText
@@ -35,7 +35,7 @@ ItemFinder:
end end
.Script_FoundNothing: .Script_FoundNothing:
reloadmappart refreshmap
special UpdateTimePals special UpdateTimePals
writetext .ItemfinderNopeText writetext .ItemfinderNopeText
closetext closetext

36
engine/events/overworld.asm
View File

@@ -200,13 +200,13 @@ CheckMapForSomethingToCut:
ret ret
Script_CutFromMenu: Script_CutFromMenu:
reloadmappart refreshmap
special UpdateTimePals special UpdateTimePals
Script_Cut: Script_Cut:
callasm GetPartyNickname callasm GetPartyNickname
writetext UseCutText writetext UseCutText
reloadmappart refreshmap
callasm CutDownTreeOrGrass callasm CutDownTreeOrGrass
closetext closetext
end end
@@ -307,7 +307,7 @@ UseFlash:
jp QueueScript jp QueueScript
Script_UseFlash: Script_UseFlash:
reloadmappart refreshmap
special UpdateTimePals special UpdateTimePals
writetext UseFlashTextScript writetext UseFlashTextScript
callasm BlindingFlash callasm BlindingFlash
@@ -608,7 +608,7 @@ FlyFunction:
ret ret
.FlyScript: .FlyScript:
reloadmappart refreshmap
callasm HideSprites callasm HideSprites
special UpdateTimePals special UpdateTimePals
callasm FlyFromAnim callasm FlyFromAnim
@@ -668,7 +668,7 @@ CheckMapCanWaterfall:
ret ret
Script_WaterfallFromMenu: Script_WaterfallFromMenu:
reloadmappart refreshmap
special UpdateTimePals special UpdateTimePals
Script_UsedWaterfall: Script_UsedWaterfall:
@@ -838,13 +838,13 @@ EscapeRopeOrDig:
text_end text_end
.UsedEscapeRopeScript: .UsedEscapeRopeScript:
reloadmappart refreshmap
special UpdateTimePals special UpdateTimePals
writetext .UseEscapeRopeText writetext .UseEscapeRopeText
sjump .UsedDigOrEscapeRopeScript sjump .UsedDigOrEscapeRopeScript
.UsedDigScript: .UsedDigScript:
reloadmappart refreshmap
special UpdateTimePals special UpdateTimePals
writetext .UseDigText writetext .UseDigText
@@ -930,11 +930,11 @@ TeleportFunction:
text_end text_end
.TeleportScript: .TeleportScript:
reloadmappart refreshmap
special UpdateTimePals special UpdateTimePals
writetext .TeleportReturnText writetext .TeleportReturnText
pause 60 pause 60
reloadmappart refreshmap
closetext closetext
playsound SFX_WARP_TO playsound SFX_WARP_TO
applymovement PLAYER, .TeleportFrom applymovement PLAYER, .TeleportFrom
@@ -1000,7 +1000,7 @@ SetStrengthFlag:
ret ret
Script_StrengthFromMenu: Script_StrengthFromMenu:
reloadmappart refreshmap
special UpdateTimePals special UpdateTimePals
Script_UsedStrength: Script_UsedStrength:
@@ -1159,13 +1159,13 @@ TryWhirlpoolMenu:
ret ret
Script_WhirlpoolFromMenu: Script_WhirlpoolFromMenu:
reloadmappart refreshmap
special UpdateTimePals special UpdateTimePals
Script_UsedWhirlpool: Script_UsedWhirlpool:
callasm GetPartyNickname callasm GetPartyNickname
writetext UseWhirlpoolText writetext UseWhirlpoolText
reloadmappart refreshmap
callasm DisappearWhirlpool callasm DisappearWhirlpool
closetext closetext
end end
@@ -1258,14 +1258,14 @@ HeadbuttNothingText:
text_end text_end
HeadbuttFromMenuScript: HeadbuttFromMenuScript:
reloadmappart refreshmap
special UpdateTimePals special UpdateTimePals
HeadbuttScript: HeadbuttScript:
callasm GetPartyNickname callasm GetPartyNickname
writetext UseHeadbuttText writetext UseHeadbuttText
reloadmappart refreshmap
callasm ShakeHeadbuttTree callasm ShakeHeadbuttTree
callasm TreeMonEncounter callasm TreeMonEncounter
@@ -1355,7 +1355,7 @@ GetFacingObject:
ret ret
RockSmashFromMenuScript: RockSmashFromMenuScript:
reloadmappart refreshmap
special UpdateTimePals special UpdateTimePals
RockSmashScript: RockSmashScript:
@@ -1582,7 +1582,7 @@ Fishing_CheckFacingUp:
ret ret
Script_FishCastRod: Script_FishCastRod:
reloadmappart refreshmap
loadmem hBGMapMode, $0 loadmem hBGMapMode, $0
special UpdateTimePals special UpdateTimePals
loademote EMOTE_ROD loademote EMOTE_ROD
@@ -1704,7 +1704,7 @@ BikeFunction:
ret ret
Script_GetOnBike: Script_GetOnBike:
reloadmappart refreshmap
special UpdateTimePals special UpdateTimePals
loadvar VAR_MOVEMENT, PLAYER_BIKE loadvar VAR_MOVEMENT, PLAYER_BIKE
writetext GotOnBikeText writetext GotOnBikeText
@@ -1724,7 +1724,7 @@ Overworld_DummyFunction: ; unreferenced
ret ret
Script_GetOffBike: Script_GetOffBike:
reloadmappart refreshmap
special UpdateTimePals special UpdateTimePals
loadvar VAR_MOVEMENT, PLAYER_NORMAL loadvar VAR_MOVEMENT, PLAYER_NORMAL
writetext GotOffBikeText writetext GotOffBikeText

2
engine/events/sacred_ash.asm
View File

@@ -47,7 +47,7 @@ CheckAnyFaintedMon:
SacredAshScript: SacredAshScript:
special HealParty special HealParty
reloadmappart refreshmap
playsound SFX_WARP_TO playsound SFX_WARP_TO
special FadeOutToWhite special FadeOutToWhite
special FadeInFromWhite special FadeInFromWhite

2
engine/events/squirtbottle.asm
View File

@@ -6,7 +6,7 @@ _Squirtbottle:
ret ret
.SquirtbottleScript: .SquirtbottleScript:
reloadmappart refreshmap
special UpdateTimePals special UpdateTimePals
callasm .CheckCanUseSquirtbottle callasm .CheckCanUseSquirtbottle
iffalse .SquirtbottleNothingScript iffalse .SquirtbottleNothingScript

2
engine/events/sweet_scent.asm
View File

@@ -6,7 +6,7 @@ SweetScentFromMenu:
ret ret
.SweetScent: .SweetScent:
reloadmappart refreshmap
special UpdateTimePals special UpdateTimePals
callasm GetPartyNickname callasm GetPartyNickname
writetext UseSweetScentText writetext UseSweetScentText

2
engine/events/whiteout.asm
View File

@@ -3,7 +3,7 @@ Script_BattleWhiteout::
sjump Script_Whiteout sjump Script_Whiteout
OverworldWhiteoutScript:: OverworldWhiteoutScript::
refreshscreen reanchormap
callasm OverworldBGMap callasm OverworldBGMap
Script_Whiteout: Script_Whiteout:

10
engine/overworld/scripting.asm
View File

@@ -136,7 +136,7 @@ ScriptCommandTable:
dw Script_itemnotify ; 45 dw Script_itemnotify ; 45
dw Script_pocketisfull ; 46 dw Script_pocketisfull ; 46
dw Script_opentext ; 47 dw Script_opentext ; 47
dw Script_refreshscreen ; 48 dw Script_reanchormap ; 48
dw Script_closetext ; 49 dw Script_closetext ; 49
dw Script_writeunusedbyte ; 4a dw Script_writeunusedbyte ; 4a
dw Script_farwritetext ; 4b dw Script_farwritetext ; 4b
@@ -188,7 +188,7 @@ ScriptCommandTable:
dw Script_changemapblocks ; 79 dw Script_changemapblocks ; 79
dw Script_changeblock ; 7a dw Script_changeblock ; 7a
dw Script_reloadmap ; 7b dw Script_reloadmap ; 7b
dw Script_reloadmappart ; 7c dw Script_refreshmap ; 7c
dw Script_writecmdqueue ; 7d dw Script_writecmdqueue ; 7d
dw Script_delcmdqueue ; 7e dw Script_delcmdqueue ; 7e
dw Script_playmusic ; 7f dw Script_playmusic ; 7f
@@ -2157,7 +2157,7 @@ Script_changeblock:
call BufferScreen call BufferScreen
ret ret
Script_reloadmappart:: Script_refreshmap::
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
call LoadOverworldTilemapAndAttrmapPals call LoadOverworldTilemapAndAttrmapPals
@@ -2192,8 +2192,8 @@ Script_opentext:
call OpenText call OpenText
ret ret
Script_refreshscreen: Script_reanchormap:
call RefreshScreen call ReanchorMap
call GetScriptByte call GetScriptByte
ret ret

6
engine/overworld/select_menu.asm
View File

@@ -139,7 +139,7 @@ UseRegisteredItem:
ret ret
.Party: .Party:
call RefreshScreen call ReanchorMap
call FadeToMenu call FadeToMenu
call DoItemEffect call DoItemEffect
call CloseSubmenu call CloseSubmenu
@@ -148,7 +148,7 @@ UseRegisteredItem:
ret ret
.Overworld: .Overworld:
call RefreshScreen call ReanchorMap
ld a, 1 ld a, 1
ld [wUsingItemWithSelect], a ld [wUsingItemWithSelect], a
call DoItemEffect call DoItemEffect
@@ -163,7 +163,7 @@ UseRegisteredItem:
ret ret
.CantUse: .CantUse:
call RefreshScreen call ReanchorMap
._cantuse ._cantuse
call CantUseItem call CantUseItem

2
engine/phone/phone.asm
View File

@@ -422,7 +422,7 @@ WrongNumber:
text_end text_end
Script_ReceivePhoneCall: Script_ReceivePhoneCall:
refreshscreen reanchormap
callasm RingTwice_StartCall callasm RingTwice_StartCall
memcall wCallerContact + PHONE_CONTACT_SCRIPT2_BANK memcall wCallerContact + PHONE_CONTACT_SCRIPT2_BANK
waitbutton waitbutton

2
engine/pokemon/breeding.asm
View File

@@ -196,7 +196,7 @@ DoEggStep::
jr .loop jr .loop
OverworldHatchEgg:: OverworldHatchEgg::
call RefreshScreen call ReanchorMap
call LoadStandardMenuHeader call LoadStandardMenuHeader
call HatchEggs call HatchEggs
call ExitAllMenus call ExitAllMenus

2
home/window.asm
View File

@@ -1,4 +1,4 @@
RefreshScreen:: ReanchorMap::
call ClearWindowData call ClearWindowData
ldh a, [hROMBank] ldh a, [hROMBank]
push af push af

14
macros/scripts/events.asm
View File

@@ -476,12 +476,12 @@ MACRO opentext
db opentext_command db opentext_command
ENDM ENDM
const refreshscreen_command ; $48 const reanchormap_command ; $48
MACRO refreshscreen MACRO reanchormap
if _NARG == 0 if _NARG == 0
refreshscreen 0 reanchormap 0
else else
db refreshscreen_command db reanchormap_command
db \1 ; dummy db \1 ; dummy
endc endc
ENDM ENDM
@@ -789,9 +789,9 @@ MACRO reloadmap
db reloadmap_command db reloadmap_command
ENDM ENDM
const reloadmappart_command ; $7c const refreshmap_command ; $7c
MACRO reloadmappart MACRO refreshmap
db reloadmappart_command db refreshmap_command
ENDM ENDM
const writecmdqueue_command ; $7d const writecmdqueue_command ; $7d

6
maps/BrunosRoom.asm
View File

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

2
maps/BurnedTower1F.asm
View File

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

4
maps/BurnedTowerB1F.asm
View File

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

6
maps/CeladonGameCorner.asm
View File

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

6
maps/ElmsLab.asm
View File

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

6
maps/GoldenrodGameCorner.asm
View File

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

2
maps/GoldenrodUnderground.asm
View File

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

16
maps/GoldenrodUndergroundSwitchRoomEntrances.asm
View File

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

6
maps/KarensRoom.asm
View File

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

6
maps/KogasRoom.asm
View File

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

6
maps/LancesRoom.asm
View File

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

2
maps/MahoganyMart1F.asm
View File

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

6
maps/MobileBattleRoom.asm
View File

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

4
maps/MobileTradeRoom.asm
View File

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

2
maps/Pokecenter2F.asm
View File

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

4
maps/PokecomCenterAdminOfficeMobile.asm
View File

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

2
maps/RadioTower2F.asm
View File

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

2
maps/RadioTower3F.asm
View File

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

6
maps/RuinsOfAlphAerodactylChamber.asm
View File

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

6
maps/RuinsOfAlphHoOhChamber.asm
View File

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

6
maps/RuinsOfAlphKabutoChamber.asm
View File

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

6
maps/RuinsOfAlphOmanyteChamber.asm
View File

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

2
maps/SilverCaveRoom3.asm
View File

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

2
maps/TeamRocketBaseB2F.asm
View File

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

2
maps/TeamRocketBaseB3F.asm
View File

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

4
maps/TinTower1F.asm
View File

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

6
maps/WillsRoom.asm
View File

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

10
mobile/mobile_40.asm
View File

@@ -360,7 +360,7 @@ Function100276:
ret ret
.asm_100296 .asm_100296
farcall Script_reloadmappart farcall Script_refreshmap
ld c, $04 ld c, $04
ret ret
@@ -370,7 +370,7 @@ Function100276:
ret ret
.asm_1002a5 .asm_1002a5
farcall Script_reloadmappart farcall Script_refreshmap
call Function1002ed call Function1002ed
ld c, $03 ld c, $03
ret ret
@@ -2737,7 +2737,7 @@ Jumptable_101247:
Function101251: Function101251:
call UpdateSprites call UpdateSprites
call RefreshScreen call ReanchorMap
ld hl, ClosingLinkText ld hl, ClosingLinkText
call Function1021e0 call Function1021e0
call Function1020ea call Function1020ea
@@ -2752,7 +2752,7 @@ Function101265:
Function10126c: Function10126c:
call UpdateSprites call UpdateSprites
farcall Script_reloadmappart farcall Script_refreshmap
ld hl, ClosingLinkText ld hl, ClosingLinkText
call Function1021e0 call Function1021e0
ret ret
@@ -7652,7 +7652,7 @@ Function10383c:
ld hl, PickThreeMonForMobileBattleText ld hl, PickThreeMonForMobileBattleText
call PrintText call PrintText
call JoyWaitAorB call JoyWaitAorB
farcall Script_reloadmappart farcall Script_refreshmap
farcall Function4a94e farcall Function4a94e
jr c, .asm_103870 jr c, .asm_103870
ld hl, wd002 ld hl, wd002

4
ram/wram.asm
View File

@@ -1303,8 +1303,8 @@ SECTION "Video", WRAM0
UNION UNION
; bg map ; bg map
wBGMapBuffer:: ds 40 wBGMapBuffer:: ds 2 * SCREEN_WIDTH
wBGMapPalBuffer:: ds 40 wBGMapPalBuffer:: ds 2 * SCREEN_WIDTH
wBGMapBufferPointers:: ds 20 * 2 wBGMapBufferPointers:: ds 20 * 2
wBGMapBufferEnd:: wBGMapBufferEnd::