Exposing/Expanding tables Relevant to Trainer Class; Editable TM palettes; Editable Hidden items #285
+3,450
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
BluRosie
requested changes
Jul 30, 2024
armips/data/trainerencountermusic.c
Outdated
There was a problem hiding this comment.
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.
are these like trainer classes and songs? what are the constants here?
src/pokemonbattlemusic.c
Outdated
There was a problem hiding this comment.
what are these combos in reference to? the other table?
src/trainerclassbattle.c
Outdated
There was a problem hiding this comment.
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
Charliexox
changed the title
Drayano's hidden item asm editor with iteration for all hidden items and comments on their locations
Add include data for hidden_items.s
Charliexox
changed the title
Aeliko
added
enhancement
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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)