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
engine/events/itemfinder.asm
View File

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

36
engine/events/overworld.asm
View File

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

2
engine/events/sacred_ash.asm
View File

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

2
engine/events/squirtbottle.asm
View File

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

2
engine/events/sweet_scent.asm
View File

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

2
engine/events/whiteout.asm
View File

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

10
engine/overworld/scripting.asm
View File

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

6
engine/overworld/select_menu.asm
View File

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

2
engine/phone/phone.asm
View File

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

2
engine/pokemon/breeding.asm
View File

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