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

Trainer tower sets to C

Browse Source
This commit is contained in:
PikalaxALT
2021-04-28 18:35:53 -04:00
parent 9ed87063f1
commit a60d6675d7
7 changed files with 9027 additions and 5185 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 flags;
/* 0x001 */ u8 floorIdx; /* 0x001 */ u8 floorIdx;
/* 0x002 */ u8 challengeType; /* 0x002 */ u8 challengeType;
/* 0x003 */ u8 prize; /* 0x003 */ u8 prize;
include/constants/trainer_tower.h
+1
View File
@@ -4,6 +4,7 @@
#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
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
+28 -28
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
@@ -52,8 +52,8 @@ struct DoublesTrainerInfo
u8 objGfx1; u8 objGfx1;
u8 objGfx2; u8 objGfx2;
u8 facilityClass; u8 facilityClass;
bool8 gender1; bool8 textColor1;
bool8 gender2; bool8 textColor2;
}; };
struct TrainerEncounterMusicPairs struct TrainerEncounterMusicPairs
@@ -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;
@@ -422,8 +422,8 @@ static const u8 sKnockoutChallengeMonIdxs[][3] = {
{0x01, 0x04, 0x05} {0x01, 0x04, 0x05}
}; };
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 +471,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();
} }
@@ -510,18 +510,18 @@ static void SetUpTrainerTowerDataStruct(void)
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 * r0_ = sTrainerTowerState;
const struct EReaderTrainerTowerSetSubstruct * r1 = &gUnknown_84827AC; const struct EReaderTrainerTowerSetSubstruct * r1 = &gTrainerTowerLocalHeader;
memcpy(&r0_->unk_0004, r1, sizeof(struct EReaderTrainerTowerSetSubstruct)); memcpy(&r0_->data, r1, sizeof(struct EReaderTrainerTowerSetSubstruct));
r7 = gUnknown_84827B4[challengeType]; r7 = gTrainerTowerFloors[challengeType];
for (r4 = 0; r4 < MAX_TRAINER_TOWER_FLOORS; r4++) for (r4 = 0; r4 < MAX_TRAINER_TOWER_FLOORS; r4++)
{ {
*(sTrainerTowerState->unk_0004.floors + r4) = *(r7[r4]); // manual pointer arithmetic needed to match *(sTrainerTowerState->data.floors + r4) = *(r7[r4]); // 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 +533,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);
@@ -667,7 +667,7 @@ static void BufferTowerOpponentSpeech(void)
static void TrainerTowerGetOpponentTextColor(u8 challengeType, u8 facilityClass) static void TrainerTowerGetOpponentTextColor(u8 challengeType, u8 facilityClass)
{ {
u16 gender = MALE; u16 textColor = MALE;
int i; int i;
switch (challengeType) switch (challengeType)
{ {
@@ -679,7 +679,7 @@ static void TrainerTowerGetOpponentTextColor(u8 challengeType, u8 facilityClass)
break; break;
} }
if (i != NELEMS(sSingleBattleTrainerInfo)) if (i != NELEMS(sSingleBattleTrainerInfo))
gender = sSingleBattleTrainerInfo[i].gender; textColor = sSingleBattleTrainerInfo[i].gender;
break; break;
case CHALLENGE_TYPE_DOUBLE: case CHALLENGE_TYPE_DOUBLE:
for (i = 0; i < NELEMS(sDoubleBattleTrainerInfo); i++) for (i = 0; i < NELEMS(sDoubleBattleTrainerInfo); i++)
@@ -690,14 +690,14 @@ static void TrainerTowerGetOpponentTextColor(u8 challengeType, u8 facilityClass)
if (i != NELEMS(sDoubleBattleTrainerInfo)) if (i != NELEMS(sDoubleBattleTrainerInfo))
{ {
if (VarGet(VAR_TEMP_3)) if (VarGet(VAR_TEMP_3))
gender = sDoubleBattleTrainerInfo[i].gender2; textColor = sDoubleBattleTrainerInfo[i].textColor2;
else else
gender = sDoubleBattleTrainerInfo[i].gender1; textColor = sDoubleBattleTrainerInfo[i].textColor1;
} }
break; break;
} }
gSpecialVar_PrevTextColor = gSpecialVar_TextColor; gSpecialVar_PrevTextColor = gSpecialVar_TextColor;
gSpecialVar_TextColor = gender; gSpecialVar_TextColor = textColor;
} }
static void CB2_EndTrainerTowerBattle(void) static void CB2_EndTrainerTowerBattle(void)
@@ -784,7 +784,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)
{ {
@@ -922,9 +922,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 +1029,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;
} }
src/trainer_tower_sets.c
+8995
View File
File diff suppressed because it is too large Load Diff