From faa41e743b3eeac9d8230271a77368a557433c78 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 17 Jan 2018 12:49:21 -0500 Subject: [PATCH] hex->dec --- data/field_move_blocks.asm | 72 +++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/data/field_move_blocks.asm b/data/field_move_blocks.asm index 5e9bbc1f4..ae062196b 100644 --- a/data/field_move_blocks.asm +++ b/data/field_move_blocks.asm @@ -1,53 +1,53 @@ CutTreeBlockPointers: ; c862 ; tileset, block list pointer - dbw TILESET_JOHTO_1, .johto1 - dbw TILESET_JOHTO_2, .johto2 - dbw TILESET_KANTO, .kanto - dbw TILESET_PARK, .park - dbw TILESET_ILEX_FOREST, .ilex - db -1 + dbw TILESET_JOHTO_1, .johto1 + dbw TILESET_JOHTO_2, .johto2 + dbw TILESET_KANTO, .kanto + dbw TILESET_PARK, .park + dbw TILESET_ILEX_FOREST, .ilex_forest + db -1 ; end -.johto1 ; Johto OW +.johto1: +; facing block, replacement block, animation + db $03, $02, 1 ; grass + db $5b, $3c, 0 ; tree + db $5f, $3d, 0 ; tree + db $63, $3f, 0 ; tree + db $67, $3e, 0 ; tree + db -1 ; end + +.johto2: ; facing block, replacement block, animation db $03, $02, $01 ; grass - db $5b, $3c, $00 ; tree - db $5f, $3d, $00 ; tree - db $63, $3f, $00 ; tree - db $67, $3e, $00 ; tree - db -1 + db -1 ; end -.johto2 ; Goldenrod area +.kanto: ; facing block, replacement block, animation - db $03, $02, $01 ; grass - db -1 + db $0b, $0a, 1 ; grass + db $32, $6d, 0 ; tree + db $33, $6c, 0 ; tree + db $34, $6f, 0 ; tree + db $35, $4c, 0 ; tree + db $60, $6e, 0 ; tree + db -1 ; end -.kanto ; Kanto OW +.park: ; facing block, replacement block, animation - db $0b, $0a, $01 ; grass - db $32, $6d, $00 ; tree - db $33, $6c, $00 ; tree - db $34, $6f, $00 ; tree - db $35, $4c, $00 ; tree - db $60, $6e, $00 ; tree - db -1 + db $13, $03, 1 ; grass + db $03, $04, 1 ; grass + db -1 ; end -.park ; National Park +.ilex_forest: ; facing block, replacement block, animation - db $13, $03, $01 ; grass - db $03, $04, $01 ; grass - db -1 - -.ilex ; Ilex Forest -; facing block, replacement block, animation - db $0f, $17, $00 - db -1 + db $0f, $17, 0 + db -1 ; end WhirlpoolBlockPointers: ; c8a4 dbw TILESET_JOHTO_1, .johto - db -1 + db -1 ; end -.johto ; c8a8 +.johto: ; facing block, replacement block, animation - db $07, $36, $00 - db -1 + db $07, $36, 0 + db -1 ; end