diff options
| author | dannye <33dannye@gmail.com> | 2024-10-09 21:56:57 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2024-10-09 21:56:57 -0500 |
| commit | 942c5f13eadb828dbf9dd6f75dfece007b53f353 (patch) | |
| tree | 0013406b83f352bed3f9b8247e7a73d11a150828 /home | |
| parent | Rename off-by-one wram labels (diff) | |
| parent | Renamed pokemon-asm-tools to gb-asm-tools (diff) | |
| download | pokeyellow-942c5f13eadb828dbf9dd6f75dfece007b53f353.tar.gz pokeyellow-942c5f13eadb828dbf9dd6f75dfece007b53f353.tar.xz pokeyellow-942c5f13eadb828dbf9dd6f75dfece007b53f353.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'home')
| -rw-r--r-- | home/map_objects.asm | 4 | ||||
| -rw-r--r-- | home/trainers.asm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm index c959f2db..59140505 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -293,9 +293,9 @@ SetSpriteMovementBytesToFE:: SetSpriteMovementBytesToFF:: push hl call GetSpriteMovementByte1Pointer - ld [hl], $FF + ld [hl], STAY call GetSpriteMovementByte2Pointer - ld [hl], $FF ; prevent person from walking? + ld [hl], NONE pop hl ret diff --git a/home/trainers.asm b/home/trainers.asm index 09a69ae1..5048a8c5 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -358,7 +358,7 @@ PrintEndBattleText:: pop af ldh [hLoadedROMBank], a ld [MBC1RomBank], a - farcall FreezeEnemyTrainerSprite + farcall SetEnemyTrainerToStayAndFaceAnyDirection jp WaitForSoundToFinish GetSavedEndBattleTextPointer:: |