diff --git a/docs/event_commands.md b/docs/event_commands.md
index 8e878a758d6..d552b14bb45 100644
--- a/docs/event_commands.md
+++ b/docs/event_commands.md
@@ -257,7 +257,7 @@ If item_id = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
## `$47`: `opentext`
-## `$48`: refreshscreen [dummy=0]
+## `$48`: reanchormap [dummy=0]
## `$49`: `closetext`
@@ -419,7 +419,7 @@ If item_id = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
## `$7B`: `reloadmap`
-## `$7C`: `reloadmappart`
+## `$7C`: `refreshmap`
## `$7D`: writecmdqueue queue_pointer
diff --git a/engine/events/itemfinder.asm b/engine/events/itemfinder.asm
index 3665187c8d7..f2bea5f9a66 100644
--- a/engine/events/itemfinder.asm
+++ b/engine/events/itemfinder.asm
@@ -27,7 +27,7 @@ ItemFinder:
ret
.Script_FoundSomething:
- reloadmappart
+ refreshmap
special UpdateTimePals
callasm .ItemfinderSound
writetext .ItemfinderItemNearbyText
@@ -35,7 +35,7 @@ ItemFinder:
end
.Script_FoundNothing:
- reloadmappart
+ refreshmap
special UpdateTimePals
writetext .ItemfinderNopeText
closetext
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index ac9e6cdf455..5945d66cb99 100644
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -200,13 +200,13 @@ CheckMapForSomethingToCut:
ret
Script_CutFromMenu:
- reloadmappart
+ refreshmap
special UpdateTimePals
Script_Cut:
callasm GetPartyNickname
writetext UseCutText
- reloadmappart
+ refreshmap
callasm CutDownTreeOrGrass
closetext
end
@@ -307,7 +307,7 @@ UseFlash:
jp QueueScript
Script_UseFlash:
- reloadmappart
+ refreshmap
special UpdateTimePals
writetext UseFlashTextScript
callasm BlindingFlash
@@ -608,7 +608,7 @@ FlyFunction:
ret
.FlyScript:
- reloadmappart
+ refreshmap
callasm HideSprites
special UpdateTimePals
callasm FlyFromAnim
@@ -668,7 +668,7 @@ CheckMapCanWaterfall:
ret
Script_WaterfallFromMenu:
- reloadmappart
+ refreshmap
special UpdateTimePals
Script_UsedWaterfall:
@@ -838,13 +838,13 @@ EscapeRopeOrDig:
text_end
.UsedEscapeRopeScript:
- reloadmappart
+ refreshmap
special UpdateTimePals
writetext .UseEscapeRopeText
sjump .UsedDigOrEscapeRopeScript
.UsedDigScript:
- reloadmappart
+ refreshmap
special UpdateTimePals
writetext .UseDigText
@@ -930,11 +930,11 @@ TeleportFunction:
text_end
.TeleportScript:
- reloadmappart
+ refreshmap
special UpdateTimePals
writetext .TeleportReturnText
pause 60
- reloadmappart
+ refreshmap
closetext
playsound SFX_WARP_TO
applymovement PLAYER, .TeleportFrom
@@ -1000,7 +1000,7 @@ SetStrengthFlag:
ret
Script_StrengthFromMenu:
- reloadmappart
+ refreshmap
special UpdateTimePals
Script_UsedStrength:
@@ -1159,13 +1159,13 @@ TryWhirlpoolMenu:
ret
Script_WhirlpoolFromMenu:
- reloadmappart
+ refreshmap
special UpdateTimePals
Script_UsedWhirlpool:
callasm GetPartyNickname
writetext UseWhirlpoolText
- reloadmappart
+ refreshmap
callasm DisappearWhirlpool
closetext
end
@@ -1258,14 +1258,14 @@ HeadbuttNothingText:
text_end
HeadbuttFromMenuScript:
- reloadmappart
+ refreshmap
special UpdateTimePals
HeadbuttScript:
callasm GetPartyNickname
writetext UseHeadbuttText
- reloadmappart
+ refreshmap
callasm ShakeHeadbuttTree
callasm TreeMonEncounter
@@ -1355,7 +1355,7 @@ GetFacingObject:
ret
RockSmashFromMenuScript:
- reloadmappart
+ refreshmap
special UpdateTimePals
RockSmashScript:
@@ -1582,7 +1582,7 @@ Fishing_CheckFacingUp:
ret
Script_FishCastRod:
- reloadmappart
+ refreshmap
loadmem hBGMapMode, $0
special UpdateTimePals
loademote EMOTE_ROD
@@ -1704,7 +1704,7 @@ BikeFunction:
ret
Script_GetOnBike:
- reloadmappart
+ refreshmap
special UpdateTimePals
loadvar VAR_MOVEMENT, PLAYER_BIKE
writetext GotOnBikeText
@@ -1724,7 +1724,7 @@ Overworld_DummyFunction: ; unreferenced
ret
Script_GetOffBike:
- reloadmappart
+ refreshmap
special UpdateTimePals
loadvar VAR_MOVEMENT, PLAYER_NORMAL
writetext GotOffBikeText
diff --git a/engine/events/sacred_ash.asm b/engine/events/sacred_ash.asm
index 83b16d60001..c9f62a9a1b1 100644
--- a/engine/events/sacred_ash.asm
+++ b/engine/events/sacred_ash.asm
@@ -47,7 +47,7 @@ CheckAnyFaintedMon:
SacredAshScript:
special HealParty
- reloadmappart
+ refreshmap
playsound SFX_WARP_TO
special FadeOutToWhite
special FadeInFromWhite
diff --git a/engine/events/squirtbottle.asm b/engine/events/squirtbottle.asm
index 411b5c2e295..357d1132cc1 100644
--- a/engine/events/squirtbottle.asm
+++ b/engine/events/squirtbottle.asm
@@ -6,7 +6,7 @@ _Squirtbottle:
ret
.SquirtbottleScript:
- reloadmappart
+ refreshmap
special UpdateTimePals
callasm .CheckCanUseSquirtbottle
iffalse .SquirtbottleNothingScript
diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm
index 05a6afc3ead..c6c6896c331 100644
--- a/engine/events/sweet_scent.asm
+++ b/engine/events/sweet_scent.asm
@@ -6,7 +6,7 @@ SweetScentFromMenu:
ret
.SweetScent:
- reloadmappart
+ refreshmap
special UpdateTimePals
callasm GetPartyNickname
writetext UseSweetScentText
diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm
index 4f5325e00b0..7775273a57d 100644
--- a/engine/events/whiteout.asm
+++ b/engine/events/whiteout.asm
@@ -3,7 +3,7 @@ Script_BattleWhiteout::
sjump Script_Whiteout
OverworldWhiteoutScript::
- refreshscreen
+ reanchormap
callasm OverworldBGMap
Script_Whiteout:
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 9b4fc8edb35..787490e7d86 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -136,7 +136,7 @@ ScriptCommandTable:
dw Script_itemnotify ; 45
dw Script_pocketisfull ; 46
dw Script_opentext ; 47
- dw Script_refreshscreen ; 48
+ dw Script_reanchormap ; 48
dw Script_closetext ; 49
dw Script_writeunusedbyte ; 4a
dw Script_farwritetext ; 4b
@@ -188,7 +188,7 @@ ScriptCommandTable:
dw Script_changemapblocks ; 79
dw Script_changeblock ; 7a
dw Script_reloadmap ; 7b
- dw Script_reloadmappart ; 7c
+ dw Script_refreshmap ; 7c
dw Script_writecmdqueue ; 7d
dw Script_delcmdqueue ; 7e
dw Script_playmusic ; 7f
@@ -2157,7 +2157,7 @@ Script_changeblock:
call BufferScreen
ret
-Script_reloadmappart::
+Script_refreshmap::
xor a
ldh [hBGMapMode], a
call LoadOverworldTilemapAndAttrmapPals
@@ -2192,8 +2192,8 @@ Script_opentext:
call OpenText
ret
-Script_refreshscreen:
- call RefreshScreen
+Script_reanchormap:
+ call ReanchorMap
call GetScriptByte
ret
diff --git a/engine/overworld/select_menu.asm b/engine/overworld/select_menu.asm
index bdd3633ed19..f507b7b3fcb 100644
--- a/engine/overworld/select_menu.asm
+++ b/engine/overworld/select_menu.asm
@@ -139,7 +139,7 @@ UseRegisteredItem:
ret
.Party:
- call RefreshScreen
+ call ReanchorMap
call FadeToMenu
call DoItemEffect
call CloseSubmenu
@@ -148,7 +148,7 @@ UseRegisteredItem:
ret
.Overworld:
- call RefreshScreen
+ call ReanchorMap
ld a, 1
ld [wUsingItemWithSelect], a
call DoItemEffect
@@ -163,7 +163,7 @@ UseRegisteredItem:
ret
.CantUse:
- call RefreshScreen
+ call ReanchorMap
._cantuse
call CantUseItem
diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm
index 0c5890bde3b..f35dc3d7ed8 100644
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -422,7 +422,7 @@ WrongNumber:
text_end
Script_ReceivePhoneCall:
- refreshscreen
+ reanchormap
callasm RingTwice_StartCall
memcall wCallerContact + PHONE_CONTACT_SCRIPT2_BANK
waitbutton
diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm
index 232cbc7e0ac..da58d8480e7 100644
--- a/engine/pokemon/breeding.asm
+++ b/engine/pokemon/breeding.asm
@@ -196,7 +196,7 @@ DoEggStep::
jr .loop
OverworldHatchEgg::
- call RefreshScreen
+ call ReanchorMap
call LoadStandardMenuHeader
call HatchEggs
call ExitAllMenus
diff --git a/home/window.asm b/home/window.asm
index 87406924918..05884a39fa9 100644
--- a/home/window.asm
+++ b/home/window.asm
@@ -1,4 +1,4 @@
-RefreshScreen::
+ReanchorMap::
call ClearWindowData
ldh a, [hROMBank]
push af
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm
index f22df182779..9088bde93e6 100644
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -476,12 +476,12 @@ MACRO opentext
db opentext_command
ENDM
- const refreshscreen_command ; $48
-MACRO refreshscreen
+ const reanchormap_command ; $48
+MACRO reanchormap
if _NARG == 0
- refreshscreen 0
+ reanchormap 0
else
- db refreshscreen_command
+ db reanchormap_command
db \1 ; dummy
endc
ENDM
@@ -789,9 +789,9 @@ MACRO reloadmap
db reloadmap_command
ENDM
- const reloadmappart_command ; $7c
-MACRO reloadmappart
- db reloadmappart_command
+ const refreshmap_command ; $7c
+MACRO refreshmap
+ db refreshmap_command
ENDM
const writecmdqueue_command ; $7d
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index 32e84898c73..8da0d885086 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -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
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index 60e0b8a310f..3fb09b2589d 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -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
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index c3d148bcc6a..a4d97330c28 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -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
diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
index 37686168c1f..fa005c86cfa 100644
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -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
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 5bead9e4d02..7636b3f4abd 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -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
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index d8072316882..2a1c7ec82d6 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -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
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index a7bbd404780..69b98e13dc1 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -386,7 +386,7 @@ BasementDoorScript::
waitbutton
closetext
changeblock 18, 6, $2e ; unlocked door
- reloadmappart
+ refreshmap
closetext
setevent EVENT_USED_BASEMENT_KEY
end
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index b0dbf26904f..e982c47e8bd 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -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
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index beeb804c15f..013b05d38cc 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -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
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index 85c58d08f1f..972883cbf7b 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -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
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index a168dab31e3..bd7898466af 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -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
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index f6c9587df52..56439ea3319 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -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
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 0e9bfd1c3b2..f96903d24ac 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -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
diff --git a/maps/MobileTradeRoom.asm b/maps/MobileTradeRoom.asm
index 96d7535acba..1edadf12f9b 100644
--- a/maps/MobileTradeRoom.asm
+++ b/maps/MobileTradeRoom.asm
@@ -18,11 +18,11 @@ MobileTradeRoomInitializeAndPreparePokecenter2FScript:
end
MobileTradeRoomConsoleScript:
- refreshscreen
+ reanchormap
special Function1037c2
writetext MobileTradeRoom_EstablishingCommsText
waitbutton
- reloadmappart
+ refreshmap
special Function101231
closetext
end
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 6f657e8e87d..2af63b6aa2a 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -581,7 +581,7 @@ Script_LeftTimeCapsule:
end
Pokecenter2FLinkRecordSign:
- refreshscreen
+ reanchormap
special DisplayLinkRecord
closetext
end
diff --git a/maps/PokecomCenterAdminOfficeMobile.asm b/maps/PokecomCenterAdminOfficeMobile.asm
index 605cc7b3214..5b65e95dc9d 100644
--- a/maps/PokecomCenterAdminOfficeMobile.asm
+++ b/maps/PokecomCenterAdminOfficeMobile.asm
@@ -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
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index b41e18b6e87..b7c9d55c1eb 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -133,7 +133,7 @@ Buena:
waitbutton
closetext
turnobject RADIOTOWER2F_BUENA, DOWN
- refreshscreen
+ reanchormap
special BuenasPassword
closetext
iffalse .WrongAnswer
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
index f7c4be9039e..7514e031477 100644
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -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
diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm
index d52ef8005f4..9077c7931c2 100644
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -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
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index 226ff9b8d92..1460aa328e4 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -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
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index 73fff828c79..2f2212ff802 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -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
diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm
index dcfb6ef7db5..9fc9f42764f 100644
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -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
diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm
index 922866c052a..c1fdd49f1ae 100644
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -30,7 +30,7 @@ Red:
special FadeInFromBlack
pause 30
special HealParty
- refreshscreen
+ reanchormap
credits
end
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index e4ddafb2f76..f0396e7c725 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -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
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 813630255b7..bc84def0912 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -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
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index 79fb675bacf..09032125e27 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -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
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index 0dbcf877447..47753d2fc79 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -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
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm
index 9fab36646a8..f72fa07b5ae 100644
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -360,7 +360,7 @@ Function100276:
ret
.asm_100296
- farcall Script_reloadmappart
+ farcall Script_refreshmap
ld c, $04
ret
@@ -370,7 +370,7 @@ Function100276:
ret
.asm_1002a5
- farcall Script_reloadmappart
+ farcall Script_refreshmap
call Function1002ed
ld c, $03
ret
@@ -2737,7 +2737,7 @@ Jumptable_101247:
Function101251:
call UpdateSprites
- call RefreshScreen
+ call ReanchorMap
ld hl, ClosingLinkText
call Function1021e0
call Function1020ea
@@ -2752,7 +2752,7 @@ Function101265:
Function10126c:
call UpdateSprites
- farcall Script_reloadmappart
+ farcall Script_refreshmap
ld hl, ClosingLinkText
call Function1021e0
ret
@@ -7652,7 +7652,7 @@ Function10383c:
ld hl, PickThreeMonForMobileBattleText
call PrintText
call JoyWaitAorB
- farcall Script_reloadmappart
+ farcall Script_refreshmap
farcall Function4a94e
jr c, .asm_103870
ld hl, wd002
diff --git a/ram/wram.asm b/ram/wram.asm
index 539434dd042..38be291f74f 100644
--- a/ram/wram.asm
+++ b/ram/wram.asm
@@ -1303,8 +1303,8 @@ SECTION "Video", WRAM0
UNION
; bg map
-wBGMapBuffer:: ds 40
-wBGMapPalBuffer:: ds 40
+wBGMapBuffer:: ds 2 * SCREEN_WIDTH
+wBGMapPalBuffer:: ds 2 * SCREEN_WIDTH
wBGMapBufferPointers:: ds 20 * 2
wBGMapBufferEnd::