diff options
Diffstat (limited to 'engine/overworld/cut.asm')
| -rwxr-xr-x | engine/overworld/cut.asm | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index 30aedbc1..276ec93e 100755 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm @@ -1,4 +1,4 @@ -UsedCut: ; ef54 (3:6f54) +UsedCut: ; edd1 (3:6dd1) xor a ld [wActionResultOrTookBattleTurn], a ; initialise to failure value ld a, [W_CURMAPTILESET] @@ -67,15 +67,16 @@ UsedCut: ; ef54 (3:6f54) call UpdateSprites jp RedrawMapView -UsedCutText: ; eff2 (3:6ff2) +UsedCutText: ; ee6f (3:6e6f) TX_FAR _UsedCutText db "@" -InitCutAnimOAM: ; eff7 (3:6ff7) +InitCutAnimOAM: ; ee74 (3:6e74) xor a ld [wWhichAnimationOffsets], a - ld a, $e4 + ld a, %11100100 ld [rOBP1], a + call UpdateGBCPal_OBP1 ld a, [wCutTile] cp $52 jr z, .grass @@ -111,22 +112,22 @@ InitCutAnimOAM: ; eff7 (3:6ff7) jr nz, .loop ret -LoadCutGrassAnimationTilePattern: ; f04c (3:704c) - ld de, AnimationTileset2 + $60 ; tile depicting a leaf +LoadCutGrassAnimationTilePattern: ; eecc (3:6ecc) + ld de, AnimationTileset2 + $30 ; tile depicting a leaf lb bc, BANK(AnimationTileset2), $01 jp CopyVideoData -WriteCutOrBoulderDustAnimationOAMBlock: ; f055 (3:7055) +WriteCutOrBoulderDustAnimationOAMBlock: ; eed5 (3:6ed5) call GetCutOrBoulderDustAnimationOffsets ld a, $9 ld de, CutOrBoulderDustAnimationTilesAndAttributes jp WriteOAMBlock -CutOrBoulderDustAnimationTilesAndAttributes: ; f060 (3:7060) - db $FC,$10,$FD,$10 - db $FE,$10,$FF,$10 +CutOrBoulderDustAnimationTilesAndAttributes: ; eee0 (3:6ee0) + db $FC,$14,$FD,$14 + db $FE,$14,$FF,$14 -GetCutOrBoulderDustAnimationOffsets: ; f068 (3:7068) +GetCutOrBoulderDustAnimationOffsets: ; eee8 (3:6ee8) ld hl, wSpriteStateData1 + 4 ld a, [hli] ; player's sprite screen Y position ld b, a @@ -157,14 +158,14 @@ GetCutOrBoulderDustAnimationOffsets: ; f068 (3:7068) ld c, a ret -CutAnimationOffsets: ; f08f (3:708f) +CutAnimationOffsets: ; ef0f (3:6f0f) ; Each pair represents the x and y pixels offsets from the player of where the cut tree animation should be drawn db 8, 36 ; player is facing down db 8, 4 ; player is facing up db -8, 20 ; player is facing left db 24, 20 ; player is facing right -BoulderDustAnimationOffsets: ; f097 (3:7097) +BoulderDustAnimationOffsets: ; ef17 (3:6f17) ; Each pair represents the x and y pixels offsets from the player of where the cut tree animation should be drawn ; These offsets represent 2 blocks away from the player db 8, 52 ; player is facing down @@ -172,7 +173,7 @@ BoulderDustAnimationOffsets: ; f097 (3:7097) db -24, 20 ; player is facing left db 40, 20 ; player is facing right -ReplaceTreeTileBlock: ; f09f (3:709f) +ReplaceTreeTileBlock: ; ef1f (3:6f1f) ; Determine the address of the tile block that contains the tile in front of the ; player (i.e. where the tree is) and replace it with the corresponding tile ; block that doesn't have the tree. @@ -248,7 +249,7 @@ ReplaceTreeTileBlock: ; f09f (3:709f) ld [hl], a ret -CutTreeBlockSwaps: ; f100 (3:7100) +CutTreeBlockSwaps: ; ef80 (3:6f80) ; first byte = tileset block containing the cut tree ; second byte = corresponding tileset block after the cut animation happens db $32, $6D |