pret/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-10-03 16:15:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #465 from sceptillion/unknown_task

Browse Source 
clean up unknown_task variables
This commit is contained in:
Marcus Huderle
2017-11-20 16:29:20 -08:00
committed by GitHub
parent 3ac76ce81a 0f0d652f4d
commit 4df36cf191
7 changed files with 39 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/unknown_task.h
+18
View File
@@ -9,6 +9,24 @@ struct UnknownTaskStruct
u8 unk9;
};
struct UnknownTaskStruct2
{
void *src[2];
volatile void *dest;
u32 unkC;
void (*unk10)(void);
u8 srcBank;
u8 unk15;
u8 unk16;
u8 unk17;
u8 taskId;
u8 filler19[0x7];
};
extern struct UnknownTaskStruct2 gUnknown_03004DC0;
extern u16 gUnknown_03004DE0[][0x3C0];
void remove_some_task(void);
void remove_some_task(void);
void dp12_8087EA4(void);
src/battle/battle_2.c
+8 -17
View File
@@ -31,13 +31,6 @@
#include "battle_move_effects.h"
#include "ewram.h"
struct UnknownStruct6
{
u16 unk0[0xA0];
u8 fillerA0[0x640];
u16 unk780[0xA0];
};
struct UnknownStruct7
{
u8 unk0;
@@ -123,8 +116,6 @@ extern void (*gBattleMainFunc)(void);
extern u8 gLeveledUpInBattle;
extern void (*gBattleBankFunc[])(void);
extern u8 gHealthboxIDs[];
extern struct UnknownStruct6 gUnknown_03004DE0;
//extern u16 gUnknown_03004DE0[][0xA0]; // possibly?
extern u16 gBattleTypeFlags;
extern s8 gBattleTerrain; // I'm not sure if this is supposed to be s8 or u8. Regardless, it must have the same type as the return value of BattleSetup_GetTerrain.
extern u8 gReservedSpritePaletteCount;
@@ -175,14 +166,14 @@ void InitBattle(void)
for (i = 0; i < 80; i++)
{
gUnknown_03004DE0.unk0[i] = 0xF0;
gUnknown_03004DE0.unk780[i] = 0xF0;
gUnknown_03004DE0[0][i] = 0xF0;
gUnknown_03004DE0[1][i] = 0xF0;
}
for (i = 80; i < 160; i++)
{
asm(""::"r"(i)); // Needed to stop the compiler from optimizing out the loop counter
gUnknown_03004DE0.unk0[i] = 0xFF10;
gUnknown_03004DE0.unk780[i] = 0xFF10;
gUnknown_03004DE0[0][i] = 0xFF10;
gUnknown_03004DE0[1][i] = 0xFF10;
}
//sub_80895F8(gUnknown_081F9674.unk0, gUnknown_081F9674.unk4, gUnknown_081F9674.unk8);
sub_80895F8(gUnknown_081F9674);
@@ -1153,14 +1144,14 @@ void c2_8011A1C(void)
for (i = 0; i < 80; i++)
{
gUnknown_03004DE0.unk0[i] = 0xF0;
gUnknown_03004DE0.unk780[i] = 0xF0;
gUnknown_03004DE0[0][i] = 0xF0;
gUnknown_03004DE0[1][i] = 0xF0;
}
for (i = 80; i < 160; i++)
{
asm(""::"r"(i)); // Needed to stop the compiler from optimizing out the loop counter
gUnknown_03004DE0.unk0[i] = 0xFF10;
gUnknown_03004DE0.unk780[i] = 0xFF10;
gUnknown_03004DE0[0][i] = 0xFF10;
gUnknown_03004DE0[1][i] = 0xFF10;
}
SetUpWindowConfig(&gWindowConfig_81E6C58);
ResetPaletteFade();
src/battle/battle_transition.c
+1 -1
View File
@@ -13,12 +13,12 @@
#include "trainer.h"
#include "field_camera.h"
#include "ewram.h"
#include "unknown_task.h"
void sub_807DE10(void);
void dp12_8087EA4(void);
extern u16 gUnknown_03005560[];
extern u16 gUnknown_03004DE0[][0x3C0];
extern const struct OamData gFieldOamData_32x32;
src/battle_anim_80CA710.c
+4 -13
View File
@@ -17,13 +17,6 @@
#include "trig.h"
#include "unknown_task.h"
struct UnknownStruct6
{
u16 unk0[0xA0];
u8 fillerA0[0x640];
u16 unk780[0xA0];
};
struct Struct_sub_8078914
{
u8 *field_0;
@@ -72,8 +65,6 @@ extern u16 gUnknown_03004240;
extern u16 gUnknown_030041B4;
extern s8 gUnknown_083D7A00[4][2];
extern u16 gUnknown_083D7A5C[5];
extern struct UnknownStruct6 gUnknown_03004DE0;
extern struct UnknownStruct_1 gUnknown_03004DC0;
static void sub_80CA768(struct Sprite* sprite);
static void sub_80CA8B4(struct Sprite* sprite);
@@ -4908,8 +4899,8 @@ void sub_80D0C88(u8 taskId)
{
if (i >= 0)
{
gUnknown_03004DE0.unk0[i] = task->data[6] + 0xF0;
gUnknown_03004DE0.unk780[i] = task->data[6] + 0xF0;
gUnknown_03004DE0[0][i] = task->data[6] + 0xF0;
gUnknown_03004DE0[1][i] = task->data[6] + 0xF0;
}
}
@@ -4954,8 +4945,8 @@ void sub_80D0D68(u8 taskId)
if (task->data[5] >= 0)
{
gUnknown_03004DE0.unk0[task->data[5]] = task->data[6];
gUnknown_03004DE0.unk780[task->data[5]] = task->data[6];
gUnknown_03004DE0[0][task->data[5]] = task->data[6];
gUnknown_03004DE0[1][task->data[5]] = task->data[6];
}
if (++task->data[3] >= task->data[15])
src/engine/trainer_card.c
+5 -12
View File
@@ -52,13 +52,6 @@ extern struct LinkPlayerMapObject gLinkPlayerMapObjects[];
EWRAM_DATA struct TrainerCard gTrainerCards[4] = {0};
struct UnknownStruct1
{
u16 filler0[0x3C0];
u16 unk780[160];
};
extern struct UnknownStruct1 gUnknown_03004DE0;
extern const u8 gBadgesTiles[];
extern const u16 gUnknown_083B5F0C[];
extern const u16 gBadgesPalette[];
@@ -263,7 +256,7 @@ static void sub_8093254(void)
ewram0_2.var_5 ^= 1;
}
if (ewram0_2.var_4)
DmaCopy16(3, gUnknown_03004DE0.filler0, gUnknown_03004DE0.unk780, sizeof(gUnknown_03004DE0.unk780));
DmaCopy16(3, &gUnknown_03004DE0[0], &gUnknown_03004DE0[1], 0x140);
}
static void sub_80932AC(Callback callBack)
@@ -737,12 +730,12 @@ static void sub_8093A68(u8 taskId)
bool8 sub_8093AA0(struct Task *task)
{
s32 i;
u32 i;
ewram0_2.var_4 = FALSE;
dp12_8087EA4();
for (i = 0; i < ARRAY_COUNT(gUnknown_03004DE0.unk780); i++)
gUnknown_03004DE0.unk780[i] = -4;
for (i = 0; i < 0xA0; i++)
gUnknown_03004DE0[1][i] = -4;
SetHBlankCallback(sub_8093D7C);
ewram0_2.var_4 = TRUE;
task->data[0]++;
@@ -1123,7 +1116,7 @@ bool8 sub_8093D50(struct Task *task)
void sub_8093D7C(void)
{
u16 bgVOffset = gUnknown_03004DE0.unk780[REG_VCOUNT & 0xFF];
u16 bgVOffset = gUnknown_03004DE0[1][REG_VCOUNT & 0xFF];
REG_BG0VOFS = bgVOffset;
REG_BG1VOFS = bgVOffset;
src/field/field_screen_effect.c
+2 -12
View File
@@ -9,16 +9,6 @@
#include "text.h"
#include "unknown_task.h"
struct UnknownStruct1
{
u8 filler0[0x14];
u8 unk14;
u8 filler15[0xB];
};
extern struct UnknownStruct1 gUnknown_03004DC0;
extern u16 gUnknown_03004DE0[][0x3C0];
const static u16 gUnknown_0839ACDC[] = { 0xC8, 0x48, 0x38, 0x28, 0x18, 0x0 };
const s32 gMaxFlashLevel = 4;
@@ -74,11 +64,11 @@ static void sub_8081424(u8 taskId)
switch (data[0])
{
case 0:
sub_8081398(&gUnknown_03004DE0[gUnknown_03004DC0.unk14][0], data[1], data[2], data[3]);
sub_8081398(&gUnknown_03004DE0[gUnknown_03004DC0.srcBank][0], data[1], data[2], data[3]);
data[0] = 1;
break;
case 1:
sub_8081398(&gUnknown_03004DE0[gUnknown_03004DC0.unk14][0], data[1], data[2], data[3]);
sub_8081398(&gUnknown_03004DE0[gUnknown_03004DC0.srcBank][0], data[1], data[2], data[3]);
data[0] = 0;
data[3] += data[5];
if (data[3] > data[4])
src/unknown_task.c
+1 -15
View File
@@ -4,20 +4,6 @@
#include "trig.h"
#include "unknown_task.h"
struct UnknownStruct1
{
void *src[2];
volatile void *dest;
u32 unkC;
void (*unk10)(void);
u8 srcBank;
u8 unk15;
u8 unk16;
u8 unk17;
u8 taskId;
u8 filler19[0x7];
};
static void sub_80896F4(void);
static void sub_8089714(void);
@@ -32,7 +18,7 @@ extern u16 gUnknown_030042C0;
extern u8 gUnknown_0202FFA4;
extern struct UnknownStruct1 gUnknown_03004DC0;
extern struct UnknownTaskStruct2 gUnknown_03004DC0;
extern u16 gUnknown_03004DE0[][0x3C0];