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

Fix Rocket Music bug, add Ariana/Archer to places

Browse source 
This fixes the executive music bug and ensures Giovanni also gets it. I removed the female Executive since it's usually just Ariana. Can use it another time if something comes up, but right now, no need.
This commit is contained in:
Llinos Evans 2024-07-29 16:03:21 +01:00
parent ce048df442
commit 5ef2108ce4
17 changed files with 43 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
constants/event_flags.asm
View file

@ -983,10 +983,10 @@
const EVENT_BEAT_COOLTRAINERF_REENA2 const EVENT_BEAT_COOLTRAINERF_REENA2
const EVENT_BEAT_COOLTRAINERF_REENA3 const EVENT_BEAT_COOLTRAINERF_REENA3
; ExecutiveF ; ExecutiveF
const EVENT_BEAT_ROCKET_EXECUTIVEF_1 const EVENT_BEAT_ROCKET_EXECUTIVEF_1 ; Ariana 1
const EVENT_BEAT_ROCKET_EXECUTIVEF_2 const EVENT_BEAT_ROCKET_EXECUTIVEF_2 ; Ariana 2
; ExecutiveM ; ExecutiveM
const EVENT_BEAT_ROCKET_EXECUTIVEM_1 const EVENT_BEAT_ROCKET_EXECUTIVEM_1 ; Archer 1
const EVENT_BEAT_ROCKET_EXECUTIVEM_2 const EVENT_BEAT_ROCKET_EXECUTIVEM_2
const EVENT_BEAT_ROCKET_EXECUTIVEM_3 const EVENT_BEAT_ROCKET_EXECUTIVEM_3
const EVENT_BEAT_ROCKET_EXECUTIVEM_4 const EVENT_BEAT_ROCKET_EXECUTIVEM_4
@ -1113,11 +1113,8 @@
const EVENT_BEAT_LEADER_GIOVANNI const EVENT_BEAT_LEADER_GIOVANNI
const EVENT_BEAT_LEADER_GREEN const EVENT_BEAT_LEADER_GREEN
const EVENT_BEAT_KURT const EVENT_BEAT_KURT
const EVENT_BEAT_ARIANA1
const EVENT_BEAT_ARIANA2
const EVENT_BEAT_ARIANA3 const EVENT_BEAT_ARIANA3
const EVENT_BEAT_ARIANA4 const EVENT_BEAT_ARIANA4
const EVENT_BEAT_ARCHER1
const EVENT_BEAT_ARCHER2 const EVENT_BEAT_ARCHER2
const EVENT_BEAT_ARCHER3 const EVENT_BEAT_ARCHER3
const EVENT_BEAT_PROFBLUE const EVENT_BEAT_PROFBLUE

6
constants/trainer_constants.asm
View file

@ -626,10 +626,6 @@ DEF KRIS EQU __trainer_class__
const TODD5 const TODD5
const QUENTIN const QUENTIN
trainerclass EXECUTIVEF ; 37
const EXECUTIVEF_1
const EXECUTIVEF_2
trainerclass SAGE ; 38 trainerclass SAGE ; 38
const CHOW const CHOW
const NICO const NICO
@ -803,6 +799,8 @@ DEF KRIS EQU __trainer_class__
trainerclass ARIANA trainerclass ARIANA
const ARIANA1 const ARIANA1
const ARIANA2
const ARIANA3
trainerclass ARCHER trainerclass ARCHER
const ARCHER1 const ARCHER1

6
data/trainers/attributes.asm
View file

@ -332,12 +332,6 @@ TrainerClassAttributes:
dw AI_BASIC | AI_CAUTIOUS | AI_STATUS dw AI_BASIC | AI_CAUTIOUS | AI_STATUS
dw CONTEXT_USE | SWITCH_SOMETIMES dw CONTEXT_USE | SWITCH_SOMETIMES
; Executivef
db NO_ITEM, NO_ITEM ; items
db 18 ; base reward
dw AI_BASIC | AI_SETUP | AI_TYPES | AI_SMART | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS | AI_RISKY
dw CONTEXT_USE | SWITCH_SOMETIMES
; Sage ; Sage
db NO_ITEM, NO_ITEM ; items db NO_ITEM, NO_ITEM ; items
db 8 ; base reward db 8 ; base reward

1
data/trainers/class_names.asm
View file

@ -56,7 +56,6 @@ TrainerClassNames::
li "PSYCHIC" li "PSYCHIC"
li "PICNICKER" li "PICNICKER"
li "CAMPER" li "CAMPER"
li "ROCKET"
li "SAGE" li "SAGE"
li "MEDIUM" li "MEDIUM"
li "BOARDER" li "BOARDER"

1
data/trainers/dvs.asm
View file

@ -57,7 +57,6 @@ TrainerClassDVs:
dn 9, 8, 8, 8 ; PSYCHIC_T dn 9, 8, 8, 8 ; PSYCHIC_T
dn 6, 10, 10, 8 ; PICNICKER dn 6, 10, 10, 8 ; PICNICKER
dn 9, 8, 8, 8 ; CAMPER dn 9, 8, 8, 8 ; CAMPER
dn 7, 14, 10, 8 ; EXECUTIVEF
dn 9, 8, 8, 8 ; SAGE dn 9, 8, 8, 8 ; SAGE
dn 7, 8, 8, 8 ; MEDIUM dn 7, 8, 8, 8 ; MEDIUM
dn 9, 8, 8, 8 ; BOARDER dn 9, 8, 8, 8 ; BOARDER

1
data/trainers/encounter_music.asm
View file

@ -59,7 +59,6 @@ TrainerEncounterMusic::
db MUSIC_YOUNGSTER_ENCOUNTER ; psychic_t db MUSIC_YOUNGSTER_ENCOUNTER ; psychic_t
db MUSIC_LASS_ENCOUNTER ; picnicker db MUSIC_LASS_ENCOUNTER ; picnicker
db MUSIC_YOUNGSTER_ENCOUNTER ; camper db MUSIC_YOUNGSTER_ENCOUNTER ; camper
db MUSIC_ROCKET_ENCOUNTER ; executivef
db MUSIC_SAGE_ENCOUNTER ; sage db MUSIC_SAGE_ENCOUNTER ; sage
db MUSIC_SAGE_ENCOUNTER ; medium db MUSIC_SAGE_ENCOUNTER ; medium
db MUSIC_HIKER_ENCOUNTER ; boarder db MUSIC_HIKER_ENCOUNTER ; boarder

1
data/trainers/genders.asm
View file

@ -58,7 +58,6 @@ BTTrainerClassGenders:
db MALE ; PSYCHIC_T db MALE ; PSYCHIC_T
db FEMALE ; PICNICKER db FEMALE ; PICNICKER
db MALE ; CAMPER db MALE ; CAMPER
db FEMALE ; EXECUTIVEF
db MALE ; SAGE db MALE ; SAGE
db FEMALE ; MEDIUM db FEMALE ; MEDIUM
db MALE ; BOARDER db MALE ; BOARDER

1
data/trainers/palettes.asm
View file

@ -65,7 +65,6 @@ INCBIN "gfx/trainers/executive_m.gbcpal", middle_colors
INCBIN "gfx/trainers/psychic_t.gbcpal", middle_colors INCBIN "gfx/trainers/psychic_t.gbcpal", middle_colors
INCBIN "gfx/trainers/picnicker.gbcpal", middle_colors INCBIN "gfx/trainers/picnicker.gbcpal", middle_colors
INCBIN "gfx/trainers/camper.gbcpal", middle_colors INCBIN "gfx/trainers/camper.gbcpal", middle_colors
INCBIN "gfx/trainers/executive_f.gbcpal", middle_colors
INCBIN "gfx/trainers/sage.gbcpal", middle_colors INCBIN "gfx/trainers/sage.gbcpal", middle_colors
INCBIN "gfx/trainers/medium.gbcpal", middle_colors INCBIN "gfx/trainers/medium.gbcpal", middle_colors
INCBIN "gfx/trainers/boarder.gbcpal", middle_colors INCBIN "gfx/trainers/boarder.gbcpal", middle_colors

38
data/trainers/parties.asm
View file

@ -4264,19 +4264,6 @@ BlackbeltGroup:
end_list_items end_list_items
ExecutiveMGroup: ; Unsure which is which. Little help? ExecutiveMGroup: ; Unsure which is which. Little help?
next_list_item ; EXECUTIVEM (1)
db "EXECUTIVE@", TRAINERTYPE_MOVES
db 33
dw HOUNDOUR
dw EMBER, ROAR, BITE, FAINT_ATTACK
db 33
dw KOFFING
dw TACKLE, SLUDGE, SMOKESCREEN, HAZE
db 35
dw HOUNDOOM
dw EMBER, SMOG, BITE, FAINT_ATTACK
db -1 ; end
next_list_item ; EXECUTIVEM (2) next_list_item ; EXECUTIVEM (2)
db "EXECUTIVE@", TRAINERTYPE_MOVES db "EXECUTIVE@", TRAINERTYPE_MOVES
db 36 db 36
@ -4862,7 +4849,7 @@ CamperGroup:
end_list_items end_list_items
ExecutiveFGroup: ; Ariana ArianaGroup: ; Ariana
next_list_item ; EXECUTIVEF (1) next_list_item ; EXECUTIVEF (1)
db "EXECUTIVE@", TRAINERTYPE_MOVES ; Radio Tower db "EXECUTIVE@", TRAINERTYPE_MOVES ; Radio Tower
db 30 db 30
@ -4878,7 +4865,7 @@ ExecutiveFGroup: ; Ariana
dw VILEPLUME dw VILEPLUME
dw ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID dw ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
db 32 db 32
dw MURKROW ; HONCHKROW? dw MURKROW
dw PECK, PURSUIT, HAZE, NIGHT_SHADE dw PECK, PURSUIT, HAZE, NIGHT_SHADE
db -1 ; end db -1 ; end
@ -4891,11 +4878,30 @@ ExecutiveFGroup: ; Ariana
dw VILEPLUME dw VILEPLUME
dw ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID dw ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
db 32 db 32
dw MURKROW ; HONCHKROW? dw HONCHKROW
dw PECK, PURSUIT, HAZE, NIGHT_SHADE dw PECK, PURSUIT, HAZE, NIGHT_SHADE
; Sneasler ; Sneasler
db 35
dw JUNGELA
dw GIGA_DRAIN, NO_MOVE, NO_MOVE, NO_MOVE ; needs sorting
db -1 ; end db -1 ; end
next_list_item ; EXECUTIVEF (3)
db "ARIANA@", TRAINERTYPE_NORMAL
db 30
dw BELLEDAM
db 30
dw ARBOK
db 30
dw VILEPLUME
db 30
dw MUK
db 30
dw HONCHKROW
db 30
dw SNEASEL
db 30
dw JUNGELA
end_list_items end_list_items
; Often seen with Hoothoot in media, so there's a few scattered around for variety. ; Often seen with Hoothoot in media, so there's a few scattered around for variety.

67
data/trainers/parties_new_classes.asm
View file

@ -544,75 +544,16 @@ KurtGroup:
db -1 ; end db -1 ; end
end_list_items end_list_items
ArianaGroup:
next_list_item
db "ARIANA@", TRAINERTYPE_NORMAL
db 30
dw BELLEDAM
db 30
dw VILEPLUME
db 30
dw MUK
db 30
dw ARBOK
db 30
dw HONCHKROW
db -1 ; end
db "ARIANA@", TRAINERTYPE_NORMAL
db 30
dw ARBOK
db 30
dw VILEPLUME
db 30
dw MUK
db 30
dw HONCHKROW
db 30
dw SNEASEL
db -1 ; end
db "ARIANA@", TRAINERTYPE_NORMAL
db 30
dw BELLEDAM
db 30
dw ARBOK
db 30
dw VILEPLUME
db 30
dw MUK
db 30
dw HONCHKROW
db 30
dw SNEASEL
db -1 ; end
db "ARIANA@", TRAINERTYPE_NORMAL
db 30
dw BELLEDAM
db 30
dw ARBOK
db 30
dw VILEPLUME
db 30
dw HONCHKROW
db 30
dw SNEASEL
db 30
dw JUNGELA
db -1 ; end
end_list_items
ArcherGroup: ArcherGroup:
next_list_item next_list_item
db "ARCHER@", TRAINERTYPE_NORMAL db "ARCHER@", TRAINERTYPE_NORMAL
db 30 db 33
dw ELECTRODE dw ELECTRODE
db 30 db 33
dw MAGMAR dw MAGMAR
db 30 db 33
dw GOLBAT dw GOLBAT
db 30 db 35
dw HOUNDOOM dw HOUNDOOM
db -1 ; end db -1 ; end

1
data/trainers/party_pointers.asm
View file

@ -58,7 +58,6 @@ TrainerGroups:
dba PsychicGroup dba PsychicGroup
dba PicnickerGroup dba PicnickerGroup
dba CamperGroup dba CamperGroup
dba ExecutiveFGroup
dba SageGroup dba SageGroup
dba MediumGroup dba MediumGroup
dba BoarderGroup dba BoarderGroup

1
data/trainers/pic_pointers.asm
View file

@ -58,7 +58,6 @@ TrainerPicPointers::
dba PsychicTPic dba PsychicTPic
dba PicnickerPic dba PicnickerPic
dba CamperPic dba CamperPic
dba ExecutivefPic
dba SagePic dba SagePic
dba MediumPic dba MediumPic
dba BoarderPic dba BoarderPic

1
data/trainers/sprites.asm
View file

@ -56,7 +56,6 @@ BTTrainerClassSprites:
db SPRITE_YOUNGSTER db SPRITE_YOUNGSTER
db SPRITE_LASS db SPRITE_LASS
db SPRITE_YOUNGSTER db SPRITE_YOUNGSTER
db SPRITE_ROCKET_GIRL
db SPRITE_SAGE db SPRITE_SAGE
db SPRITE_GRANNY db SPRITE_GRANNY
db SPRITE_ROCKER db SPRITE_ROCKER

8
engine/battle/start_battle.asm
View file

@ -99,6 +99,14 @@ PlayBattleMusic:
jr z, .done jr z, .done
cp GRUNTF cp GRUNTF
jr z, .done jr z, .done
cp COATGIOVANNI
jr z, .done
cp EXECUTIVEM ; placeholder
jr z, .done
cp ARCHER
jr z, .done
cp ARIANA
jr z, .done
ld de, MUSIC_KANTO_GYM_LEADER_BATTLE ld de, MUSIC_KANTO_GYM_LEADER_BATTLE
farcall IsKantoGymLeader farcall IsKantoGymLeader

1
gfx/pics.asm
View file

@ -586,7 +586,6 @@ SECTION "Pics 17", ROMX
ParasBackpic: INCBIN "gfx/pokemon/paras/back.2bpp.lz" ParasBackpic: INCBIN "gfx/pokemon/paras/back.2bpp.lz"
VaporeonBackpic: INCBIN "gfx/pokemon/vaporeon/back.2bpp.lz" VaporeonBackpic: INCBIN "gfx/pokemon/vaporeon/back.2bpp.lz"
TentacoolBackpic: INCBIN "gfx/pokemon/tentacool/back.2bpp.lz" TentacoolBackpic: INCBIN "gfx/pokemon/tentacool/back.2bpp.lz"
ExecutivefPic: INCBIN "gfx/trainers/executive_f.2bpp.lz"
BulbasaurBackpic: INCBIN "gfx/pokemon/bulbasaur/back.2bpp.lz" BulbasaurBackpic: INCBIN "gfx/pokemon/bulbasaur/back.2bpp.lz"
SmoochumBackpic: INCBIN "gfx/pokemon/smoochum/back.2bpp.lz" SmoochumBackpic: INCBIN "gfx/pokemon/smoochum/back.2bpp.lz"
PichuBackpic: INCBIN "gfx/pokemon/pichu/back.2bpp.lz" PichuBackpic: INCBIN "gfx/pokemon/pichu/back.2bpp.lz"

4
maps/RadioTower5F.asm
View file

@ -66,7 +66,7 @@ Director:
end end
TrainerExecutivef1: TrainerExecutivef1:
trainer EXECUTIVEF, EXECUTIVEF_1, EVENT_BEAT_ROCKET_EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, .Script trainer ARIANA, ARIANA1, EVENT_BEAT_ROCKET_EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, .Script
.Script: .Script:
endifjustbattled endifjustbattled
@ -86,7 +86,7 @@ RadioTower5FRocketBossScript:
closetext closetext
winlosstext RadioTower5FRocketBossWinText, 0 winlosstext RadioTower5FRocketBossWinText, 0
setlasttalked RADIOTOWER5F_ROCKET setlasttalked RADIOTOWER5F_ROCKET
loadtrainer EXECUTIVEM, EXECUTIVEM_1 loadtrainer ARCHER, ARCHER1
startbattle startbattle
reloadmapafterbattle reloadmapafterbattle
opentext opentext

2
maps/TeamRocketBaseB2F.asm
View file

@ -95,7 +95,7 @@ RocketBaseBossFScript:
applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, RocketBaseBossFBattlesPlayerMovement applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, RocketBaseBossFBattlesPlayerMovement
winlosstext RocketBaseBossWinText, 0 winlosstext RocketBaseBossWinText, 0
setlasttalked TEAMROCKETBASEB2F_ROCKET_GIRL setlasttalked TEAMROCKETBASEB2F_ROCKET_GIRL
loadtrainer EXECUTIVEF, EXECUTIVEF_2 loadtrainer ARIANA, ARIANA2
startbattle startbattle
disappear TEAMROCKETBASEB2F_DRAGON disappear TEAMROCKETBASEB2F_DRAGON
setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE