aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld/pewter_guys.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-05-23 14:14:13 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-05-23 14:14:13 -0400
commit3618f25a34ca78ba424bf1977cb6e21241eedb2b (patch)
tree8a9a1e883c228ee90373986babc31a8cab368780 /engine/overworld/pewter_guys.asm
parentBank15 misc functions (diff)
parentMove diploma tilemaps out of incbins (diff)
downloadpokeyellow-3618f25a34ca78ba424bf1977cb6e21241eedb2b.tar.gz
pokeyellow-3618f25a34ca78ba424bf1977cb6e21241eedb2b.tar.xz
pokeyellow-3618f25a34ca78ba424bf1977cb6e21241eedb2b.zip
Merge pull request #8 from PikalaxALT/master
Disassemble yellow sounds
Diffstat (limited to 'engine/overworld/pewter_guys.asm')
-rwxr-xr-xengine/overworld/pewter_guys.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/overworld/pewter_guys.asm b/engine/overworld/pewter_guys.asm
index 543dac91..ff3c6152 100755
--- a/engine/overworld/pewter_guys.asm
+++ b/engine/overworld/pewter_guys.asm
@@ -1,4 +1,4 @@
-PewterGuys: ; 37ca1 (d:7ca1)
+PewterGuys: ; 1a6e5 (6:66e5)
ld hl, wSimulatedJoypadStatesEnd
ld a, [wSimulatedJoypadStatesIndex]
dec a ; this decrement causes it to overwrite the last byte before $FF in the list
@@ -48,14 +48,14 @@ PewterGuys: ; 37ca1 (d:7ca1)
inc hl
jr .findMatchingCoordsLoop
-PointerTable_37ce6: ; 37ce6 (d:7ce6)
+PointerTable_37ce6: ; 1a72a (6:672a)
dw PewterMuseumGuyCoords
dw PewterGymGuyCoords
; these are the four coordinates of the spaces below, above, to the left and
; to the right of the museum guy, and pointers to different movements for
; the player to make to get positioned before the main movement.
-PewterMuseumGuyCoords: ; 37cea (d:7cea)
+PewterMuseumGuyCoords: ; 1a72e (6:672e)
db 18, 27
dw .down
db 16, 27
@@ -78,7 +78,7 @@ PewterMuseumGuyCoords: ; 37cea (d:7cea)
; different movements for the player to make to get positioned before the
; main movement
; $00 is a pause
-PewterGymGuyCoords: ; 37d06 (d:7d06)
+PewterGymGuyCoords: ; 1a74a (6:674a)
db 16, 34
dw .one
db 17, 35