diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-06-09 22:54:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 22:54:21 -0500 |
| commit | 377bd14ea67d6177250fb401e12d7dfcf44e2cf6 (patch) | |
| tree | 5440970e02a7890791b234aa233e91e5c1d65b40 /src/play_time.c | |
| parent | eaa141c612dd1689936a21bd57018a55ff686b69 (diff) | |
Dungeon pokemon/Floor ID JSON Part 1 (#39)
* move Thunderwave and Tiny Woods pokemon to json
* rule tweaking to actually build tool before parsing JSON
* delete .inc pokemon for tiny Woods and Thunderwave
* silence git complaining about br_ips and ips_patch
* use defines for species and pass the header file for species
* convert sinister woods
* convert MtThunderPeak
* convert silent chasm
* add trial floor_id w/ tiny woods
* change make rule name to fix compile
* MtSteel converted and bugfix
* convert few floor headers and great canyon pokemon
* code cleanup
* unify unkData into UnkTextStruct2
* more code cleanup and some text decomp
* doc more funcs and decomp/split some stuff
* document more save stuff
* more save work and move some data
* pika sniped UpdateNatureTotal
* decomp a litle and convert a few more dungeons
* better scanning for json files
* mt freeze and peak
Diffstat (limited to 'src/play_time.c')
| -rw-r--r-- | src/play_time.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/play_time.c b/src/play_time.c index 37af5fe..7622e31 100644 --- a/src/play_time.c +++ b/src/play_time.c @@ -2,7 +2,7 @@ #include "play_time.h" extern struct PlayTimeStruct *gPlayTimeRef; -extern struct PlayTimeStruct gPlayTime; +EWRAM_DATA struct PlayTimeStruct gPlayTime; extern void sub_809488C(u8 *r0, u8 *r1, u32); extern void sub_8094924(u8 *r0, u8 *r1, u32); @@ -76,7 +76,7 @@ void DeconstructPlayTime(struct PlayTimeStruct *r0, u32 *outHours, u32 *outMinut } } -void sub_8095044(u8 *r0) +void WritePlayTime(u8 *r0) { sub_809488C(r0, (&(gPlayTimeRef->frames)), 6); sub_809488C(r0, (&(gPlayTimeRef->seconds)), 6); @@ -84,7 +84,7 @@ void sub_8095044(u8 *r0) sub_809488C(r0, (u8 *)(&(gPlayTimeRef->hours)), 14); } -void sub_8095080(u8 *r0) +void ReadPlayTime(u8 *r0) { sub_8094924(r0, (&(gPlayTimeRef->frames)), 6); sub_8094924(r0, (&(gPlayTimeRef->seconds)), 6); |