pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

ReplaceKrisSprite -> UpdatePlayerSprite

Browse Source
This commit is contained in:
Rangi 2020-06-16 19:38:00 -04:00
parent f76dabedcc
commit f2550fc3c2
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/special_pointers.asm
View File

@ -67,7 +67,7 @@ SpecialsPointers::
add_special UpdateTimePals ; bank 0 add_special UpdateTimePals ; bank 0
add_special ClearTilemap ; bank 0 add_special ClearTilemap ; bank 0
add_special UpdateSprites ; bank 0 add_special UpdateSprites ; bank 0
add_special ReplaceKrisSprite ; bank 0 add_special UpdatePlayerSprite ; bank 0
add_special GameCornerPrizeMonCheckDex add_special GameCornerPrizeMonCheckDex
add_special UnusedSetSeenMon add_special UnusedSetSeenMon
add_special WaitSFX ; bank 0 add_special WaitSFX ; bank 0

2
docs/bugs_and_glitches.md
View File

@ -1766,7 +1766,7 @@ First, edit `UsedSurfScript` in [engine/events/overworld.asm](https://github.com
readmem wBuffer2 readmem wBuffer2
writevar VAR_MOVEMENT writevar VAR_MOVEMENT
special ReplaceKrisSprite special UpdatePlayerSprite
special PlayMapMusic special PlayMapMusic
-; step into the water (slow_step DIR, step_end) -; step into the water (slow_step DIR, step_end)
special SurfStartStep special SurfStartStep

2
engine/events/field_moves.asm
View File

@ -72,7 +72,7 @@ ShakeHeadbuttTree:
ld hl, vTiles1 ld hl, vTiles1
lb bc, BANK(Font), 12 lb bc, BANK(Font), 12
call Get1bpp call Get1bpp
call ReplaceKrisSprite call UpdatePlayerSprite
ret ret
HeadbuttTreeGFX: HeadbuttTreeGFX:

12
engine/events/overworld.asm
View File

@ -412,7 +412,7 @@ UsedSurfScript:
readmem wBuffer2 readmem wBuffer2
writevar VAR_MOVEMENT writevar VAR_MOVEMENT
special ReplaceKrisSprite special UpdatePlayerSprite
special PlayMapMusic special PlayMapMusic
; step into the water (slow_step DIR, step_end) ; step into the water (slow_step DIR, step_end)
special SurfStartStep special SurfStartStep
@ -628,7 +628,7 @@ FlyFunction:
.ReturnFromFly: .ReturnFromFly:
farcall Function561d farcall Function561d
call DelayFrame call DelayFrame
call ReplaceKrisSprite call UpdatePlayerSprite
farcall LoadOverworldFont farcall LoadOverworldFont
ret ret
@ -1605,7 +1605,7 @@ PutTheRodAway:
ld a, $1 ld a, $1
ld [wPlayerAction], a ld [wPlayerAction], a
call UpdateSprites call UpdateSprites
call ReplaceKrisSprite call UpdatePlayerSprite
ret ret
RodBiteText: RodBiteText:
@ -1713,13 +1713,13 @@ Script_GetOnBike:
writetext GotOnBikeText writetext GotOnBikeText
waitbutton waitbutton
closetext closetext
special ReplaceKrisSprite special UpdatePlayerSprite
end end
Script_GetOnBike_Register: Script_GetOnBike_Register:
loadvar VAR_MOVEMENT, PLAYER_BIKE loadvar VAR_MOVEMENT, PLAYER_BIKE
closetext closetext
special ReplaceKrisSprite special UpdatePlayerSprite
end end
; unused ; unused
@ -1735,7 +1735,7 @@ Script_GetOffBike:
FinishGettingOffBike: FinishGettingOffBike:
closetext closetext
special ReplaceKrisSprite special UpdatePlayerSprite
special PlayMapMusic special PlayMapMusic
end end

4
engine/overworld/map_setup.asm
View File

@ -142,7 +142,7 @@ SkipUpdateMapSprites:
set PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl] set PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl]
ret ret
CheckReplaceKrisSprite: CheckUpdatePlayerSprite:
nop nop
call .CheckBiking call .CheckBiking
jr c, .ok jr c, .ok
@ -153,7 +153,7 @@ CheckReplaceKrisSprite:
ret ret
.ok .ok
call ReplaceKrisSprite call UpdatePlayerSprite
ret ret
.CheckBiking: .CheckBiking:

2
engine/overworld/overworld.asm
View File

@ -6,7 +6,7 @@ GetEmote2bpp:
ldh [rVBK], a ldh [rVBK], a
ret ret
_ReplaceKrisSprite:: _UpdatePlayerSprite::
call GetPlayerSprite call GetPlayerSprite
ld a, [wUsedSprites] ld a, [wUsedSprites]
ldh [hUsedSpriteIndex], a ldh [hUsedSpriteIndex], a

2
engine/overworld/player_movement.asm
View File

@ -784,7 +784,7 @@ ENDM
push bc push bc
ld a, PLAYER_NORMAL ld a, PLAYER_NORMAL
ld [wPlayerState], a ld [wPlayerState], a
call ReplaceKrisSprite ; UpdateSprites call UpdatePlayerSprite ; UpdateSprites
pop bc pop bc
ret ret

2
engine/overworld/warp_connection.asm
View File

@ -316,7 +316,7 @@ RefreshMapSprites:
farcall InitMapNameSign farcall InitMapNameSign
call GetMovementPermissions call GetMovementPermissions
farcall RefreshPlayerSprite farcall RefreshPlayerSprite
farcall CheckReplaceKrisSprite farcall CheckUpdatePlayerSprite
ld hl, wPlayerSpriteSetupFlags ld hl, wPlayerSpriteSetupFlags
bit PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl] bit PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl]
jr nz, .skip jr nz, .skip

4
home/gfx.asm
View File

@ -94,8 +94,8 @@ Unreferenced_DMATransfer:
ldh [hBGMapMode], a ldh [hBGMapMode], a
ret ret
ReplaceKrisSprite:: UpdatePlayerSprite::
farcall _ReplaceKrisSprite farcall _UpdatePlayerSprite
ret ret
LoadStandardFont:: LoadStandardFont::

2
home/window.asm
View File

@ -38,7 +38,7 @@ CloseText::
call SafeUpdateSprites call SafeUpdateSprites
ld a, $90 ld a, $90
ldh [hWY], a ldh [hWY], a
call ReplaceKrisSprite call UpdatePlayerSprite
farcall InitMapNameSign farcall InitMapNameSign
farcall LoadOverworldFont farcall LoadOverworldFont
ret ret

10
maps/Pokecenter2F.asm
View File

@ -437,7 +437,7 @@ Pokecenter2F_CheckGender:
special SetPlayerPalette special SetPlayerPalette
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
setflag ENGINE_KRIS_IN_CABLE_CLUB setflag ENGINE_KRIS_IN_CABLE_CLUB
special ReplaceKrisSprite special UpdatePlayerSprite
opentext opentext
writetext Text_LikeTheLook writetext Text_LikeTheLook
waitbutton waitbutton
@ -463,7 +463,7 @@ Script_WalkOutOfLinkTradeRoom:
setval (PAL_NPC_BLUE << 4) setval (PAL_NPC_BLUE << 4)
special SetPlayerPalette special SetPlayerPalette
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
special ReplaceKrisSprite special UpdatePlayerSprite
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2 applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2
applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown
end end
@ -485,7 +485,7 @@ Script_WalkOutOfLinkBattleRoom:
setval (PAL_NPC_BLUE << 4) setval (PAL_NPC_BLUE << 4)
special SetPlayerPalette special SetPlayerPalette
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
special ReplaceKrisSprite special UpdatePlayerSprite
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2 applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2
applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown
end end
@ -546,7 +546,7 @@ TimeCapsuleScript_CheckPlayerGender:
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown
faceobject PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST faceobject PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST
setflag ENGINE_KRIS_IN_CABLE_CLUB setflag ENGINE_KRIS_IN_CABLE_CLUB
special ReplaceKrisSprite special UpdatePlayerSprite
opentext opentext
writetext Text_LikeTheLook writetext Text_LikeTheLook
waitbutton waitbutton
@ -573,7 +573,7 @@ Script_LeftTimeCapsule:
setval (PAL_NPC_BLUE << 4) setval (PAL_NPC_BLUE << 4)
special SetPlayerPalette special SetPlayerPalette
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
special ReplaceKrisSprite special UpdatePlayerSprite
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown
applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2 applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2
.Done: .Done: