aboutsummaryrefslogtreecommitdiffstats
path: root/home.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 /home.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 'home.asm')
-rw-r--r--home.asm4
1 files changed, 3 insertions, 1 deletions
diff --git a/home.asm b/home.asm
index 233b00be..c8f227ef 100644
--- a/home.asm
+++ b/home.asm
@@ -2447,7 +2447,7 @@ RunNPCMovementScript:: ; 30ae (0:30ae)
ret
.NPCMovementScriptPointerTables
- dw ProfOakMovementScriptPointerTable
+ dw PalletMovementScriptPointerTable
dw PewterMuseumGuyMovementScriptPointerTable
dw PewterGymGuyMovementScriptPointerTable
.playerStepOutFromDoor
@@ -5044,3 +5044,5 @@ TextPredefs:: ; 3f67 (0:3f67)
; add_tx_pre BookOrSculptureText ; 40
; add_tx_pre ElevatorText ; 41
; add_tx_pre PokemonStuffText ; 42
+; add_tx_pre $7a9b ; 43
+; add_tx_pre $7ad3 ; 44