dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #428 from PikalaxALT/trainer_tower_to_c

Browse Source 
Trainer tower sets to C
This commit is contained in:
GriffinR
2021-05-07 14:11:38 -04:00
committed by GitHub
parent bfce7b67ed b79634e2f3
commit f4130c5932
8 changed files with 9095 additions and 5221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/data_8479668.s
-2
View File
@@ -15,8 +15,6 @@
@ 847ABAC @ 847ABAC
.align 2 .align 2
.include "data/trainer_tower/trainers.inc"
.include "data/text/move_descriptions.inc" .include "data/text/move_descriptions.inc"
.align 2, 0 .align 2, 0
data/trainer_tower/trainers.inc
-5153
View File
File diff suppressed because it is too large Load Diff
include/cereader_tool.h
+2 -2
View File
@@ -8,7 +8,7 @@ struct TrainerTowerTrainer
{ {
/* 0x000 */ u8 name[11]; /* 0x000 */ u8 name[11];
/* 0x00B */ u8 facilityClass; /* 0x00B */ u8 facilityClass;
/* 0x00C */ u8 gender; /* 0x00C */ u8 textColor;
/* 0x00E */ u16 speechBefore[6]; /* 0x00E */ u16 speechBefore[6];
/* 0x01A */ u16 speechWin[6]; /* 0x01A */ u16 speechWin[6];
/* 0x026 */ u16 speechLose[6]; /* 0x026 */ u16 speechLose[6];
@@ -18,7 +18,7 @@ struct TrainerTowerTrainer
struct TrainerTowerFloor struct TrainerTowerFloor
{ {
/* 0x000 */ u8 unk_000; /* 0x000 */ u8 id;
/* 0x001 */ u8 floorIdx; /* 0x001 */ u8 floorIdx;
/* 0x002 */ u8 challengeType; /* 0x002 */ u8 challengeType;
/* 0x003 */ u8 prize; /* 0x003 */ u8 prize;
include/constants/trainer_tower.h
+17
View File
@@ -4,12 +4,29 @@
#define CHALLENGE_TYPE_SINGLE 0 #define CHALLENGE_TYPE_SINGLE 0
#define CHALLENGE_TYPE_DOUBLE 1 #define CHALLENGE_TYPE_DOUBLE 1
#define CHALLENGE_TYPE_KNOCKOUT 2 #define CHALLENGE_TYPE_KNOCKOUT 2
#define CHALLENGE_TYPE_MIXED 3
// Mixed challenges use one of the above 3 for each floor // Mixed challenges use one of the above 3 for each floor
#define CHALLENGE_STATUS_LOST 0 #define CHALLENGE_STATUS_LOST 0
#define CHALLENGE_STATUS_UNK 1 // Never set, possibly e-Card related #define CHALLENGE_STATUS_UNK 1 // Never set, possibly e-Card related
#define CHALLENGE_STATUS_NORMAL 2 // Not started or ongoing #define CHALLENGE_STATUS_NORMAL 2 // Not started or ongoing
#define TTPRIZE_HP_UP 0
#define TTPRIZE_PROTEIN 1
#define TTPRIZE_IRON 2
#define TTPRIZE_CARBOS 3
#define TTPRIZE_CALCIUM 4
#define TTPRIZE_ZINC 5
#define TTPRIZE_BRIGHT_POWDER 6
#define TTPRIZE_WHITE_HERB 7
#define TTPRIZE_MENTAL_HERB 8
#define TTPRIZE_CHOICE_BAND 9
#define TTPRIZE_KINGS_ROCK 10
#define TTPRIZE_SCOPE_LENS 11
#define TTPRIZE_METAL_COAT 12
#define TTPRIZE_DRAGON_SCALE 13
#define TTPRIZE_UP_GRADE 14
#define MAX_TRAINER_TOWER_FLOORS 8 #define MAX_TRAINER_TOWER_FLOORS 8
#define MAX_TRAINERS_PER_FLOOR 3 #define MAX_TRAINERS_PER_FLOOR 3
include/easy_chat.h
+1 -1
View File
@@ -31,7 +31,7 @@ struct EasyChatWordsByLetter
}; };
u8 *CopyEasyChatWord(u8 *dest, u16 word); u8 *CopyEasyChatWord(u8 *dest, u16 word);
u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2); u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows);
bool8 EC_DoesEasyChatStringFitOnLine(const u16 *easyChatWords, u8 columns, u8 rows, u16 maxLength); bool8 EC_DoesEasyChatStringFitOnLine(const u16 *easyChatWords, u8 columns, u8 rows, u16 maxLength);
void EC_ResetMEventProfileMaybe(void); void EC_ResetMEventProfileMaybe(void);
void InitEasyChatPhrases(void); void InitEasyChatPhrases(void);
ld_script.txt
+1
View File
@@ -609,6 +609,7 @@ SECTIONS {
src/minigame_countdown.o(.rodata); src/minigame_countdown.o(.rodata);
src/berry_fix_program.o(.rodata); src/berry_fix_program.o(.rodata);
src/keyboard_text.o(.rodata); src/keyboard_text.o(.rodata);
src/trainer_tower_sets.o(.rodata);
data/data_8479668.o(.rodata); data/data_8479668.o(.rodata);
/* These should not be moved to C files */ /* These should not be moved to C files */
src/trainer_tower.c
+77 -63
View File
@@ -19,13 +19,13 @@
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/trainer_tower.h" #include "constants/trainer_tower.h"
#define CURR_FLOOR sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx] #define CURR_FLOOR sTrainerTowerState->data.floors[sTrainerTowerState->floorIdx]
#define TRAINER_TOWER gSaveBlock1Ptr->trainerTower[gSaveBlock1Ptr->towerChallengeId] #define TRAINER_TOWER gSaveBlock1Ptr->trainerTower[gSaveBlock1Ptr->towerChallengeId]
struct UnkStruct_203F458 struct TrainerTowerState
{ {
/* 0x0000 */ u8 floorIdx; /* 0x0000 */ u8 floorIdx;
/* 0x0004 */ struct EReaderTrainerTowerSet unk_0004; /* 0x0004 */ struct EReaderTrainerTowerSet data;
}; };
struct TrainerTowerOpponent struct TrainerTowerOpponent
@@ -37,7 +37,7 @@ struct TrainerTowerOpponent
/* 0x30 */ u16 speechLose2[6]; /* 0x30 */ u16 speechLose2[6];
/* 0x3C */ u8 battleType; /* 0x3C */ u8 battleType;
/* 0x3D */ u8 facilityClass; /* 0x3D */ u8 facilityClass;
/* 0x3E */ u8 gender; /* 0x3E */ u8 textColor;
}; };
struct SinglesTrainerInfo struct SinglesTrainerInfo
@@ -62,7 +62,7 @@ struct TrainerEncounterMusicPairs
u8 musicId; u8 musicId;
}; };
static EWRAM_DATA struct UnkStruct_203F458 * sTrainerTowerState = NULL; static EWRAM_DATA struct TrainerTowerState * sTrainerTowerState = NULL;
static EWRAM_DATA struct TrainerTowerOpponent * sTrainerTowerOpponent = NULL; static EWRAM_DATA struct TrainerTowerOpponent * sTrainerTowerOpponent = NULL;
static EWRAM_DATA u8 sUnused_203F460 = 0; static EWRAM_DATA u8 sUnused_203F460 = 0;
@@ -310,8 +310,15 @@ static const struct TrainerEncounterMusicPairs sTrainerEncounterMusicLUT[105] =
}; };
static const struct WindowTemplate sTimeBoardWindowTemplate[] = { static const struct WindowTemplate sTimeBoardWindowTemplate[] = {
{0, 3, 1, 27, 18, 15, 0x001}, {
DUMMY_WIN_TEMPLATE .bg = 0,
.tilemapLeft = 3,
.tilemapTop = 1,
.width = 27,
.height = 18,
.paletteNum = 15,
.baseBlock = 0x001
}, DUMMY_WIN_TEMPLATE
}; };
static const u32 sUnused_847A228 = 0x70; static const u32 sUnused_847A228 = 0x70;
@@ -389,41 +396,44 @@ static const u16 sTrainerTowerEncounterMusic[] = {
[TRAINER_ENCOUNTER_MUSIC_RICH] = MUS_ENCOUNTER_BOY [TRAINER_ENCOUNTER_MUSIC_RICH] = MUS_ENCOUNTER_BOY
}; };
static const u8 sSingleBattleChallengeMonIdxs[][2] = { // The trainer only uses two Pokemon from the encoded pool, based on the current floor
{0x00, 0x02}, static const u8 sSingleBattleChallengeMonIdxs[MAX_TRAINER_TOWER_FLOORS][2] = {
{0x01, 0x03}, {0, 2},
{0x02, 0x04}, {1, 3},
{0x03, 0x05}, {2, 4},
{0x04, 0x01}, {3, 5},
{0x05, 0x02}, {4, 1},
{0x00, 0x03}, {5, 2},
{0x01, 0x04} {0, 3},
{1, 4}
}; };
static const u8 sDoubleBattleChallengeMonIdxs[][2] = { // Each trainer only uses one Pokemon from the encoded pool, based on the current floor
{0x00, 0x01}, static const u8 sDoubleBattleChallengeMonIdxs[MAX_TRAINER_TOWER_FLOORS][2] = {
{0x01, 0x03}, {0, 1},
{0x02, 0x00}, {1, 3},
{0x03, 0x04}, {2, 0},
{0x04, 0x02}, {3, 4},
{0x05, 0x02}, {4, 2},
{0x00, 0x03}, {5, 2},
{0x01, 0x05} {0, 3},
{1, 5}
}; };
static const u8 sKnockoutChallengeMonIdxs[][3] = { // Each trainer only uses one Pokemon from the encoded pool, based on the current floor
{0x00, 0x02, 0x04}, static const u8 sKnockoutChallengeMonIdxs[MAX_TRAINER_TOWER_FLOORS][3] = {
{0x01, 0x03, 0x05}, {0, 2, 4},
{0x02, 0x03, 0x01}, {1, 3, 5},
{0x03, 0x04, 0x00}, {2, 3, 1},
{0x04, 0x01, 0x02}, {3, 4, 0},
{0x05, 0x00, 0x03}, {4, 1, 2},
{0x00, 0x05, 0x02}, {5, 0, 3},
{0x01, 0x04, 0x05} {0, 5, 2},
{1, 4, 5}
}; };
extern const struct EReaderTrainerTowerSetSubstruct gUnknown_84827AC; extern const struct EReaderTrainerTowerSetSubstruct gTrainerTowerLocalHeader;
extern const struct TrainerTowerFloor *const gUnknown_84827B4[][MAX_TRAINER_TOWER_FLOORS]; extern const struct TrainerTowerFloor *const gTrainerTowerFloors[][MAX_TRAINER_TOWER_FLOORS];
void CallTrainerTowerFunc(void) void CallTrainerTowerFunc(void)
{ {
@@ -471,7 +481,7 @@ void InitTrainerTowerBattleStruct(void)
sTrainerTowerOpponent->battleType = CURR_FLOOR.challengeType; sTrainerTowerOpponent->battleType = CURR_FLOOR.challengeType;
sTrainerTowerOpponent->facilityClass = CURR_FLOOR.trainers[trainerId].facilityClass; sTrainerTowerOpponent->facilityClass = CURR_FLOOR.trainers[trainerId].facilityClass;
sTrainerTowerOpponent->gender = CURR_FLOOR.trainers[trainerId].gender; sTrainerTowerOpponent->textColor = CURR_FLOOR.trainers[trainerId].textColor;
SetVBlankCounter1Ptr(&TRAINER_TOWER.timer); SetVBlankCounter1Ptr(&TRAINER_TOWER.timer);
FreeTrainerTowerDataStruct(); FreeTrainerTowerDataStruct();
} }
@@ -504,24 +514,24 @@ void GetTrainerTowerOpponentLoseText(u8 *dest, u8 opponentIdx)
static void SetUpTrainerTowerDataStruct(void) static void SetUpTrainerTowerDataStruct(void)
{ {
u32 challengeType = gSaveBlock1Ptr->towerChallengeId; u32 challengeType = gSaveBlock1Ptr->towerChallengeId;
s32 r4; s32 i;
const struct TrainerTowerFloor *const * r7; const struct TrainerTowerFloor *const * floors_p;
sTrainerTowerState = AllocZeroed(sizeof(*sTrainerTowerState)); sTrainerTowerState = AllocZeroed(sizeof(*sTrainerTowerState));
sTrainerTowerState->floorIdx = gMapHeader.mapLayoutId - LAYOUT_TRAINER_TOWER_1F; sTrainerTowerState->floorIdx = gMapHeader.mapLayoutId - LAYOUT_TRAINER_TOWER_1F;
if (ReadTrainerTowerAndValidate() == TRUE) if (ReadTrainerTowerAndValidate() == TRUE)
CEReaderTool_LoadTrainerTower(&sTrainerTowerState->unk_0004); CEReaderTool_LoadTrainerTower(&sTrainerTowerState->data);
else else
{ {
struct UnkStruct_203F458 * r0_ = sTrainerTowerState; struct TrainerTowerState * ttstate_p = sTrainerTowerState;
const struct EReaderTrainerTowerSetSubstruct * r1 = &gUnknown_84827AC; const struct EReaderTrainerTowerSetSubstruct * header_p = &gTrainerTowerLocalHeader;
memcpy(&r0_->unk_0004, r1, sizeof(struct EReaderTrainerTowerSetSubstruct)); memcpy(&ttstate_p->data, header_p, sizeof(struct EReaderTrainerTowerSetSubstruct));
r7 = gUnknown_84827B4[challengeType]; floors_p = gTrainerTowerFloors[challengeType];
for (r4 = 0; r4 < MAX_TRAINER_TOWER_FLOORS; r4++) for (i = 0; i < MAX_TRAINER_TOWER_FLOORS; i++)
{ {
*(sTrainerTowerState->unk_0004.floors + r4) = *(r7[r4]); // manual pointer arithmetic needed to match *(sTrainerTowerState->data.floors + i) = *(floors_p[i]); // manual pointer arithmetic needed to match
} }
sTrainerTowerState->unk_0004.checksum = CalcByteArraySum((void *)sTrainerTowerState->unk_0004.floors, sizeof(sTrainerTowerState->unk_0004.floors)); sTrainerTowerState->data.checksum = CalcByteArraySum((void *)sTrainerTowerState->data.floors, sizeof(sTrainerTowerState->data.floors));
ValidateOrResetCurTrainerTowerRecord(); ValidateOrResetCurTrainerTowerRecord();
} }
} }
@@ -533,7 +543,7 @@ static void FreeTrainerTowerDataStruct(void)
static void InitTrainerTowerFloor(void) static void InitTrainerTowerFloor(void)
{ {
if (gMapHeader.mapLayoutId - LAYOUT_TRAINER_TOWER_LOBBY > sTrainerTowerState->unk_0004.numFloors) if (gMapHeader.mapLayoutId - LAYOUT_TRAINER_TOWER_LOBBY > sTrainerTowerState->data.numFloors)
{ {
gSpecialVar_Result = 3; // Skip past usable challenge types gSpecialVar_Result = 3; // Skip past usable challenge types
SetCurrentMapLayout(LAYOUT_TRAINER_TOWER_ROOF); SetCurrentMapLayout(LAYOUT_TRAINER_TOWER_ROOF);
@@ -620,17 +630,21 @@ static void SetTrainerTowerNPCGraphics(void)
static void TT_ConvertEasyChatMessageToString(u16 *ecWords, u8 *dest) static void TT_ConvertEasyChatMessageToString(u16 *ecWords, u8 *dest)
{ {
s32 r1; s32 i;
ConvertEasyChatWordsToString(dest, ecWords, 3, 2); ConvertEasyChatWordsToString(dest, ecWords, 3, 2);
if ((unsigned)GetStringWidth(2, dest, -1) > 196) if ((unsigned)GetStringWidth(2, dest, -1) > 196)
{ {
// Has to be printed 2x3
ConvertEasyChatWordsToString(dest, ecWords, 2, 3); ConvertEasyChatWordsToString(dest, ecWords, 2, 3);
r1 = 0; // Skip line 1
while (dest[r1++] != CHAR_NEWLINE) i = 0;
while (dest[i++] != CHAR_NEWLINE)
; ;
while (dest[r1] != CHAR_NEWLINE) // Skip line 2
r1++; while (dest[i] != CHAR_NEWLINE)
dest[r1] = CHAR_PROMPT_SCROLL; i++;
// Replace \n with \l at the end of line 2
dest[i] = CHAR_PROMPT_SCROLL;
} }
} }
@@ -784,7 +798,7 @@ static void GetOwnerState(void)
static void GiveChallengePrize(void) static void GiveChallengePrize(void)
{ {
u16 itemId = sPrizeList[sTrainerTowerState->unk_0004.floors->prize]; u16 itemId = sPrizeList[sTrainerTowerState->data.floors->prize];
if (TRAINER_TOWER.receivedPrize) if (TRAINER_TOWER.receivedPrize)
{ {
@@ -891,15 +905,15 @@ static void ShowResultsBoard(void)
windowId = AddWindow(sTimeBoardWindowTemplate); windowId = AddWindow(sTimeBoardWindowTemplate);
LoadStdWindowFrameGfx(); LoadStdWindowFrameGfx();
DrawStdWindowFrame(windowId, FALSE); DrawStdWindowFrame(windowId, FALSE);
AddTextPrinterParameterized(windowId, 2, gText_TimeBoard, 0x4A, 0, 0xFF, NULL); AddTextPrinterParameterized(windowId, 2, gText_TimeBoard, 74, 0, TEXT_SPEED_FF, NULL);
for (i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++) for (i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++)
{ {
PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&TRAINER_TOWER.bestTime)); PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&TRAINER_TOWER.bestTime));
StringExpandPlaceholders(gStringVar4, gText_XMinYZSec); StringExpandPlaceholders(gStringVar4, gText_XMinYZSec);
AddTextPrinterParameterized(windowId, 2, gTrainerTowerChallengeTypeTexts[i - 1], 0x18, 0x24 + 0x14 * i, 0xFF, NULL); AddTextPrinterParameterized(windowId, 2, gTrainerTowerChallengeTypeTexts[i - 1], 24, 36 + 20 * i, TEXT_SPEED_FF, NULL);
AddTextPrinterParameterized(windowId, 2, gStringVar4, 0x60, 0x2E + 0x14 * i, 0xFF, NULL); AddTextPrinterParameterized(windowId, 2, gStringVar4, 96, 46 + 20 * i, TEXT_SPEED_FF, NULL);
} }
PutWindowTilemap(windowId); PutWindowTilemap(windowId);
@@ -922,9 +936,9 @@ static void TrainerTowerGetDoublesEligiblity(void)
static void TrainerTowerGetNumFloors(void) static void TrainerTowerGetNumFloors(void)
{ {
if (sTrainerTowerState->unk_0004.numFloors != sTrainerTowerState->unk_0004.floors[0].floorIdx) if (sTrainerTowerState->data.numFloors != sTrainerTowerState->data.floors[0].floorIdx)
{ {
ConvertIntToDecimalStringN(gStringVar1, sTrainerTowerState->unk_0004.numFloors, STR_CONV_MODE_LEFT_ALIGN, 1); ConvertIntToDecimalStringN(gStringVar1, sTrainerTowerState->data.numFloors, STR_CONV_MODE_LEFT_ALIGN, 1);
gSpecialVar_Result = TRUE; gSpecialVar_Result = TRUE;
} }
else else
@@ -1029,9 +1043,9 @@ static s32 GetPartyMaxLevel(void)
static void ValidateOrResetCurTrainerTowerRecord(void) static void ValidateOrResetCurTrainerTowerRecord(void)
{ {
if (TRAINER_TOWER.unk9 != sTrainerTowerState->unk_0004.id) if (TRAINER_TOWER.unk9 != sTrainerTowerState->data.id)
{ {
TRAINER_TOWER.unk9 = sTrainerTowerState->unk_0004.id; TRAINER_TOWER.unk9 = sTrainerTowerState->data.id;
SetTrainerTowerRecordTime(&TRAINER_TOWER.bestTime, TRAINER_TOWER_MAX_TIME); SetTrainerTowerRecordTime(&TRAINER_TOWER.bestTime, TRAINER_TOWER_MAX_TIME);
TRAINER_TOWER.receivedPrize = FALSE; TRAINER_TOWER.receivedPrize = FALSE;
} }
@@ -1043,7 +1057,7 @@ void PrintTrainerTowerRecords(void)
u8 windowId = 0; u8 windowId = 0;
SetUpTrainerTowerDataStruct(); SetUpTrainerTowerDataStruct();
FillWindowPixelRect(0, 0, 0, 0, 0xd8, 0x90); FillWindowPixelRect(0, PIXEL_FILL(0), 0, 0, 216, 144);
ValidateOrResetCurTrainerTowerRecord(); ValidateOrResetCurTrainerTowerRecord();
AddTextPrinterParameterized3(0, 2, 0x4a, 0, sTextColors, 0, gText_TimeBoard); AddTextPrinterParameterized3(0, 2, 0x4a, 0, sTextColors, 0, gText_TimeBoard);
src/trainer_tower_sets.c
+8997
View File
File diff suppressed because it is too large Load Diff