dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Rebrand 'map object' and 'field object' to 'event object'

Browse Source
This commit is contained in:
Marcus Huderle
2018-06-11 19:11:48 -05:00
parent ed245b677a
commit aa9a45c16f
2157 changed files with 12673 additions and 12675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/naming_screen.c
View File

@@ -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);
}