diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-11 12:06:00 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-11 12:06:00 -0400 |
| commit | b1603bba92dac95fd1621978f21ee9bf107f7b6a (patch) | |
| tree | 9d86f2a2aed82e2dcbefebe7c5dbdecf3aed607e /src/evolution_scene.c | |
| parent | 44dc1a473c8a4ff1c73b776889f2002136c7787d (diff) | |
| parent | 4767019e4f541a19577a9bfd09851a94b2e3c745 (diff) | |
Merge remote-tracking branch 'origin/master' into modern_ld
Diffstat (limited to 'src/evolution_scene.c')
| -rw-r--r-- | src/evolution_scene.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 1f8fd1cda..0eb36b523 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -59,12 +59,12 @@ static void Task_MovingBackgroundPos(u8 taskId); static void ResetBgRegsAfterMovingBackgroundCancel(void); // const data -static const u16 sUnrefPal_83F6C90[] = INCBIN_U16("graphics/evolution_scene/unknown_5B4114.gbapal"); +static const u16 sUnusedPal[] = INCBIN_U16("graphics/evolution_scene/unused.gbapal"); static const u32 sMovingBackgroundTiles[] = INCBIN_U32("graphics/evolution_scene/bg.4bpp.lz"); static const u32 sMovingBackgroundMap1[] = INCBIN_U32("graphics/evolution_scene/bg.bin.lz"); static const u32 sMovingBackgroundMap2[] = INCBIN_U32("graphics/evolution_scene/bg2.bin.lz"); static const u16 sBlackPalette[] = INCBIN_U16("graphics/evolution_scene/gray_transition_intro.gbapal"); -static const u16 unref_83F7D80[] = INCBIN_U16("graphics/evolution_scene/unref_83F7D80.bin"); +static const u16 sUnusedTilemap[] = INCBIN_U16("graphics/evolution_scene/unused_tilemap.bin"); static const u16 sMovingBgPals[] = INCBIN_U16("graphics/evolution_scene/transition.gbapal"); static const u8 sText_ShedinjaJapaneseName[] = _("ヌケニン"); |