diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 4d30584..550251d 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -143,10 +143,10 @@ const SPRITE_GIOVANNI const SPRITE_CHANNELER const SPRITE_BALDING_GUY + const SPRITE_GAMEBOY_GIRL DEF NUM_OVERWORLD_SPRITES EQU const_value - 1 ; SpriteMons indexes (see data/sprites/sprite_mons.asm) - const_next $8A DEF SPRITE_POKEMON EQU const_value const SPRITE_UNOWN ; 80 const SPRITE_GEODUDE ; 81 diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm index 33c8cd1..900e967 100644 --- a/data/sprites/sprites.asm +++ b/data/sprites/sprites.asm @@ -148,4 +148,5 @@ OverworldSprites: overworld_sprite GiovanniGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite ChannelerGFX, 12, WALKING_SPRITE, PAL_OW_BROWN overworld_sprite BaldingGuyGFX, 12, STANDING_SPRITE, PAL_OW_BROWN + overworld_sprite GameboyGirlGFX, 12, STANDING_SPRITE, PAL_OW_RED assert_table_length NUM_OVERWORLD_SPRITES diff --git a/gfx/sprites.asm b/gfx/sprites.asm index 9d613fe..b8fa443 100644 --- a/gfx/sprites.asm +++ b/gfx/sprites.asm @@ -148,4 +148,5 @@ SafariZoneWorkerGFX:: INCBIN "gfx/sprites/safari_zone_worker.2bpp" LoreleiGFX:: INCBIN "gfx/sprites/lorelei.2bpp" GiovanniGFX:: INCBIN "gfx/sprites/giovanni.2bpp" ChannelerGFX:: INCBIN "gfx/sprites/channeler.2bpp" -BaldingGuyGFX:: INCBIN "gfx/sprites/balding_guy.2bpp" \ No newline at end of file +BaldingGuyGFX:: INCBIN "gfx/sprites/balding_guy.2bpp" +GameboyGirlGFX:: INCBIN "gfx/sprites/gameboy_girl.2bpp" \ No newline at end of file diff --git a/gfx/sprites/gameboy_girl.png b/gfx/sprites/gameboy_girl.png new file mode 100644 index 0000000..78dbf35 Binary files /dev/null and b/gfx/sprites/gameboy_girl.png differ diff --git a/maps/PokecomCenterAdminOfficeMobile.asm b/maps/PokecomCenterAdminOfficeMobile.asm index a00a24b..bd85e99 100644 --- a/maps/PokecomCenterAdminOfficeMobile.asm +++ b/maps/PokecomCenterAdminOfficeMobile.asm @@ -818,6 +818,6 @@ PokecomCenterAdminOfficeMobile_MapEvents: object_event 11, 13, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FPokefanF, -1 object_event 15, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecomCenterPerson1Script, -1 object_event 13, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecomCenterPerson2Script, -1 - object_event 18, 13, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecomCenterPerson4Script, -1 - object_event 19, 13, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecomCenterPerson5Script, -1 + object_event 18, 13, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecomCenterPerson4Script, -1 + object_event 19, 13, SPRITE_GAMEBOY_GIRL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecomCenterPerson5Script, -1 object_event 22, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecomCenterPerson6Script, -1