diff options
| -rw-r--r-- | include/berry_crush.h | 2 | ||||
| -rw-r--r-- | include/strings.h | 2 | ||||
| -rw-r--r-- | src/berry_crush_2.c | 15 |
3 files changed, 9 insertions, 10 deletions
diff --git a/include/berry_crush.h b/include/berry_crush.h index 18ac6d1bd..9077b966e 100644 --- a/include/berry_crush.h +++ b/include/berry_crush.h @@ -108,7 +108,7 @@ struct BerryCrushGame_138 struct BerryCrushGame { MainCallback unk0; - u32 (* unk4)(struct BerryCrushGame *, u8 *); + u32 (*unk4)(struct BerryCrushGame *, u8 *); u8 unk8; u8 unk9; u8 unkA; diff --git a/include/strings.h b/include/strings.h index 2587d7008..c812e991a 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1148,7 +1148,7 @@ extern const u8 gUnknown_841DF92[]; extern const u8 gUnknown_841DF99[]; extern const u8 gUnknown_841DFA0[]; -// berry_cursh +// berry_crush extern const u8 gUnknown_841CE3C[]; extern const u8 gUnknown_841CE78[]; extern const u8 gUnknown_841CEA8[]; diff --git a/src/berry_crush_2.c b/src/berry_crush_2.c index 9d994f64f..e76f33988 100644 --- a/src/berry_crush_2.c +++ b/src/berry_crush_2.c @@ -44,10 +44,10 @@ static u32 sub_814D4C8(struct BerryCrushGame * berryCrushGame, u8 *params); void sub_814D4D8(struct BerryCrushGame * r4); void sub_814D5A4(u8 *r0, u32 r1, u32 r2, u32 r3, u32 r5); -const u8 gUnknown_846E2E0[] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; -const u8 gUnknown_846E2E8[] = {0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00}; +static const u8 gUnknown_846E2E0[] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; +static const u8 gUnknown_846E2E8[] = {0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00}; -const s8 gUnknown_846E2F0[][7] = { +static const s8 gUnknown_846E2F0[][7] = { {0x04, 0x01, 0x00, 0xff, 0x00, 0x00, 0x00}, {0x04, 0x02, 0x00, 0xff, 0x00, 0x00, 0x00}, {0x04, 0x02, 0x00, 0xfe, 0x00, 0x00, 0x00}, @@ -63,7 +63,7 @@ ALIGNED(4) const u8 gUnknown_846E314[][4] = { {0x03, 0x05, 0x03, 0x00} }; -const u8 *const gUnknown_846E328[] = { +static const u8 *const gUnknown_846E328[] = { gUnknown_841CE3C, gUnknown_841CE78, gUnknown_841CEA8, @@ -104,16 +104,16 @@ static u32 (*const gUnknown_846E34C[])(struct BerryCrushGame * berryCrushGame, u sub_814D4C8 }; -const u8 gUnknown_846E3B4[][4] = { +static const u8 gUnknown_846E3B4[][4] = { {0x02, 0x04, 0x06, 0x07}, {0x03, 0x05, 0x08, 0x0b}, {0x03, 0x07, 0x0b, 0x0f}, {0x04, 0x08, 0x0c, 0x11} }; -const u8 gUnknown_846E3C4[] = {0x05, 0x07, 0x09, 0x0c}; +static const u8 gUnknown_846E3C4[] = {0x05, 0x07, 0x09, 0x0c}; -const u8 gUnknown_846E3C8[] = {0x03, 0x07, 0x0F, 0x1F}; +static const u8 gUnknown_846E3C8[] = {0x03, 0x07, 0x0F, 0x1F}; void sub_814BB4C(u16 r5, u8 r4, u8 *r7) { @@ -1478,4 +1478,3 @@ void sub_814D5A4(u8 *r0, u32 r1, u32 r2, u32 r3, u32 r5) r0[3] = sp[1]; r0[4] = r5; } - |