diff options
| author | Logan <log.butt@gmail.com> | 2016-05-30 00:54:10 +1200 |
|---|---|---|
| committer | Logan <log.butt@gmail.com> | 2016-05-30 00:54:10 +1200 |
| commit | 492c0961713e18f0828bc2f88bfc8cfff2b0b8ab (patch) | |
| tree | 6146e2a2f17c7325b5abef7af0bf082effe7453c /engine | |
| parent | f71b489ad8c194a392ca79b07261816b61cb55e2 (diff) | |
Merge branch 'master' of https://github.com/einstein95/pokered
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/oak_speech2.asm | 20 | ||||
| -rwxr-xr-x | engine/overworld/doors.asm | 39 | ||||
| -rw-r--r-- | engine/overworld/movement.asm | 6 |
3 files changed, 32 insertions, 33 deletions
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index f90d8ed4..88670a16 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 "NOM:@RED@SACHA@PAUL@" + db "NOM:@" + db "RED@" + db "SACHA@" + db "PAUL@" DefaultNamesRivalList: ; 6b08 (1:6b08) - db "NOM:@BLUE@REGIS@JEAN@" + db "NOM:@" + db "BLUE@" + db "REGIS@" + db "JEAN@" ENDC IF DEF(_BLUE) DefaultNamesPlayerList: ; 6af2 (1:6af2) - db "NOM:@BLUE@REGIS@JEAN@" + db "NOM:@" + db "BLUE@" + db "REGIS@" + db "JEAN@" DefaultNamesRivalList: ; 6b08 (1:6b08) - db "NOM:@RED@SACHA@PAUL@" + db "NOM:@" + db "RED@" + db "SACHA@" + db "PAUL@" ENDC TextTerminator_6b20: ; 6b20 (1:6b20) diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm index 6b0c0464..3145c3c6 100755 --- a/engine/overworld/doors.asm +++ b/engine/overworld/doors.asm @@ -26,32 +26,19 @@ IsPlayerStandingOnDoorTile: ; 1a609 (6:6609) ret DoorTileIDPointers: ; 1a62c (6:662c) - db OVERWORLD - dw OverworldDoorTileIDs - db FOREST - dw ForestDoorTileIDs - db MART - dw MartDoorTileIDs - db HOUSE - dw HouseDoorTileIDs - db FOREST_GATE - dw TilesetMuseumDoorTileIDs - db MUSEUM - dw TilesetMuseumDoorTileIDs - db GATE - dw TilesetMuseumDoorTileIDs - db SHIP - dw ShipDoorTileIDs - db LOBBY - dw LobbyDoorTileIDs - db MANSION - dw MansionDoorTileIDs - db LAB - dw LabDoorTileIDs - db FACILITY - dw FacilityDoorTileIDs - db PLATEAU - dw PlateauDoorTileIDs + dbw OVERWORLD, OverworldDoorTileIDs + dbw FOREST, ForestDoorTileIDs + dbw MART, MartDoorTileIDs + dbw HOUSE, HouseDoorTileIDs + dbw FOREST_GATE, TilesetMuseumDoorTileIDs + dbw MUSEUM, TilesetMuseumDoorTileIDs + dbw GATE, TilesetMuseumDoorTileIDs + dbw SHIP, ShipDoorTileIDs + dbw LOBBY, LobbyDoorTileIDs + dbw MANSION, MansionDoorTileIDs + dbw LAB, LabDoorTileIDs + dbw FACILITY, FacilityDoorTileIDs + dbw PLATEAU, PlateauDoorTileIDs db $ff OverworldDoorTileIDs: ; 1a654 (6:6654) diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 05c73213..7f92a243 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 |