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

compile contest

Browse Source
This commit is contained in:
DizzyEggg 2018-12-29 12:27:24 +01:00 committed by Marcus Huderle
parent 55e44b0951
commit 75b4e9ac70
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/contest_painting_effects.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_CONTEST_PAINTING_EFFECTS_H #ifndef GUARD_CONTEST_PAINTING_EFFECTS_H
#define GUARD_CONTEST_PAINTING_EFFECTS_H #define GUARD_CONTEST_PAINTING_EFFECTS_H
struct Unk03005E20 struct Unk030061A0
{ {
u8 var_0; u8 var_0;
u8 pad1[3]; u8 pad1[3];
@ -21,8 +21,8 @@ struct Unk03005E20
u8 var_1F; u8 var_1F;
}; };
void sub_8124F2C(struct Unk03005E20 *); void sub_8124F2C(struct Unk030061A0 *);
void sub_81261A4(struct Unk03005E20 *); void sub_81261A4(struct Unk030061A0 *);
void sub_8126058(struct Unk03005E20 *); void sub_8126058(struct Unk030061A0 *);
#endif #endif

4
src/contest_painting_effects.c
View File

@ -36,7 +36,7 @@ u16 sub_8125F38(u16*, u16*, u16*);
u16 sub_8125CF4(u16*, u16*); u16 sub_8125CF4(u16*, u16*);
u16 GetCoolColorFromPersonality(u8); u16 GetCoolColorFromPersonality(u8);
void sub_8124F2C(struct Unk03005E20 *info) void sub_8124F2C(struct Unk030061A0 *info)
{ {
gUnknown_03006168 = info->var_4; gUnknown_03006168 = info->var_4;
gUnknown_0300617C = info->var_1F; gUnknown_0300617C = info->var_1F;
@ -746,7 +746,7 @@ u16 sub_8125F38(u16 *a0, u16 *a1, u16 *a2)
} }
/* /*
void sub_8126058(struct Unk03005E20 *arg0) void sub_8126058(struct Unk030061A0 *arg0)
{ {
u16 i, j, k; u16 i, j, k;
u8 r5 = arg0->var_1D >> 3; u8 r5 = arg0->var_1D >> 3;