diff options
| author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-07-02 22:19:49 +0200 |
|---|---|---|
| committer | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-07-02 22:19:49 +0200 |
| commit | 41a9423550ce33ccbc0a9034ff59e473acc4702c (patch) | |
| tree | 7806ae8b67525d93c14dd33be0a03b3f7a4b5a89 /arm9/modules | |
| parent | 067a94af916cdc506fd468aaff3de336f5a9cbcf (diff) | |
| parent | 8f7c115c0e110aa50a5c81b9a8f7dec31760fa67 (diff) | |
Merge branch 'master' of github.com:pret/pokediamond
Diffstat (limited to 'arm9/modules')
| -rw-r--r-- | arm9/modules/63/include/mod63_021DB450.h | 6 | ||||
| -rw-r--r-- | arm9/modules/63/src/mod63_021DB450.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arm9/modules/63/include/mod63_021DB450.h b/arm9/modules/63/include/mod63_021DB450.h index e5ecc7df..ac3da1b6 100644 --- a/arm9/modules/63/include/mod63_021DB450.h +++ b/arm9/modules/63/include/mod63_021DB450.h @@ -3,10 +3,10 @@ #include "global.h" -typedef struct UnkStruct63_021DB450 +typedef struct UnkStruct63_021DB450 //intro base struct type { - struct UnkStruct63_021DB450 * field_00; - u32 field_04[3]; + struct UnkStruct63_021DB450 * field_00; //oddly requires this to be set to progress past copyright/pokemon screen. + u32 field_04[3]; //mon animations? u32 field_10; void * field_14; void * field_18; diff --git a/arm9/modules/63/src/mod63_021DB450.c b/arm9/modules/63/src/mod63_021DB450.c index 84461fe1..454b2b19 100644 --- a/arm9/modules/63/src/mod63_021DB450.c +++ b/arm9/modules/63/src/mod63_021DB450.c @@ -69,12 +69,12 @@ THUMB_FUNC u32 MOD63_021DB498(void) return 32; } -THUMB_FUNC void Title_SetupMonAnimationSprites(struct UnkStruct63_021DB450 * arg0) +THUMB_FUNC void Title_SetupMonAnimationSprites(struct UnkStruct63_021DB450 * arg0) //TODO: this does a lot more than setup anim sprites { struct UnkStruct63_021DB49C sp1C; int introMonArray[3] = {SPECIES_TURTWIG, SPECIES_CHIMCHAR, SPECIES_PIPLUP}; - arg0->field_00 = FUN_02006D98(76); + arg0->field_00 = FUN_02006D98(76); //this is needed to get into the world view, otherwise it is just black for (u8 i = 0; i < 3; i++) //some kind of animation assignment TODO: investigate further { |