diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-11-12 18:44:01 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 18:44:01 -0600 |
| commit | 90a58c859bffa3ab6d6b1efb4b904a7a5416500d (patch) | |
| tree | 9dc1d2b06fa55f722da1204316d6f15d708ecbea /src/trainer_card.c | |
| parent | 0ad332124e5bf57d0a43122616a77cd8c9318250 (diff) | |
| parent | cacc17391765b3917acb3292ae2a49c61fd13dbe (diff) | |
Merge pull request #703 from Sewef/master
Some Trainer_Card work
Diffstat (limited to 'src/trainer_card.c')
| -rw-r--r-- | src/trainer_card.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/trainer_card.c b/src/trainer_card.c index 541a4a061..b34517def 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -174,7 +174,7 @@ static void TrainerCard_ResetOffsetRegisters(void); static void TrainerCard_CopyGraphics(void); static void TrainerCard_LoadPalettes(void); static void TrainerCard_LoadTrainerGraphics(void); -static void sub_8093F14(void); +static void TrainerCard_LoadCardTileMap(void); static void sub_8093F48(void); static void sub_8093F64(void); static void TrainerCard_LoadTrainerTilemap(void); @@ -1211,7 +1211,7 @@ static void TrainerCard_DrawCardFront(void) { Menu_EraseScreen(); TrainerCard_ClearTrainerGraphics(); - sub_8093F14(); + TrainerCard_LoadCardTileMap(); TrainerCard_LoadTrainerTilemap(); TrainerCard_DrawStars(); TrainerCard_DisplayBadges(); @@ -1259,9 +1259,9 @@ static void TrainerCard_LoadTrainerGraphics(void) LoadTrainerGfx_TrainerCard(ewram0_2.displayedCard.gender, 80, (void *)(VRAM + 0x1880)); } -static void sub_8093F14(void) +static void TrainerCard_LoadCardTileMap(void) { - const void *arr[] = {gUnknown_08E8CAC0, gUnknown_08E8D4C0}; + const void *arr[] = {gMenuTrainerCardFront_Tilemap, gMenuTrainerCardFront2_Tilemap}; CpuFastSet(arr[ewram0_2.isShowingLinkCard], (void *)(VRAM + 0x4800), 0x140); } @@ -1287,12 +1287,12 @@ const u16 gTrainerCardBadgesMap[][4] = INCBIN_U16("graphics/trainer_card/83B5F8C static void sub_8093F48(void) { - CpuFastSet(gUnknown_08E8CFC0, (void *)(VRAM + 0x4800), 320); + CpuFastSet(gMenuTrainerCardBack_Tilemap, (void *)(VRAM + 0x4800), 320); } static void sub_8093F64(void) { - CpuFastSet(gUnknown_08E8D9C0, (void *)(VRAM + 0x5000), 320); + CpuFastSet(gMenuTrainerCardBackground_Tilemap, (void *)(VRAM + 0x5000), 320); } static void TrainerCard_LoadTrainerTilemap(void) |