mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-25 11:14:15 +01:00
Clean up ram vars
This commit is contained in:
parent
9d8a43a1fb
commit
363fa9bed2
4
common_syms/contest_painting.txt
Normal file
4
common_syms/contest_painting.txt
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
gUnknown_03006190
|
||||||
|
gUnknown_030061A0
|
||||||
|
gUnknown_030061C0
|
||||||
|
gContestPaintingMonPalette
|
10
common_syms/contest_painting_effects.txt
Normal file
10
common_syms/contest_painting_effects.txt
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
gUnknown_03006164
|
||||||
|
gUnknown_03006168
|
||||||
|
gUnknown_0300616C
|
||||||
|
gUnknown_03006170
|
||||||
|
gUnknown_03006174
|
||||||
|
gUnknown_03006178
|
||||||
|
gUnknown_0300617C
|
||||||
|
gUnknown_03006180
|
||||||
|
gUnknown_03006184
|
||||||
|
gUnknown_03006188
|
1
common_syms/evolution_scene.txt
Normal file
1
common_syms/evolution_scene.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
gCB2_AfterEvolution
|
1
common_syms/party_menu.txt
Normal file
1
common_syms/party_menu.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
gUnknown_03006328
|
1
common_syms/pokedex_cry_screen.txt
Normal file
1
common_syms/pokedex_cry_screen.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
gDexCryScreenState
|
@ -437,6 +437,8 @@ extern u8 gHighestRibbonRank;
|
|||||||
extern struct ContestResources *gContestResources;
|
extern struct ContestResources *gContestResources;
|
||||||
extern u8 sContestBgCopyFlags;
|
extern u8 sContestBgCopyFlags;
|
||||||
extern struct ContestWinner gUnknown_02039F3C;
|
extern struct ContestWinner gUnknown_02039F3C;
|
||||||
|
extern u8 gUnknown_02039F5C;
|
||||||
|
extern u8 gUnknown_02039F5D;
|
||||||
|
|
||||||
extern u32 gContestRngValue;
|
extern u32 gContestRngValue;
|
||||||
|
|
||||||
|
@ -13,7 +13,4 @@ enum
|
|||||||
void sub_812FDA8(int);
|
void sub_812FDA8(int);
|
||||||
void CB2_ContestPainting(void);
|
void CB2_ContestPainting(void);
|
||||||
|
|
||||||
extern u8 gUnknown_02039F5C;
|
|
||||||
extern u8 gUnknown_02039F5D;
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -48,6 +48,8 @@ extern MainCallback gPostMenuFieldCallback;
|
|||||||
extern u8 gSelectedOrderFromParty[4];
|
extern u8 gSelectedOrderFromParty[4];
|
||||||
extern u8 gUnknown_0203CF00[3];
|
extern u8 gUnknown_0203CF00[3];
|
||||||
|
|
||||||
|
extern void (*gUnknown_03006328)(u8, TaskFunc);
|
||||||
|
|
||||||
extern const u16 gTutorMoves[];
|
extern const u16 gTutorMoves[];
|
||||||
|
|
||||||
void sub_81B0FCC(u8 slot, u8 b);
|
void sub_81B0FCC(u8 slot, u8 b);
|
||||||
|
@ -10,6 +10,8 @@ struct CryRelatedStruct
|
|||||||
u8 yPos;
|
u8 yPos;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extern u8 gDexCryScreenState;
|
||||||
|
|
||||||
bool8 sub_8145354(struct CryRelatedStruct*, u8);
|
bool8 sub_8145354(struct CryRelatedStruct*, u8);
|
||||||
void sub_814545C(u8);
|
void sub_814545C(u8);
|
||||||
void sub_8145534(u16);
|
void sub_8145534(u16);
|
||||||
|
@ -6,8 +6,11 @@
|
|||||||
// Exported type declarations
|
// Exported type declarations
|
||||||
|
|
||||||
// Exported RAM declarations
|
// Exported RAM declarations
|
||||||
|
extern struct MailStruct gUnknown_020321C0[PARTY_SIZE];
|
||||||
|
extern u8 gUnknown_02032298[2];
|
||||||
|
|
||||||
// Exported ROM declarations
|
// Exported ROM declarations
|
||||||
|
extern const struct WindowTemplate gUnknown_0833900C;
|
||||||
|
|
||||||
s32 sub_807A728(void);
|
s32 sub_807A728(void);
|
||||||
void sub_80773AC(void);
|
void sub_80773AC(void);
|
||||||
|
@ -27,12 +27,10 @@
|
|||||||
#include "task.h"
|
#include "task.h"
|
||||||
#include "trade.h"
|
#include "trade.h"
|
||||||
#include "trainer_card.h"
|
#include "trainer_card.h"
|
||||||
|
#include "party_menu.h"
|
||||||
#include "window.h"
|
#include "window.h"
|
||||||
#include "constants/songs.h"
|
#include "constants/songs.h"
|
||||||
|
|
||||||
extern u8 gUnknown_02032298[2];
|
|
||||||
extern u8 gSelectedOrderFromParty[];
|
|
||||||
|
|
||||||
static const struct WindowTemplate gUnknown_08550594 = {
|
static const struct WindowTemplate gUnknown_08550594 = {
|
||||||
.bg = 0,
|
.bg = 0,
|
||||||
.tilemapLeft = 16,
|
.tilemapLeft = 16,
|
||||||
|
@ -214,6 +214,8 @@ EWRAM_DATA u8 gHighestRibbonRank = 0;
|
|||||||
EWRAM_DATA struct ContestResources *gContestResources = NULL;
|
EWRAM_DATA struct ContestResources *gContestResources = NULL;
|
||||||
EWRAM_DATA u8 sContestBgCopyFlags = 0;
|
EWRAM_DATA u8 sContestBgCopyFlags = 0;
|
||||||
EWRAM_DATA struct ContestWinner gUnknown_02039F3C = {0};
|
EWRAM_DATA struct ContestWinner gUnknown_02039F3C = {0};
|
||||||
|
EWRAM_DATA u8 gUnknown_02039F5C = 0;
|
||||||
|
EWRAM_DATA u8 gUnknown_02039F5D = 0;
|
||||||
|
|
||||||
// IWRAM common vars.
|
// IWRAM common vars.
|
||||||
u32 gContestRngValue;
|
u32 gContestRngValue;
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
#include "bg.h"
|
#include "bg.h"
|
||||||
#include "contest.h"
|
#include "contest.h"
|
||||||
#include "contest_link_80F57C4.h"
|
#include "contest_link_80F57C4.h"
|
||||||
#include "contest_painting.h"
|
|
||||||
#include "decompress.h"
|
#include "decompress.h"
|
||||||
#include "dma3.h"
|
#include "dma3.h"
|
||||||
#include "event_data.h"
|
#include "event_data.h"
|
||||||
@ -67,10 +66,9 @@ struct ContestLink80F57C4
|
|||||||
u8 *unkC[4];
|
u8 *unkC[4];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
EWRAM_DATA struct ContestLink80F57C4 *gUnknown_0203A034 = NULL;
|
||||||
|
|
||||||
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
|
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
|
||||||
|
|
||||||
extern struct ContestLink80F57C4 *gUnknown_0203A034;
|
|
||||||
|
|
||||||
extern const struct BgTemplate gUnknown_0858D888[4];
|
extern const struct BgTemplate gUnknown_0858D888[4];
|
||||||
extern const struct WindowTemplate gUnknown_0858D898[];
|
extern const struct WindowTemplate gUnknown_0858D898[];
|
||||||
extern const struct CompressedSpriteSheet gUnknown_0858D878[];
|
extern const struct CompressedSpriteSheet gUnknown_0858D878[];
|
||||||
@ -138,7 +136,7 @@ void sub_80F57C4(void)
|
|||||||
InitBgsFromTemplates(0, gUnknown_0858D888, ARRAY_COUNT(gUnknown_0858D888));
|
InitBgsFromTemplates(0, gUnknown_0858D888, ARRAY_COUNT(gUnknown_0858D888));
|
||||||
for (i = 0; i < 4; i++)
|
for (i = 0; i < 4; i++)
|
||||||
SetBgTilemapBuffer(i, gUnknown_0203A034->unkC[i]);
|
SetBgTilemapBuffer(i, gUnknown_0203A034->unkC[i]);
|
||||||
|
|
||||||
InitWindows(gUnknown_0858D898);
|
InitWindows(gUnknown_0858D898);
|
||||||
DeactivateAllTextPrinters();
|
DeactivateAllTextPrinters();
|
||||||
SetGpuReg(REG_OFFSET_MOSAIC, 0);
|
SetGpuReg(REG_OFFSET_MOSAIC, 0);
|
||||||
@ -720,7 +718,7 @@ static void sub_80F66B4(u8 taskId)
|
|||||||
{
|
{
|
||||||
nationalDexNum = SpeciesToNationalPokedexNum(gContestMons[i].species);
|
nationalDexNum = SpeciesToNationalPokedexNum(gContestMons[i].species);
|
||||||
GetSetPokedexFlag(nationalDexNum, FLAG_SET_SEEN);
|
GetSetPokedexFlag(nationalDexNum, FLAG_SET_SEEN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
gTasks[taskId].data[10] = 0;
|
gTasks[taskId].data[10] = 0;
|
||||||
@ -761,7 +759,7 @@ static void sub_80F67C4(u8 taskId)
|
|||||||
{
|
{
|
||||||
if (!(gIsLinkContest & 0x1))
|
if (!(gIsLinkContest & 0x1))
|
||||||
BravoTrainerPokemonProfile_BeforeInterview2(gContestFinalStandings[gContestPlayerMonIndex]);
|
BravoTrainerPokemonProfile_BeforeInterview2(gContestFinalStandings[gContestPlayerMonIndex]);
|
||||||
|
|
||||||
BeginHardwarePaletteFade(0xFF, 0, 0, 16, 0);
|
BeginHardwarePaletteFade(0xFF, 0, 0, 16, 0);
|
||||||
gTasks[taskId].func = sub_80F6820;
|
gTasks[taskId].func = sub_80F6820;
|
||||||
}
|
}
|
||||||
@ -1282,7 +1280,7 @@ static void sub_80F6F68(struct Sprite *sprite)
|
|||||||
struct Sprite *sprite2 = &gSprites[sprite->data[i]];
|
struct Sprite *sprite2 = &gSprites[sprite->data[i]];
|
||||||
sprite2->pos1.x = sprite->pos1.x + sprite->pos2.x + (i + 1) * 64;
|
sprite2->pos1.x = sprite->pos1.x + sprite->pos2.x + (i + 1) * 64;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sprite->pos1.x == sprite->data[4])
|
if (sprite->pos1.x == sprite->data[4])
|
||||||
sprite->callback = sub_80F6FDC;
|
sprite->callback = sub_80F6FDC;
|
||||||
}
|
}
|
||||||
@ -1348,7 +1346,7 @@ static void sub_80F7144(void)
|
|||||||
sprite->invisible = 1;
|
sprite->invisible = 1;
|
||||||
for (i = 0; i < 3; i++)
|
for (i = 0; i < 3; i++)
|
||||||
gSprites[sprite->data[i]].invisible = 1;
|
gSprites[sprite->data[i]].invisible = 1;
|
||||||
|
|
||||||
gBattle_WIN0H = 0;
|
gBattle_WIN0H = 0;
|
||||||
gBattle_WIN0V = 0;
|
gBattle_WIN0V = 0;
|
||||||
SetGpuReg(REG_OFFSET_WIN0H, gBattle_WIN0H);
|
SetGpuReg(REG_OFFSET_WIN0H, gBattle_WIN0H);
|
||||||
|
@ -20,10 +20,11 @@
|
|||||||
#include "window.h"
|
#include "window.h"
|
||||||
#include "constants/rgb.h"
|
#include "constants/rgb.h"
|
||||||
|
|
||||||
extern u16 (*gUnknown_03006190)[][32];
|
// IWRAM common
|
||||||
extern struct ContestWinner *gUnknown_030061C0;
|
u16 (*gUnknown_03006190)[][32];
|
||||||
extern u16 *gContestPaintingMonPalette;
|
struct Unk030061A0 gUnknown_030061A0;
|
||||||
extern struct Unk030061A0 gUnknown_030061A0;
|
struct ContestWinner *gUnknown_030061C0;
|
||||||
|
u16 *gContestPaintingMonPalette;
|
||||||
|
|
||||||
// IWRAM bss
|
// IWRAM bss
|
||||||
IWRAM_DATA u8 gContestPaintingState;
|
IWRAM_DATA u8 gContestPaintingState;
|
||||||
@ -103,7 +104,7 @@ const u8 *const gContestRankTextPointers[] =
|
|||||||
gContestLink,
|
gContestLink,
|
||||||
};
|
};
|
||||||
|
|
||||||
const struct BgTemplate gUnknown_085B07E8[] =
|
const struct BgTemplate gUnknown_085B07E8[] =
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
.bg = 1,
|
.bg = 1,
|
||||||
@ -116,7 +117,7 @@ const struct BgTemplate gUnknown_085B07E8[] =
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
const struct WindowTemplate gUnknown_085B07EC =
|
const struct WindowTemplate gUnknown_085B07EC =
|
||||||
{
|
{
|
||||||
.bg = 1,
|
.bg = 1,
|
||||||
.tilemapLeft = 2,
|
.tilemapLeft = 2,
|
||||||
|
@ -3,14 +3,17 @@
|
|||||||
#include "contest_painting.h"
|
#include "contest_painting.h"
|
||||||
#include "constants/rgb.h"
|
#include "constants/rgb.h"
|
||||||
|
|
||||||
extern u8 gUnknown_03006164;
|
// IWRAM common
|
||||||
extern u16 (*gUnknown_03006168)[][32];
|
u8 gUnknown_03006164;
|
||||||
extern u8 gUnknown_0300616C;
|
u16 (*gUnknown_03006168)[][32];
|
||||||
extern u8 gUnknown_03006170;
|
u8 gUnknown_0300616C;
|
||||||
extern u8 gUnknown_03006174;
|
u8 gUnknown_03006170;
|
||||||
extern u8 gUnknown_03006178;
|
u8 gUnknown_03006174;
|
||||||
extern u8 gUnknown_0300617C;
|
u8 gUnknown_03006178;
|
||||||
extern u8 gUnknown_03006180;
|
u8 gUnknown_0300617C;
|
||||||
|
u8 gUnknown_03006180;
|
||||||
|
u16 gUnknown_03006184;
|
||||||
|
u16 gUnknown_03006188;
|
||||||
|
|
||||||
// this file's functions
|
// this file's functions
|
||||||
void sub_8125230(void);
|
void sub_8125230(void);
|
||||||
|
@ -5,8 +5,6 @@
|
|||||||
#include "trig.h"
|
#include "trig.h"
|
||||||
#include "constants/rgb.h"
|
#include "constants/rgb.h"
|
||||||
|
|
||||||
extern u16 gUnknown_0203A100[];
|
|
||||||
|
|
||||||
void sub_8113064(struct Sprite *);
|
void sub_8113064(struct Sprite *);
|
||||||
void sub_81131B4(struct Sprite *);
|
void sub_81131B4(struct Sprite *);
|
||||||
void sub_8113224(struct Sprite *);
|
void sub_8113224(struct Sprite *);
|
||||||
@ -17,6 +15,8 @@ static void sub_81134B8(u8);
|
|||||||
static void sub_8113574(struct Task *);
|
static void sub_8113574(struct Task *);
|
||||||
static void sub_811369C(struct Sprite *);
|
static void sub_811369C(struct Sprite *);
|
||||||
|
|
||||||
|
EWRAM_DATA static u16 gUnknown_0203A100[7] = {0};
|
||||||
|
|
||||||
const union AnimCmd gUnknown_08596E60[] =
|
const union AnimCmd gUnknown_08596E60[] =
|
||||||
{
|
{
|
||||||
ANIMCMD_FRAME(0, 4),
|
ANIMCMD_FRAME(0, 4),
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
#include "evolution_graphics.h"
|
#include "evolution_graphics.h"
|
||||||
#include "gpu_regs.h"
|
#include "gpu_regs.h"
|
||||||
#include "link.h"
|
#include "link.h"
|
||||||
|
#include "link_rfu.h"
|
||||||
#include "m4a.h"
|
#include "m4a.h"
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "menu.h"
|
#include "menu.h"
|
||||||
@ -16,10 +17,12 @@
|
|||||||
#include "palette.h"
|
#include "palette.h"
|
||||||
#include "pokedex.h"
|
#include "pokedex.h"
|
||||||
#include "pokemon.h"
|
#include "pokemon.h"
|
||||||
|
#include "pokemon_summary_screen.h"
|
||||||
#include "scanline_effect.h"
|
#include "scanline_effect.h"
|
||||||
#include "sound.h"
|
#include "sound.h"
|
||||||
#include "sprite.h"
|
#include "sprite.h"
|
||||||
#include "string_util.h"
|
#include "string_util.h"
|
||||||
|
#include "strings.h"
|
||||||
#include "task.h"
|
#include "task.h"
|
||||||
#include "text.h"
|
#include "text.h"
|
||||||
#include "text_window.h"
|
#include "text_window.h"
|
||||||
@ -39,22 +42,18 @@ struct EvoInfo
|
|||||||
u16 savedPalette[48];
|
u16 savedPalette[48];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// EWRAM vars
|
||||||
static EWRAM_DATA struct EvoInfo *sEvoStructPtr = NULL;
|
static EWRAM_DATA struct EvoInfo *sEvoStructPtr = NULL;
|
||||||
static EWRAM_DATA u16 *sEvoMovingBgPtr = NULL;
|
static EWRAM_DATA u16 *sEvoMovingBgPtr = NULL;
|
||||||
|
|
||||||
|
// IWRAM common
|
||||||
|
void (*gCB2_AfterEvolution)(void);
|
||||||
|
|
||||||
#define sEvoCursorPos gBattleCommunication[1] // when learning a new move
|
#define sEvoCursorPos gBattleCommunication[1] // when learning a new move
|
||||||
#define sEvoGraphicsTaskID gBattleCommunication[2]
|
#define sEvoGraphicsTaskID gBattleCommunication[2]
|
||||||
|
|
||||||
extern const struct WindowTemplate gUnknown_0833900C;
|
|
||||||
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
|
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
|
||||||
|
|
||||||
// strings
|
|
||||||
extern const u8 gText_CommunicationStandby5[];
|
|
||||||
|
|
||||||
extern void ShowSelectMovePokemonSummaryScreen(struct Pokemon *party, u8 monId, u8 partyCount, void *CB2_ptr, u16 move);
|
|
||||||
extern u8 sub_81C1B94(void);
|
|
||||||
extern void sub_800E084(void);
|
|
||||||
|
|
||||||
// this file's functions
|
// this file's functions
|
||||||
static void Task_EvolutionScene(u8 taskID);
|
static void Task_EvolutionScene(u8 taskID);
|
||||||
static void Task_TradeEvolutionScene(u8 taskID);
|
static void Task_TradeEvolutionScene(u8 taskID);
|
||||||
|
@ -38,8 +38,6 @@
|
|||||||
#include "constants/songs.h"
|
#include "constants/songs.h"
|
||||||
#include "constants/vars.h"
|
#include "constants/vars.h"
|
||||||
|
|
||||||
extern void(*gUnknown_0203A0F4)(u8 taskId);
|
|
||||||
extern void (*gUnknown_03006328)(u8, TaskFunc);
|
|
||||||
extern void unknown_ItemMenu_Confirm(u8 taskId);
|
extern void unknown_ItemMenu_Confirm(u8 taskId);
|
||||||
extern void sub_81C5B14(u8 taskId);
|
extern void sub_81C5B14(u8 taskId);
|
||||||
extern void ScriptUnfreezeEventObjects(void);
|
extern void ScriptUnfreezeEventObjects(void);
|
||||||
@ -100,6 +98,9 @@ void sub_80FDBEC(void);
|
|||||||
bool8 sub_80FDE2C(void);
|
bool8 sub_80FDE2C(void);
|
||||||
void ItemUseOutOfBattle_CannotUse(u8 taskId);
|
void ItemUseOutOfBattle_CannotUse(u8 taskId);
|
||||||
|
|
||||||
|
// EWRAM variables
|
||||||
|
EWRAM_DATA static void(*gUnknown_0203A0F4)(u8 taskId) = NULL;
|
||||||
|
|
||||||
// .rodata
|
// .rodata
|
||||||
|
|
||||||
static const MainCallback gUnknown_085920D8[] =
|
static const MainCallback gUnknown_085920D8[] =
|
||||||
|
@ -119,6 +119,7 @@ struct Struct203CEDC
|
|||||||
u8 unkC;
|
u8 unkC;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// EWRAM vars
|
||||||
static EWRAM_DATA struct Struct203CEC4 *gUnknown_0203CEC4 = NULL;
|
static EWRAM_DATA struct Struct203CEC4 *gUnknown_0203CEC4 = NULL;
|
||||||
EWRAM_DATA struct Struct203CEC8 gUnknown_0203CEC8 = {0};
|
EWRAM_DATA struct Struct203CEC8 gUnknown_0203CEC8 = {0};
|
||||||
static EWRAM_DATA struct Struct203CEDC *gUnknown_0203CEDC = NULL;
|
static EWRAM_DATA struct Struct203CEDC *gUnknown_0203CEDC = NULL;
|
||||||
@ -134,7 +135,8 @@ static EWRAM_DATA u16 gUnknown_0203CEFC = 0;
|
|||||||
static EWRAM_DATA u16 gUnknown_0203CEFE = 0; // unused
|
static EWRAM_DATA u16 gUnknown_0203CEFE = 0; // unused
|
||||||
EWRAM_DATA u8 gUnknown_0203CF00[3] = {0};
|
EWRAM_DATA u8 gUnknown_0203CF00[3] = {0};
|
||||||
|
|
||||||
extern void (*gUnknown_03006328)(u8, TaskFunc);
|
// IWRAM common
|
||||||
|
void (*gUnknown_03006328)(u8, TaskFunc);
|
||||||
|
|
||||||
static void reset_brm(void);
|
static void reset_brm(void);
|
||||||
static void PartyMenuInitCallback(void);
|
static void PartyMenuInitCallback(void);
|
||||||
|
@ -30,8 +30,6 @@
|
|||||||
#include "constants/songs.h"
|
#include "constants/songs.h"
|
||||||
#include "constants/species.h"
|
#include "constants/species.h"
|
||||||
|
|
||||||
extern u8 gDexCryScreenState;
|
|
||||||
|
|
||||||
// EWRAM
|
// EWRAM
|
||||||
static EWRAM_DATA struct PokedexView *sPokedexView = NULL;
|
static EWRAM_DATA struct PokedexView *sPokedexView = NULL;
|
||||||
static EWRAM_DATA u16 gUnknown_02039B50 = 0;
|
static EWRAM_DATA u16 gUnknown_02039B50 = 0;
|
||||||
|
@ -39,7 +39,10 @@ static void sub_8145824(u8, s16, u8);
|
|||||||
static void sub_814596C(struct Sprite *);
|
static void sub_814596C(struct Sprite *);
|
||||||
static void sub_8145B24(s8);
|
static void sub_8145B24(s8);
|
||||||
|
|
||||||
extern u8 gDexCryScreenState;
|
// IWRAM common
|
||||||
|
u8 gDexCryScreenState;
|
||||||
|
|
||||||
|
// EWRAM vars
|
||||||
static EWRAM_DATA struct PokedexCryScreen *sDexCryScreen = NULL;
|
static EWRAM_DATA struct PokedexCryScreen *sDexCryScreen = NULL;
|
||||||
static EWRAM_DATA u8 *sCryWaveformWindowTiledata = NULL;
|
static EWRAM_DATA u8 *sCryWaveformWindowTiledata = NULL;
|
||||||
static EWRAM_DATA struct PokedexCryVolumeMeter *sCryVolumeMeter = NULL;
|
static EWRAM_DATA struct PokedexCryVolumeMeter *sCryVolumeMeter = NULL;
|
||||||
|
@ -189,8 +189,6 @@ extern u16 gUnknown_02022C3C;
|
|||||||
extern u8 gUnknown_02022C20[];
|
extern u8 gUnknown_02022C20[];
|
||||||
extern u8 gFieldLinkPlayerCount;
|
extern u8 gFieldLinkPlayerCount;
|
||||||
extern u8 gUnknown_03005DB4;
|
extern u8 gUnknown_03005DB4;
|
||||||
extern struct MailStruct gUnknown_020321C0[PARTY_SIZE];
|
|
||||||
extern u8 gUnknown_02032298[2];
|
|
||||||
|
|
||||||
// IWRAM vars
|
// IWRAM vars
|
||||||
IWRAM_DATA struct UnkStruct_Leader *gUnknown_03000DA0;
|
IWRAM_DATA struct UnkStruct_Leader *gUnknown_03000DA0;
|
||||||
|
@ -93,6 +93,7 @@ struct TrainerCardData
|
|||||||
extern u8 sub_80D30A0(u16);
|
extern u8 sub_80D30A0(u16);
|
||||||
|
|
||||||
// EWRAM
|
// EWRAM
|
||||||
|
EWRAM_DATA struct TrainerCard gTrainerCards[4] = {0};
|
||||||
EWRAM_DATA static struct TrainerCardData *sData = NULL;
|
EWRAM_DATA static struct TrainerCardData *sData = NULL;
|
||||||
|
|
||||||
//this file's functions
|
//this file's functions
|
||||||
|
@ -23,57 +23,14 @@
|
|||||||
.include "contest.o"
|
.include "contest.o"
|
||||||
.include "tv.o"
|
.include "tv.o"
|
||||||
.include "mauville_old_man.o"
|
.include "mauville_old_man.o"
|
||||||
|
.include "contest_painting_effects.o"
|
||||||
gUnknown_03006164: @ 3006164
|
|
||||||
.space 0x4
|
.space 0x4
|
||||||
|
|
||||||
gUnknown_03006168: @ 3006168
|
.include "contest_painting.o"
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_0300616C: @ 300616C
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_03006170: @ 3006170
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_03006174: @ 3006174
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_03006178: @ 3006178
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_0300617C: @ 300617C
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_03006180: @ 3006180
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_03006184: @ 3006184
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gUnknown_03006188: @ 3006188
|
|
||||||
.space 0x8
|
|
||||||
|
|
||||||
gUnknown_03006190: @ 3006190
|
|
||||||
.space 0x10
|
|
||||||
|
|
||||||
gUnknown_030061A0: @ 30061A0
|
|
||||||
.space 0x20
|
|
||||||
|
|
||||||
gUnknown_030061C0: @ 30061C0
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gContestPaintingMonPalette: @ 30061C4
|
|
||||||
.space 0xC
|
|
||||||
|
|
||||||
.include "field_specials.o"
|
.include "field_specials.o"
|
||||||
|
.include "evolution_scene.o"
|
||||||
gCB2_AfterEvolution: @ 30061E8
|
.include "pokedex_cry_screen.o"
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
gDexCryScreenState: @ 30061EC
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
.include "save.o"
|
.include "save.o"
|
||||||
.include "battle_tower.o"
|
.include "battle_tower.o"
|
||||||
.include "intro.o"
|
.include "intro.o"
|
||||||
@ -84,9 +41,9 @@ gDexCryScreenState: @ 30061EC
|
|||||||
.space 0x8
|
.space 0x8
|
||||||
|
|
||||||
.include "list_menu.o"
|
.include "list_menu.o"
|
||||||
|
.include "party_menu.o"
|
||||||
gUnknown_03006328: @ 3006328
|
|
||||||
.space 0x48
|
.space 0x44
|
||||||
|
|
||||||
gUnknown_03006370: @ 3006370
|
gUnknown_03006370: @ 3006370
|
||||||
.space 0x10
|
.space 0x10
|
||||||
|
@ -140,19 +140,6 @@ gUnknown_02022D00: @ 2022D00
|
|||||||
.include "src/scanline_effect.o"
|
.include "src/scanline_effect.o"
|
||||||
.include "src/option_menu.o"
|
.include "src/option_menu.o"
|
||||||
.include "src/pokedex.o"
|
.include "src/pokedex.o"
|
||||||
|
|
||||||
gTrainerCards: @ 2039B58
|
|
||||||
.space 0x14
|
|
||||||
|
|
||||||
gUnknown_02039B6C: @ 2039B6C
|
|
||||||
.space 0x2
|
|
||||||
|
|
||||||
gUnknown_02039B6E: @ 2039B6E
|
|
||||||
.space 0x1A
|
|
||||||
|
|
||||||
gUnknown_02039B88: @ 2039B88
|
|
||||||
.space 0x160
|
|
||||||
|
|
||||||
.include "src/trainer_card.o"
|
.include "src/trainer_card.o"
|
||||||
.include "src/frontier_pass.o"
|
.include "src/frontier_pass.o"
|
||||||
.include "src/pokemon_storage_system.o"
|
.include "src/pokemon_storage_system.o"
|
||||||
@ -161,14 +148,6 @@ gUnknown_02039B88: @ 2039B88
|
|||||||
.include "src/map_name_popup.o"
|
.include "src/map_name_popup.o"
|
||||||
.include "src/item.o"
|
.include "src/item.o"
|
||||||
.include "src/contest.o"
|
.include "src/contest.o"
|
||||||
|
|
||||||
.align 2
|
|
||||||
gUnknown_02039F5C: @ 2039F5C
|
|
||||||
.space 0x1
|
|
||||||
|
|
||||||
gUnknown_02039F5D: @ 2039F5D
|
|
||||||
.space 0x3
|
|
||||||
|
|
||||||
.include "src/shop.o"
|
.include "src/shop.o"
|
||||||
.include "src/fldeff_escalator.o"
|
.include "src/fldeff_escalator.o"
|
||||||
.include "src/script_menu.o"
|
.include "src/script_menu.o"
|
||||||
@ -177,21 +156,12 @@ gUnknown_02039F5D: @ 2039F5D
|
|||||||
.include "src/record_mixing.o"
|
.include "src/record_mixing.o"
|
||||||
.include "src/secret_base.o"
|
.include "src/secret_base.o"
|
||||||
.include "src/tv.o"
|
.include "src/tv.o"
|
||||||
|
.include "src/contest_link_80F57C4.o"
|
||||||
gUnknown_0203A034: @ 203A034
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
.include "src/rotating_gate.o"
|
.include "src/rotating_gate.o"
|
||||||
.include "src/safari_zone.o"
|
.include "src/safari_zone.o"
|
||||||
|
.include "src/item_use.o"
|
||||||
gUnknown_0203A0F4: @ 203A0F4
|
|
||||||
.space 0x4
|
|
||||||
|
|
||||||
.include "src/battle_anim_effects_1.o"
|
.include "src/battle_anim_effects_1.o"
|
||||||
|
.include "src/dragon.o"
|
||||||
gUnknown_0203A100: @ 203A100
|
|
||||||
.space 0x10
|
|
||||||
|
|
||||||
.include "src/battle_anim_utility_funcs.o"
|
.include "src/battle_anim_utility_funcs.o"
|
||||||
.include "src/battle_intro.o"
|
.include "src/battle_intro.o"
|
||||||
.include "src/easy_chat.o"
|
.include "src/easy_chat.o"
|
||||||
|
Loading…
Reference in New Issue
Block a user