From 8c2c9e91b50daf8e13c0833524d5f36ba67bb4f8 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 17:13:38 -0500 Subject: Better file name --- data/field_move_blocks.asm | 53 ++++++++++++++++++++++++++++++++++++++++++++++ data/hm_blocks.asm | 53 ---------------------------------------------- event/overworld.asm | 2 +- 3 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 data/field_move_blocks.asm delete mode 100644 data/hm_blocks.asm diff --git a/data/field_move_blocks.asm b/data/field_move_blocks.asm new file mode 100644 index 000000000..5e9bbc1f4 --- /dev/null +++ b/data/field_move_blocks.asm @@ -0,0 +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 + +.johto1 ; Johto OW +; 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 + +.johto2 ; Goldenrod area +; facing block, replacement block, animation + db $03, $02, $01 ; grass + db -1 + +.kanto ; Kanto OW +; 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 + +.park ; National Park +; 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 + + +WhirlpoolBlockPointers: ; c8a4 + dbw TILESET_JOHTO_1, .johto + db -1 + +.johto ; c8a8 +; facing block, replacement block, animation + db $07, $36, $00 + db -1 diff --git a/data/hm_blocks.asm b/data/hm_blocks.asm deleted file mode 100644 index 5e9bbc1f4..000000000 --- a/data/hm_blocks.asm +++ /dev/null @@ -1,53 +0,0 @@ -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 - -.johto1 ; Johto OW -; 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 - -.johto2 ; Goldenrod area -; facing block, replacement block, animation - db $03, $02, $01 ; grass - db -1 - -.kanto ; Kanto OW -; 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 - -.park ; National Park -; 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 - - -WhirlpoolBlockPointers: ; c8a4 - dbw TILESET_JOHTO_1, .johto - db -1 - -.johto ; c8a8 -; facing block, replacement block, animation - db $07, $36, $00 - db -1 diff --git a/event/overworld.asm b/event/overworld.asm index 221f02a4f..d50c158e9 100755 --- a/event/overworld.asm +++ b/event/overworld.asm @@ -278,7 +278,7 @@ CheckOverworldTileArrays: ; c840 ret -INCLUDE "data/hm_blocks.asm" +INCLUDE "data/field_move_blocks.asm" OWFlash: ; c8ac -- cgit v1.2.3