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

sub_804C728; sub_804CF14

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-12-19 13:43:11 +08:00
parent 7984a91c08
commit 84d9a1e723
6 changed files with 46 additions and 1639 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/cereader_tool.h
+9 -6
View File
@@ -25,11 +25,12 @@ struct TrainerTowerFloor
/* 0x3DC */ u32 checksum; /* 0x3DC */ u32 checksum;
}; };
struct Unk_203F458_Header struct EReaderTrainerHillSetSubstruct
{ {
u8 unk0; u8 count;
u8 unk1; u8 id;
u32 unk4; u16 dummy;
u32 checksum;
}; };
struct EReaderTrainerHillSet struct EReaderTrainerHillSet
@@ -41,7 +42,9 @@ struct EReaderTrainerHillSet
struct TrainerTowerFloor floors[8]; struct TrainerTowerFloor floors[8];
}; };
bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * a0); bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * ttdata);
bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * a0); bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * ttdata);
bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerHillSet * ttdata);
u8 sub_815D654(void);
#endif //GUARD_CEREADER_TOOL_H #endif //GUARD_CEREADER_TOOL_H
include/constants/object_events.h
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GUARD_CONSTANTS_MAP_OBJECTS_H #ifndef GUARD_CONSTANTS_OBJECT_EVENTS_H
#define GUARD_CONSTANTS_MAP_OBJECTS_H #define GUARD_CONSTANTS_OBJECT_EVENTS_H
#define OBJECT_EVENT_GFX_RED_NORMAL 0 #define OBJECT_EVENT_GFX_RED_NORMAL 0
#define OBJECT_EVENT_GFX_RED_BIKE 1 #define OBJECT_EVENT_GFX_RED_BIKE 1
@@ -183,4 +183,4 @@
#define TRACKS_FOOT 1 #define TRACKS_FOOT 1
#define TRACKS_BIKE_TIRE 2 #define TRACKS_BIKE_TIRE 2
#endif // GUARD_CONSTANTS_MAP_OBJECTS_H #endif // GUARD_CONSTANTS_OBJECT_EVENTS_H
src/title_screen.c
+6 -6
View File
@@ -54,7 +54,7 @@ static void SetGpuRegsForTitleScreenRun(void);
static void SetTitleScreenScene_Restart(s16 * data); static void SetTitleScreenScene_Restart(s16 * data);
static void SetTitleScreenScene_Cry(s16 * data); static void SetTitleScreenScene_Cry(s16 * data);
static void Task_TitleScreen_SlideWin0(u8 taskId); static void Task_TitleScreen_SlideWin0(u8 taskId);
static void Task_TitleScreen_PaletteSomething(u8 taskId); static void Task_TitleScreen_BlinkPressStart(u8 taskId);
static void SignalEndTitleScreenPaletteSomethingTask(void); static void SignalEndTitleScreenPaletteSomethingTask(void);
static void UpdateScanlineEffectRegBuffer(s16 a0); static void UpdateScanlineEffectRegBuffer(s16 a0);
static void ScheduleStopScanlineEffect(void); static void ScheduleStopScanlineEffect(void);
@@ -509,7 +509,7 @@ static void SetTitleScreenScene_Run(s16 * data)
{ {
case 0: case 0:
HelpSystem_SetSomeVariable2(1); HelpSystem_SetSomeVariable2(1);
CreateTask(Task_TitleScreen_PaletteSomething, 0); CreateTask(Task_TitleScreen_BlinkPressStart, 0);
CreateTask(Task_FlameOrLeafSpawner, 5); CreateTask(Task_FlameOrLeafSpawner, 5);
SetGpuRegsForTitleScreenRun(); SetGpuRegsForTitleScreenRun();
data[6] = CreateSlashSprite(); data[6] = CreateSlashSprite();
@@ -569,7 +569,7 @@ static void SetTitleScreenScene_Restart(s16 * data)
case 2: case 2:
if (IsNotWaitingForBGMStop() && !gPaletteFade.active) if (IsNotWaitingForBGMStop() && !gPaletteFade.active)
{ {
DestroyTask(FindTaskIdByFunc(Task_TitleScreen_PaletteSomething)); DestroyTask(FindTaskIdByFunc(Task_TitleScreen_BlinkPressStart));
data[2] = 0; data[2] = 0;
data[1]++; data[1]++;
} }
@@ -578,7 +578,7 @@ static void SetTitleScreenScene_Restart(s16 * data)
data[2]++; data[2]++;
if (data[2] >= 20) if (data[2] >= 20)
{ {
DestroyTask(FindTaskIdByFunc(Task_TitleScreen_PaletteSomething)); DestroyTask(FindTaskIdByFunc(Task_TitleScreen_BlinkPressStart));
data[1]++; data[1]++;
} }
break; break;
@@ -692,7 +692,7 @@ static void Task_TitleScreen_SlideWin0(u8 taskId)
} }
} }
static void Task_TitleScreen_PaletteSomething(u8 taskId) static void Task_TitleScreen_BlinkPressStart(u8 taskId)
{ {
s16 * data = gTasks[taskId].data; s16 * data = gTasks[taskId].data;
s32 i; s32 i;
@@ -738,7 +738,7 @@ static void Task_TitleScreen_PaletteSomething(u8 taskId)
static void SignalEndTitleScreenPaletteSomethingTask(void) static void SignalEndTitleScreenPaletteSomethingTask(void)
{ {
u8 taskId = FindTaskIdByFunc(Task_TitleScreen_PaletteSomething); u8 taskId = FindTaskIdByFunc(Task_TitleScreen_BlinkPressStart);
gTasks[taskId].data[15] = TRUE; gTasks[taskId].data[15] = TRUE;
} }
src/trade.c
+22 -1620
View File
File diff suppressed because it is too large Load Diff
src/trainer_tower.c
+4 -4
View File
@@ -431,7 +431,7 @@ static const u8 sKnockoutChallengeMonIdxs[][3] = {
{0x01, 0x04, 0x05} {0x01, 0x04, 0x05}
}; };
extern const struct Unk_203F458_Header gUnknown_84827AC; extern const struct EReaderTrainerHillSetSubstruct gUnknown_84827AC;
extern const struct TrainerTowerFloor *const gUnknown_84827B4[][8]; extern const struct TrainerTowerFloor *const gUnknown_84827B4[][8];
void sub_815D9E8(void) void sub_815D9E8(void)
@@ -527,9 +527,9 @@ static void sub_815DC8C(void) // fakematching
else else
{ {
struct UnkStruct_203F458 * r0_ = sTrainerTowerState; struct UnkStruct_203F458 * r0_ = sTrainerTowerState;
const struct Unk_203F458_Header * r1 = &gUnknown_84827AC; const struct EReaderTrainerHillSetSubstruct * r1 = &gUnknown_84827AC;
// *r0_ = *r1; // *r0_ = *r1;
memcpy(&r0_->unk_0004.floorIdx, r1, sizeof(struct Unk_203F458_Header)); memcpy(&r0_->unk_0004, r1, sizeof(struct EReaderTrainerHillSetSubstruct));
// sTrainerTowerState->unk_0004.floorIdx = gUnknown_84827AC; // sTrainerTowerState->unk_0004.floorIdx = gUnknown_84827AC;
r7 = gUnknown_84827B4[whichTimer]; r7 = gUnknown_84827B4[whichTimer];
for (r4 = 0; r4 < 8; r4++) for (r4 = 0; r4 < 8; r4++)
@@ -540,7 +540,7 @@ static void sub_815DC8C(void) // fakematching
memcpy(r0, r7[r4], sizeof(struct TrainerTowerFloor)); memcpy(r0, r7[r4], sizeof(struct TrainerTowerFloor));
// r0[r4] = *r7[r4]; // r0[r4] = *r7[r4];
} }
sTrainerTowerState->unk_0004.unk4 = CalcByteArraySum((void *)sTrainerTowerState->unk_0004.floors, sizeof(sTrainerTowerState->unk_0004.floors)); sTrainerTowerState->unk_0004.checksum = CalcByteArraySum((void *)sTrainerTowerState->unk_0004.floors, sizeof(sTrainerTowerState->unk_0004.floors));
ValidateOrResetCurTrainerTowerRecord(); ValidateOrResetCurTrainerTowerRecord();
} }
} }
src/vs_seeker.c
+2
View File
@@ -11,6 +11,7 @@
#include "script.h" #include "script.h"
#include "event_object_lock.h" #include "event_object_lock.h"
#include "field_specials.h" #include "field_specials.h"
#include "item.h"
#include "item_menu.h" #include "item_menu.h"
#include "field_effect.h" #include "field_effect.h"
#include "script_movement.h" #include "script_movement.h"
@@ -27,6 +28,7 @@
#include "constants/object_events.h" #include "constants/object_events.h"
#include "constants/trainers.h" #include "constants/trainers.h"
#include "constants/maps.h" #include "constants/maps.h"
#include "constants/items.h"
typedef enum typedef enum
{ {