-
Notifications
You must be signed in to change notification settings - Fork 92
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Exposing/Expanding tables Relevant to Trainer Class; Editable TM palettes; Editable Hidden items #285
base: move-dev
Are you sure you want to change the base?
Conversation
Add extended ranges to - trainer class music table - maintable combo - pokemon battle music table - sTrainersEncounterMusicParam
Prize money column 1+2 Trainer genders sTrainerEncounterMusicParam Trainer Class Battle Music MainTableCombo column 1+2 PokemonBattleMusic
Trainerclass constant file: Facilitates money/music tables working Sndseq constant file: Facilitates SEQ_EYE trainerencountermusic working
Prizemoney table (Bagboy, Senate) Trainergenders table Music tables x3 (AdAstra, Senate) Credit for the code and related repoints/bytereplacements listed in brackets
Added credits for AdAstra, Bagboy, Senate
Added relevant credits to Mikelan
Fixed Will gender to match vanilla value
Reformatted SEQ_EYE table into c code format and moved to src
Made the trainerclasses consistent with base hg-e
Moved define to a constant file
Added new define fine
Added include for new constant file
This array now contained in pokemon.c
Added sTrainerGenders array and hooked TT_TrainerTypeSexGet function
Added hook, hooked in pokemon.c
Removed linker, now hooked in pokemon.c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just a few things. let me know if you have any questions or want me to take over from here! will also be doing the trainer sprite expansion on this before merging
armips/data/trainerencountermusic.c
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks like this file is extraneous to the c file that defines this below (and in fact is not built by the makefile)
src/maintablecombos.c
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
are these like trainer classes and songs? what are the constants here?
src/pokemonbattlemusic.c
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what are these combos in reference to? the other table?
src/trainerclassbattle.c
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
may be worth it to do constants for combos. if you're willing to take some time to explain all of these tables to me, i'd love to run through this and define everything needed
Prevents misalignment
Drayano's tm pallete expansion with iteration for all 100 TMs
Add include data for tm_palettes.s
Drayano's hidden item asm editor with iteration for all hidden items and comments on their locations
Add include data for hidden_items.s
Issue where Will (possibly other trainerclasses?) has all pokemon stay female even when gender is changed to male. Possibly related to following compile error
This issue shouldn't prevent merge, compile or future trainerclass expansion. It's beyond my understanding so I will leave it there for this PR.
Future tasks: Trainerclass expansion, trainer sprite expansion
Fully iterated TM_Palettes asm implementation (with permission from and thanks to drayano)
Fully iterated Hidden_Items asm implementation (with permission from and thanks to drayano)