diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/oak_speech2.asm | 20 | ||||
| -rw-r--r-- | engine/overworld/movement.asm | 6 |
2 files changed, 19 insertions, 7 deletions
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index 61775531..d58aef83 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -245,15 +245,27 @@ GetDefaultName: ; 6ad6 (1:6ad6) IF DEF(_RED) DefaultNamesPlayerList: ; 6af2 (1:6af2) - db "NEW NAME@RED@ASH@JACK@" + db "NEW NAME@" + db "RED@" + db "ASH@" + db "JACK@" DefaultNamesRivalList: ; 6b08 (1:6b08) - db "NEW NAME@BLUE@GARY@JOHN@" + db "NEW NAME@" + db "BLUE@" + db "GARY@" + db "JOHN@" ENDC IF DEF(_BLUE) DefaultNamesPlayerList: ; 6af2 (1:6af2) - db "NEW NAME@BLUE@GARY@JOHN@" + db "NEW NAME@" + db "BLUE@" + db "GARY@" + db "JOHN@" DefaultNamesRivalList: ; 6b08 (1:6b08) - db "NEW NAME@RED@ASH@JACK@" + db "NEW NAME@" + db "RED@" + db "ASH@" + db "JACK@" ENDC TextTerminator_6b20: ; 6b20 (1:6b20) diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index c89406d1..2af2e518 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -95,7 +95,7 @@ UpdatePlayerSprite: ; 4e31 (1:4e31) jr nz, .next2 ld a, $80 .next2 - ld [wSpriteStateData2 + $07], a + ld [wSpriteStateData2 + 7], a ret UnusedReadSpriteDataFunction: ; 4ec7 (1:4ec7) @@ -169,7 +169,7 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) call LoadDEPlusA ; a = [wNPCMovementDirections + movement byte 1] cp $e0 jp z, ChangeFacingDirection - cp $ff + cp STAY jr nz, .next ; reached end of wNPCMovementDirections list ld [hl], a ; store $ff in movement byte 1, disabling scripted movement @@ -180,7 +180,7 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) ld [wWastedByteCD3A], a ret .next - cp $fe + cp WALK jr nz, .determineDirection ; current NPC movement data is $fe. this seems buggy ld [hl], $1 ; set movement byte 1 to $1 |