diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-23 13:47:44 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-26 12:57:30 -0800 |
| commit | 5a8cd94046983f15eaf6d414d5f431cb296abdc3 (patch) | |
| tree | 7e4fd6745103d348d9cdf2faf2a5839f2913f1d3 /src/pokemon/learn_move.c | |
| parent | 34a49a726c6c42803950fc993394be8b96492c71 (diff) | |
Lots more pokemon_summary_screen decompilation
Diffstat (limited to 'src/pokemon/learn_move.c')
| -rw-r--r-- | src/pokemon/learn_move.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/pokemon/learn_move.c b/src/pokemon/learn_move.c index 55aac840f..2ba708a97 100644 --- a/src/pokemon/learn_move.c +++ b/src/pokemon/learn_move.c @@ -4,6 +4,7 @@ #include "main.h" #include "menu.h" #include "menu_cursor.h" +#include "learn_move.h" #include "palette.h" #include "pokemon.h" #include "overworld.h" @@ -22,26 +23,11 @@ extern u16 gSpecialVar_0x8004; extern u16 gSpecialVar_0x8005; extern u8 gTileBuffer[]; -struct ContestMove -{ - u8 effect; - u8 contestCategory:3; - u8 comboStarterId; - u8 comboMoves[4]; -}; - -struct ContestEffect -{ - u8 effectType; - u8 appeal; - u8 jam; -}; - extern const struct ContestMove gContestMoves[]; extern const struct ContestEffect gContestEffects[]; extern const struct WindowConfig gWindowConfig_81E6CE4; extern const struct WindowConfig gWindowConfig_81E7240; -extern const u8 *const gUnknown_083CADD4[]; +extern const u8 *const gContestEffectStrings[]; extern const u8 *const gMoveDescriptions[]; extern const u8 gTypeNames[][7]; extern const u8 *const gUnknown_083CAF70[]; @@ -1039,7 +1025,7 @@ void sub_8133AEC(bool8 contestInfo, int unused) gSprites[sLearnMoveStruct->spriteIDs[i + 4]].invisible = FALSE; for (i = 0; i < 3; i++) PrintMoveInfo(moveId, gUnknown_08402E24[gUnknown_08402E3D[i]]); - sub_8072AB0(gUnknown_083CADD4[gContestMoves[moveId].effect], 0x58, 0x48, 0x90, 32, 1); + sub_8072AB0(gContestEffectStrings[gContestMoves[moveId].effect], 0x58, 0x48, 0x90, 32, 1); } else { |