diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm index 71430ce1..fddebf84 100644 --- a/data/maps/objects/SSAnne1FRooms.asm +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -23,7 +23,7 @@ SSAnne1FRooms_Object: object_event 10, 13, SPRITE_GIRL, STAY, RIGHT, 9 ; person object_event 12, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_BODY_SLAM object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 11 ; person - object_event 0, 4, SPRITE_GAMEBOY_KID, STAY, DOWN, 12 ; Perrserker Trader + object_event 20, 14, SPRITE_GAMEBOY_KID, STAY, DOWN, 12 ; Perrserker Trader object_event 20, 4, SPRITE_GAMEBOY_KID, STAY, DOWN, 13 ; Weezing Trader object_event 23, 1, SPRITE_NURSE, STAY, LEFT, 14 ; Healer diff --git a/data/pokemon/base_stats/mrrime.asm b/data/pokemon/base_stats/mrrime.asm index dbbf1278..e97acb69 100644 --- a/data/pokemon/base_stats/mrrime.asm +++ b/data/pokemon/base_stats/mrrime.asm @@ -1,6 +1,6 @@ db DEX_MR_RIME ; pokedex id - db 80, 85, 75, 70, 100 + db 80, 85, 75, 70, 110 ; hp atk def spd spc db ICE, PSYCHIC_TYPE ; type