pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #690 from Rangi42/master

Browse Source 
Identify some labels and constants for Battle Tower
This commit is contained in:
Rangi 2020-02-25 19:44:07 -05:00 committed by GitHub
commit 754268c691
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
constants/collision_constants.asm
View File

@ -20,14 +20,14 @@ COLL_TALL_GRASS EQU $18
COLL_CUT_TREE_1A EQU $1a ; unused COLL_CUT_TREE_1A EQU $1a ; unused
COLL_LONG_GRASS_1C EQU $1c ; unused COLL_LONG_GRASS_1C EQU $1c ; unused
COLL_HEADBUTT_TREE_1D EQU $1d ; unused COLL_HEADBUTT_TREE_1D EQU $1d ; unused
COLL_WATER_21 EQU $21 ; ??? COLL_WATER_21 EQU $21 ; unused
COLL_ICE EQU $23 COLL_ICE EQU $23
COLL_WHIRLPOOL EQU $24 COLL_WHIRLPOOL EQU $24
COLL_BUOY EQU $27 COLL_BUOY EQU $27
COLL_CUT_28 EQU $28 ; garbage COLL_CUT_28 EQU $28 ; garbage
COLL_WATER EQU $29 COLL_WATER EQU $29
COLL_ICE_2B EQU $2b ; unused COLL_ICE_2B EQU $2b ;
COLL_WHIRLPOOL_2C EQU $2c ; unused COLL_WHIRLPOOL_2C EQU $2c ;
COLL_WATERFALL_RIGHT EQU $30 ; unused COLL_WATERFALL_RIGHT EQU $30 ; unused
COLL_WATERFALL_LEFT EQU $31 ; unused COLL_WATERFALL_LEFT EQU $31 ; unused
COLL_WATERFALL_UP EQU $32 ; unused COLL_WATERFALL_UP EQU $32 ; unused

0
data/tilesets/unused_dark_cave_collision.asm → data/tilesets/unused_johto_collision.asm
View File

0
data/tilesets/unused_dark_cave_metatiles.bin → data/tilesets/unused_johto_metatiles.bin
View File

24
engine/events/battle_tower/battle_tower.asm
View File

@ -29,7 +29,7 @@ Function1700c4:
call CopyBytes call CopyBytes
ld hl, w3_d202Name ld hl, w3_d202Name
ld de, s5_aa8e 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 call CopyBytes
ld hl, s5_aa5d ; some sort of count ld hl, s5_aa5d ; some sort of count
ld a, [hl] ld a, [hl]
@ -582,22 +582,22 @@ SkipBattleTowerTrainer:
ret ret
Unreferenced_Function1704ca: Unreferenced_Function1704ca:
ld a, [$be46] ld a, [s5_be46]
cp $7 cp BATTLETOWER_STREAK_LENGTH
jr c, .asm_1704d3 jr c, .not_max
ld a, $6 ld a, BATTLETOWER_STREAK_LENGTH - 1
.asm_1704d3 .not_max
ld hl, $afce ld hl, s5_aa8e + BATTLE_TOWER_STRUCT_LENGTH * (BATTLETOWER_STREAK_LENGTH - 1)
ld de, -$e0 ld de, -BATTLE_TOWER_STRUCT_LENGTH
.asm_1704d9 .loop
and a and a
jr z, .asm_1704e0 jr z, .done
add hl, de add hl, de
dec a dec a
jr .asm_1704d9 jr .loop
.asm_1704e0 .done
ret ret
Function1704e1: Function1704e1:

8
gfx/tilesets.asm
View File

@ -190,11 +190,11 @@ INCLUDE "data/tilesets/underground_collision.asm"
TilesetDarkCaveGFX:: TilesetDarkCaveGFX::
INCBIN "gfx/tilesets/dark_cave.2bpp.lz" INCBIN "gfx/tilesets/dark_cave.2bpp.lz"
UnusedTilesetDarkCaveMeta:: UnusedTilesetJohtoMeta::
INCBIN "data/tilesets/unused_dark_cave_metatiles.bin" INCBIN "data/tilesets/unused_johto_metatiles.bin"
UnusedTilesetDarkCaveColl:: UnusedTilesetJohtoColl::
INCLUDE "data/tilesets/unused_dark_cave_collision.asm" INCLUDE "data/tilesets/unused_johto_collision.asm"
SECTION "Tileset Data 5", ROMX SECTION "Tileset Data 5", ROMX