diff options
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/doors.asm | 14 | ||||
| -rwxr-xr-x | engine/overworld/npc_movement.asm | 4 | ||||
| -rwxr-xr-x | engine/overworld/oaks_aide.asm | 14 | ||||
| -rwxr-xr-x | engine/overworld/saffron_guards.asm | 4 |
4 files changed, 18 insertions, 18 deletions
diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm index 8ec9772a..3f7b5f0f 100755 --- a/engine/overworld/doors.asm +++ b/engine/overworld/doors.asm @@ -1,5 +1,5 @@ ; returns whether the player is standing on a door tile in carry -IsPlayerStandingOnDoorTile: ; 1a609 (6:6609) +IsPlayerStandingOnDoorTile: ; 1a785 (6:6785) push de ld hl, DoorTileIDPointers ld a, [wCurMapTileset] @@ -42,22 +42,22 @@ DoorTileIDPointers: ; 1a7a8 (6:67a8) dbw INTERIOR, InteriorDoorTileIDs db $ff -OverworldDoorTileIDs: ; 1a654 (6:6654) +OverworldDoorTileIDs: ; 1a7d3 (6:67d3) db $1B,$58,$00 -ForestDoorTileIDs: ; 1a657 (6:6657) +ForestDoorTileIDs: ; 1a7d6 (6:67d6) db $3a,$00 -MartDoorTileIDs: ; 1a659 (6:6659) +MartDoorTileIDs: ; 1a7d8 (6:67d8) db $5e,$00 -HouseDoorTileIDs: ; 1a65b (6:665b) +HouseDoorTileIDs: ; 1a7da (6:67da) db $54,$00 -TilesetMuseumDoorTileIDs: ; 1a65d (6:665d) +TilesetMuseumDoorTileIDs: ; 1a7dc (6:67dc) db $3b,$00 -ShipDoorTileIDs: ; 1a65f (6:665f) +ShipDoorTileIDs: ; 1a7de (6:67de) db $1e,$00 LobbyDoorTileIDs: ; 1a7e0 (6:67e0) diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 58eb6a47..07abd44f 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -1,4 +1,4 @@ -PlayerStepOutFromDoor: ; 1a3e0 (6:63e0) +PlayerStepOutFromDoor: ; 1a4ea (6:64ea) ld hl, wd730 res 1, [hl] call IsPlayerStandingOnDoorTile @@ -258,7 +258,7 @@ RLEList_PewterGymPlayer: ; 1a6cb (6:66cb) db D_LEFT, $0F db $FF -RLEList_PewterGymGuy: ; 1a6cd8(6:66d8) +RLEList_PewterGymGuy: ; 1a6cd8 (6:66d8) db NPC_MOVEMENT_DOWN, $02 db NPC_MOVEMENT_LEFT, $0F db NPC_MOVEMENT_UP, $05 diff --git a/engine/overworld/oaks_aide.asm b/engine/overworld/oaks_aide.asm index 8ac456d2..d412d8ec 100755 --- a/engine/overworld/oaks_aide.asm +++ b/engine/overworld/oaks_aide.asm @@ -1,4 +1,4 @@ -OaksAideScript: ; 0x59035 +OaksAideScript: ; 58ecc (16:4ecc) ld hl, OaksAideHiText call PrintText call YesNoChoice @@ -45,27 +45,27 @@ OaksAideScript: ; 0x59035 ld [hOaksAideResult], a ret -OaksAideHiText: ; 59091 (16:5091) +OaksAideHiText: ; 58f28 (16:4f28) TX_FAR _OaksAideHiText db "@" -OaksAideUhOhText: ; 59096 (16:5096) +OaksAideUhOhText: ; 58f2d (16:4f2d) TX_FAR _OaksAideUhOhText db "@" -OaksAideComeBackText: ; 5909b (16:509b) +OaksAideComeBackText: ; 58f32 (16:4f32) TX_FAR _OaksAideComeBackText db "@" -OaksAideHereYouGoText: ; 590a0 (16:50a0) +OaksAideHereYouGoText: ; 58f37 (16:4f37) TX_FAR _OaksAideHereYouGoText db "@" -OaksAideGotItemText: ; 590a5 (16:50a5) +OaksAideGotItemText: ; 58f3c (16:4f3c) TX_FAR _OaksAideGotItemText db $0b db "@" -OaksAideNoRoomText: ; 590ab (16:50ab) +OaksAideNoRoomText: ; 58f41 (16:4f41) TX_FAR _OaksAideNoRoomText db "@" diff --git a/engine/overworld/saffron_guards.asm b/engine/overworld/saffron_guards.asm index c0d6a985..83d73d02 100755 --- a/engine/overworld/saffron_guards.asm +++ b/engine/overworld/saffron_guards.asm @@ -1,4 +1,4 @@ -RemoveGuardDrink: ; 5a59f (16:659f) +RemoveGuardDrink: ; 5a53a (16:653a) ld hl, GuardDrinksList .drinkLoop ld a, [hli] @@ -12,5 +12,5 @@ RemoveGuardDrink: ; 5a59f (16:659f) jr z, .drinkLoop jpba RemoveItemByID -GuardDrinksList: ; 5a5b7 (16:65b7) +GuardDrinksList: ; 5a552 (16:6552) db FRESH_WATER, SODA_POP, LEMONADE, $00 |