diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-02-25 19:44:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 19:44:07 -0500 |
| commit | 754268c6911a24d05c8775783ee708b0f06c5c98 (patch) | |
| tree | 7c4020c8e03836d39cfa8299f0c5533b38f0afb8 | |
| parent | 4ab60eb2d2898c21af540a605b48911954ec4c45 (diff) | |
| parent | a73ced3b692f100a347bf1785d670ff410ad3657 (diff) | |
Merge pull request #690 from Rangi42/master
Identify some labels and constants for Battle Tower
| -rw-r--r-- | constants/collision_constants.asm | 6 | ||||
| -rw-r--r-- | data/tilesets/unused_johto_collision.asm (renamed from data/tilesets/unused_dark_cave_collision.asm) | 0 | ||||
| -rw-r--r-- | data/tilesets/unused_johto_metatiles.bin (renamed from data/tilesets/unused_dark_cave_metatiles.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | engine/events/battle_tower/battle_tower.asm | 26 | ||||
| -rw-r--r-- | gfx/tilesets.asm | 8 |
5 files changed, 20 insertions, 20 deletions
diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm index a03f4a0bb..c7f00861a 100644 --- a/constants/collision_constants.asm +++ b/constants/collision_constants.asm @@ -20,14 +20,14 @@ COLL_TALL_GRASS EQU $18 COLL_CUT_TREE_1A EQU $1a ; unused COLL_LONG_GRASS_1C EQU $1c ; unused COLL_HEADBUTT_TREE_1D EQU $1d ; unused -COLL_WATER_21 EQU $21 ; ??? +COLL_WATER_21 EQU $21 ; unused COLL_ICE EQU $23 COLL_WHIRLPOOL EQU $24 COLL_BUOY EQU $27 COLL_CUT_28 EQU $28 ; garbage COLL_WATER EQU $29 -COLL_ICE_2B EQU $2b ; unused -COLL_WHIRLPOOL_2C EQU $2c ; unused +COLL_ICE_2B EQU $2b ; +COLL_WHIRLPOOL_2C EQU $2c ; COLL_WATERFALL_RIGHT EQU $30 ; unused COLL_WATERFALL_LEFT EQU $31 ; unused COLL_WATERFALL_UP EQU $32 ; unused diff --git a/data/tilesets/unused_dark_cave_collision.asm b/data/tilesets/unused_johto_collision.asm index 8bbc11f2a..8bbc11f2a 100644 --- a/data/tilesets/unused_dark_cave_collision.asm +++ b/data/tilesets/unused_johto_collision.asm diff --git a/data/tilesets/unused_dark_cave_metatiles.bin b/data/tilesets/unused_johto_metatiles.bin Binary files differindex b70f1a0e6..b70f1a0e6 100644 --- a/data/tilesets/unused_dark_cave_metatiles.bin +++ b/data/tilesets/unused_johto_metatiles.bin diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 088d920ba..a851c76f8 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -29,7 +29,7 @@ Function1700c4: call CopyBytes ld hl, w3_d202Name ld de, s5_aa8e - ld bc, 7 * $cc ; length of battle tower struct from japanese games? + ld bc, BATTLETOWER_STREAK_LENGTH * $cc ; length of battle tower struct from japanese games? call CopyBytes ld hl, s5_aa5d ; some sort of count ld a, [hl] @@ -582,22 +582,22 @@ SkipBattleTowerTrainer: ret Unreferenced_Function1704ca: - ld a, [$be46] - cp $7 - jr c, .asm_1704d3 - ld a, $6 - -.asm_1704d3 - ld hl, $afce - ld de, -$e0 -.asm_1704d9 + ld a, [s5_be46] + cp BATTLETOWER_STREAK_LENGTH + jr c, .not_max + ld a, BATTLETOWER_STREAK_LENGTH - 1 + +.not_max + ld hl, s5_aa8e + BATTLE_TOWER_STRUCT_LENGTH * (BATTLETOWER_STREAK_LENGTH - 1) + ld de, -BATTLE_TOWER_STRUCT_LENGTH +.loop and a - jr z, .asm_1704e0 + jr z, .done add hl, de dec a - jr .asm_1704d9 + jr .loop -.asm_1704e0 +.done ret Function1704e1: diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index 72410ef30..ead1860e7 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -190,11 +190,11 @@ INCLUDE "data/tilesets/underground_collision.asm" TilesetDarkCaveGFX:: INCBIN "gfx/tilesets/dark_cave.2bpp.lz" -UnusedTilesetDarkCaveMeta:: -INCBIN "data/tilesets/unused_dark_cave_metatiles.bin" +UnusedTilesetJohtoMeta:: +INCBIN "data/tilesets/unused_johto_metatiles.bin" -UnusedTilesetDarkCaveColl:: -INCLUDE "data/tilesets/unused_dark_cave_collision.asm" +UnusedTilesetJohtoColl:: +INCLUDE "data/tilesets/unused_johto_collision.asm" SECTION "Tileset Data 5", ROMX |