diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-20 19:37:51 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-20 19:37:51 -0500 |
| commit | 7839a979969bc39fa60957e1c6b3575dc3e11405 (patch) | |
| tree | 71ed13be61b6609d6d28fc14a9905bd9c1727a0a /src/battle | |
| parent | 9415d1d1dd92f952933d976bc5535384e5a2e743 (diff) | |
| parent | 4df36cf191f874f4ea00faab0c2d231f2f606244 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into linguist
Diffstat (limited to 'src/battle')
| -rw-r--r-- | src/battle/battle_2.c | 25 | ||||
| -rw-r--r-- | src/battle/battle_transition.c | 2 |
2 files changed, 9 insertions, 18 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 095482305..6d406c5e5 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -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(); diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c index 2bde7299b..7f6c114f6 100644 --- a/src/battle/battle_transition.c +++ b/src/battle/battle_transition.c @@ -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; |