diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-10-22 10:01:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-22 10:01:07 -0700 |
| commit | 3e5dd1d047bada52ab0dce2fe58b04e39bcaa1cc (patch) | |
| tree | 0e40067d711c783ef97667f4a8256f38ab0d4b0a /src/mailbox_1.c | |
| parent | 3f7ee3a806d965fae70fd98f2cd1af13a2e4cf0b (diff) | |
Death by 74 files (#65)
* death by 74 files
* 20% reached
* doc move stuff in pokemon
* fix undef reference
* doc more and plumb a few more constanst for num party members and num moves
* that struct is def PokemonMove.. clean up all code with it
Diffstat (limited to 'src/mailbox_1.c')
| -rw-r--r-- | src/mailbox_1.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/mailbox_1.c b/src/mailbox_1.c index ee212ae..18bb8fc 100644 --- a/src/mailbox_1.c +++ b/src/mailbox_1.c @@ -9,13 +9,12 @@ extern u8 gMailAccepted[]; extern u8 gUnknown_80E0324[]; extern void xxx_call_draw_string(s32 x, u32 y, u8 *, u32 , u32); extern void sub_8012BC4(u32 x, u32 y, u32, u32, u32, u32); -extern u32 sub_80969AC(void); extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); extern u32 sub_802BA8C(void); extern void sub_802BACC(void); -extern u8 sub_802B7A8(void); +extern u8 GetPokemonNewsIndex(void); extern void sub_802B81C(void); extern u32 sub_802B720(u32); extern u32 sub_802C898(void); @@ -63,7 +62,7 @@ void sub_802E774(void) break; case 3: case 4: - gUnknown_203B304->unk9 = sub_802B7A8(); + gUnknown_203B304->mailIndex = GetPokemonNewsIndex(); gUnknown_203B304->unk4 = 0xA; SetMailboxState(0xB); break; @@ -97,8 +96,8 @@ void CreateMailAcceptedStatusBox(u32 r0) sub_8008C54(r0); sub_80073B8(r0); xxx_call_draw_string(3, 0, gMailAccepted, r0, 0); - sub_8012BC4(0x12, 0xD, sub_80969AC(), 2, 7, r0); - xxx_call_draw_string(0x16, 0xD, gUnknown_80E0324, r0, 0); - sub_8012BC4(0x23, 0xD, 0x8, 0x2, 7, r0); + sub_8012BC4(0x12, 0xD, GetNumAcceptedJobs(), 2, 7, r0); + xxx_call_draw_string(0x16, 0xD, gUnknown_80E0324, r0, 0); // "/" + sub_8012BC4(0x23, 0xD, MAX_ACCEPTED_JOBS, 2, 7, r0); sub_80073E0(r0); } |