thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-05 11:04:30 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

tweaks

Browse source 
still struggling with the removepokemon bit...
This commit is contained in:
Llinos Evans 2023-05-14 08:58:34 +01:00
parent e02a4b54ef
commit 0bda742995
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/maps/songs.asm
View file

@ -250,5 +250,5 @@ MapSongBanks::
db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM
db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_B1F db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_B1F
db MUSIC_DUNGEON2, 0 ; GIOVANNIS_ROOM db MUSIC_DUNGEON2, 0 ; GIOVANNIS_ROOM
db MUSIC_INDIGO_PLATEAU, 0 ; BATTLE_TENT db MUSIC_GYM, 0 ; BATTLE_TENT
assert_table_length NUM_MAPS assert_table_length NUM_MAPS

4
engine/battletentdata.asm
View file

@ -216,8 +216,8 @@ BTTrainerClassList::
db BIRD_KEEPER, SPRITE_COOLTRAINER_M, 6 db BIRD_KEEPER, SPRITE_COOLTRAINER_M, 6
db BLACKBELT, SPRITE_HIKER, 2 db BLACKBELT, SPRITE_HIKER, 2
db SCIENTIST, SPRITE_SCIENTIST, 8 db SCIENTIST, SPRITE_SCIENTIST, 8
db FIREFIGHTER, SPRITE_COOLTRAINER_M, 0 db FIREFIGHTER, SPRITE_FISHER, 0
db JACK, SPRITE_BALDING_GUY, 0 db JACK, SPRITE_SCIENTIST, 8
db CHANNELER, SPRITE_CHANNELER, 8 db CHANNELER, SPRITE_CHANNELER, 8
BTMonList:: BTMonList::

4
scripts/BattleTent.asm
View file

@ -176,7 +176,7 @@ BattleTent_RestoreTeam:
xor a xor a
ld [wRemoveMonFromBox], a ld [wRemoveMonFromBox], a
ld [wWhichPokemon], a ld [wWhichPokemon], a
call RemovePokemon call _RemovePokemon
pop bc pop bc
dec b dec b
jr nz, .removeloop jr nz, .removeloop
@ -201,7 +201,7 @@ BattleTent_RestoreTeam:
call MoveMon call MoveMon
ld a, $1 ld a, $1
ld [wRemoveMonFromBox], a ld [wRemoveMonFromBox], a
call RemovePokemon call _RemovePokemon
pop bc pop bc
dec b dec b
jr nz, .withdloop jr nz, .withdloop