From e85051712361063b04aa7a35ff5c25aed068cab9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 27 Oct 2018 21:01:35 +0200 Subject: more battle frontier 2 --- src/overworld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/overworld.c') diff --git a/src/overworld.c b/src/overworld.c index 8d73a6680..6fc880a54 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -52,6 +52,7 @@ #include "tv.h" #include "scanline_effect.h" #include "wild_encounter.h" +#include "battle_frontier_2.h" #include "constants/abilities.h" #include "constants/map_types.h" #include "constants/maps.h" @@ -136,7 +137,6 @@ extern void sub_8087D74(void); extern void battle_pyramid_map_load_related(u8); extern void sub_80B00E8(u8); extern void sub_80E9238(u8); -extern void sub_81A3908(void); extern void sub_81AA2F8(void); extern void sub_8195E10(void); extern void sub_80EDB44(void); -- cgit v1.2.3 From 7de1c4bd141bc793873b12acd7f1eaae7474bfbc Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 30 Oct 2018 22:17:03 +0100 Subject: Make frontier util compile --- src/overworld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/overworld.c') diff --git a/src/overworld.c b/src/overworld.c index 6fc880a54..cc945dea2 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -52,7 +52,7 @@ #include "tv.h" #include "scanline_effect.h" #include "wild_encounter.h" -#include "battle_frontier_2.h" +#include "frontier_util.h" #include "constants/abilities.h" #include "constants/map_types.h" #include "constants/maps.h" -- cgit v1.2.3 From 645830624d78f9241a43aaf1f09b483c8b5e9422 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 31 Oct 2018 23:03:41 -0500 Subject: Continue script_menu.c --- src/overworld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/overworld.c') diff --git a/src/overworld.c b/src/overworld.c index 8d73a6680..6ce46b9b8 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -3144,7 +3144,7 @@ static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion) eventObj->spriteId = AddPseudoEventObject(GetRSAvatarGraphicsIdByGender(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; case VERSION_EMERALD: - eventObj->spriteId = AddPseudoEventObject(GetRivalAvatarGraphicsIdByStateIdAndGender(0, eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); + eventObj->spriteId = AddPseudoEventObject(GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; } -- cgit v1.2.3