thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-06 16:15:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pokemon Pagoda

Browse source 
This gives Sepia City all of its locations.

The pagoda uses references to the Five-Story Pagoda story from 1891, with Sages using various 成语 translated into English.

This also adds the Elder class, assigning it to Li and (now) Roen.

The Elder in the pagoda is not yet battle-able as I haven't really fit anything into the story. No cutscenes, etc, it's all too early.
This commit is contained in:
Llinos Evans 2024-07-26 13:17:15 +01:00
parent 675e112bee
commit e43decef70
37 changed files with 1017 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

6
data/trainers/attributes.asm
View file

@ -549,4 +549,10 @@ TrainerClassAttributes:
dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
dw CONTEXT_USE | SWITCH_SOMETIMES
; Elder
db NO_ITEM, NO_ITEM ; items
db 10 ; base reward
dw AI_BASIC | AI_SETUP | AI_TYPES | AI_CAUTIOUS | AI_STATUS | AI_RISKY
dw CONTEXT_USE | SWITCH_SOMETIMES
assert_table_length NUM_TRAINER_CLASSES

1
data/trainers/class_names.asm
View file

@ -92,4 +92,5 @@ TrainerClassNames::
li "EXECUTIVE"
li "EXECUTIVE"
li "PROFESSOR"
li "ELDER"
assert_list_length NUM_TRAINER_CLASSES

1
data/trainers/dvs.asm
View file

@ -93,4 +93,5 @@ TrainerClassDVs:
dn 13, 12, 13, 13 ; ARIANA
dn 13, 12, 13, 13 ; ARCHER
dn 13, 12, 13, 13 ; PROF.BLUE
dn 12, 15, 13, 13 ; ELDER (HP Ground)
assert_table_length NUM_TRAINER_CLASSES

1
data/trainers/encounter_music.asm
View file

@ -95,4 +95,5 @@ TrainerEncounterMusic::
db MUSIC_ROCKET_ENCOUNTER ; ARIANA
db MUSIC_ROCKET_ENCOUNTER ; ARCHER
db MUSIC_OFFICER_ENCOUNTER ; PROF.BLUE
db MUSIC_SAGE_ENCOUNTER ; ELDER
assert_table_length NUM_TRAINER_CLASSES + 1

1
data/trainers/gendered_trainers.asm
View file

@ -36,6 +36,7 @@ MaleTrainers:
db SOLDIER
db SPORTSMAN
db AEROFOSSIL
db ELDER
.End
FemaleTrainers:

1
data/trainers/genders.asm
View file

@ -94,4 +94,5 @@ BTTrainerClassGenders:
db MALE ; ARIANA
db FEMALE ; ARCHER
db MALE ; PROF.BLUE
db MALE ; ELDER
assert_table_length NUM_TRAINER_CLASSES

1
data/trainers/palettes.asm
View file

@ -101,6 +101,7 @@ INCBIN "gfx/trainers/kurt.gbcpal", middle_colors
INCBIN "gfx/trainers/ariana.gbcpal", middle_colors
INCBIN "gfx/trainers/archer.gbcpal", middle_colors
INCBIN "gfx/trainers/blue_professor.gbcpal", middle_colors
INCBIN "gfx/trainers/sage.gbcpal", middle_colors ; elder
EnbyPalette:
INCLUDE "gfx/player/topaz.pal"

199
data/trainers/parties.asm
View file

@ -4876,6 +4876,7 @@ ExecutiveFGroup: ; Ariana
end_list_items
; Often seen with Hoothoot in media, so there's a few scattered around for variety.
SageGroup:
next_list_item ; SAGE (1)
db "CHOW@", TRAINERTYPE_NORMAL
@ -4894,13 +4895,13 @@ SageGroup:
db 3
dw BELLSPROUT
db 3
dw BELLSPROUT
dw HOOTHOOT
db -1 ; end
next_list_item ; SAGE (3)
db "JIN@", TRAINERTYPE_NORMAL
db 6
dw BELLSPROUT
dw HOOTHOOT
db -1 ; end
next_list_item ; SAGE (4)
@ -4947,16 +4948,9 @@ SageGroup:
dw BELLSPROUT
db -1 ; end
next_list_item ; SAGE (9)
db "LI@", TRAINERTYPE_MOVES
db 10
dw BELLIGNAN
dw FLASH, VINE_WHIP, GROWTH, WRAP
db -1 ; end
; So these sages are in the Dragon's Den but end up being the Kimono Girls but again.
; Let's give them the Eeveelutions the Kimono Girls don't have!
next_list_item ; SAGE (10)
next_list_item ; SAGE (9)
db "GAKU@", TRAINERTYPE_NORMAL
db 42
dw NOCTOWL
@ -4964,7 +4958,7 @@ SageGroup:
dw LEAFEON
db -1 ; end
next_list_item ; SAGE (11)
next_list_item ; SAGE (10)
db "MASA@", TRAINERTYPE_NORMAL
db 42
dw NOCTOWL
@ -4972,14 +4966,71 @@ SageGroup:
dw GLACEON
db -1 ; end
next_list_item ; SAGE (12)
next_list_item ; SAGE (11)
db "KOJI@", TRAINERTYPE_NORMAL
db 42
dw NOCTOWL
db 42
dw SYLVEON
db -1 ; end
; Pokemon Pagoda Sages
; 3F
next_list_item ; SAGE (12)
db "MING@", TRAINERTYPE_NORMAL ; double-references this one super old clam that lived since the ming dynasty and aptly received it as an epithet before dying to trawlers. Since it's the Tentacruel floor, it felt very fitting! https://en.wikipedia.org/wiki/Ming_(clam)
db 50
dw CLOYSTER
db 50
dw TENTACRUEL
db -1 ; end
next_list_item ; SAGE (13)
db "WEI@", TRAINERTYPE_NORMAL
db 50
dw TENTACRUEL
db -1 ; end
next_list_item ; SAGE (14)
db "LANG@", TRAINERTYPE_NORMAL
db 50
dw TENTACRUEL
db -1 ; end
next_list_item ; SAGE (15)
db "HUANG@", TRAINERTYPE_NORMAL
db 50
dw NOCTOWL
db 50
dw TENTACRUEL
db -1 ; end
; 4F
next_list_item ; SAGE (16)
db "GEN@", TRAINERTYPE_NORMAL
db 50
dw FEAROW
db -1 ; end
next_list_item ; SAGE (17)
db "RAOH@", TRAINERTYPE_NORMAL
db 50
dw FEAROW
db -1 ; end
next_list_item ; SAGE (18)
db "SHUU@", TRAINERTYPE_NORMAL
db 50
dw FEAROW
db -1 ; end
next_list_item ; SAGE (19)
db "SHENG@", TRAINERTYPE_NORMAL
db 50
dw NOCTOWL
db 50
dw FEAROW
db -1 ; end
end_list_items
MediumGroup:
@ -5000,21 +5051,23 @@ MediumGroup:
db -1 ; end
next_list_item ; MEDIUM (3)
db "BETHANY@", TRAINERTYPE_NORMAL ; Unused?
db 25
dw HAUNTER
db "BETHANY@", TRAINERTYPE_NORMAL ; unused, now Pagoda 2F Medium
db 50
dw WISPIRIT
db -1 ; end
next_list_item ; MEDIUM (4)
db "MARGRET@", TRAINERTYPE_NORMAL ; unused
db 25
dw HAUNTER
db "MARGRET@", TRAINERTYPE_NORMAL ; unused, now Pagoda 2F Medium
db 50
dw STROMEN
db 50
dw PHANDARIN
db -1 ; end
next_list_item ; MEDIUM (5)
db "ETHEL@", TRAINERTYPE_NORMAL ; unused
db 25
dw HAUNTER
db "ETHEL@", TRAINERTYPE_NORMAL ; unused, now Pagoda 2F Medium
db 50
dw KITSEN
db -1 ; end
next_list_item ; MEDIUM (6)
@ -5032,7 +5085,13 @@ MediumGroup:
db 36
dw SLOWBRO
db -1 ; end
next_list_item ; MEDIUM (8)
db "ELSIE@", TRAINERTYPE_NORMAL ; Pagoda 2F Medium
db 50
dw WISPIRIT
db -1 ; end
end_list_items
BoarderGroup: ; All in Pryce's Gym. Could expand to Ice Path and Seafoam.
@ -5263,100 +5322,6 @@ KimonoGirlGroup:
end_list_items
; No rematches here, just a lot of unused dupes.
; Potential alt usage? rename a few?
; See spreadsheet for combinations.
TwinsGroup:
next_list_item ; TWINS (1)
db "AMY & MAY@", TRAINERTYPE_NORMAL
db 10
dw SPINARAK
db 10
dw LEDYBA
db -1 ; end
next_list_item ; TWINS (2)
db "ANN & ANNE@", TRAINERTYPE_MOVES
db 16
dw CLEFAIRY
dw GROWL, ENCORE, DOUBLESLAP, METRONOME
db 16
dw JIGGLYPUFF
dw SING, DEFENSE_CURL, POUND, DISABLE
db -1 ; end
next_list_item ; TWINS (3)
db "ANN & ANNE@", TRAINERTYPE_MOVES
db 16
dw JIGGLYPUFF
dw SING, DEFENSE_CURL, POUND, DISABLE
db 16
dw CLEFAIRY
dw GROWL, ENCORE, DOUBLESLAP, METRONOME
db -1 ; end
next_list_item ; TWINS (4)
db "AMY & MAY@", TRAINERTYPE_NORMAL
db 10
dw LEDYBA
db 10
dw SPINARAK
db -1 ; end
next_list_item ; TWINS (5)
db "JO & ZOE@", TRAINERTYPE_NORMAL
db 35
dw VICTREEBEL
db 35
dw VILEPLUME
db -1 ; end
next_list_item ; TWINS (6)
db "JO & ZOE@", TRAINERTYPE_NORMAL
db 35
dw VILEPLUME
db 35
dw VICTREEBEL
db -1 ; end
next_list_item ; TWINS (7)
db "MEG & PEG@", TRAINERTYPE_NORMAL
db 31
dw TEDDIURSA
db 31
dw PHANPY
db -1 ; end
next_list_item ; TWINS (8)
db "MEG & PEG@", TRAINERTYPE_NORMAL
db 31
dw PHANPY
db 31
dw TEDDIURSA
db -1 ; end
next_list_item ; TWINS (9)
db "LEA & PIA@", TRAINERTYPE_MOVES
db 35
dw DRATINI
dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
db 35
dw DRATINI
dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
db -1 ; end
next_list_item ; TWINS (10)
db "LEA & PIA@", TRAINERTYPE_MOVES
db 38
dw DRATINI
dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
db 38
dw DRATINI
dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
db -1 ; end
end_list_items
; Added this to make room for more stuff.
; Yeah, they filled trainers to max capacity originally. Pretty impressive.
SECTION "Enemy Trainer Parties 3", ROMX

122
data/trainers/parties_new_classes.asm
View file

@ -672,3 +672,125 @@ ProfBlueGroup:
dw THUNDERBOLT, CROSS_CHOP, EARTHQUAKE, THIEF
db -1 ; end
end_list_items
ElderGroup:
next_list_item ; originally SAGE (9), now adapted from HGSS
db "LI@", TRAINERTYPE_MOVES
db 10
dw BELLIGNAN
dw FLASH, VINE_WHIP, GROWTH, WRAP
db -1 ; end
; Intended to be just before you fight Shi-Shi (potentially)
db "ROEN@", TRAINERTYPE_MOVES ; from Roen, an esteemed priest from The Five-Storied Pagoda by Koda Rohan.
db 65
dw FEAROW
dw DOUBLE_EDGE, DRILL_PECK, MIRROR_MOVE, AGILITY
db 65
dw TENTACRUEL
dw SURF, DOUBLE_EDGE, SLUDGE_BOMB, SWORDS_DANCE
db 65
dw ALAKAZAM
dw PSYCHIC_M, THUNDERPUNCH, FIRE_PUNCH, RECOVER
db 65
dw ARCANINE
dw FIRE_BLAST, BODY_SLAM, DIG, HIDDEN_POWER
db 65
dw GOROCHU
dw BELLY_DRUM, THUNDERBOLT, BODY_SLAM, SUBMISSION
db -1 ; end
end_list_items
; No rematches here, just a lot of unused dupes.
; Potential alt usage? rename a few?
; See spreadsheet for combinations.
TwinsGroup:
next_list_item ; TWINS (1)
db "AMY & MAY@", TRAINERTYPE_NORMAL
db 10
dw SPINARAK
db 10
dw LEDYBA
db -1 ; end
next_list_item ; TWINS (2)
db "ANN & ANNE@", TRAINERTYPE_MOVES
db 16
dw CLEFAIRY
dw GROWL, ENCORE, DOUBLESLAP, METRONOME
db 16
dw JIGGLYPUFF
dw SING, DEFENSE_CURL, POUND, DISABLE
db -1 ; end
next_list_item ; TWINS (3)
db "ANN & ANNE@", TRAINERTYPE_MOVES
db 16
dw JIGGLYPUFF
dw SING, DEFENSE_CURL, POUND, DISABLE
db 16
dw CLEFAIRY
dw GROWL, ENCORE, DOUBLESLAP, METRONOME
db -1 ; end
next_list_item ; TWINS (4)
db "AMY & MAY@", TRAINERTYPE_NORMAL
db 10
dw LEDYBA
db 10
dw SPINARAK
db -1 ; end
next_list_item ; TWINS (5)
db "JO & ZOE@", TRAINERTYPE_NORMAL
db 35
dw VICTREEBEL
db 35
dw VILEPLUME
db -1 ; end
next_list_item ; TWINS (6)
db "JO & ZOE@", TRAINERTYPE_NORMAL
db 35
dw VILEPLUME
db 35
dw VICTREEBEL
db -1 ; end
next_list_item ; TWINS (7)
db "MEG & PEG@", TRAINERTYPE_NORMAL
db 31
dw TEDDIURSA
db 31
dw PHANPY
db -1 ; end
next_list_item ; TWINS (8)
db "MEG & PEG@", TRAINERTYPE_NORMAL
db 31
dw PHANPY
db 31
dw TEDDIURSA
db -1 ; end
next_list_item ; TWINS (9)
db "LEA & PIA@", TRAINERTYPE_MOVES
db 35
dw DRATINI
dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
db 35
dw DRATINI
dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
db -1 ; end
next_list_item ; TWINS (10)
db "LEA & PIA@", TRAINERTYPE_MOVES
db 38
dw DRATINI
dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT
db 38
dw DRATINI
dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT
db -1 ; end
end_list_items

1
data/trainers/party_pointers.asm
View file

@ -94,4 +94,5 @@ TrainerGroups:
dba ArianaGroup
dba ArcherGroup
dba ProfBlueGroup
dba ElderGroup
assert_table_length NUM_TRAINER_CLASSES

1
data/trainers/pic_pointers.asm
View file

@ -94,4 +94,5 @@ TrainerPicPointers::
dba ArianaPic
dba ArcherPic
dba ProfBluePic
dba SagePic ; Elder
assert_table_length NUM_TRAINER_CLASSES

1
data/trainers/sprites.asm
View file

@ -92,4 +92,5 @@ BTTrainerClassSprites:
db SPRITE_RED ; Ariana
db SPRITE_RED ; Archer
db SPRITE_RED ; Prof.Blue
db SPRITE_SAGE ; ELDER
assert_table_length NUM_TRAINER_CLASSES