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

Bug Fixes

Browse source 
Fixes the following bugs:
- Restores the Museum Guy's functionality that was removed when trying to allow Brock skip. Now works fine.
- Attempt to fix Yujirou's Sabrina-like glitch. If this doesn't fix it, look at Sabrina between RB and Y
- Attempt to fix some Misty text.
- Changed Squirtle check to use EVENT_BEAT_SURGE over the ThunderBadge. Same effect, saves a line of code, generally easier.
- Reverts a really old and shoddy DV generation system back to vanilla.

Also, I changed some gym/rival teams to reflect new philosophies from Discord discussion.
This commit is contained in:
Llinos Evans 2023-07-08 10:01:27 +01:00
parent 9528f45ce2
commit 8a87ce000e
7 changed files with 71 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
data/trainers/rival_parties.asm
View file

@ -31,29 +31,29 @@ Green2Data:
db $FF, 25, FEAROW, 23, SANDSHREW, 22, VULPIX, 20, MAGNETITE, 25, EEVEE, 0 db $FF, 25, FEAROW, 23, SANDSHREW, 22, VULPIX, 20, MAGNETITE, 25, EEVEE, 0
db $FF, 25, FEAROW, 23, SANDSHREW, 22, VULPIX, 20, SHELLDER, 25, RAICHU, 0 db $FF, 25, FEAROW, 23, SANDSHREW, 22, VULPIX, 20, SHELLDER, 25, RAICHU, 0
; Silph Co. 7F ; Silph Co. 7F
db $FF, 37, MADAAMU, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, TOTARTLE, 0 db $FF, 37, PIDGEOT, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, TOTARTLE, 0
db $FF, 37, MADAAMU, 38, GYARADOS, 35, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0 db $FF, 37, PIDGEOT, 38, GYARADOS, 35, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0
db $FF, 37, MADAAMU, 38, EXEGGCUTE, 35, GYARADOS, 35, ALAKAZAM, 40, CHARIZARD, 0 db $FF, 37, PIDGEOT, 38, EXEGGCUTE, 35, GYARADOS, 35, ALAKAZAM, 40, CHARIZARD, 0
db $FF, 38, SANDSLASH, 35, ALAKAZAM, 37, NINETALES_A, 35, MAGNETON, 40, UMBREON, 0 db $FF, 38, SANDSLASH, 35, ALAKAZAM, 37, NINETALES, 35, MAGNETON, 40, UMBREON, 0
db $FF, 38, SANDSLASH, 35, ALAKAZAM, 37, NINETALES, 35, CLOYSTER, 40, GOROCHU, 0 db $FF, 38, SANDSLASH, 35, ALAKAZAM, 37, NINETALES, 35, CLOYSTER, 40, GOROCHU, 0
; Route 22 ; Route 22
db $FF, 47, MADAAMU, 45, RHYDON, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, TOTARTLE, 0 db $FF, 47, PIDGEOT, 45, RHYDON, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, TOTARTLE, 0
db $FF, 47, MADAAMU, 45, RHYDON, 45, GYARADOS, 47, GROWLITHE, 50, ALAKAZAM, 53, VENUSAUR, 0 db $FF, 47, PIDGEOT, 45, RHYDON, 45, GYARADOS, 47, GROWLITHE, 50, ALAKAZAM, 53, VENUSAUR, 0
db $FF, 47, MADAAMU, 45, RHYDON, 45, EXEGGCUTE, 47, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0 db $FF, 47, PIDGEOT, 45, RHYDON, 45, EXEGGCUTE, 47, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0
db $FF, 47, SANDSLASH, 45, ALAKAZAM, 45, EXEGGCUTE, 47, NINETALES_A, 50, MAGNEZONE, 53, UMBREON, 0 db $FF, 47, SANDSLASH, 45, ALAKAZAM, 45, EXEGGCUTE, 47, NINETALES, 50, MAGNEZONE, 53, UMBREON, 0
db $FF, 47, SANDSLASH, 45, ALAKAZAM, 45, EXEGGCUTE, 47, NINETALES, 50, CLOYSTER, 53, GOROCHU, 0 db $FF, 47, SANDSLASH, 45, ALAKAZAM, 45, EXEGGCUTE, 47, NINETALES, 50, CLOYSTER, 53, GOROCHU, 0
Green3Data: Green3Data:
db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0 db $FF, 61, PIDGEOT, 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, PIDGEOT, 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, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 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, MAGNEZONE, 65, UMBREON, 0 ; could base on trace but eeeeeeeehhhhhhh...
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 - based on FRLG team
; db $FF, 81, SCIZOR, 79, ALAKAZAM, 81, RHYPERIOR, 81, ARCANINE, 83, ELECTIVIRE, 85, TOTARTLE, 0 ; db $FF, 81, PURAKKUSU, 79, ALAKAZAM, 81, GYAOON, 81, ARCANINE, 83, EXEGGUTOR, 85, TOTARTLE, 0
; db $FF, 81, SCIZOR, 79, ALAKAZAM, 81, RHYPERIOR, 81, GYARADOS, 83, MAGMORTAR, 85, VENUSAUR, 0 ; db $FF, 81, PURAKKUSU, 79, ALAKAZAM, 81, GYAOON, 81, GYARADOS, 83, ARCANINE, 85, VENUSAUR, 0
; db $FF, 81, SCIZOR, 79, ALAKAZAM, 81, RHYPERIOR, 81, EXEGGUTOR, 83, CRYITHAN, 85, CHARIZARD, 0 ; db $FF, 81, PURAKKUSU, 79, ALAKAZAM, 81, GYAOON, 81, EXEGGUTOR, 83, GYARADOS, 85, CHARIZARD, 0
; db $FF, 81, GUARDIA, 79, ALAKAZAM, 81, TANGROWTH, 81, NINETALES_A, 83, MAGNEZONE, 85, UMBREON, 0 ; db $FF, 81, GUARDIA, 79, ALAKAZAM, 81, TANGROWTH, 81, NINETALES, 83, MAGNEZONE, 85, UMBREON, 0
; db $FF, 81, GUARDIA, 79, ALAKAZAM, 81, TANGROWTH, 81, NINETALES, 83, CLOYSTER, 85, GOROCHU, 0 ; db $FF, 81, GUARDIA, 79, ALAKAZAM, 81, TANGROWTH, 81, NINETALES, 83, CLOYSTER, 85, GOROCHU, 0
ProfOakData: ProfOakData:

12
data/trainers/scaled_parties.asm
View file

@ -4,11 +4,11 @@ BrockData:
db $FF, 19, GEODUDE, 18, KABUTO, 19, DECILLA, 21, ONIX, 0 ; 1 db $FF, 19, GEODUDE, 18, KABUTO, 19, DECILLA, 21, ONIX, 0 ; 1
db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 24, ONIX, 0 ; 2 db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 24, ONIX, 0 ; 2
db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0 ; 3 db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0 ; 3
db $FF, 38, GOLEM, 37, OMANYTE, 37, KABUTO, 38, NIDOREIGN, 40, GYAOON, 0, ; 4 db $FF, 38, GOLEM, 37, OMANYTE, 37, KABUTO, 38, ONIX, 40, GYAOON, 0, ; 4
db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, NIDOREIGN, 43, GYAOON, 0 ; 5 db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, STEELIX, 43, GYAOON, 0 ; 5
db $FF, 45, GOLEM, 44, OMASTAR, 44, KABUTOPS, 45, NIDOREIGN, 47, GYAOON, 0 ; 6 db $FF, 45, GOLEM, 44, OMASTAR, 44, KABUTOPS, 45, STEELIX, 47, GYAOON, 0 ; 6
db $FF, 47, GOLEM, 46, OMASTAR, 46, KABUTOPS, 48, NIDOREIGN, 48, KLEAVOR, 50, GYAOON, 0 ; 7 (unused) db $FF, 47, GOLEM, 46, OMASTAR, 46, KABUTOPS, 48, KLEAVOR, 48, STEELIX, 50, GYAOON, 0 ; 7 (unused)
db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, ARCANINE_H, 67, KLEAVOR, 70, GYAOON, 0 ; 8 (postgame) db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, ARCANINE_H, 67, STEELIX, 70, GYAOON, 0 ; 8 (postgame)
MistyData: MistyData:
db $FF, 10, STARYU, 11, GYOPIN, 13, WEIRDUCK, 0 ; 0 badges db $FF, 10, STARYU, 11, GYOPIN, 13, WEIRDUCK, 0 ; 0 badges
@ -95,7 +95,7 @@ BrunoData:
db $FF, 74, POLIWRATH, 75, STEELIX, 75, SIRFETCHD, 76, PURAKKUSU, 76, MACHAMP, 78, ZAPDOS_G, 0 db $FF, 74, POLIWRATH, 75, STEELIX, 75, SIRFETCHD, 76, PURAKKUSU, 76, MACHAMP, 78, ZAPDOS_G, 0
AgathaData: AgathaData:
db $FF, 57, CROAKOZUNA, 56, ANNIHILAPE, 56, CROBAT, 58, MAROWAK_A, 58, UMBREON, 60, GENGAR, 0 db $FF, 57, ARBOK, 56, ANNIHILAPE, 56, CROBAT, 58, MAROWAK_A, 58, UMBREON, 60, GENGAR, 0
; post-game rematch team (currently unused) ; post-game rematch team (currently unused)
db $FF, 77, ANNIHILAPE, 76, CROBAT, 76, MAROWAK_A, 78, UMBREON, 78, GENGAR, 80, MOLTRES_G, 0 db $FF, 77, ANNIHILAPE, 76, CROBAT, 76, MAROWAK_A, 78, UMBREON, 78, GENGAR, 80, MOLTRES_G, 0

3
engine/battle/core.asm
View file

@ -6282,8 +6282,7 @@ LoadEnemyMonData:
jr z, .storeDVs jr z, .storeDVs
; random DVs for wild mon ; random DVs for wild mon
call BattleRandom call BattleRandom
ld a, ATKDEFDV_TRAINER ld b, a
ld b, SPDSPCDV_TRAINER
call BattleRandom call BattleRandom
.storeDVs .storeDVs
ld hl, wEnemyMonDVs ld hl, wEnemyMonDVs

4
scripts/CeruleanGym.asm
View file

@ -43,7 +43,7 @@ CeruleanGymMistyPostBattle:
ld [wJoyIgnore], a ld [wJoyIgnore], a
CeruleanGymReceiveTM11: CeruleanGymReceiveTM11:
ld a, $5 ld a, $7
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndexOrTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_BEAT_MISTY SetEvent EVENT_BEAT_MISTY
@ -56,7 +56,7 @@ CeruleanGymReceiveTM11:
SetEvent EVENT_GOT_TM11 SetEvent EVENT_GOT_TM11
jr .gymVictory jr .gymVictory
.BagFull .BagFull
ld a, $7 ld a, $8
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndexOrTextID], a
call DisplayTextID call DisplayTextID
.gymVictory .gymVictory

86
scripts/PewterCity.asm
View file

@ -6,7 +6,7 @@ PewterCity_Script:
PewterCity_ScriptPointers: PewterCity_ScriptPointers:
dw PewterCityScript0 dw PewterCityScript0
; dw PewterCityScript1 dw PewterCityScript1
dw PewterCityScript2 dw PewterCityScript2
dw PewterCityScript3 dw PewterCityScript3
dw PewterCityScript4 dw PewterCityScript4
@ -44,49 +44,49 @@ PewterCityScript0:
; dbmapcoord 37, 19 ; dbmapcoord 37, 19
; db -1 ; end ; db -1 ; end
;PewterCityScript1: PewterCityScript1:
; ld a, [wNPCMovementScriptPointerTableNum] ld a, [wNPCMovementScriptPointerTableNum]
; and a and a
; ret nz ret nz
; ld a, $3 ld a, $3
; ldh [hSpriteIndex], a ldh [hSpriteIndex], a
; ld a, SPRITE_FACING_UP ld a, SPRITE_FACING_UP
; ldh [hSpriteFacingDirection], a ldh [hSpriteFacingDirection], a
; call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
; ld a, ($3 << 4) | SPRITE_FACING_UP ld a, ($3 << 4) | SPRITE_FACING_UP
; ldh [hSpriteImageIndex], a ldh [hSpriteImageIndex], a
; call SetSpriteImageIndexAfterSettingFacingDirection call SetSpriteImageIndexAfterSettingFacingDirection
; call PlayDefaultMusic call PlayDefaultMusic
; ld hl, wFlags_0xcd60 ld hl, wFlags_0xcd60
; set 4, [hl] set 4, [hl]
; ld a, $d ld a, $d
; ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndexOrTextID], a
; call DisplayTextID call DisplayTextID
; ld a, $3c ld a, $3c
; ldh [hSpriteScreenYCoord], a ldh [hSpriteScreenYCoord], a
; ld a, $30 ld a, $30
; ldh [hSpriteScreenXCoord], a ldh [hSpriteScreenXCoord], a
; ld a, 12 ld a, 12
; ldh [hSpriteMapYCoord], a ldh [hSpriteMapYCoord], a
; ld a, 17 ld a, 17
; ldh [hSpriteMapXCoord], a ldh [hSpriteMapXCoord], a
; ld a, $3 ld a, $3
; ld [wSpriteIndex], a ld [wSpriteIndex], a
; call SetSpritePosition1 call SetSpritePosition1
; ld a, $3 ld a, $3
; ldh [hSpriteIndex], a ldh [hSpriteIndex], a
; ld de, MovementData_PewterMuseumGuyExit ld de, MovementData_PewterMuseumGuyExit
; call MoveSprite call MoveSprite
; ld a, $2 ld a, $2
; ld [wPewterCityCurScript], a ld [wPewterCityCurScript], a
; ret ret
;MovementData_PewterMuseumGuyExit: MovementData_PewterMuseumGuyExit:
; db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN
; db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN
; db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN
; db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN
; db -1 ; end db -1 ; end
PewterCityScript2: PewterCityScript2:
ld a, [wd730] ld a, [wd730]

3
scripts/VermilionCity.asm
View file

@ -441,8 +441,7 @@ OfficerJennySquirtle:
text_asm text_asm
CheckEvent EVENT_GOT_SQUIRTLE CheckEvent EVENT_GOT_SQUIRTLE
jr nz, .howDoing jr nz, .howDoing
ld a, [wObtainedBadges] CheckEvent EVENT_BEAT_LT_SURGE
bit 3, a ; THUNDERBADGE
jr z, .noBadge jr z, .noBadge
ld hl, OfficerJennyHasBadge ld hl, OfficerJennyHasBadge
call PrintText call PrintText

2
scripts/ViridianPreGym.asm
View file

@ -80,7 +80,7 @@ YujirouText:
ld hl, YujirouLoseText ld hl, YujirouLoseText
ld de, YujirouWinText ld de, YujirouWinText
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ld a, $3 ld a, $2
ld [wViridianPreGymCurScript], a ld [wViridianPreGymCurScript], a
ld [wCurMapScript], a ld [wCurMapScript], a
jr .done jr .done