thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor bits and pieces

Browse source 
- Tweaked debug team for easier testing of actual trainers
- Hopefully(?) fixed nasty plot anim
This commit is contained in:
Llinos Evans 2023-07-06 16:02:31 +01:00
parent ab72fa0e51
commit 9528f45ce2
4 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/hide_show_constants.asm
View file

@ -8,7 +8,7 @@ DEF SHOW EQU $15
; (they are either items or sprites that deactivate after battle ; (they are either items or sprites that deactivate after battle
; and are detected in wMissableObjectList) ; and are detected in wMissableObjectList)
; However, these constants are still required to synchronise properly ; However, these constants are still required to synchronise properly
; with the hide/show list, so you can't just remove them. ; Factoring in the hide/show list, so you can't just remove them.
const_def const_def
const HS_PALLET_TOWN_OAK ; 00 const HS_PALLET_TOWN_OAK ; 00

6
data/moves/animations.asm
View file

@ -999,6 +999,7 @@ ConstrictAnim:
battle_anim CONSTRICT, SUBANIM_0_BIND, 0, 6 battle_anim CONSTRICT, SUBANIM_0_BIND, 0, 6
db -1 ; end db -1 ; end
NastyPlotAnim:
AmnesiaAnim: AmnesiaAnim:
battle_anim AMNESIA, SUBANIM_0_STATUS_CONFUSED, 0, 8 battle_anim AMNESIA, SUBANIM_0_STATUS_CONFUSED, 0, 8
battle_anim AMNESIA, SUBANIM_0_STATUS_CONFUSED, 0, 8 battle_anim AMNESIA, SUBANIM_0_STATUS_CONFUSED, 0, 8
@ -1208,11 +1209,6 @@ DisarmingVoiceAnim:
battle_anim DISARMING_VOICE, SUBANIM_0_HEART_1_MUSIC, 1, 6 battle_anim DISARMING_VOICE, SUBANIM_0_HEART_1_MUSIC, 1, 6
db -1 ; end db -1 ; end
NastyPlotAnim:
battle_anim AMNESIA, SUBANIM_0_STATUS_CONFUSED, 0, 8
battle_anim AMNESIA, SUBANIM_0_STATUS_CONFUSED, 0, 8
db -1 ; end
BallTossAnim: BallTossAnim:
battle_anim NO_MOVE, SUBANIM_0_BALL_TOSS_HIGH, 0, 3 battle_anim NO_MOVE, SUBANIM_0_BALL_TOSS_HIGH, 0, 3
db -1 ; end db -1 ; end

2
data/trainers/rival_parties.asm
View file

@ -47,7 +47,7 @@ Green3Data:
db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0 db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0
db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0 db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0
db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0 db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0
db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES_A, 63, MAGNEZONE, 65, UMBREON, 0 db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES, 63, MAGNEZONE, 65, UMBREON, 0
db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES, 63, CLOYSTER, 65, GOROCHU, 0 db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES, 63, CLOYSTER, 65, GOROCHU, 0
; post-game rematch teams (currently unused) ; post-game rematch teams (currently unused)
; db $FF, 81, SCIZOR, 79, ALAKAZAM, 81, RHYPERIOR, 81, ARCANINE, 83, ELECTIVIRE, 85, TOTARTLE, 0 ; db $FF, 81, SCIZOR, 79, ALAKAZAM, 81, RHYPERIOR, 81, ARCANINE, 83, ELECTIVIRE, 85, TOTARTLE, 0

22
engine/debug/debug_party.asm
View file

@ -25,7 +25,7 @@ IshiharaTeam:
db MELTAN, 90 db MELTAN, 90
db TRAMPEL, 90 db TRAMPEL, 90
IF DEF(_DEBUG) IF DEF(_DEBUG)
db TAUROS_PB, 90 db MEWTWO, 90
db SNORLAX, 50 db SNORLAX, 50
ENDC ENDC
db -1 ; end db -1 ; end
@ -93,15 +93,16 @@ IF DEF(_DEBUG)
ld a, 15 ld a, 15
ld [hl], a ld [hl], a
; Blaze Tauros (Pokemon 4) has a full moveset ; Mewtwo (Pokemon 4) has a full moveset
; Use for sweeping the 4.
ld hl, wPartyMon4Moves ld hl, wPartyMon4Moves
ld a, FIRE_BLAST ld a, AMNESIA
ld [hli], a ld [hli], a
ld a, LOW_KICK ld a, PSYCHIC_M
ld [hli], a ld [hli], a
ld a, FIRE_SPIN ld a, THUNDERBOLT
ld [hli], a ld [hli], a
ld a, HYPER_BEAM ld a, RECOVER
ld [hl], a ld [hl], a
ld hl, wPartyMon1PP ld hl, wPartyMon1PP
ld a, 99 ld a, 99
@ -147,10 +148,11 @@ IF DEF(_DEBUG)
.items_end .items_end
; Complete the Pokédex. ; Complete the Pokédex.
ld hl, wPokedexOwned ; Comment out (except for the event) to test post-game setup.
call DebugSetPokedexEntries ;ld hl, wPokedexOwned
ld hl, wPokedexSeen ;call DebugSetPokedexEntries
call DebugSetPokedexEntries ;ld hl, wPokedexSeen
;call DebugSetPokedexEntries
SetEvent EVENT_GOT_POKEDEX SetEvent EVENT_GOT_POKEDEX
; Rival chose Pikachu, ; Rival chose Pikachu,