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 | |
| parent | fdfc393da39c0978c8472a58e48c2adabae4b508 (diff) | |
Final phase 3 of Viridian City script disassembly
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/bank3c.asm | 11 | ||||
| -rw-r--r-- | engine/bank3f.asm | 17 |
2 files changed, 16 insertions, 12 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" diff --git a/engine/bank3f.asm b/engine/bank3f.asm index a077a24b..8f01097e 100644 --- a/engine/bank3f.asm +++ b/engine/bank3f.asm @@ -1051,32 +1051,35 @@ Func_fcb52: ; fcb52 (3f:4b52) ld a, [wYCoord] add $4 ld e, a - ld hl, $104 + ld hl, wSpriteStateData2 - wSpriteStateData1 + 4 add hl, bc ld a, [hl] cp e jr z, Func_fcb71 jr nc, .asm_fcb6e - ld a, $4 + ld a, SPRITE_FACING_UP ret + .asm_fcb6e - ld a, $0 + ld a, SPRITE_FACING_DOWN ret Func_fcb71: ; fcb71 (3f:4b71) - ld hl, $105 + ld hl, wSpriteStateData2 - wSpriteStateData1 + 5 add hl, bc ld a, [hl] cp d jr z, .asm_fcb81 jr nc, .asm_fcb7e - ld a, $8 + ld a, SPRITE_FACING_LEFT ret + .asm_fcb7e - ld a, $c + ld a, SPRITE_FACING_RIGHT ret + .asm_fcb81 - ld a, $ff + ld a, $ff ; standing ret Func_fcb84: ; fcb84 (3f:4b84) |