Fix object event graphic names (#731)
* Fixed object event graphic names * Updated files and other variable names * Fix from finding and replacing without matching case * spritesheet updates * Update flag name --------- Co-authored-by: Marcus Huderle <huderlem@gmail.com>
This commit is contained in:
+6
-6
@@ -337,20 +337,20 @@ static const u8 sFameCheckerArrayNpcGraphicsIds[] = {
|
||||
OBJ_EVENT_GFX_BRUNO,
|
||||
OBJ_EVENT_GFX_BRUNO,
|
||||
OBJ_EVENT_GFX_CLIPBOARD,
|
||||
OBJ_EVENT_GFX_BLACKBELT,
|
||||
OBJ_EVENT_GFX_BLACK_BELT,
|
||||
OBJ_EVENT_GFX_BEAUTY,
|
||||
OBJ_EVENT_GFX_BLACKBELT,
|
||||
OBJ_EVENT_GFX_BLACK_BELT,
|
||||
// AGATHA
|
||||
OBJ_EVENT_GFX_AGATHA,
|
||||
OBJ_EVENT_GFX_BLACKBELT,
|
||||
OBJ_EVENT_GFX_BLACKBELT,
|
||||
OBJ_EVENT_GFX_BLACK_BELT,
|
||||
OBJ_EVENT_GFX_BLACK_BELT,
|
||||
OBJ_EVENT_GFX_CLIPBOARD,
|
||||
OBJ_EVENT_GFX_AGATHA,
|
||||
OBJ_EVENT_GFX_OLD_WOMAN,
|
||||
// LANCE
|
||||
OBJ_EVENT_GFX_LANCE,
|
||||
OBJ_EVENT_GFX_LANCE,
|
||||
OBJ_EVENT_GFX_BATTLE_GIRL,
|
||||
OBJ_EVENT_GFX_CRUSH_GIRL,
|
||||
OBJ_EVENT_GFX_WOMAN_1,
|
||||
OBJ_EVENT_GFX_CLIPBOARD,
|
||||
OBJ_EVENT_GFX_COOLTRAINER_M,
|
||||
@@ -1235,7 +1235,7 @@ void UpdatePickStateFromSpecialVar8005(void)
|
||||
{
|
||||
if (gSpecialVar_0x8005 == FCPICKSTATE_NO_DRAW)
|
||||
return;
|
||||
if ( gSpecialVar_0x8005 == FCPICKSTATE_SILHOUETTE
|
||||
if ( gSpecialVar_0x8005 == FCPICKSTATE_SILHOUETTE
|
||||
&& gSaveBlock1Ptr->fameChecker[gSpecialVar_0x8004].pickState == FCPICKSTATE_COLORED
|
||||
)
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user