diff options
author | huderlem <huderlem@gmail.com> | 2020-02-12 18:34:19 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-12 18:34:19 -0600 |
commit | 204c431993dad29661a9ff47326787cd0cf381e6 (patch) | |
tree | bda0c76fa20f0cc9e679985d8f7286ad95dd38c4 /src/naming_screen.c | |
parent | 66c6b7a38b2a071ce7029978dd0d02fe6ec05952 (diff) | |
parent | 6b966d20e5d3866117fc9f1c0616654f2dfc415e (diff) |
Merge pull request #910 from GriffinRichards/fix-eventobj
Standardize Object Event naming
Diffstat (limited to 'src/naming_screen.c')
-rw-r--r-- | src/naming_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/naming_screen.c b/src/naming_screen.c index 68eeded91..161d4a7e0 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1171,7 +1171,7 @@ static void NamingScreen_CreatePlayerIcon(void) u8 spriteId; rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, gNamingScreenData->monSpecies); - spriteId = AddPseudoEventObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0); + spriteId = AddPseudoObjectEvent(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0); gSprites[spriteId].oam.priority = 3; StartSpriteAnim(&gSprites[spriteId], 4); } @@ -1198,7 +1198,7 @@ static void NamingScreen_CreateWandaDadIcon(void) { u8 spriteId; - spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0); + spriteId = AddPseudoObjectEvent(OBJ_EVENT_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0); gSprites[spriteId].oam.priority = 3; StartSpriteAnim(&gSprites[spriteId], 4); } |