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

Extra trainer classes, new bold P

Browse source 
I changed the P image to match the font used in the prototype assets.

Also, because Yujirou has a pic all alone in that one bank, I added the other 4 beta trainer classes that never got used. They're all ready to be used, just need teams and a place to go, but I want to address trainer line-ups last code-wise.
This commit is contained in:
May Evans 2023-04-04 19:28:02 +01:00
parent c4d780b8c7
commit 4669dbc53a
14 changed files with 49 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
constants/trainer_constants.asm
View file

@ -62,4 +62,8 @@ ENDM
trainer_const AGATHA ; $2E
trainer_const LANCE ; $2F
trainer_const YUJIROU ; $0D, was unused juggler, also not 0D but I can't be bothered to change everything
trainer_const STUDENT
trainer_const FIREFIGHTER
trainer_const JUNIOR
trainer_const JACK
DEF NUM_TRAINERS EQU const_value - 1

6
data/trainers/ai_pointers.asm
View file

@ -16,7 +16,6 @@ TrainerAIPointers:
dbw 3, GenericAI
dbw 3, GenericAI
dbw 3, GenericAI
dbw 3, JugglerAI ; unused_juggler
dbw 3, GenericAI
dbw 3, GenericAI
dbw 3, GenericAI
@ -51,4 +50,9 @@ TrainerAIPointers:
dbw 3, GenericAI
dbw 2, AgathaAI ; agatha
dbw 1, LanceAI ; lance
dbw 3, GenericAI ; Yujirou
dbw 3, GenericAI ; Student
dbw 3, GenericAI ; Firefighter
dbw 3, GenericAI ; Junior
dbw 2, BlackbeltAI ; Jack
assert_table_length NUM_TRAINERS

6
data/trainers/move_choices.asm
View file

@ -21,7 +21,6 @@ TrainerClassMoveChoiceModifications:
move_choices 1 ; BIKER
move_choices 1, 3 ; BURGLAR
move_choices 1 ; ENGINEER
move_choices 1, 3, ; UNUSED_JUGGLER
move_choices 1, 3 ; FISHER
move_choices 1, 3 ; SWIMMER
move_choices ; CUE_BALL
@ -56,4 +55,9 @@ TrainerClassMoveChoiceModifications:
move_choices 1 ; CHANNELER
move_choices 1 ; AGATHA
move_choices 1, 3 ; LANCE
move_choices 1, 3, ; YUJIROU, was UNUSED_JUGGLER
move_choices 1, 3, ; STUDENT
move_choices 1, 3, ; FIREFIGHTER
move_choices 1, 3, ; JUNIOR
move_choices 1, 3, ; JACK
assert_list_length NUM_TRAINERS

4
data/trainers/names.asm
View file

@ -46,3 +46,7 @@ TrainerNames::
db "AGATHA@"
db "LANCE@"
db "YUJIROU@"
db "STUDENT@"
db "FIREFIGHTER@"
db "JUNIOR@"
db "JACK@"

12
data/trainers/parties.asm
View file

@ -46,6 +46,10 @@ TrainerDataPointers:
dw AgathaData
dw LanceData
dw YujirouData ; was unused juggler
dw StudentData
dw FirefighterData
dw JuniorData
dw JackData
; if first byte != $FF, then
; first byte is level (of all pokemon on this team)
@ -858,3 +862,11 @@ YujirouData: ; was unused juggler
db $FF, 7, KONYA, 7, RATTATA, 10, LICKITUNG, 0
; post-game rematch team (currently unused)
db $FF, 66, PERSIAN, 67, TAUROS, 67, MADAAMU, 66, BLISSEY, 67, SNORLAX, 70, LICKILICKY, 0
StudentData:
FirefighterData:
JuniorData:
JackData:

6
data/trainers/pic_pointers_money.asm
View file

@ -20,7 +20,7 @@ TrainerPicAndMoneyPointers::
pic_money BurglarPic, 9000
pic_money EngineerPic, 5000
pic_money FisherPic, 3500
pic_money SwimmerPic, 500
pic_money SwimmerPic, 1500
pic_money CueBallPic, 2500
pic_money GamblerPic, 7000
pic_money BeautyPic, 7000
@ -54,4 +54,8 @@ TrainerPicAndMoneyPointers::
pic_money AgathaPic, 9900
pic_money LancePic, 9900
pic_money YujirouPic, 9900 ; was unused juggler
pic_money StudentPic, 1000
pic_money FirefighterPic, 1500
pic_money JuniorPic, 1000
pic_money JackPic, 5000
assert_table_length NUM_TRAINERS

BIN
gfx/font/P.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 77 B

After

Width:  |  Height:  |  Size: 151 B

4
gfx/pics.asm
View file

@ -551,3 +551,7 @@ MissingNoPicBack:: INCBIN "gfx/pokemon/back/missingnob.pic"
SECTION "Pics 10", ROMX ; Extra Trainer Bank
YujirouPic:: INCBIN "gfx/trainers/yujirou.pic"
StudentPic:: INCBIN "gfx/trainers/student.pic"
FirefighterPic:: INCBIN "gfx/trainers/firefighter.pic"
JuniorPic:: INCBIN "gfx/trainers/junior.pic"
JackPic:: INCBIN "gfx/trainers/jack.pic"

BIN
gfx/trainers/firefighter.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 891 B

BIN
gfx/trainers/jack.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 807 B

BIN
gfx/trainers/junior.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 645 B

BIN
gfx/trainers/student.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 718 B

3
main.asm
View file

@ -236,7 +236,7 @@ SECTION "Battle Engine 8", ROMX
INCLUDE "engine/battle/init_battle_variables.asm"
INCLUDE "engine/battle/move_effects/paralyze.asm"
INCLUDE "engine/battle/experience.asm" ; moved because trainer ai grew too big
SECTION "Hidden Objects 2", ROMX
@ -249,7 +249,6 @@ INCLUDE "engine/events/hidden_objects/indigo_plateau_hq.asm"
SECTION "Battle Engine 9", ROMX
INCLUDE "engine/battle/experience.asm"
INCLUDE "engine/battle/scroll_draw_trainer_pic.asm"
INCLUDE "engine/battle/trainer_ai.asm"
INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm"

17
scan_includes.exe.stackdump
View file

@ -1,16 +1,15 @@
Exception: STATUS_ACCESS_VIOLATION at rip=00100401246
rax=FFFFFFF7FFF97021 rbx=00000000000006AD rcx=0000000800000010
rdx=0000000000000000 rsi=000000080005895E rdi=0000000000000000
r8 =00000000FFFFC7C4 r9 =0000000000000000 r10=0000000100000000
r11=0000000100401282 r12=0000000800068FE0 r13=0000000100403148
r14=0000000000000000 r15=0000000000000001
rbp=0000000100403156 rsp=00000000FFFFCA60
program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 1123, thread main
rax=FFFFFFF7FFFA7851 rbx=0000000000007D5E rcx=0000000800000010
rdx=0000000000000000 rsi=0000000180369F60 rdi=0000000000000000
r8 =00000000FFFFC844 r9 =0000000000000000 r10=0000000100000000
r11=0000000100401282 r12=00000008000587B0 r13=0000000100403148
r14=0000000000000018 r15=0000000000000001
rbp=0000000100403156 rsp=00000000FFFFCAE0
program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 521, thread main
cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B
Stack trace:
Frame Function Args
00100403156 00100401246 (0080005895E, 00000000022, 00100403166, 000FFFFCB90)
00100403156 00100401409 (00000000000, 00100000001, 00180227860, 00100407000)
00100403156 00100401246 (00000000000, 00100000001, 00180227860, 00100407000)
00100403178 00100401C87 (00000000020, 00000000000, 00180049B11, 00180048A70)
000FFFFCD30 00180049B7D (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFFFF0 00180047746 (00000000000, 00000000000, 00000000000, 00000000000)