diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-21 01:15:34 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-02-12 18:35:27 -0600 |
| commit | 98ca62cf91e7e0bd33f09edfc848a62061015aee (patch) | |
| tree | 6902d9b2183b6f0a379bf141ed3f88b1e2a36598 /src/easy_chat_2.c | |
| parent | 6356dc03c1736df6ba25f2bc999e211d8e30a9f0 (diff) | |
Standardize Event Object to Object Event
Diffstat (limited to 'src/easy_chat_2.c')
| -rw-r--r-- | src/easy_chat_2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 7cf4d87b9..70626b367 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -740,10 +740,10 @@ void sub_80E8BF4(u8 reporter, u8 b) { case 0: // Gabby default: - gabbyTyGfxId = EVENT_OBJ_GFX_REPORTER_M; + gabbyTyGfxId = OBJ_EVENT_GFX_REPORTER_M; break; case 1: // Ty - gabbyTyGfxId = EVENT_OBJ_GFX_REPORTER_F; + gabbyTyGfxId = OBJ_EVENT_GFX_REPORTER_F; break; } @@ -751,8 +751,8 @@ void sub_80E8BF4(u8 reporter, u8 b) LoadSpritePalette(&gUnknown_083DBD38); CreateSprite(&gSpriteTemplate_83DBD48, x, y, 1); - spriteId = AddPseudoEventObject( - (gSaveBlock2.playerGender == MALE) ? EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL : EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, + spriteId = AddPseudoObjectEvent( + (gSaveBlock2.playerGender == MALE) ? OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL : OBJ_EVENT_GFX_RIVAL_MAY_NORMAL, SpriteCallbackDummy, x - 12, y, 0); if (spriteId != MAX_SPRITES) { @@ -760,7 +760,7 @@ void sub_80E8BF4(u8 reporter, u8 b) StartSpriteAnim(&gSprites[spriteId], 3); } - spriteId = AddPseudoEventObject(gabbyTyGfxId, SpriteCallbackDummy, x + 12, y, 0); + spriteId = AddPseudoObjectEvent(gabbyTyGfxId, SpriteCallbackDummy, x + 12, y, 0); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 0; |