mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
ReplaceKrisSprite -> UpdatePlayerSprite
This commit is contained in:
parent
f76dabedcc
commit
f2550fc3c2
@ -67,7 +67,7 @@ SpecialsPointers::
|
||||
add_special UpdateTimePals ; bank 0
|
||||
add_special ClearTilemap ; bank 0
|
||||
add_special UpdateSprites ; bank 0
|
||||
add_special ReplaceKrisSprite ; bank 0
|
||||
add_special UpdatePlayerSprite ; bank 0
|
||||
add_special GameCornerPrizeMonCheckDex
|
||||
add_special UnusedSetSeenMon
|
||||
add_special WaitSFX ; bank 0
|
||||
|
@ -1766,7 +1766,7 @@ First, edit `UsedSurfScript` in [engine/events/overworld.asm](https://github.com
|
||||
readmem wBuffer2
|
||||
writevar VAR_MOVEMENT
|
||||
|
||||
special ReplaceKrisSprite
|
||||
special UpdatePlayerSprite
|
||||
special PlayMapMusic
|
||||
-; step into the water (slow_step DIR, step_end)
|
||||
special SurfStartStep
|
||||
|
@ -72,7 +72,7 @@ ShakeHeadbuttTree:
|
||||
ld hl, vTiles1
|
||||
lb bc, BANK(Font), 12
|
||||
call Get1bpp
|
||||
call ReplaceKrisSprite
|
||||
call UpdatePlayerSprite
|
||||
ret
|
||||
|
||||
HeadbuttTreeGFX:
|
||||
|
@ -412,7 +412,7 @@ UsedSurfScript:
|
||||
readmem wBuffer2
|
||||
writevar VAR_MOVEMENT
|
||||
|
||||
special ReplaceKrisSprite
|
||||
special UpdatePlayerSprite
|
||||
special PlayMapMusic
|
||||
; step into the water (slow_step DIR, step_end)
|
||||
special SurfStartStep
|
||||
@ -628,7 +628,7 @@ FlyFunction:
|
||||
.ReturnFromFly:
|
||||
farcall Function561d
|
||||
call DelayFrame
|
||||
call ReplaceKrisSprite
|
||||
call UpdatePlayerSprite
|
||||
farcall LoadOverworldFont
|
||||
ret
|
||||
|
||||
@ -1605,7 +1605,7 @@ PutTheRodAway:
|
||||
ld a, $1
|
||||
ld [wPlayerAction], a
|
||||
call UpdateSprites
|
||||
call ReplaceKrisSprite
|
||||
call UpdatePlayerSprite
|
||||
ret
|
||||
|
||||
RodBiteText:
|
||||
@ -1713,13 +1713,13 @@ Script_GetOnBike:
|
||||
writetext GotOnBikeText
|
||||
waitbutton
|
||||
closetext
|
||||
special ReplaceKrisSprite
|
||||
special UpdatePlayerSprite
|
||||
end
|
||||
|
||||
Script_GetOnBike_Register:
|
||||
loadvar VAR_MOVEMENT, PLAYER_BIKE
|
||||
closetext
|
||||
special ReplaceKrisSprite
|
||||
special UpdatePlayerSprite
|
||||
end
|
||||
|
||||
; unused
|
||||
@ -1735,7 +1735,7 @@ Script_GetOffBike:
|
||||
|
||||
FinishGettingOffBike:
|
||||
closetext
|
||||
special ReplaceKrisSprite
|
||||
special UpdatePlayerSprite
|
||||
special PlayMapMusic
|
||||
end
|
||||
|
||||
|
@ -142,7 +142,7 @@ SkipUpdateMapSprites:
|
||||
set PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl]
|
||||
ret
|
||||
|
||||
CheckReplaceKrisSprite:
|
||||
CheckUpdatePlayerSprite:
|
||||
nop
|
||||
call .CheckBiking
|
||||
jr c, .ok
|
||||
@ -153,7 +153,7 @@ CheckReplaceKrisSprite:
|
||||
ret
|
||||
|
||||
.ok
|
||||
call ReplaceKrisSprite
|
||||
call UpdatePlayerSprite
|
||||
ret
|
||||
|
||||
.CheckBiking:
|
||||
|
@ -6,7 +6,7 @@ GetEmote2bpp:
|
||||
ldh [rVBK], a
|
||||
ret
|
||||
|
||||
_ReplaceKrisSprite::
|
||||
_UpdatePlayerSprite::
|
||||
call GetPlayerSprite
|
||||
ld a, [wUsedSprites]
|
||||
ldh [hUsedSpriteIndex], a
|
||||
|
@ -784,7 +784,7 @@ ENDM
|
||||
push bc
|
||||
ld a, PLAYER_NORMAL
|
||||
ld [wPlayerState], a
|
||||
call ReplaceKrisSprite ; UpdateSprites
|
||||
call UpdatePlayerSprite ; UpdateSprites
|
||||
pop bc
|
||||
ret
|
||||
|
||||
|
@ -316,7 +316,7 @@ RefreshMapSprites:
|
||||
farcall InitMapNameSign
|
||||
call GetMovementPermissions
|
||||
farcall RefreshPlayerSprite
|
||||
farcall CheckReplaceKrisSprite
|
||||
farcall CheckUpdatePlayerSprite
|
||||
ld hl, wPlayerSpriteSetupFlags
|
||||
bit PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl]
|
||||
jr nz, .skip
|
||||
|
@ -94,8 +94,8 @@ Unreferenced_DMATransfer:
|
||||
ldh [hBGMapMode], a
|
||||
ret
|
||||
|
||||
ReplaceKrisSprite::
|
||||
farcall _ReplaceKrisSprite
|
||||
UpdatePlayerSprite::
|
||||
farcall _UpdatePlayerSprite
|
||||
ret
|
||||
|
||||
LoadStandardFont::
|
||||
|
@ -38,7 +38,7 @@ CloseText::
|
||||
call SafeUpdateSprites
|
||||
ld a, $90
|
||||
ldh [hWY], a
|
||||
call ReplaceKrisSprite
|
||||
call UpdatePlayerSprite
|
||||
farcall InitMapNameSign
|
||||
farcall LoadOverworldFont
|
||||
ret
|
||||
|
@ -437,7 +437,7 @@ Pokecenter2F_CheckGender:
|
||||
special SetPlayerPalette
|
||||
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
|
||||
setflag ENGINE_KRIS_IN_CABLE_CLUB
|
||||
special ReplaceKrisSprite
|
||||
special UpdatePlayerSprite
|
||||
opentext
|
||||
writetext Text_LikeTheLook
|
||||
waitbutton
|
||||
@ -463,7 +463,7 @@ Script_WalkOutOfLinkTradeRoom:
|
||||
setval (PAL_NPC_BLUE << 4)
|
||||
special SetPlayerPalette
|
||||
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
|
||||
special ReplaceKrisSprite
|
||||
special UpdatePlayerSprite
|
||||
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2
|
||||
applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown
|
||||
end
|
||||
@ -485,7 +485,7 @@ Script_WalkOutOfLinkBattleRoom:
|
||||
setval (PAL_NPC_BLUE << 4)
|
||||
special SetPlayerPalette
|
||||
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
|
||||
special ReplaceKrisSprite
|
||||
special UpdatePlayerSprite
|
||||
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2
|
||||
applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown
|
||||
end
|
||||
@ -546,7 +546,7 @@ TimeCapsuleScript_CheckPlayerGender:
|
||||
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown
|
||||
faceobject PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST
|
||||
setflag ENGINE_KRIS_IN_CABLE_CLUB
|
||||
special ReplaceKrisSprite
|
||||
special UpdatePlayerSprite
|
||||
opentext
|
||||
writetext Text_LikeTheLook
|
||||
waitbutton
|
||||
@ -573,7 +573,7 @@ Script_LeftTimeCapsule:
|
||||
setval (PAL_NPC_BLUE << 4)
|
||||
special SetPlayerPalette
|
||||
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
|
||||
special ReplaceKrisSprite
|
||||
special UpdatePlayerSprite
|
||||
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown
|
||||
applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2
|
||||
.Done:
|
||||
|
Loading…
Reference in New Issue
Block a user