merge overworld with master

src/fldeff_strength.c

@@ -0,0 +1,44 @@
+#include "global.h"
+#include "event_data.h"
+#include "event_scripts.h"
+#include "field_effect.h"
+#include "party_menu.h"
+#include "rom6.h"
+#include "script.h"
+#include "task.h"
+
+void FldEff_UseStrength(void);
+void sub_8145E74(void);
+
+bool8 SetUpFieldMove_Strength(void)
+{
+    if (npc_before_player_of_type(87) == TRUE)
+    {
+        gSpecialVar_Result = GetCursorSelectionMonId();
+        gUnknown_03005DB0 = FieldCallback_Teleport;
+        gUnknown_0203CEEC = FldEff_UseStrength;
+        return TRUE;
+    }
+    return FALSE;
+}
+
+void FldEff_UseStrength(void)
+{
+    gFieldEffectArguments[0] = GetCursorSelectionMonId();
+    ScriptContext1_SetupScript(FieryPath_EventScript_2908FD);
+}
+
+bool8 sub_8145E2C(void)
+{
+    u8 taskId = oei_task_add();
+    gTasks[taskId].data[8] = (u32)sub_8145E74 >> 16;
+    gTasks[taskId].data[9] = (u32)sub_8145E74;
+    GetMonNickname(&gPlayerParty[gFieldEffectArguments[0]], gStringVar1);
+    return FALSE;
+}
+
+void sub_8145E74(void)
+{
+    FieldEffectActiveListRemove(FLDEFF_USE_STRENGTH);
+    EnableBothScriptContexts();
+}

src/fldeff_sweetscent.c

@@ -0,0 +1,97 @@
+#include "global.h"
+#include "constants/rgb.h"
+#include "constants/songs.h"
+#include "event_data.h"
+#include "event_scripts.h"
+#include "field_effect.h"
+#include "field_player_avatar.h"
+#include "field_screen.h"
+#include "fldeff_groundshake.h"
+#include "palette.h"
+#include "party_menu.h"
+#include "rom6.h"
+#include "script.h"
+#include "sound.h"
+#include "sprite.h"
+#include "task.h"
+#include "wild_encounter.h"
+
+void hm2_sweet_scent(void);
+void sub_8159F5C(void);
+void sub_8159FEC(u8 taskId);
+void sub_815A090(u8 taskId);
+
+bool8 SetUpFieldMove_SweetScent(void)
+{
+    gUnknown_03005DB0 = FieldCallback_Teleport;
+    gUnknown_0203CEEC = hm2_sweet_scent;
+    return TRUE;
+}
+
+void hm2_sweet_scent(void)
+{
+    FieldEffectStart(FLDEFF_SWEET_SCENT);
+    gFieldEffectArguments[0] = GetCursorSelectionMonId();
+}
+
+bool8 FldEff_SweetScent()
+{
+    u8 taskId;
+
+    sub_80AC3D0();
+    taskId = oei_task_add();
+    gTasks[taskId].data[8] = (u32)sub_8159F5C >> 16;
+    gTasks[taskId].data[9] = (u32)sub_8159F5C;
+    return FALSE;
+}
+
+void sub_8159F5C(void)
+{
+    u8 taskId;
+
+    PlaySE(SE_W230);
+    CpuFastSet(gPlttBufferUnfaded, gPaletteDecompressionBuffer, 0x100);
+    CpuFastSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x100);
+    BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, RGB_RED);
+    taskId = CreateTask(sub_8159FEC, 0);
+    gTasks[taskId].data[0] = 0;
+    FieldEffectActiveListRemove(FLDEFF_SWEET_SCENT);
+}
+
+void sub_8159FEC(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        sub_81BE72C();
+        BlendPalettes(0x00000040, 8, RGB_RED);
+        if (gTasks[taskId].data[0] == 64)
+        {
+            gTasks[taskId].data[0] = 0;
+            if (SweetScentWildEncounter() == TRUE)
+            {
+                DestroyTask(taskId);
+            }
+            else
+            {
+                gTasks[taskId].func = sub_815A090;
+                BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 8, 0, RGB_RED);
+                sub_81BE6B8();
+            }
+        }
+        else
+        {
+            gTasks[taskId].data[0]++;
+        }
+    }
+}
+
+void sub_815A090(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        CpuFastSet(gPaletteDecompressionBuffer, gPlttBufferUnfaded, 0x100);
+        sub_80AC3E4();
+        ScriptContext1_SetupScript(EventScript_290CAE);
+        DestroyTask(taskId);
+    }
+}

src/fldeff_teleport.c

@@ -7,17 +7,14 @@
 #include "rom6.h"
 #include "task.h"
 
-extern bool8 (*gUnknown_03005DB0)(void);
-extern void (*gUnknown_0203CEEC)(void);
-
 bool8 SetUpFieldMove_Teleport(void)
 {
     if (Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType) == TRUE)
     {
         gUnknown_03005DB0 = FieldCallback_Teleport;
-        gUnknown_0203CEEC = hm_teleport_run_dp02scr;   
+        gUnknown_0203CEEC = hm_teleport_run_dp02scr;
         return TRUE;
-    } 
+    }
     return FALSE;
 }
 

src/item_menu.c

@@ -214,7 +214,7 @@ const struct YesNoFuncTable gUnknown_08614084 = {BagMenuActuallyToss, BagMenuCan
 
 const struct YesNoFuncTable gUnknown_0861408C = {sub_81AD84C, sub_81AD6FC};
 
-const u16 gUnknown_08614094[] = {0x1C00, 0x110, 0x1064, -1, -1, 0x6F, 0x6F, 0};
+const struct ArrowStruct gUnknown_08614094 = {0, 0x1C, 16, 1, 100, 16, -1, -1, 0x6F, 0x6F, 0};
 
 const u8 gUnknown_086140A4[] = INCBIN_U8("graphics/interface/select_button.4bpp");