diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-26 18:24:54 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-26 18:24:54 -0400 |
| commit | ce639816996d908de0a197b62c08d3a63846a512 (patch) | |
| tree | f57c3990eaab42c339ea8daa42a967efb1810d07 /engine/bank3c.asm | |
| parent | fdfc393da39c0978c8472a58e48c2adabae4b508 (diff) | |
Final phase 3 of Viridian City script disassembly
Diffstat (limited to 'engine/bank3c.asm')
| -rw-r--r-- | engine/bank3c.asm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engine/bank3c.asm b/engine/bank3c.asm index 6345424f..e8121bb1 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -302,7 +302,7 @@ Func_f0a82: ; f0a82 ret nz push hl push bc - callab Func_fcb4d + callab Func_fcb4d ; get Pikachu's position with respect to you? pop bc pop hl ld a, b @@ -317,7 +317,7 @@ Func_f0a82: ; f0a82 pop af ld [wUpdateSpritesEnabled], a pop hl - call Func_159b + call Func_159b ; homecall Func_fd2a1 - pikachu movement script? callab Func_fcba1 ret @@ -342,9 +342,10 @@ NurseChanseyText: TX_FAR _NurseChanseyText db "@" - dr $f0f26, $f1a01 -Func_f1a01: - dr $f1a01, $f220e + dr $f0f26, $f18bb + +INCLUDE "scripts/viridiancity2.asm" + dr $f1a0f, $f220e INCLUDE "data/mapHeaders/beach_house.asm" INCLUDE "scripts/beach_house.asm" |