ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-25 19:24:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

move data to c

Browse Source
This commit is contained in:
DizzyEggg 2018-12-23 14:52:47 +01:00
parent 6d57a9dfc8
commit efa820469a
10 changed files with 105 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
data/cry_id_table.inc
View File

@ -1,137 +0,0 @@
.align 1
gSpeciesIdToCryId:: @ 831F61C
.2byte 273 @ TREECKO
.2byte 274 @ GROVYLE
.2byte 275 @ SCEPTILE
.2byte 270 @ TORCHIC
.2byte 271 @ COMBUSKEN
.2byte 272 @ BLAZIKEN
.2byte 276 @ MUDKIP
.2byte 277 @ MARSHTOMP
.2byte 278 @ SWAMPERT
.2byte 359 @ POOCHYENA
.2byte 360 @ MIGHTYENA
.2byte 378 @ ZIGZAGOON
.2byte 375 @ LINOONE
.2byte 290 @ WURMPLE
.2byte 291 @ SILCOON
.2byte 292 @ BEAUTIFLY
.2byte 293 @ CASCOON
.2byte 294 @ DUSTOX
.2byte 283 @ LOTAD
.2byte 284 @ LOMBRE
.2byte 285 @ LUDICOLO
.2byte 286 @ SEEDOT
.2byte 287 @ NUZLEAF
.2byte 288 @ SHIFTRY
.2byte 301 @ NINCADA
.2byte 302 @ NINJASK
.2byte 303 @ SHEDINJA
.2byte 266 @ TAILLOW
.2byte 267 @ SWELLOW
.2byte 374 @ SHROOMISH
.2byte 373 @ BRELOOM
.2byte 269 @ SPINDA
.2byte 280 @ WINGULL
.2byte 279 @ PELIPPER
.2byte 310 @ SURSKIT
.2byte 311 @ MASQUERAIN
.2byte 377 @ WAILMER
.2byte 381 @ WAILORD
.2byte 312 @ SKITTY
.2byte 313 @ DELCATTY
.2byte 251 @ KECLEON
.2byte 329 @ BALTOY
.2byte 330 @ CLAYDOL
.2byte 306 @ NOSEPASS
.2byte 253 @ TORKOAL
.2byte 362 @ SABLEYE
.2byte 318 @ BARBOACH
.2byte 319 @ WHISCASH
.2byte 368 @ LUVDISC
.2byte 320 @ CORPHISH
.2byte 321 @ CRAWDAUNT
.2byte 333 @ FEEBAS
.2byte 334 @ MILOTIC
.2byte 289 @ CARVANHA
.2byte 260 @ SHARPEDO
.2byte 324 @ TRAPINCH
.2byte 325 @ VIBRAVA
.2byte 326 @ FLYGON
.2byte 304 @ MAKUHITA
.2byte 305 @ HARIYAMA
.2byte 254 @ ELECTRIKE
.2byte 255 @ MANECTRIC
.2byte 316 @ NUMEL
.2byte 317 @ CAMERUPT
.2byte 338 @ SPHEAL
.2byte 339 @ SEALEO
.2byte 340 @ WALREIN
.2byte 327 @ CACNEA
.2byte 328 @ CACTURNE
.2byte 383 @ SNORUNT
.2byte 307 @ GLALIE
.2byte 331 @ LUNATONE
.2byte 332 @ SOLROCK
.2byte 262 @ AZURILL
.2byte 322 @ SPOINK
.2byte 323 @ GRUMPIG
.2byte 308 @ PLUSLE
.2byte 309 @ MINUN
.2byte 363 @ MAWILE
.2byte 336 @ MEDITITE
.2byte 337 @ MEDICHAM
.2byte 263 @ SWABLU
.2byte 264 @ ALTARIA
.2byte 258 @ WYNAUT
.2byte 256 @ DUSKULL
.2byte 361 @ DUSCLOPS
.2byte 252 @ ROSELIA
.2byte 298 @ SLAKOTH
.2byte 299 @ VIGOROTH
.2byte 300 @ SLAKING
.2byte 314 @ GULPIN
.2byte 315 @ SWALOT
.2byte 376 @ TROPIUS
.2byte 382 @ WHISMUR
.2byte 380 @ LOUDRED
.2byte 379 @ EXPLOUD
.2byte 341 @ CLAMPERL
.2byte 342 @ HUNTAIL
.2byte 343 @ GOREBYSS
.2byte 335 @ ABSOL
.2byte 282 @ SHUPPET
.2byte 281 @ BANETTE
.2byte 259 @ SEVIPER
.2byte 261 @ ZANGOOSE
.2byte 367 @ RELICANTH
.2byte 364 @ ARON
.2byte 365 @ LAIRON
.2byte 366 @ AGGRON
.2byte 356 @ CASTFORM
.2byte 357 @ VOLBEAT
.2byte 358 @ ILLUMISE
.2byte 344 @ LILEEP
.2byte 345 @ CRADILY
.2byte 346 @ ANORITH
.2byte 347 @ ARMALDO
.2byte 295 @ RALTS
.2byte 296 @ KIRLIA
.2byte 297 @ GARDEVOIR
.2byte 351 @ BAGON
.2byte 352 @ SHELGON
.2byte 372 @ SALAMENCE
.2byte 348 @ BELDUM
.2byte 349 @ METANG
.2byte 350 @ METAGROSS
.2byte 353 @ REGIROCK
.2byte 354 @ REGICE
.2byte 355 @ REGISTEEL
.2byte 370 @ KYOGRE
.2byte 369 @ GROUDON
.2byte 371 @ RAYQUAZA
.2byte 257 @ LATIAS
.2byte 384 @ LATIOS
.2byte 385 @ JIRACHI
.2byte 386 @ DEOXYS
.2byte 387 @ CHIMECHO

40
data/data2c.s
View File

@ -1,40 +0,0 @@
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/pokemon.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gBattleIntroSlideScanlineEffectParams:: @ 831AC70
.4byte REG_BG3HOFS
.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
.4byte 1
.align 2
gUnknown_0831AC7C:: @ 831AC7C
.4byte REG_BG3HOFS
.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
.4byte 1
.align 2
gUnknown_0831AC88:: @ 831AC88
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8038528
gText_ShedinjaJapaneseName:: @ 831ACA0
.string "ヌケニン$" @ Nukenin
.align 2
gUnknown_0831ACA8:: @ 831ACA8
.2byte 0x0100
.2byte 0xC000
.2byte 0x0800
.align 2
gUnknown_0831ACB0:: @ 831ACB0
.2byte 0x0100
.2byte 0xC000
.2byte 0x2800

11
data/field_effect_helpers.s
View File

@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 1
gUnknown_085CDC6E:: @ 85CDC6E
@the following might be unref, not sure
.byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00

5
include/battle_main.h
View File

@ -54,7 +54,7 @@ void sub_8038B74(struct Sprite *sprite);
void sub_8038D64(void); void sub_8038D64(void);
u32 sub_80391E0(u8 arrayId, u8 caseId); u32 sub_80391E0(u8 arrayId, u8 caseId);
u32 sub_80397C4(u32 setId, u32 tableId); u32 sub_80397C4(u32 setId, u32 tableId);
void oac_poke_opponent(struct Sprite *sprite); void SpriteCb_WildMon(struct Sprite *sprite);
void SpriteCallbackDummy_2(struct Sprite *sprite); void SpriteCallbackDummy_2(struct Sprite *sprite);
void SpriteCB_FaintOpponentMon(struct Sprite *sprite); void SpriteCB_FaintOpponentMon(struct Sprite *sprite);
void sub_8039AD8(struct Sprite *sprite); void sub_8039AD8(struct Sprite *sprite);
@ -86,6 +86,9 @@ bool8 TryRunFromBattle(u8 battlerId);
extern struct UnknownPokemonStruct4 gUnknown_02022FF8[3]; extern struct UnknownPokemonStruct4 gUnknown_02022FF8[3];
extern const struct SpriteTemplate gUnknown_0831AC88;
extern const struct OamData gOamData_831ACA8;
extern const struct OamData gOamData_831ACB0;
extern const u8 gTypeEffectiveness[336]; extern const u8 gTypeEffectiveness[336];
extern const u8 gTypeNames[][TYPE_NAME_LENGTH + 1]; extern const u8 gTypeNames[][TYPE_NAME_LENGTH + 1];
extern const struct TrainerMoney gTrainerMoneyTable[]; extern const struct TrainerMoney gTrainerMoneyTable[];

2
ld_script.txt
View File

@ -403,7 +403,6 @@ SECTIONS {
src/data2b.o(.rodata); src/data2b.o(.rodata);
src/battle_data.o(.rodata); src/battle_data.o(.rodata);
src/battle_bg.o(.rodata); src/battle_bg.o(.rodata);
data/data2c.o(.rodata);
src/battle_main.o(.rodata); src/battle_main.o(.rodata);
src/battle_util.o(.rodata); src/battle_util.o(.rodata);
src/battle_script_commands.o(.rodata); src/battle_script_commands.o(.rodata);
@ -534,7 +533,6 @@ SECTIONS {
src/cable_car.o(.rodata); src/cable_car.o(.rodata);
src/save.o(.rodata); src/save.o(.rodata);
src/field_effect_helpers.o(.rodata); src/field_effect_helpers.o(.rodata);
data/field_effect_helpers.o(.rodata);
src/contest_ai.o(.rodata); src/contest_ai.o(.rodata);
src/battle_controller_safari.o(.rodata); src/battle_controller_safari.o(.rodata);
src/battle_anim_effects_3.o(.rodata); src/battle_anim_effects_3.o(.rodata);

3
src/battle_bg.c
View File

@ -11,6 +11,7 @@
#include "link.h" #include "link.h"
#include "main.h" #include "main.h"
#include "menu.h" #include "menu.h"
#include "overworld.h"
#include "palette.h" #include "palette.h"
#include "sound.h" #include "sound.h"
#include "sprite.h" #include "sprite.h"
@ -31,8 +32,6 @@ struct BattleBackground
const void *palette; const void *palette;
}; };
extern u8 GetCurrentMapBattleScene(void);
// .rodata // .rodata
static const u16 sUnrefArray[] = {0x0300, 0x0000}; //OamData? static const u16 sUnrefArray[] = {0x0300, 0x0000}; //OamData?

83
src/battle_main.c
View File

@ -68,12 +68,10 @@ extern const u8 *const gBattlescriptsForBallThrow[];
extern const u8 *const gBattlescriptsForRunningByItem[]; extern const u8 *const gBattlescriptsForRunningByItem[];
extern const u8 *const gBattlescriptsForUsingItem[]; extern const u8 *const gBattlescriptsForUsingItem[];
extern const u8 *const gBattlescriptsForSafariActions[]; extern const u8 *const gBattlescriptsForSafariActions[];
extern const struct ScanlineEffectParams gBattleIntroSlideScanlineEffectParams;
// strings // strings
extern const u8 gText_LinkStandby3[]; extern const u8 gText_LinkStandby3[];
extern const u8 gText_BattleRecordCouldntBeSaved[]; extern const u8 gText_BattleRecordCouldntBeSaved[];
extern const u8 gText_ShedinjaJapaneseName[];
extern const u8 gText_Poison[]; extern const u8 gText_Poison[];
extern const u8 gText_Sleep[]; extern const u8 gText_Sleep[];
extern const u8 gText_Paralysis[]; extern const u8 gText_Paralysis[];
@ -104,9 +102,9 @@ static void sub_8038F34(void);
static void sub_80392A8(void); static void sub_80392A8(void);
static void sub_803937C(void); static void sub_803937C(void);
static void sub_803939C(void); static void sub_803939C(void);
static void sub_803980C(struct Sprite *sprite); static void SpriteCb_MoveWildMonToRight(struct Sprite *sprite);
static void sub_8039838(struct Sprite *sprite); static void SpriteCb_WildMonShowHealthbox(struct Sprite *sprite);
static void sub_8039894(struct Sprite *sprite); static void SpriteCb_WildMonAnimate(struct Sprite *sprite);
static void sub_80398D0(struct Sprite *sprite); static void sub_80398D0(struct Sprite *sprite);
static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite); static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite);
static void sub_8039AF4(struct Sprite *sprite); static void sub_8039AF4(struct Sprite *sprite);
@ -283,6 +281,63 @@ u8 gNumberOfMovesToChoose;
u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT];
// rom const data // rom const data
static const struct ScanlineEffectParams sIntroScanlineParams16Bit =
{
(void *)REG_ADDR_BG3HOFS, SCANLINE_EFFECT_DMACNT_16BIT, 1
};
// unused
static const struct ScanlineEffectParams sIntroScanlineParams32Bit =
{
(void *)REG_ADDR_BG3HOFS, SCANLINE_EFFECT_DMACNT_32BIT, 1
};
const struct SpriteTemplate gUnknown_0831AC88 =
{
.tileTag = 0,
.paletteTag = 0,
.oam = &gDummyOamData,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8038528,
};
static const u8 sText_ShedinjaJpnName[] = _("ヌケニン"); // Nukenin
const struct OamData gOamData_831ACA8 =
{
.y = 0,
.affineMode = 1,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.x = 0,
.matrixNum = 0,
.size = 3,
.tileNum = 0,
.priority = 2,
.paletteNum = 0,
.affineParam = 0
};
const struct OamData gOamData_831ACB0 =
{
.y = 0,
.affineMode = 1,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.x = 0,
.matrixNum = 0,
.size = 3,
.tileNum = 0,
.priority = 2,
.paletteNum = 2,
.affineParam = 0
};
// Unknown and unused data. Feel free to remove. // Unknown and unused data. Feel free to remove.
static const u16 gUnknown_0831ACB8[] = {0, 5, 0xfffe, 0}; static const u16 gUnknown_0831ACB8[] = {0, 5, 0xfffe, 0};
@ -627,7 +682,7 @@ static void CB2_InitBattleInternal(void)
gScanlineEffectRegBuffers[1][i] = 0xFF10; gScanlineEffectRegBuffers[1][i] = 0xFF10;
} }
ScanlineEffect_SetParams(gBattleIntroSlideScanlineEffectParams); ScanlineEffect_SetParams(sIntroScanlineParams16Bit);
} }
ResetPaletteFade(); ResetPaletteFade();
@ -2599,7 +2654,7 @@ static void TryCorrectShedinjaLanguage(struct Pokemon *mon)
&& GetMonData(mon, MON_DATA_LANGUAGE) != language) && GetMonData(mon, MON_DATA_LANGUAGE) != language)
{ {
GetMonData(mon, MON_DATA_NICKNAME, nickname); GetMonData(mon, MON_DATA_NICKNAME, nickname);
if (StringCompareWithoutExtCtrlCodes(nickname, gText_ShedinjaJapaneseName) == 0) if (StringCompareWithoutExtCtrlCodes(nickname, sText_ShedinjaJpnName) == 0)
SetMonData(mon, MON_DATA_LANGUAGE, &language); SetMonData(mon, MON_DATA_LANGUAGE, &language);
} }
} }
@ -2612,38 +2667,38 @@ u32 sub_80397C4(u32 setId, u32 tableId)
#define sBattler data[0] #define sBattler data[0]
#define sSpeciesId data[2] #define sSpeciesId data[2]
void oac_poke_opponent(struct Sprite *sprite) void SpriteCb_WildMon(struct Sprite *sprite)
{ {
sprite->callback = sub_803980C; sprite->callback = SpriteCb_MoveWildMonToRight;
StartSpriteAnimIfDifferent(sprite, 0); StartSpriteAnimIfDifferent(sprite, 0);
BeginNormalPaletteFade(0x20000, 0, 10, 10, RGB(8, 8, 8)); BeginNormalPaletteFade(0x20000, 0, 10, 10, RGB(8, 8, 8));
} }
static void sub_803980C(struct Sprite *sprite) static void SpriteCb_MoveWildMonToRight(struct Sprite *sprite)
{ {
if ((gIntroSlideFlags & 1) == 0) if ((gIntroSlideFlags & 1) == 0)
{ {
sprite->pos2.x += 2; sprite->pos2.x += 2;
if (sprite->pos2.x == 0) if (sprite->pos2.x == 0)
{ {
sprite->callback = sub_8039838; sprite->callback = SpriteCb_WildMonShowHealthbox;
} }
} }
} }
static void sub_8039838(struct Sprite *sprite) static void SpriteCb_WildMonShowHealthbox(struct Sprite *sprite)
{ {
if (sprite->animEnded) if (sprite->animEnded)
{ {
sub_8076918(sprite->sBattler); sub_8076918(sprite->sBattler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[sprite->sBattler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[sprite->sBattler]);
sprite->callback = sub_8039894; sprite->callback = SpriteCb_WildMonAnimate;
StartSpriteAnimIfDifferent(sprite, 0); StartSpriteAnimIfDifferent(sprite, 0);
BeginNormalPaletteFade(0x20000, 0, 10, 0, RGB(8, 8, 8)); BeginNormalPaletteFade(0x20000, 0, 10, 0, RGB(8, 8, 8));
} }
} }
static void sub_8039894(struct Sprite *sprite) static void SpriteCb_WildMonAnimate(struct Sprite *sprite)
{ {
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {

18
src/field_effect_helpers.c
View File

@ -1228,13 +1228,11 @@ u32 ShowTreeDisguiseFieldEffect(void)
return ShowDisguiseFieldEffect(FLDEFF_TREE_DISGUISE, 24, 4); return ShowDisguiseFieldEffect(FLDEFF_TREE_DISGUISE, 24, 4);
} }
u32 ShowMountainDisguiseFieldEffect(void) u32 ShowMountainDisguiseFieldEffect(void)
{ {
return ShowDisguiseFieldEffect(FLDEFF_MOUNTAIN_DISGUISE, 25, 3); return ShowDisguiseFieldEffect(FLDEFF_MOUNTAIN_DISGUISE, 25, 3);
} }
u32 ShowSandDisguiseFieldEffect(void) u32 ShowSandDisguiseFieldEffect(void)
{ {
return ShowDisguiseFieldEffect(FLDEFF_SAND_DISGUISE, 28, 2); return ShowDisguiseFieldEffect(FLDEFF_SAND_DISGUISE, 28, 2);
@ -1579,3 +1577,19 @@ static void sub_81561FC(struct Sprite *sprite, u8 z, u8 offset)
} }
} }
} }
// Unused data. Feel free to remove.
static const u8 gUnknown_085CDC6E[] =
{
0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02,
0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02,
0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00,
0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01,
0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00,
0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF,
0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00
};

30
src/pokemon.c
View File

@ -45,8 +45,6 @@ struct SpeciesItem
u16 item; u16 item;
}; };
extern const struct OamData gUnknown_0831ACB0;
extern const struct OamData gUnknown_0831ACA8;
extern const struct SpriteFrameImage gUnknown_082FF3A8[]; extern const struct SpriteFrameImage gUnknown_082FF3A8[];
extern const struct SpriteFrameImage gUnknown_082FF3C8[]; extern const struct SpriteFrameImage gUnknown_082FF3C8[];
extern const struct SpriteFrameImage gUnknown_082FF3E8[]; extern const struct SpriteFrameImage gUnknown_082FF3E8[];
@ -2298,7 +2296,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] =
{ // B_POSITION_PLAYER_LEFT { // B_POSITION_PLAYER_LEFT
.tileTag = 0xFFFF, .tileTag = 0xFFFF,
.paletteTag = 0, .paletteTag = 0,
.oam = &gUnknown_0831ACB0, .oam = &gOamData_831ACB0,
.anims = NULL, .anims = NULL,
.images = gUnknown_082FF3A8, .images = gUnknown_082FF3A8,
.affineAnims = gUnknown_082FF618, .affineAnims = gUnknown_082FF618,
@ -2307,16 +2305,16 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] =
{ // B_POSITION_OPPONENT_LEFT { // B_POSITION_OPPONENT_LEFT
.tileTag = 0xFFFF, .tileTag = 0xFFFF,
.paletteTag = 0, .paletteTag = 0,
.oam = &gUnknown_0831ACA8, .oam = &gOamData_831ACA8,
.anims = NULL, .anims = NULL,
.images = gUnknown_082FF3C8, .images = gUnknown_082FF3C8,
.affineAnims = gUnknown_082FF694, .affineAnims = gUnknown_082FF694,
.callback = oac_poke_opponent, .callback = SpriteCb_WildMon,
}, },
{ // B_POSITION_PLAYER_RIGHT { // B_POSITION_PLAYER_RIGHT
.tileTag = 0xFFFF, .tileTag = 0xFFFF,
.paletteTag = 0, .paletteTag = 0,
.oam = &gUnknown_0831ACB0, .oam = &gOamData_831ACB0,
.anims = NULL, .anims = NULL,
.images = gUnknown_082FF3E8, .images = gUnknown_082FF3E8,
.affineAnims = gUnknown_082FF618, .affineAnims = gUnknown_082FF618,
@ -2325,11 +2323,11 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] =
{ // B_POSITION_OPPONENT_RIGHT { // B_POSITION_OPPONENT_RIGHT
.tileTag = 0xFFFF, .tileTag = 0xFFFF,
.paletteTag = 0, .paletteTag = 0,
.oam = &gUnknown_0831ACA8, .oam = &gOamData_831ACA8,
.anims = NULL, .anims = NULL,
.images = gUnknown_082FF408, .images = gUnknown_082FF408,
.affineAnims = gUnknown_082FF694, .affineAnims = gUnknown_082FF694,
.callback = oac_poke_opponent .callback = SpriteCb_WildMon
}, },
}; };
@ -2338,7 +2336,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
{ {
.tileTag = 0xFFFF, .tileTag = 0xFFFF,
.paletteTag = 0, .paletteTag = 0,
.oam = &gUnknown_0831ACB0, .oam = &gOamData_831ACB0,
.anims = NULL, .anims = NULL,
.images = gUnknown_082FF428, .images = gUnknown_082FF428,
.affineAnims = gUnknown_082FF618, .affineAnims = gUnknown_082FF618,
@ -2347,7 +2345,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
{ {
.tileTag = 0xFFFF, .tileTag = 0xFFFF,
.paletteTag = 0, .paletteTag = 0,
.oam = &gUnknown_0831ACB0, .oam = &gOamData_831ACB0,
.anims = NULL, .anims = NULL,
.images = gUnknown_082FF448, .images = gUnknown_082FF448,
.affineAnims = gUnknown_082FF618, .affineAnims = gUnknown_082FF618,
@ -2356,7 +2354,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
{ {
.tileTag = 0xFFFF, .tileTag = 0xFFFF,
.paletteTag = 0, .paletteTag = 0,
.oam = &gUnknown_0831ACB0, .oam = &gOamData_831ACB0,
.anims = NULL, .anims = NULL,
.images = gUnknown_082FF468, .images = gUnknown_082FF468,
.affineAnims = gUnknown_082FF618, .affineAnims = gUnknown_082FF618,
@ -2365,7 +2363,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
{ {
.tileTag = 0xFFFF, .tileTag = 0xFFFF,
.paletteTag = 0, .paletteTag = 0,
.oam = &gUnknown_0831ACB0, .oam = &gOamData_831ACB0,
.anims = NULL, .anims = NULL,
.images = gUnknown_082FF490, .images = gUnknown_082FF490,
.affineAnims = gUnknown_082FF618, .affineAnims = gUnknown_082FF618,
@ -2374,7 +2372,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
{ {
.tileTag = 0xFFFF, .tileTag = 0xFFFF,
.paletteTag = 0, .paletteTag = 0,
.oam = &gUnknown_0831ACB0, .oam = &gOamData_831ACB0,
.anims = NULL, .anims = NULL,
.images = gUnknown_082FF4B8, .images = gUnknown_082FF4B8,
.affineAnims = gUnknown_082FF618, .affineAnims = gUnknown_082FF618,
@ -2383,7 +2381,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
{ {
.tileTag = 0xFFFF, .tileTag = 0xFFFF,
.paletteTag = 0, .paletteTag = 0,
.oam = &gUnknown_0831ACB0, .oam = &gOamData_831ACB0,
.anims = NULL, .anims = NULL,
.images = gUnknown_082FF4D8, .images = gUnknown_082FF4D8,
.affineAnims = gUnknown_082FF618, .affineAnims = gUnknown_082FF618,
@ -2392,7 +2390,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
{ {
.tileTag = 0xFFFF, .tileTag = 0xFFFF,
.paletteTag = 0, .paletteTag = 0,
.oam = &gUnknown_0831ACB0, .oam = &gOamData_831ACB0,
.anims = NULL, .anims = NULL,
.images = gUnknown_082FF4F8, .images = gUnknown_082FF4F8,
.affineAnims = gUnknown_082FF618, .affineAnims = gUnknown_082FF618,
@ -2401,7 +2399,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
{ {
.tileTag = 0xFFFF, .tileTag = 0xFFFF,
.paletteTag = 0, .paletteTag = 0,
.oam = &gUnknown_0831ACB0, .oam = &gOamData_831ACB0,
.anims = NULL, .anims = NULL,
.images = gUnknown_082FF518, .images = gUnknown_082FF518,
.affineAnims = gUnknown_082FF618, .affineAnims = gUnknown_082FF618,

3
src/rom_8034C54.c
View File

@ -3,6 +3,7 @@
#include "alloc.h" #include "alloc.h"
#include "decompress.h" #include "decompress.h"
#include "main.h" #include "main.h"
#include "battle_main.h"
struct UnkStruct2 struct UnkStruct2
{ {
@ -31,8 +32,6 @@ struct UnkStruct1
struct UnkStruct2 *array; struct UnkStruct2 *array;
}; };
extern const struct SpriteTemplate gUnknown_0831AC88;
// this file's functions // this file's functions
static u8 sub_8035518(u8 arg0);; static u8 sub_8035518(u8 arg0);;
static void sub_8034EFC(struct UnkStruct2 *arg0); static void sub_8034EFC(struct UnkStruct2 *arg0);