Skip to content

Commit 4c85a7e

Browse files
authored
Merge pull request #720 from GigaExcalibur/master
gPal_NotMapSprite -> gPal_LightRune
2 parents eb0cfda + a6216e6 commit 4c85a7e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

data/data_59E8E0.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ unit_icon_pal_after_action:
3636
gPal_MapSpriteArena:
3737
.incbin "graphics/unit_icon/palette/unit_icon_pal_p4.agbpal"
3838

39-
.global gPal_NotMapSprite
40-
gPal_NotMapSprite: @ 0x0859EEC0
39+
.global gPal_LightRune
40+
gPal_LightRune: @ 0x0859EEC0
4141
.incbin "baserom.gba", 0x59EEC0, 0x20
4242

4343
.global gPal_MapSpriteSepia

include/variables.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ extern u8 gImg_UiCursorHandBottom[];
410410
// extern ??? gUnknown_0859EE60
411411
// extern ??? gUnknown_0859EEA0
412412
extern u16 gPal_MapSprite[];
413-
extern u16 gPal_NotMapSprite[];
413+
extern u16 gPal_LightRune[];
414414
extern u16 gPal_MapSpriteArena[];
415415
extern u16 gPal_MapSpriteSepia[];
416416
extern u16 Pal_Text[];

src/bmudisp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ void ApplyUnitSpritePalettes(void)
356356
if (gBmSt.gameStateBits & BM_FLAG_LINKARENA)
357357
ApplyPalette(gPal_MapSpriteArena, 0x10 + OBJPAL_UNITSPRITE_PURPLE);
358358
else
359-
ApplyPalette(gPal_NotMapSprite, 0x10 + OBJPAL_UNITSPRITE_PURPLE);
359+
ApplyPalette(gPal_LightRune, 0x10 + OBJPAL_UNITSPRITE_PURPLE);
360360
}
361361

362362
void sub_8026670(void)

0 commit comments

Comments
 (0)