dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

move externs and remove comments

Browse Source
This commit is contained in:
garak
2018-12-10 09:52:36 -05:00
parent e1e2132a37
commit 10237e8d13
2 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/fldeff_80F9BCC.h
+12 -1
View File
@@ -3,11 +3,22 @@
void PopSecretBaseBalloon(s16 id, s16 x, s16 y); void PopSecretBaseBalloon(s16 id, s16 x, s16 y);
void ShatterSecretBaseBreakableDoor(s16 x, s16 y); void ShatterSecretBaseBreakableDoor(s16 x, s16 y);
void CreateRecordMixingSprite(void); u8 CreateRecordMixingSprite(void);
void DestroyRecordMixingSprite(void); void DestroyRecordMixingSprite(void);
void FldeffPoison_Start(void); void FldeffPoison_Start(void);
void PlaySecretBaseMusicNoteMatSound(s16 metatileId); void PlaySecretBaseMusicNoteMatSound(s16 metatileId);
void DoSecretBaseGlitterMatSparkle(void); void DoSecretBaseGlitterMatSparkle(void);
bool8 sub_80FADE4(u16, u8); bool8 sub_80FADE4(u16, u8);
extern struct MapPosition gPlayerFacingPosition;
extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
extern u8 EventScript_275A86[];
extern u8 EventScript_275ADF[];
extern u8 EventScript_275B38[];
extern const struct OamData gEventObjectBaseOam_32x8;
extern const u16 gTilesetPalettes_SecretBase[][16];
#endif //GUARD_FLDEFF_80F9BCC_H #endif //GUARD_FLDEFF_80F9BCC_H
src/fldeff_80F9BCC.c
+3 -24
View File
@@ -20,21 +20,7 @@
#include "constants/metatile_behaviors.h" #include "constants/metatile_behaviors.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/vars.h" #include "constants/vars.h"
#include "fldeff_80F9BCC.h"
extern struct MapPosition gPlayerFacingPosition;
extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
extern const struct SpriteTemplate gUnknown_0858E600;
extern const struct SpriteTemplate gUnknown_0858E618;
extern const struct SpriteTemplate gUnknown_0858E630;
extern u8 EventScript_275A86[];
extern u8 EventScript_275ADF[];
extern u8 EventScript_275B38[];
extern const struct OamData gEventObjectBaseOam_32x8;
extern const u16 gTilesetPalettes_SecretBase[][16];
void sub_80F9C90(u8); void sub_80F9C90(u8);
void sub_80F9DFC(u8); void sub_80F9DFC(u8);
@@ -277,7 +263,7 @@ const union AnimCmd *const gSpriteAnimTable_858E670[] =
const struct SpriteFrameImage gUnknown_0858E674[] = const struct SpriteFrameImage gUnknown_0858E674[] =
{ {
{gSpriteImage_858E1D8, 0x100},// sizeof()? {gSpriteImage_858E1D8, 0x100},
{gSpriteImage_858E2D8, 0x100}, {gSpriteImage_858E2D8, 0x100},
{gSpriteImage_858E3D8, 0x100}, {gSpriteImage_858E3D8, 0x100},
}; };
@@ -308,7 +294,7 @@ static const struct SpriteFrameImage gUnknown_0858E84C[] =
{gSpriteImage_858E7AC, sizeof(gSpriteImage_858E7AC)}, {gSpriteImage_858E7AC, sizeof(gSpriteImage_858E7AC)},
}; };
static const struct SpritePalette gUnknown_0858E864 = {gUnknown_0858E82C, 0x1000};// sizeof(gUnknown_0858E82C)? static const struct SpritePalette gUnknown_0858E864 = {gUnknown_0858E82C, 0x1000};
static const union AnimCmd gSpriteAnim_858E86C[] = static const union AnimCmd gSpriteAnim_858E86C[] =
{ {
@@ -385,7 +371,6 @@ void sub_80F9C90(u8 taskId)
{ {
// //
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
//u16 ta, tb;
switch(task->data[0]) switch(task->data[0])
{ {
@@ -710,9 +695,6 @@ void sub_80F9DFC(u8 taskId)
task->data[0] += 1; task->data[0] += 1;
} }
//=============================================================================
// fldeff_secretpower.c
void SetCurrentSecretBase(void) void SetCurrentSecretBase(void)
{ {
sub_80E9608(&gPlayerFacingPosition, gMapHeader.events); sub_80E9608(&gPlayerFacingPosition, gMapHeader.events);
@@ -1066,9 +1048,6 @@ void DoSecretBasePCTurnOffEffect(void)
CurrentMapDrawMetatileAt(x, y); CurrentMapDrawMetatileAt(x, y);
} }
//=============================================================================
// fldeff_decoration.c
void PopSecretBaseBalloon(s16 metatileId, s16 x, s16 y) void PopSecretBaseBalloon(s16 metatileId, s16 x, s16 y)
{ {
u8 taskId = CreateTask(Task_PopSecretBaseBalloon, 0); u8 taskId = CreateTask(Task_PopSecretBaseBalloon, 0);