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/easy_chat.c | |
| parent | 66c6b7a38b2a071ce7029978dd0d02fe6ec05952 (diff) | |
| parent | 6b966d20e5d3866117fc9f1c0616654f2dfc415e (diff) | |
Merge pull request #910 from GriffinRichards/fix-eventobj
Standardize Object Event naming
Diffstat (limited to 'src/easy_chat.c')
| -rw-r--r-- | src/easy_chat.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/easy_chat.c b/src/easy_chat.c index 86349cbd6..05e366420 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -4718,13 +4718,13 @@ static void sub_811E828(void) switch (GetDisplayedPersonType()) { case EASY_CHAT_PERSON_REPORTER_MALE: - graphicsId = EVENT_OBJ_GFX_REPORTER_M; + graphicsId = OBJ_EVENT_GFX_REPORTER_M; break; case EASY_CHAT_PERSON_REPORTER_FEMALE: - graphicsId = EVENT_OBJ_GFX_REPORTER_F; + graphicsId = OBJ_EVENT_GFX_REPORTER_F; break; case EASY_CHAT_PERSON_BOY: - graphicsId = EVENT_OBJ_GFX_BOY_1; + graphicsId = OBJ_EVENT_GFX_BOY_1; break; default: return; @@ -4733,15 +4733,15 @@ static void sub_811E828(void) if (GetEasyChatScreenFrameId() != 4) return; - spriteId = AddPseudoEventObject(graphicsId, SpriteCallbackDummy, 76, 40, 0); + spriteId = AddPseudoObjectEvent(graphicsId, SpriteCallbackDummy, 76, 40, 0); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 0; StartSpriteAnim(&gSprites[spriteId], 2); } - spriteId = AddPseudoEventObject( - gSaveBlock2Ptr->playerGender == MALE ? EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL : EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, + spriteId = AddPseudoObjectEvent( + gSaveBlock2Ptr->playerGender == MALE ? OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL : OBJ_EVENT_GFX_RIVAL_MAY_NORMAL, SpriteCallbackDummy, 52, 40, |