diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2022-03-25 09:39:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-25 09:39:44 -0700 |
| commit | 9f98e08fb99112eedd56873b5557c5e4e757dbba (patch) | |
| tree | 439b1bce980e4452fcc92999eb62df354ef9b790 /src/load_screen.c | |
| parent | a0264b99956cc67dd13704b758dc1f2f4c1480ca (diff) | |
| parent | 57f540b320ae8439fe4b42c6149641b877c7ea73 (diff) | |
Save work
Diffstat (limited to 'src/load_screen.c')
| -rw-r--r-- | src/load_screen.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/load_screen.c b/src/load_screen.c index 1c224f5..775e974 100644 --- a/src/load_screen.c +++ b/src/load_screen.c @@ -9,17 +9,10 @@ #include "pokemon.h" #include "save.h" #include "code_800D090.h" +#include "code_8094F88.h" extern const struct FileArchive gTitleMenuFileArchive; -struct unkStruct_203B484 -{ - u8 fill0[0xC]; - /* 0xC */ s16 speciesIndex; - u8 fillE[0x50 - 0xE]; - /* 0x50 */ u8 helperName[10]; -}; - struct LoadScreen { // size: 0x27c @@ -373,9 +366,9 @@ void DrawLoadScreenText(void) if (iVar2 == 0xf1207){ // NOTE: very hacky match here but needed var here to match temp2 = gUnknown_203B484; - if(temp2->speciesIndex != SPECIES_NONE) { - sub_808D930(speciesHelper,temp2->speciesIndex); - sub_80922B4(nameHelper,temp2->helperName,POKEMON_NAME_LENGTH); + if(temp2->unk4.speciesNum != SPECIES_NONE) { + sub_808D930(speciesHelper,temp2->unk4.speciesNum); + sub_80922B4(nameHelper,temp2->unk4.name,POKEMON_NAME_LENGTH); sprintf_2(gLoadScreen->formattedHelperInfo,gHelperInfoPlaceholder,nameHelper,speciesHelper); // %s (%s) } else |