diff options
| author | hjk321 <37224753+hjk321@users.noreply.github.com> | 2021-04-10 21:35:14 -0500 |
|---|---|---|
| committer | hjk321 <37224753+hjk321@users.noreply.github.com> | 2021-04-10 21:35:14 -0500 |
| commit | 47cc3aa0f1fd77f16d898da30fd482cfd5a4c1ba (patch) | |
| tree | 3050cd4b8f7bc44b5b672b23658eae811e113d2e | |
| parent | dc59d5ac4fb0deeaf4068f91126a1e1835067299 (diff) | |
Document hall of fame and help system gfx
| -rw-r--r-- | graphics/hall_of_fame/hall_of_fame.png | bin | 0 -> 437 bytes | |||
| -rw-r--r-- | graphics/hall_of_fame/unk_840C3BC.png | bin | 481 -> 0 bytes | |||
| -rw-r--r-- | graphics/help_system/unused.bin (renamed from graphics/help_system/unk_845BCB0.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | graphics_file_rules.mk | 4 | ||||
| -rw-r--r-- | src/hall_of_fame.c | 4 | ||||
| -rw-r--r-- | src/help_system.c | 2 |
6 files changed, 7 insertions, 3 deletions
diff --git a/graphics/hall_of_fame/hall_of_fame.png b/graphics/hall_of_fame/hall_of_fame.png Binary files differnew file mode 100644 index 000000000..769ca4b35 --- /dev/null +++ b/graphics/hall_of_fame/hall_of_fame.png diff --git a/graphics/hall_of_fame/unk_840C3BC.png b/graphics/hall_of_fame/unk_840C3BC.png Binary files differdeleted file mode 100644 index 567665495..000000000 --- a/graphics/hall_of_fame/unk_840C3BC.png +++ /dev/null diff --git a/graphics/help_system/unk_845BCB0.bin b/graphics/help_system/unused.bin Binary files differindex b7ceb5080..b7ceb5080 100644 --- a/graphics/help_system/unk_845BCB0.bin +++ b/graphics/help_system/unused.bin diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index d064c63c8..3ad7cf542 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -26,6 +26,7 @@ ITEMMENUGFXDIR := graphics/item_menu INTROGFXDIR := graphics/intro BATTLETERRAINGFXDIR := graphics/battle_terrain BERRYPOUCHGFXDIR := graphics/berry_pouch +HALLOFFAMEGFXDIR := graphics/hall_of_fame types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -573,3 +574,6 @@ $(BATTLETERRAINGFXDIR)/terrain_water.4bpp: %.4bpp: %.png $(BERRYPOUCHGFXDIR)/background.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 52 + +$(HALLOFFAMEGFXDIR)/hall_of_fame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 29 diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 8480edfaf..e6f8b72ec 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -283,8 +283,8 @@ static const struct SpriteTemplate sSpriteTemplate_Confetti = { .callback = SpriteCB_Confetti }; -static const u16 sHallOfFame_Pal[] = INCBIN_U16("graphics/hall_of_fame/unk_840C3BC.gbapal"); -static const u32 sHallOfFame_Gfx[] = INCBIN_U32("graphics/hall_of_fame/unk_840C3BC.4bpp.lz"); +static const u16 sHallOfFame_Pal[] = INCBIN_U16("graphics/hall_of_fame/hall_of_fame.gbapal"); +static const u32 sHallOfFame_Gfx[] = INCBIN_U32("graphics/hall_of_fame/hall_of_fame.4bpp.lz"); static const struct HallofFameMon sDummyHofMon = { .tid = 0x03EA03EA, // (u16[]){1002, 1002} corrupted sprite template? diff --git a/src/help_system.c b/src/help_system.c index 27ec64baa..f29359354 100644 --- a/src/help_system.c +++ b/src/help_system.c @@ -1646,7 +1646,7 @@ static const u8 *const sHelpSystemSubmenuItemLists[HELPCONTEXT_COUNT * (TOPIC_CO NULL, NULL, NULL, NULL, NULL // HELPCONTEXT_UNUSED }; -static const u16 unref_845BCB0[] = INCBIN_U16("graphics/help_system/unk_845BCB0.bin"); +static const u16 unref_845BCB0[] = INCBIN_U16("graphics/help_system/unused.bin"); static const u8 sHelpSystemContextTopicOrder[TOPIC_COUNT] = { TOPIC_ABOUT_GAME, |
