diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-06-11 19:11:48 -0500 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-11 19:11:48 -0500 |
commit | aa9a45c16fbaee2fffc94e4741e0a1f203b244bc (patch) | |
tree | 9bdd507453e9b51ff52216d9f04bda62ac799cfb /src/naming_screen.c | |
parent | ed245b677addbb7f5c748193301507de7fed6ec4 (diff) |
Rebrand 'map object' and 'field object' to 'event object'
Diffstat (limited to 'src/naming_screen.c')
-rw-r--r-- | src/naming_screen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/naming_screen.c b/src/naming_screen.c index 9ad1a9742..f99d23bc3 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -25,7 +25,7 @@ #include "menu.h" #include "text_window.h" #include "overworld.h" -#include "constants/map_objects.h" +#include "constants/event_objects.h" EWRAM_DATA static struct NamingScreenData *gNamingScreenData = NULL; extern u16 gKeyRepeatStartDelay; @@ -1142,7 +1142,7 @@ static void NamingScreen_CreatePlayerIcon(void) u8 spriteId; rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, gNamingScreenData->monSpecies); - spriteId = AddPseudoFieldObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0); + spriteId = AddPseudoEventObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0); gSprites[spriteId].oam.priority = 3; StartSpriteAnim(&gSprites[spriteId], 4); } @@ -1169,7 +1169,7 @@ static void NamingScreen_CreateWandaDadIcon(void) { u8 spriteId; - spriteId = AddPseudoFieldObject(MAP_OBJ_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0); + spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0); gSprites[spriteId].oam.priority = 3; StartSpriteAnim(&gSprites[spriteId], 4); } |