diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-03 20:59:29 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-03 20:59:29 -0400 |
| commit | ca2bc94c2be5d7b915e5ab913ef026aa12b8fc0f (patch) | |
| tree | 44f306d946f8431e51a079921d170c516a68466a /include | |
| parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) | |
through sub_80E6BF8
Diffstat (limited to 'include')
| -rw-r--r-- | include/cable_club.h | 12 | ||||
| -rw-r--r-- | include/global.h | 6 | ||||
| -rw-r--r-- | include/record_mixing.h | 19 |
3 files changed, 34 insertions, 3 deletions
diff --git a/include/cable_club.h b/include/cable_club.h new file mode 100644 index 000000000..adb0c4f90 --- /dev/null +++ b/include/cable_club.h @@ -0,0 +1,12 @@ +#ifndef GUARD_CABLE_CLUB_H +#define GUARD_CABLE_CLUB_H + +// Exported type declarations + +// Exported RAM declarations + +// Exported ROM declarations + +void sub_80B37D4(TaskFunc taskFunc); + +#endif //GUARD_CABLE_CLUB_H diff --git a/include/global.h b/include/global.h index 3421517d7..ad4f23c2b 100644 --- a/include/global.h +++ b/include/global.h @@ -192,7 +192,8 @@ struct SaveBlock2 /*0xAC*/ u32 encryptionKey; // TODO: fix and verify labels - /*0xB0*/ u8 field_B0[316]; + /*0xB0*/ u8 field_B0[0x2c]; + /*0xDC*/ u8 field_0DC[0x110]; /*0x1EC*/ struct BerryCrush berryCrush; /*0x1FC*/ struct PokemonJumpResults pokeJump; /*0x20C*/ struct BerryPickingResults berryPick; @@ -579,13 +580,12 @@ struct SaveBlock1 /*0x2BB0*/ u16 unk2BB0[6]; /*0x2BBC*/ u16 unk2BBC[6]; /*0x2BC8*/ u16 unk2BC8[6]; - /*0x2BD4*/ u16 unk2BD4[3]; + /*0x2BD4*/ u16 unk2BD4[6]; /*0x2BE0*/ struct MailStruct mail[16]; /*0x2E20*/ u8 additionalPhrases[5]; // bitfield for 33 additional phrases in easy chat system /*0x2E25*/ u8 unk2E25[3]; // possibly padding? /*0x2E28*/ OldMan oldMan; /*0x2e64*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff - /*0x2e8c*/ u8 filler_2E8C[0x4]; /*0x2e90*/ struct ContestWinner contestWinners[13]; // 0 - 5 used in contest hall, 6 - 7 unused?, 8 - 12 museum /*0x3030*/ struct DaycareData daycare; /*0x3150*/ struct LinkBattleRecord linkBattleRecords[5]; diff --git a/include/record_mixing.h b/include/record_mixing.h new file mode 100644 index 000000000..5ccbdc0dd --- /dev/null +++ b/include/record_mixing.h @@ -0,0 +1,19 @@ +#ifndef GUARD_RECORD_MIXING_H +#define GUARD_RECORD_MIXING_H + +// Exported type declarations + +struct DayCareMailRecordMixing { + struct MailStruct mail; + u8 OT_name[OT_NAME_LENGTH + 1]; + u8 monName[11]; + u8 language_maybe : 4; + u8 unknown : 4; + u32 stepsTaken; +}; + +// Exported RAM declarations + +// Exported ROM declarations + +#endif //GUARD_RECORD_MIXING_H |