From 7e157f202703f75933302d509f8b2bf26cf40655 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 18 Sep 2017 22:49:42 -0400 Subject: [PATCH] Decorate local EWRAM objects in battle_dome_cards.c as EWRAM --- src/battle_dome_cards.c | 10 +++++----- sym_ewram.txt | 6 +----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index 7eee245ee..f27e1e4fa 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -12,13 +12,13 @@ extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES]; extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; +extern const union AffineAnimCmd *const gUnknown_082FF618[]; +extern const union AffineAnimCmd *const gUnknown_082FF694[]; extern const union AnimCmd *const gUnknown_082FF70C[]; +extern const union AnimCmd *const *const gUnknown_08309AAC[NUM_SPECIES]; extern const union AnimCmd *const *const gUnknown_0830536C[]; extern const struct OamData gUnknown_0860B064; extern const struct OamData gUnknown_0860B06C; -extern const union AnimCmd *const *const gUnknown_08309AAC[NUM_SPECIES]; -extern const union AffineAnimCmd *const gUnknown_082FF694[]; -extern const union AffineAnimCmd *const gUnknown_082FF618[]; // Static type declarations @@ -32,8 +32,8 @@ struct BattleDomeCard { // Static RAM declarations -extern struct BattleDomeCard gUnknown_0203CD04[8]; -extern struct SpriteTemplate gUnknown_0203CCEC; +static EWRAM_DATA struct SpriteTemplate gUnknown_0203CCEC = {}; +EWRAM_DATA struct BattleDomeCard gUnknown_0203CD04[8] = {}; // Static ROM declarations diff --git a/sym_ewram.txt b/sym_ewram.txt index a675fa4e2..cc63c342b 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1762,11 +1762,7 @@ gUnknown_0203CCDC: @ 203CCDC gUnknown_0203CCE8: @ 203CCE8 .space 0x4 -gUnknown_0203CCEC: @ 203CCEC - .space 0x18 - -gUnknown_0203CD04: @ 203CD04 - .space 0x60 + .include "src/battle_dome_cards.o" gUnknown_0203CD64: @ 203CD64 .space 0x4