diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-04-03 20:44:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-03 20:44:48 -0500 |
| commit | 22fec43f1812cb863ad699b357bd593222ae140c (patch) | |
| tree | 4efa162869946a9bfdbde1be498857fac3db3b39 /src/text_util.c | |
| parent | a2d206665c6fffbd962375f262b7fbb05c7b7478 (diff) | |
More menu work (#33)
* split adventure log menu out and decompile
* add most adventure log matchings w/ 2 nonmatchings and move some relevant data
* more work on other menus
* fully decomp debug stuff around 203B3F0
* more debug menu work
* fix CreatePartnerSelectionMenu nonmatch
* move more data and clean some data up
Diffstat (limited to 'src/text_util.c')
| -rw-r--r-- | src/text_util.c | 44 |
1 files changed, 43 insertions, 1 deletions
diff --git a/src/text_util.c b/src/text_util.c index 02c4239..1de233c 100644 --- a/src/text_util.c +++ b/src/text_util.c @@ -21,6 +21,26 @@ extern const char gDragonText[]; extern const char gDarkText[]; extern const char gSteelText[]; +extern const char gFormattedNoneText[]; +extern const char gFormattedNormalText[]; +extern const char gFormattedFireText[]; +extern const char gFormattedWaterText[]; +extern const char gFormattedGrassText[]; +extern const char gFormattedElectricText[]; +extern const char gFormattedIceText[]; +extern const char gFormattedFightingText[]; +extern const char gFormattedPoisonText[]; +extern const char gFormattedGroundText[]; +extern const char gFormattedFlyingText[]; +extern const char gFormattedPsychicText[]; +extern const char gFormattedBugText[]; +extern const char gFormattedRockText[]; +extern const char gFormattedGhostText[]; +extern const char gFormattedDragonText[]; +extern const char gFormattedDarkText[]; +extern const char gFormattedSteelText[]; + + const char * const gUnformattedTypeStrings[NUM_POKEMON_TYPES] = { gNoneText, @@ -45,7 +65,29 @@ const char * const gUnformattedTypeStrings[NUM_POKEMON_TYPES] = #include "data/unformatted_type_names.h" -extern const char * gFormattedTypeStrings[NUM_POKEMON_TYPES]; // formatted type names +const char * const gFormattedTypeStrings[NUM_POKEMON_TYPES] = +{ + gFormattedNoneText, + gFormattedNormalText, + gFormattedFireText, + gFormattedWaterText, + gFormattedGrassText, + gFormattedElectricText, + gFormattedIceText, + gFormattedFightingText, + gFormattedPoisonText, + gFormattedGroundText, + gFormattedFlyingText, + gFormattedPsychicText, + gFormattedBugText, + gFormattedRockText, + gFormattedGhostText, + gFormattedDragonText, + gFormattedDarkText, + gFormattedSteelText, +}; + +#include "data/formatted_type_names.h" extern u8 *gAbilityNames[]; |