more accurate script names: refreshscreen -> reanchormap, and reloadm…

…appart -> refreshmap (#1078)
pret · Jan 7, 2024 · 7f3b879 · 7f3b879
1 parent f72f078
commit 7f3b879
Show file tree

Hide file tree

Showing 42 changed files with 115 additions and 115 deletions.
diff --git a/docs/event_commands.md b/docs/event_commands.md
@@ -257,7 +257,7 @@ If <code><i>item_id</i></code> = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
 ## `$47`: `opentext`
 
 
-## `$48`: <code>refreshscreen [<i>dummy</i>=0]</code>
+## `$48`: <code>reanchormap [<i>dummy</i>=0]</code>
 
 
 ## `$49`: `closetext`
@@ -419,7 +419,7 @@ If <code><i>item_id</i></code> = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
 ## `$7B`: `reloadmap`
 
 
-## `$7C`: `reloadmappart`
+## `$7C`: `refreshmap`
 
 
 ## `$7D`: <code>writecmdqueue <i>queue_pointer</i></code>

diff --git a/engine/events/itemfinder.asm b/engine/events/itemfinder.asm
@@ -27,15 +27,15 @@ ItemFinder:
 	ret
 
 .Script_FoundSomething:
-	reloadmappart
+	refreshmap
 	special UpdateTimePals
 	callasm .ItemfinderSound
 	writetext .ItemfinderItemNearbyText
 	closetext
 	end
 
 .Script_FoundNothing:
-	reloadmappart
+	refreshmap
 	special UpdateTimePals
 	writetext .ItemfinderNopeText
 	closetext

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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