mirror of
https://github.com/pret/pokered.git
synced 2024-10-22 22:55:31 +00:00
FreezeEnemyTrainerSprite
-> SetEnemyTrainerToStayAndFaceAnyDirection
This commit is contained in:
parent
1aa3fb24ec
commit
678d014aef
3 changed files with 6 additions and 6 deletions
|
@ -266,10 +266,10 @@ RLEList_PewterGymGuy:
|
||||||
db NPC_MOVEMENT_RIGHT, 3
|
db NPC_MOVEMENT_RIGHT, 3
|
||||||
db -1 ; end
|
db -1 ; end
|
||||||
|
|
||||||
FreezeEnemyTrainerSprite::
|
SetEnemyTrainerToStayAndFaceAnyDirection::
|
||||||
ld a, [wCurMap]
|
ld a, [wCurMap]
|
||||||
cp POKEMON_TOWER_7F
|
cp POKEMON_TOWER_7F
|
||||||
ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them
|
ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't set them
|
||||||
ld hl, RivalIDs
|
ld hl, RivalIDs
|
||||||
ld a, [wEngagedTrainerClass]
|
ld a, [wEngagedTrainerClass]
|
||||||
ld b, a
|
ld b, a
|
||||||
|
@ -278,7 +278,7 @@ FreezeEnemyTrainerSprite::
|
||||||
cp -1
|
cp -1
|
||||||
jr z, .notRival
|
jr z, .notRival
|
||||||
cp b
|
cp b
|
||||||
ret z ; the rival leaves after battling, so don't freeze him
|
ret z ; the rival leaves after battling, so don't set him
|
||||||
jr .loop
|
jr .loop
|
||||||
.notRival
|
.notRival
|
||||||
ld a, [wSpriteIndex]
|
ld a, [wSpriteIndex]
|
||||||
|
|
|
@ -219,9 +219,9 @@ SetSpriteMovementBytesToFE::
|
||||||
SetSpriteMovementBytesToFF::
|
SetSpriteMovementBytesToFF::
|
||||||
push hl
|
push hl
|
||||||
call GetSpriteMovementByte1Pointer
|
call GetSpriteMovementByte1Pointer
|
||||||
ld [hl], $FF
|
ld [hl], STAY
|
||||||
call GetSpriteMovementByte2Pointer
|
call GetSpriteMovementByte2Pointer
|
||||||
ld [hl], $FF ; prevent person from walking?
|
ld [hl], NONE
|
||||||
pop hl
|
pop hl
|
||||||
ret
|
ret
|
||||||
|
|
||||||
|
|
|
@ -358,7 +358,7 @@ PrintEndBattleText::
|
||||||
pop af
|
pop af
|
||||||
ldh [hLoadedROMBank], a
|
ldh [hLoadedROMBank], a
|
||||||
ld [MBC1RomBank], a
|
ld [MBC1RomBank], a
|
||||||
farcall FreezeEnemyTrainerSprite
|
farcall SetEnemyTrainerToStayAndFaceAnyDirection
|
||||||
jp WaitForSoundToFinish
|
jp WaitForSoundToFinish
|
||||||
|
|
||||||
GetSavedEndBattleTextPointer::
|
GetSavedEndBattleTextPointer::
|
||||||
|
|
Loading…
Reference in a new issue