Game-Decompilation/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2024-10-07 02:23:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Finish porting contest data to C

Browse Source
This commit is contained in:
PikalaxALT 2021-06-24 09:02:27 -04:00
parent 5dd61a98b8
commit 0f1c570209
10 changed files with 561 additions and 480 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

260
data/contest.s
View File

@ -1,260 +0,0 @@
#include "constants/moves.h"
#include "constants/species.h"
.include "include/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknownText_UnknownFormatting2:: @ 83CC3A0
.string "{COLOR GREEN}{SHADOW RED}$"
gUnknownText_UnknownFormatting3:: @ 83CC3A7
.string "{COLOR LIGHT_GREY}$"
.align 2
gUnknown_083CC3AC:: @ 83CC3AC
obj_tiles gContestNumbers_UnusedGfx, 512, 0x4e20
.align 2
gUnknown_083CC3B4:: @ 83CC3B4
obj_pal gContestNumbers_UnusedPal, 0x4E20
obj_pal gContestNumbers_UnusedPal, 0x4E21
obj_pal gContestNumbers_UnusedPal, 0x4E22
obj_pal gContestNumbers_UnusedPal, 0x4E23
.align 2
gSpriteAnim_83CC3D4:: @ 83CC3D4
obj_image_anim_frame 0, 1
obj_image_anim_end
.align 2
gSpriteAnim_83CC3DC:: @ 83CC3DC
obj_image_anim_frame 4, 1
obj_image_anim_end
.align 2
gSpriteAnim_83CC3E4:: @ 83CC3E4
obj_image_anim_frame 8, 1
obj_image_anim_end
.align 2
gSpriteAnim_83CC3EC:: @ 83CC3EC
obj_image_anim_frame 12, 1
obj_image_anim_end
.align 2
gSpriteAnimTable_83CC3F4:: @ 83CC3F4
.4byte gSpriteAnim_83CC3D4
.4byte gSpriteAnim_83CC3DC
.4byte gSpriteAnim_83CC3E4
.4byte gSpriteAnim_83CC3EC
.align 2
gSpriteAffineAnim_83CC404:: @ 83CC404
obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83CC414:: @ 83CC414
obj_rot_scal_anim_frame 0xFFF1, 0xFFF1, 0, 15
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83CC424:: @ 83CC424
obj_rot_scal_anim_frame 0x1F, 0x1F, 0, 0
obj_rot_scal_anim_frame 0xF, 0xF, 0, 15
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_83CC43C:: @ 83CC43C
.4byte gSpriteAffineAnim_83CC404
.4byte gSpriteAffineAnim_83CC414
.4byte gSpriteAffineAnim_83CC424
.4byte NULL
.align 2
gOamData_83CC44C:: @ 83CC44C
.2byte 0x0000
.2byte 0x4000
.2byte 0x0000
.align 2
gSpriteTemplate_83CC454:: @ 83CC454
spr_template 20000, 20000, gOamData_83CC44C, gSpriteAnimTable_83CC3F4, NULL, gSpriteAffineAnimTable_83CC43C, SpriteCallbackDummy
.align 2
gSpriteTemplate_83CC46C:: @ 83CC46C
spr_template 20000, 20001, gOamData_83CC44C, gSpriteAnimTable_83CC3F4, NULL, gSpriteAffineAnimTable_83CC43C, SpriteCallbackDummy
.align 2
gSpriteTemplate_83CC484:: @ 83CC484
spr_template 20000, 20002, gOamData_83CC44C, gSpriteAnimTable_83CC3F4, NULL, gSpriteAffineAnimTable_83CC43C, SpriteCallbackDummy
.align 2
gSpriteTemplate_83CC49C:: @ 83CC49C
spr_template 20000, 20003, gOamData_83CC44C, gSpriteAnimTable_83CC3F4, NULL, gSpriteAffineAnimTable_83CC43C, SpriteCallbackDummy
.align 2
gUnknown_083CC4B4:: @ 83CC4B4
obj_tiles gBlankGfxCompressed, 4096, 33000
obj_tiles gBlankGfxCompressed, 4096, 33001
obj_tiles gBlankGfxCompressed, 4096, 33002
obj_tiles gBlankGfxCompressed, 4096, 33003
.align 2
gUnknown_083CC4D4:: @ 83CC4D4
obj_pal gSharedMem + 0x180A4, 33000
obj_pal gSharedMem + 0x180C4, 33001
obj_pal gSharedMem + 0x180E4, 33002
obj_pal gSharedMem + 0x18104, 33003
.align 2
gOamData_83CC4F4:: @ 83CC4F4
.2byte 0x0700
.2byte 0xC000
.2byte 0x0000
.align 2
gSpriteAffineAnim_83CC4FC:: @ 83CC4FC
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_83CC50C:: @ 83CC50C
obj_rot_scal_anim_frame 0x3, 0x3, 0, 15
obj_rot_scal_anim_frame 0xFFFD, 0xFFFD, 0, 15
obj_rot_scal_anim_frame 0x3, 0x3, 0, 15
obj_rot_scal_anim_frame 0xFFFD, 0xFFFD, 0, 15
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_83CC534:: @ 83CC534
.4byte gSpriteAffineAnim_83CC4FC
.4byte gSpriteAffineAnim_83CC50C
.align 2
gSpriteTemplate_83CC53C:: @ 83CC53C
spr_template 33000, 33000, gOamData_83CC4F4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83CC534, SpriteCallbackDummy
.align 2
gSpriteTemplate_83CC554:: @ 83CC554
spr_template 33001, 33001, gOamData_83CC4F4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83CC534, SpriteCallbackDummy
.align 2
gSpriteTemplate_83CC56C:: @ 83CC56C
spr_template 33002, 33002, gOamData_83CC4F4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83CC534, SpriteCallbackDummy
.align 2
gSpriteTemplate_83CC584:: @ 83CC584
spr_template 33003, 33003, gOamData_83CC4F4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83CC534, SpriteCallbackDummy
gUnknown_083CC59C:: @ 83CC59C
.string "{HIGHLIGHT TRANSPARENT}{COLOR}$"
gText_Slash:: @ 83CC5A2
.string "/$"
.align 1
gUnknown_083CC5A4:: @ 83CC5A4
.2byte 0x73, 0x19E6, 0x253, 0x4CC4, 0x1F, 0x3E0, 0x3FF, 0x7C00
@ 83CC5B4
.include "data/contest_excitement_table.inc"
.align 2
gDefaultContestWinners:: @ 83CC5D0
.4byte 0
.4byte 0xFFFF
.2byte SPECIES_TAILLOW
.byte CONTEST_SMART
.ifdef ENGLISH
.string "TAILTA$", 11
.string "WYATT$", 10
.else
.string "SCHWALBI$", 11
.string "ROSEL$", 10
.endif
.4byte 0
.4byte 0xFFFF
.2byte SPECIES_BRELOOM
.byte CONTEST_BEAUTY
.ifdef ENGLISH
.string "BRELO$", 11
.string "LIANA$", 10
.else
.string "TUFUNG$", 11
.string "WITOLD$", 10
.endif
.4byte 0
.4byte 0xFFFF
.2byte SPECIES_PELIPPER
.byte CONTEST_COOL
.ifdef ENGLISH
.string "PELEP$", 11
.string "TIERA$", 10
.else
.string "LIPPER$", 11
.string "RUFUS$", 10
.endif
.4byte 0
.4byte 0xFFFF
.2byte SPECIES_PELIPPER
.byte CONTEST_COOL
.ifdef ENGLISH
.string "PELEP$", 11
.string "TIERA$", 10
.else
.string "LIPPER$", 11
.string "ELLEN$", 10
.endif
.4byte 0
.4byte 0xFFFF
.2byte SPECIES_PELIPPER
.byte CONTEST_COOL
.ifdef ENGLISH
.string "PELEP$", 11
.string "TIERA$", 10
.else
.string "LIPPER$", 11
.string "AVIA$", 10
.endif
.4byte 0
.4byte 0xFFFF
.2byte SPECIES_DELCATTY
.byte CONTEST_SMART
.ifdef ENGLISH
.string "KITSY$", 11
.string "OMAR$", 10
.else
.string "CONEC$", 11
.string "HAUBERT$", 10
.endif
.4byte 0
.4byte 0xFFFF
.2byte SPECIES_GULPIN
.byte CONTEST_CUTE
.ifdef ENGLISH
.string "GULPS$", 11
.string "MACIE$", 10
.else
.string "SCHLUCKI$", 11
.string "HEILWIG$", 10
.endif
.4byte 0
.4byte 0xFFFF
.2byte SPECIES_LOUDRED
.byte CONTEST_TOUGH
.ifdef ENGLISH
.string "LOUDED$", 11
.string "BRYANT$", 10
.else
.string "KEELO$", 11
.string "ISEGRIM$", 10
.endif

7
data/contest_excitement_table.inc
View File

@ -1,7 +0,0 @@
gContestExcitementTable:: @ 83CC5B4
@ Cool Beauty Cute Smart Tough
.byte 1, 0, -1, -1, 0 @ Cool Contest
.byte 0, 1, 0, -1, -1 @ Beauty Contest
.byte -1, 0, 1, 0, -1 @ Cute Contest
.byte -1, -1, 0, 1, 0 @ Smart Contest
.byte 0, -1, -1, 0, 1 @ Tough Contest

2
include/graphics.h
View File

@ -43,6 +43,8 @@ extern const u8 gContestMiscGfx[];
extern const u8 gContestAudienceGfx[];
extern const u8 gContestJudgeSymbolsGfx[];
extern const u8 gContest3Pal[];
extern const u8 gContestNumbers_UnusedGfx[];
extern const u8 gContestNumbers_UnusedPal[];
extern const u8 gTiles_8D1975C[];
extern const u8 gUnknown_08D1977C[];
extern const u8 gUnknown_08D1A250[];

1
ld_script.txt
View File

@ -576,7 +576,6 @@ SECTIONS {
src/debug/matsuda_debug_menu.o(.rodata);
src/contest.o(.rodata);
src/contest_2.o(.rodata);
data/contest.o(.rodata);
src/shop.o(.rodata);
src/fldeff_escalator.o(.rodata);
src/berry.o(.rodata);

22
src/battle_interface.c
View File

@ -1538,7 +1538,7 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
sp14 = 0;
for (i = 0; i < 6; i++) //_080448A0
{
if (b[i].totalPoints != 0xFFFF)
if (b[i].unk0 != 0xFFFF)
sp14++;
}
@ -1599,19 +1599,19 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
{
if (gBattleTypeFlags & BATTLE_TYPE_MULTI) // && b[i] != 0xFFFF && b[i]
{
if (b[i].totalPoints == 0xFFFF)
if (b[i].unk0 == 0xFFFF)
{
//_08044AE6
gSprites[sp[i]].oam.tileNum += 1;
gSprites[sp[i]].data[7] = 1;
// to _08044B52
}
else if (b[i].totalPoints == 0)
else if (b[i].unk0 == 0)
{
gSprites[sp[i]].oam.tileNum += 3;
// to _08044B46
}
else if (b[i].round1Points != 0)
else if (b[i].unk4 != 0)
{
gSprites[sp[i]].oam.tileNum += 2;
}
@ -1626,13 +1626,13 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
gSprites[sp[i]].data[7] = 1;
// to _08044B52
}
else if (b[i].totalPoints == 0)
else if (b[i].unk0 == 0)
{
//_08044B14
gSprites[sp[i]].oam.tileNum += 3;
// to _08044B46
}
else if (b[i].round1Points != 0)
else if (b[i].unk4 != 0)
{
gSprites[sp[i]].oam.tileNum += 2;
}
@ -1647,16 +1647,16 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
{
if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
{
if (b[i].totalPoints == 0xFFFF)
if (b[i].unk0 == 0xFFFF)
{
gSprites[sp[5 - i]].oam.tileNum += 1;
gSprites[sp[5 - i]].data[7] = 1;
}
else if (b[i].totalPoints == 0)
else if (b[i].unk0 == 0)
{
gSprites[sp[5 - i]].oam.tileNum += 3;
}
else if (b[i].round1Points != 0)
else if (b[i].unk4 != 0)
{
gSprites[sp[5 - i]].oam.tileNum += 2;
}
@ -1668,11 +1668,11 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
gSprites[sp[5 - i]].oam.tileNum += 1;
gSprites[sp[5 - i]].data[7] = 1;
}
else if (b[i].totalPoints == 0)
else if (b[i].unk0 == 0)
{
gSprites[sp[5 - i]].oam.tileNum += 3;
}
else if (b[i].round1Points != 0)
else if (b[i].unk4 != 0)
{
gSprites[sp[5 - i]].oam.tileNum += 2;
}

385
src/contest_2.c
View File

@ -39,6 +39,7 @@ extern u8 gBattlerTarget;
extern u8 gBattlerSpriteIds[];
extern struct Window gWindowTemplate_Contest_MoveDescription;
extern struct SpriteTemplate gUnknown_02024E8C;
extern void (*const gContestEffectFuncs[])(void);
#include "data/contest_opponents.h"
@ -277,32 +278,374 @@ const struct SpriteTemplate sSpriteTemplate_JudgeSpeechBubble = {
.callback = SpriteCallbackDummy,
};
#ifdef ENGLISH
#if defined(ENGLISH)
#include "data/text/contest_en.h"
#else
#elif defined(GERMAN)
#include "data/text/contest_de.h"
#endif //ENGLISH
const u8 ALIGNED(2) _unk_83CC3BE[] = __("ピラ");
const u8 gUnknownText_UnknownFormatting2[] = _("{COLOR GREEN}{SHADOW RED}");
const u8 gUnknownText_UnknownFormatting3[] = _("{COLOR LIGHT_GREY}");
extern const struct CompressedSpriteSheet gUnknown_083CC3AC;
extern const struct CompressedSpritePalette gUnknown_083CC3B4[];
extern const struct SpriteTemplate gSpriteTemplate_83CC454[];
extern const u8 *const gUnknown_083CC188[];
extern const u8 gText_Contest_Shyness[];
extern const u8 gText_Contest_Anxiety[];
extern const u8 gText_Contest_Laziness[];
extern const u8 gText_Contest_Hesitancy[];
extern const u8 gText_Contest_Fear[];
extern const u8 gUnknown_083CC2EC[];
extern const u8 gUnknown_083CC59C[];
extern const u8 gText_Slash[];
extern const u16 gUnknown_083CC5A4[];
extern const struct ContestWinner gDefaultContestWinners[];
extern const u8 gUnknownText_MissedTurn[];
extern const u8 gUnknownText_LinkStandbyAndWinner[];
extern void (*const gContestEffectFuncs[])(void);
extern const s8 gContestExcitementTable[][5];
const struct CompressedSpriteSheet gUnknown_083CC3AC = {
.data = gContestNumbers_UnusedGfx,
.size = 0x200,
.tag = 20000
};
const struct CompressedSpritePalette gUnknown_083CC3B4[] = {
{ .data = gContestNumbers_UnusedPal, .tag = 20000 },
{ .data = gContestNumbers_UnusedPal, .tag = 20001 },
{ .data = gContestNumbers_UnusedPal, .tag = 20002 },
{ .data = gContestNumbers_UnusedPal, .tag = 20003 },
};
const union AnimCmd gSpriteAnim_83CC3D4[] = {
ANIMCMD_FRAME( 0, 1),
ANIMCMD_END
};
const union AnimCmd gSpriteAnim_83CC3DC[] = {
ANIMCMD_FRAME( 4, 1),
ANIMCMD_END
};
const union AnimCmd gSpriteAnim_83CC3E4[] = {
ANIMCMD_FRAME( 8, 1),
ANIMCMD_END
};
const union AnimCmd gSpriteAnim_83CC3EC[] = {
ANIMCMD_FRAME(12, 1),
ANIMCMD_END
};
const union AnimCmd *const gSpriteAnimTable_83CC3F4[] = {
gSpriteAnim_83CC3D4,
gSpriteAnim_83CC3DC,
gSpriteAnim_83CC3E4,
gSpriteAnim_83CC3EC,
};
const union AffineAnimCmd gSpriteAffineAnim_83CC404[] = {
AFFINEANIMCMD_FRAME(0, 0, 0, 1),
AFFINEANIMCMD_END
};
const union AffineAnimCmd gSpriteAffineAnim_83CC414[] = {
AFFINEANIMCMD_FRAME(-15, -15, 0, 15),
AFFINEANIMCMD_END
};
const union AffineAnimCmd gSpriteAffineAnim_83CC424[] = {
AFFINEANIMCMD_FRAME(31, 31, 0, 0),
AFFINEANIMCMD_FRAME(15, 15, 0, 15),
AFFINEANIMCMD_END
};
const union AffineAnimCmd *const gSpriteAffineAnimTable_83CC43C[] = {
gSpriteAffineAnim_83CC404,
gSpriteAffineAnim_83CC414,
gSpriteAffineAnim_83CC424,
NULL,
};
const struct OamData gOamData_83CC44C = {
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(16x16),
.x = 0,
.matrixNum = 0,
.size = SPRITE_SIZE(16x16),
.tileNum = 0,
.priority = 0,
.paletteNum = 0
};
const struct SpriteTemplate gSpriteTemplate_83CC454[] = {
{
.tileTag = 20000,
.paletteTag = 20000,
.oam = &gOamData_83CC44C,
.anims = gSpriteAnimTable_83CC3F4,
.images = NULL,
.affineAnims = gSpriteAffineAnimTable_83CC43C,
.callback = SpriteCallbackDummy,
},
{
.tileTag = 20000,
.paletteTag = 20001,
.oam = &gOamData_83CC44C,
.anims = gSpriteAnimTable_83CC3F4,
.images = NULL,
.affineAnims = gSpriteAffineAnimTable_83CC43C,
.callback = SpriteCallbackDummy,
},
{
.tileTag = 20000,
.paletteTag = 20002,
.oam = &gOamData_83CC44C,
.anims = gSpriteAnimTable_83CC3F4,
.images = NULL,
.affineAnims = gSpriteAffineAnimTable_83CC43C,
.callback = SpriteCallbackDummy,
},
{
.tileTag = 20000,
.paletteTag = 20003,
.oam = &gOamData_83CC44C,
.anims = gSpriteAnimTable_83CC3F4,
.images = NULL,
.affineAnims = gSpriteAffineAnimTable_83CC43C,
.callback = SpriteCallbackDummy,
},
};
const struct CompressedSpriteSheet gUnknown_083CC4B4[] = {
{ .data = gBlankGfxCompressed, .size = 0x1000, .tag = 33000 },
{ .data = gBlankGfxCompressed, .size = 0x1000, .tag = 33001 },
{ .data = gBlankGfxCompressed, .size = 0x1000, .tag = 33002 },
{ .data = gBlankGfxCompressed, .size = 0x1000, .tag = 33003 },
};
const struct SpritePalette gUnknown_083CC4D4[] = {
{ .data = eContestTempSave.cachedWindowPalettes[5], .tag = 33000 },
{ .data = eContestTempSave.cachedWindowPalettes[6], .tag = 33001 },
{ .data = eContestTempSave.cachedWindowPalettes[7], .tag = 33002 },
{ .data = eContestTempSave.cachedWindowPalettes[8], .tag = 33003 },
};
const struct OamData gOamData_83CC4F4 = {
.y = 0,
.affineMode = ST_OAM_AFFINE_DOUBLE,
.objMode = ST_OAM_OBJ_BLEND,
.mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
.matrixNum = 0,
.size = SPRITE_SIZE(64x64),
.tileNum = 0,
.priority = 0,
.paletteNum = 0
};
const union AffineAnimCmd gSpriteAffineAnim_83CC4FC[] = {
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_END
};
const union AffineAnimCmd gSpriteAffineAnim_83CC50C[] = {
AFFINEANIMCMD_FRAME( 3, 3, 0, 15),
AFFINEANIMCMD_FRAME(-3, -3, 0, 15),
AFFINEANIMCMD_FRAME( 3, 3, 0, 15),
AFFINEANIMCMD_FRAME(-3, -3, 0, 15),
AFFINEANIMCMD_END
};
const union AffineAnimCmd *const gSpriteAffineAnimTable_83CC534[] = {
gSpriteAffineAnim_83CC4FC,
gSpriteAffineAnim_83CC50C,
};
const struct SpriteTemplate gSpriteTemplate_83CC53C[] = {
{
.tileTag = 33000,
.paletteTag = 33000,
.oam = &gOamData_83CC4F4,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gSpriteAffineAnimTable_83CC534,
.callback = SpriteCallbackDummy,
},
{
.tileTag = 33001,
.paletteTag = 33001,
.oam = &gOamData_83CC4F4,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gSpriteAffineAnimTable_83CC534,
.callback = SpriteCallbackDummy,
},
{
.tileTag = 33002,
.paletteTag = 33002,
.oam = &gOamData_83CC4F4,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gSpriteAffineAnimTable_83CC534,
.callback = SpriteCallbackDummy,
},
{
.tileTag = 33003,
.paletteTag = 33003,
.oam = &gOamData_83CC4F4,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gSpriteAffineAnimTable_83CC534,
.callback = SpriteCallbackDummy,
},
};
const u8 gUnknown_083CC59C[] = _("{HIGHLIGHT TRANSPARENT}{COLOR}");
const u8 gText_Slash[] = _("/");
const u16 gUnknown_083CC5A4[] = {
RGB(19, 3, 0),
RGB(6, 15, 6),
RGB(19, 18, 0),
RGB(4, 6, 19),
RGB(31, 0, 0),
RGB(0, 31, 0),
RGB(31, 31, 0),
RGB(0, 0, 31),
};
const u8 gContestExcitementTable[][5] =
{
[CONTEST_CATEGORY_COOL] = {
[CONTEST_CATEGORY_COOL] = +1,
[CONTEST_CATEGORY_BEAUTY] = 0,
[CONTEST_CATEGORY_CUTE] = -1,
[CONTEST_CATEGORY_SMART] = -1,
[CONTEST_CATEGORY_TOUGH] = 0
},
[CONTEST_CATEGORY_BEAUTY] = {
[CONTEST_CATEGORY_COOL] = 0,
[CONTEST_CATEGORY_BEAUTY] = +1,
[CONTEST_CATEGORY_CUTE] = 0,
[CONTEST_CATEGORY_SMART] = -1,
[CONTEST_CATEGORY_TOUGH] = -1
},
[CONTEST_CATEGORY_CUTE] = {
[CONTEST_CATEGORY_COOL] = -1,
[CONTEST_CATEGORY_BEAUTY] = 0,
[CONTEST_CATEGORY_CUTE] = +1,
[CONTEST_CATEGORY_SMART] = 0,
[CONTEST_CATEGORY_TOUGH] = -1
},
[CONTEST_CATEGORY_SMART] = {
[CONTEST_CATEGORY_COOL] = -1,
[CONTEST_CATEGORY_BEAUTY] = -1,
[CONTEST_CATEGORY_CUTE] = 0,
[CONTEST_CATEGORY_SMART] = +1,
[CONTEST_CATEGORY_TOUGH] = 0
},
[CONTEST_CATEGORY_TOUGH] = {
[CONTEST_CATEGORY_COOL] = 0,
[CONTEST_CATEGORY_BEAUTY] = -1,
[CONTEST_CATEGORY_CUTE] = -1,
[CONTEST_CATEGORY_SMART] = 0,
[CONTEST_CATEGORY_TOUGH] = +1
}
};
#if defined(ENGLISH)
#define CONTEST_WINNER_1_NICKNAME "TAILTA"
#define CONTEST_WINNER_1_OTNAME "WYATT"
#define CONTEST_WINNER_2_NICKNAME "BRELO"
#define CONTEST_WINNER_2_OTNAME "LIANA"
#define CONTEST_WINNER_3_NICKNAME "PELEP"
#define CONTEST_WINNER_3_OTNAME "TIERA"
#define CONTEST_WINNER_4_NICKNAME "PELEP"
#define CONTEST_WINNER_4_OTNAME "TIERA"
#define CONTEST_WINNER_5_NICKNAME "PELEP"
#define CONTEST_WINNER_5_OTNAME "TIERA"
#define CONTEST_WINNER_6_NICKNAME "KITSY"
#define CONTEST_WINNER_6_OTNAME "OMAR"
#define CONTEST_WINNER_7_NICKNAME "GULPS"
#define CONTEST_WINNER_7_OTNAME "MACIE"
#define CONTEST_WINNER_8_NICKNAME "LOUDED"
#define CONTEST_WINNER_8_OTNAME "BRYANT"
#elif defined(GERMAN)
#define CONTEST_WINNER_1_NICKNAME "SCHWALBI"
#define CONTEST_WINNER_1_OTNAME "ROSEL"
#define CONTEST_WINNER_2_NICKNAME "TUFUNG"
#define CONTEST_WINNER_2_OTNAME "WITOLD"
#define CONTEST_WINNER_3_NICKNAME "LIPPER"
#define CONTEST_WINNER_3_OTNAME "RUFUS"
#define CONTEST_WINNER_4_NICKNAME "LIPPER"
#define CONTEST_WINNER_4_OTNAME "ELLEN"
#define CONTEST_WINNER_5_NICKNAME "LIPPER"
#define CONTEST_WINNER_5_OTNAME "AVIA"
#define CONTEST_WINNER_6_NICKNAME "CONEC"
#define CONTEST_WINNER_6_OTNAME "HAUBERT"
#define CONTEST_WINNER_7_NICKNAME "SCHLUCKI"
#define CONTEST_WINNER_7_OTNAME "HEILWIG"
#define CONTEST_WINNER_8_NICKNAME "KEELO"
#define CONTEST_WINNER_8_OTNAME "ISEGRIM"
#endif
const struct ContestWinner gDefaultContestWinners[] = {
{
.personality = 0,
.otId = 0xFFFF,
.species = SPECIES_TAILLOW,
.contestCategory = CONTEST_CATEGORY_SMART,
.nickname = _(CONTEST_WINNER_1_NICKNAME),
.trainerName = _(CONTEST_WINNER_1_OTNAME),
},
{
.personality = 0,
.otId = 0xFFFF,
.species = SPECIES_BRELOOM,
.contestCategory = CONTEST_CATEGORY_BEAUTY,
.nickname = _(CONTEST_WINNER_2_NICKNAME),
.trainerName = _(CONTEST_WINNER_2_OTNAME),
},
{
.personality = 0,
.otId = 0xFFFF,
.species = SPECIES_PELIPPER,
.contestCategory = CONTEST_CATEGORY_COOL,
.nickname = _(CONTEST_WINNER_3_NICKNAME),
.trainerName = _(CONTEST_WINNER_3_OTNAME),
},
{
.personality = 0,
.otId = 0xFFFF,
.species = SPECIES_PELIPPER,
.contestCategory = CONTEST_CATEGORY_COOL,
.nickname = _(CONTEST_WINNER_4_NICKNAME),
.trainerName = _(CONTEST_WINNER_4_OTNAME),
},
{
.personality = 0,
.otId = 0xFFFF,
.species = SPECIES_PELIPPER,
.contestCategory = CONTEST_CATEGORY_COOL,
.nickname = _(CONTEST_WINNER_5_NICKNAME),
.trainerName = _(CONTEST_WINNER_5_OTNAME),
},
{
.personality = 0,
.otId = 0xFFFF,
.species = SPECIES_DELCATTY,
.contestCategory = CONTEST_CATEGORY_SMART,
.nickname = _(CONTEST_WINNER_6_NICKNAME),
.trainerName = _(CONTEST_WINNER_6_OTNAME),
},
{
.personality = 0,
.otId = 0xFFFF,
.species = SPECIES_GULPIN,
.contestCategory = CONTEST_CATEGORY_CUTE,
.nickname = _(CONTEST_WINNER_7_NICKNAME),
.trainerName = _(CONTEST_WINNER_7_OTNAME),
},
{
.personality = 0,
.otId = 0xFFFF,
.species = SPECIES_LOUDRED,
.contestCategory = CONTEST_CATEGORY_TOUGH,
.nickname = _(CONTEST_WINNER_8_NICKNAME),
.trainerName = _(CONTEST_WINNER_8_OTNAME),
},
};
void TryPutPlayerLast(void)
{
@ -1984,7 +2327,7 @@ u8 CreateUnusedBrokenBlendTask(u8 *a)
}
#ifdef NONMATCHING
void Task_UnusedBlend(u8 taskId)
void Task_UnusedBrokenBlend(u8 taskId)
{
u8 i;
u8 r4;

4
src/data/text/contest_de.h
View File

@ -261,6 +261,8 @@ const u8 *const gContestString_UnreferencedPtrTable3[] = {
ContestString_Terminator,
ContestString_JammedAppealsNotice,
ContestString_AppealSame,
};
const u8 ContestString_MoreConscious[] = _("Es wird sich der anderen\nPKMN mehr bewusst.{PAUSE 60}");
const u8 ContestString_NoAppeal[] = _("{STR_VAR_1} kann danach\nkeinen Ausdruck zeigen.{PAUSE 60}");
const u8 ContestString_SettleDown[] = _("Es kommt ein wenig\nzur Ruhe.{PAUSE 60}");
@ -461,6 +463,8 @@ const u8 *const gContestString_UnreferencedPtrTable3[] = {
const u8 ContestString_HighlightTransparent_ColorMagenta[] = _("{HIGHLIGHT TRANSPARENT}{COLOR MAGENTA} ");
const u8 gUnknownText_MissedTurn[] = _("Verpasste Chance");
const u8 gUnknownText_LinkStandbyAndWinner[] = _("Verbindung...");
const u8 gUnknownText_ColorWhite2[] = _("{COLOR WHITE2}");
const u8 gUnknownText_LinkWinner[] = _("Der Sieger ist {STR_VAR_2} von\n{STR_VAR_1}! Herzlichen Glückwunsch!!");

2
src/mystery_event_menu.c
View File

@ -156,7 +156,7 @@ static void CB2_MysteryEventMenu(void)
if (GetLinkPlayerDataExchangeStatusTimed() == 3)
{
sub_800832C();
SetCloseLinkCallback();
Menu_EraseWindowRect(6, 5, 23, 8);
GetEventLoadMessage(gStringVar4, 1);
MenuPrintMessageDefaultCoords(gStringVar4);

10
src/party_menu.c
View File

@ -2406,13 +2406,13 @@ void SwapValues_s16(s16 *a, s16 *b)
#ifdef NONMATCHING
void sub_806CF04(void)
{
SwapValues_s16(&gSprites[ewram01000.unk3].pos1.x, &gSprites[ewram01000.round1Points].pos1.x);
SwapValues_s16(&gSprites[ewram01000.unk3].pos1.y, &gSprites[ewram01000.round1Points].pos1.y);
SwapValues_s16(&gSprites[ewram01000.unk3].pos2.x, &gSprites[ewram01000.round1Points].pos2.x);
SwapValues_s16(&gSprites[ewram01000.unk3].data[0], &gSprites[ewram01000.round1Points].data[0]);
SwapValues_s16(&gSprites[ewram01000.unk3].pos1.x, &gSprites[ewram01000.unk4].pos1.x);
SwapValues_s16(&gSprites[ewram01000.unk3].pos1.y, &gSprites[ewram01000.unk4].pos1.y);
SwapValues_s16(&gSprites[ewram01000.unk3].pos2.x, &gSprites[ewram01000.unk4].pos2.x);
SwapValues_s16(&gSprites[ewram01000.unk3].data[0], &gSprites[ewram01000.unk4].data[0]);
gSprites[ewram01000.unk3].callback = SpriteCB_sub_806D37C;
gSprites[ewram01000.round1Points].callback = SpriteCB_sub_806D37C;
gSprites[ewram01000.unk4].callback = SpriteCB_sub_806D37C;
}
#else
NAKED

6
src/pokedex_cry_screen.c
View File

@ -216,7 +216,7 @@ u8 sub_8119E3C(struct CryRelatedStruct *cry, u8 arg1)
switch (gUnknown_03005E98)
{
case 0:
gPokedexCryScreenPtr->unk0014 = cry->totalPoints;
gPokedexCryScreenPtr->unk0014 = cry->unk0;
gPokedexCryScreenPtr->unk0016 = cry->yPos;
gPokedexCryScreenPtr->unk001A = 0;
gPokedexCryScreenPtr->unk001B = 0;
@ -234,8 +234,8 @@ u8 sub_8119E3C(struct CryRelatedStruct *cry, u8 arg1)
gUnknown_03005E98++;
break;
case 1:
r7 = cry->excitementAppealBonus << 11;
r6 = (cry->paletteNo << 12) + ((unsigned)(cry->totalPoints << 18) >> 23);
r7 = cry->unk2 << 11;
r6 = (cry->paletteNo << 12) + ((unsigned)(cry->unk0 << 18) >> 23);
for (i = 0; i < 7; i++)
{
for (j = 0; j < 32; j++)