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

Merge pull request #458 from ultima-soul/contest

Browse Source 
Decompile more of contest
This commit is contained in:
Diegoisawesome 2019-01-27 23:08:24 -06:00 committed by GitHub
commit 183b6857ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 3467 additions and 6989 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6966
asm/contest.s
View File

File diff suppressed because it is too large Load Diff

2
data/contest.s
View File

@ -406,7 +406,7 @@ gSpriteTemplate_858998C:: @ 858998C
spr_template 0x80eb, 0x80eb, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy spr_template 0x80eb, 0x80eb, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
.align 2 .align 2
gUnknown_085899EC:: @ 85899EC gContestExcitementTable:: @ 85899EC
.2byte 0x0001, 0xffff, 0x0000, 0x0001, 0xffff, 0x00ff, 0x0001, 0xffff, 0x00ff, 0x0001, 0xff00, 0x00ff, 0x0001, 0x0000 .2byte 0x0001, 0xffff, 0x0000, 0x0001, 0xffff, 0x00ff, 0x0001, 0xffff, 0x00ff, 0x0001, 0xff00, 0x00ff, 0x0001, 0x0000

10
data/text/contest_strings.inc
View File

@ -665,19 +665,19 @@ gText_0827E817:: @ 827E817
.string "{STR_VAR_1}'s\n" .string "{STR_VAR_1}'s\n"
.string "{STR_VAR_2} is ignored.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "{STR_VAR_2} is ignored.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gText_0827E837:: @ 827E837 gText_Contest_Shyness:: @ 827E837
.string "shyness$" .string "shyness$"
gText_0827E83F:: @ 827E83F gText_Contest_Anxiety:: @ 827E83F
.string "anxiety$" .string "anxiety$"
gText_0827E847:: @ 827E847 gText_Contest_Laziness:: @ 827E847
.string "laziness$" .string "laziness$"
gText_0827E850:: @ 827E850 gText_Contest_Hesitancy:: @ 827E850
.string "hesitancy$" .string "hesitancy$"
gText_0827E85A:: @ 827E85A gText_Contest_Fear:: @ 827E85A
.string "fear$" .string "fear$"
gText_0827E85F:: @ 827E85F gText_0827E85F:: @ 827E85F

14
include/contest.h
View File

@ -385,6 +385,14 @@ struct UnknownContestStruct4
u8 unk2_2:1; u8 unk2_2:1;
}; };
struct UnknownContestStruct6
{
s32 unk0;
s32 unk4;
s32 unk8;
s32 unkC;
};
struct ContestResourcesField1C struct ContestResourcesField1C
{ {
u8 filler_00[0x40]; u8 filler_00[0x40];
@ -421,9 +429,13 @@ extern struct ContestResources *gContestResources;
#define shared19328 (*gContestResources->field_10) #define shared19328 (*gContestResources->field_10)
#define shared19338 (*gContestResources->field_14) #define shared19338 (*gContestResources->field_14)
#define shared15800 (gHeap + 0x18000) #define shared15800 (gHeap + 0x18000)
#define shared16800 (gHeap + 0x19000)
#define shared18000 (*(struct Shared18000 *)(gHeap + 0x1a000)) #define shared18000 (*(struct Shared18000 *)(gHeap + 0x1a000))
extern u32 gContestRngValue; extern u32 gContestRngValue;
extern u8 gUnknown_02039F26[4]; extern u8 gUnknown_02039F26[4];
@ -437,7 +449,7 @@ bool8 sub_80DE1E8(u8 a);
void SetStartledString(u8 a, u8 b); void SetStartledString(u8 a, u8 b);
s8 Contest_GetMoveExcitement(u16); s8 Contest_GetMoveExcitement(u16);
u8 sub_80DAE0C(struct Pokemon *); u8 sub_80DAE0C(struct Pokemon *);
void sub_80DEDA8(u8); bool8 sub_80DEDA8(u8);
void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame); void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame);
void sub_80DB09C(u8 contestCategory); void sub_80DB09C(u8 contestCategory);
void sub_80DCE58(u8); void sub_80DCE58(u8);

4
include/graphics.h
View File

@ -4745,9 +4745,13 @@ extern const u32 gBattleStatMask8_Pal[];
extern const u32 gUnknown_08D9A88C[]; extern const u32 gUnknown_08D9A88C[];
extern const u32 gContestMiscGfx[]; extern const u32 gContestMiscGfx[];
extern const u32 gContestAudienceGfx[]; extern const u32 gContestAudienceGfx[];
extern const u8 gContestApplauseMeterGfx[];
extern const u8 gContestNextTurnNumbersGfx[];
extern const u8 gContestNextTurnRandomGfx[];
extern const u32 gUnknown_08C16FA8[]; extern const u32 gUnknown_08C16FA8[];
extern const u32 gUnknown_08C16E90[]; extern const u32 gUnknown_08C16E90[];
extern const u32 gUnknown_08C17170[]; extern const u32 gUnknown_08C17170[];
extern const u32 gUnknown_08C17980[];
extern const u32 gUnknown_08D95E00[]; extern const u32 gUnknown_08D95E00[];
extern const u32 gUnknown_08D960D0[]; extern const u32 gUnknown_08D960D0[];

2
include/util.h
View File

@ -15,5 +15,7 @@ u16 CalcCRC16WithTable(u8 *data, u32 length);
u32 CalcByteArraySum(const u8* data, u32 length); u32 CalcByteArraySum(const u8* data, u32 length);
void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor); void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor);
void DoBgAffineSet(struct BgAffineDstData *dest, u32 texX, u32 texY, s16 scrX, s16 scrY, s16 sx, s16 sy, u16 alpha); void DoBgAffineSet(struct BgAffineDstData *dest, u32 texX, u32 texY, s16 scrX, s16 scrY, s16 sx, s16 sy, u16 alpha);
void CopySpriteTiles(u8 shape, u8 size, u8 *tiles, u16 *tilemap, u8 *output);
#endif // GUARD_UTIL_H #endif // GUARD_UTIL_H

3454
src/contest.c
View File

File diff suppressed because it is too large Load Diff

4
src/graphics.c
View File

@ -1023,8 +1023,8 @@ const u32 gBattleAnimSpriteSheet_262[] = INCBIN_U32("graphics/battle_anims/sprit
const u32 gBattleAnimSpritePalette_262[] = INCBIN_U32("graphics/battle_anims/sprites/262.gbapal.lz"); const u32 gBattleAnimSpritePalette_262[] = INCBIN_U32("graphics/battle_anims/sprites/262.gbapal.lz");
const u32 gContestNextTurnGfx[] = INCBIN_U32("graphics/contest/nextturn.4bpp.lz"); const u32 gContestNextTurnGfx[] = INCBIN_U32("graphics/contest/nextturn.4bpp.lz");
const u8 gUnknown_08D8E9B4[] = INCBIN_U8("graphics/contest/nextturn_numbers.4bpp"); const u8 gContestNextTurnNumbersGfx[] = INCBIN_U8("graphics/contest/nextturn_numbers.4bpp");
const u8 gUnknown_08D8EA34[] = INCBIN_U8("graphics/contest/nextturn_random.4bpp"); const u8 gContestNextTurnRandomGfx[] = INCBIN_U8("graphics/contest/nextturn_random.4bpp");
const u32 gBattleAnimSpriteSheet_264[] = INCBIN_U32("graphics/battle_anims/sprites/264.4bpp.lz"); const u32 gBattleAnimSpriteSheet_264[] = INCBIN_U32("graphics/battle_anims/sprites/264.4bpp.lz");
const u32 gBattleAnimSpritePalette_264[] = INCBIN_U32("graphics/battle_anims/sprites/264.gbapal.lz"); const u32 gBattleAnimSpritePalette_264[] = INCBIN_U32("graphics/battle_anims/sprites/264.gbapal.lz");