Merge pull request #1 from pret/master

upstream merge

11 files changed, 60 insertions, 49 deletions

diff --git a/include/battle.h b/include/battle.h
index 7527247fe..346423e65 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -823,6 +823,8 @@ void sub_8032638();
 void sub_8032AA8(u8, u8);
 void SetBankFuncToOpponentBufferRunCommand(void);
 void BattleStopLowHpSound(void);
+void sub_8031FC4(u8, u8, bool8);
+void sub_8032984(u8, u16);
 
 void SetBankFuncToLinkOpponentBufferRunCommand(void);
 
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 21e60a60a..e1e7529ca 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -245,7 +245,7 @@ enum {
 #define GROUND_EFFECT_FLAG_HOT_SPRINGS           (1 << 18)
 #define GROUND_EFFECT_FLAG_SEAWEED               (1 << 19)
 
-extern const u8 gUnknown_0830FD14[];
+extern const u8 gReflectionEffectPaletteMap[];
 
 #define movement_type_def(setup, table) \
 static u8 setup##_callback(struct EventObject *, struct Sprite *);\
@@ -269,10 +269,10 @@ static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprit
     return 0;\
 }
 
-struct PairedPalettes
+struct ReflectionPaletteSet
 {
-    u16 tag;
-    const u16 *data;
+    u16 mainPaletteTag;
+    const u16 *reflectionPaletteTags;
 };
 
 extern const u16 gEventObjectPalette19[];
@@ -563,8 +563,7 @@ u8 GetMoveDirectionFastestAnimNum(u8);
 
 u32 state_to_direction(u8, u32, u32);
 
-void sub_805AA98();
-void sub_805AAB0(void);
+void ResetEventObjects();
 u8 GetFirstInactiveEventObjectId(void);
 u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8);
 bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
@@ -592,13 +591,13 @@ void sub_805BCC0(s16 x, s16 y);
 void sub_805BCF0(u8, u8, u8, u8);
 void sub_805BD48(u8, u8, u8);
 void sub_805BD90(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
-void gpu_pal_allocator_reset__manage_upper_four(void);
+void FreeAndReserveObjectSpritePalettes(void);
 void sub_805BDF8(u16);
 u8 sub_805BE58(const struct SpritePalette *);
-void pal_patch_for_npc(u16, u16);
+void PatchObjectPalette(u16, u16);
 u8 FindEventObjectPaletteIndexByTag(u16);
-void npc_load_two_palettes__no_record(u16, u8);
-void npc_load_two_palettes__and_record(u16, u8);
+void LoadPlayerObjectReflectionPalette(u16, u8);
+void LoadSpecialObjectReflectionPalette(u16, u8);
 void ShiftEventObjectCoords(struct EventObject *pObject, s16 x, s16 y);
 void sub_805C0F8(u8, u8, u8, s16, s16);
 void ShiftStillEventObjectCoords(struct EventObject *pObject);
@@ -613,7 +612,7 @@ struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8, u8, u8);
 void OverrideTemplateCoordsForEventObject(struct EventObject *pObject);
 void OverrideMovementTypeForEventObject(struct EventObject *, u8);
 void TryOverrideTemplateCoordsForEventObject(u8, u8, u8);
-void sub_805C7C4(u8 i);
+void InitEventObjectPalettes(u8);
 u8 GetFaceDirectionAnimNum(u8);
 u8 GetMoveDirectionAnimNum(u8 unk_19);
 u8 GetAcroWheelieDirectionAnimNum(u8);
@@ -671,8 +670,8 @@ u8 GetOppositeDirection(u8);
 u8 SpawnSpecialEventObjectParametrized(u8, u8, u8, s16, s16, u8);
 void CameraObjectSetFollowedObjectId(u8);
 u8 TryInitLocalEventObject(u8);
-u8 obj_unfreeze(struct Sprite *, s16, s16, u8);
-u16 npc_paltag_by_palslot(u8);
+u8 CreateCopySpriteAt(struct Sprite *, s16, s16, u8);
+u16 GetObjectPaletteTag(u8);
 void sub_8060470(s16 *, s16 *, s16, s16);
 bool8 FreezeEventObject(struct EventObject *);
 void FreezeEventObjects(void);
diff --git a/include/ewram.h b/include/ewram.h
index f8a0d69f9..baa64f42f 100644
--- a/include/ewram.h
+++ b/include/ewram.h
@@ -232,7 +232,7 @@ extern u8 gSharedMem[];
 #define eRoulette                       ((struct Roulette *)(gSharedMem + 0x19000))
 #define shared192D0                     (*(struct UnknownContestStruct7 *)(gSharedMem + 0x192D0))
 #define eContestAI                      ((struct ContestAIInfo *)(gSharedMem + 0x192E4))
-#define EWRAM_19348                     (*(u16 *)(gSharedMem + 0x19348))
+#define EWRAM_19348                     ((u16 *)(gSharedMem + 0x19348))
 #define ewram19800                      (&gSharedMem[0x19800])
 #define ePokedexView4                   (struct PokedexView *)(gSharedMem + 0x19800)
 #define ewram1A000                      (&gSharedMem[0x1A000])
diff --git a/include/field_effect.h b/include/field_effect.h
index 4ca97c898..a1c175eb8 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -120,9 +120,6 @@ bool8 sub_8087774(struct Task *, struct EventObject *, struct Sprite *);
 bool8 sub_80877AC(struct Task *, struct EventObject *, struct Sprite *);
 bool8 sub_80877D4(struct Task *, struct EventObject *, struct Sprite *);
 
-void sub_80878F4(struct Task *);
-void sub_8087914(struct Task *);
-
 void sub_8087AA4(struct Task *);
 void sub_8087AC8(struct Task *);
 
@@ -176,7 +173,7 @@ u8 CreateBirchSprite(s16 x, s16 y, u8 subpriority);
 u8 CreateMonSprite_PicBox(u16, s16, s16, u8);
 void FreeResourcesAndDestroySprite(struct Sprite *sprite);
 void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8);
-void sub_80878A8(void);
+void StartEscapeRopeFieldEffect(void);
 void CreateTeleportFieldEffectTask(void);
 void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
 
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 8d207aded..8462b6ff8 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -5,32 +5,32 @@ extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 
 void sub_812869C(struct EventObject *);
 bool8 sub_81286C4(struct EventObject *);
-void oamc_shadow(struct Sprite *);
+void UpdateShadowFieldEffect(struct Sprite *);
 void sub_8087638(struct Sprite *);
 void sub_808788C(struct Sprite *);
-void sub_8127334(struct Sprite *);
-void sub_8127584(struct Sprite *);
-void sub_81276B4(struct Sprite *);
-void sub_8127A7C(struct Sprite *);
-void sub_8127D84(struct Sprite *);
-void sub_8127F7C(struct Sprite *);
-void sub_81282E0(struct Sprite *);
-void sub_8128410(struct Sprite *);
-void sub_81285AC(struct Sprite *);
-void sub_8128774(struct Sprite *);
-void sub_81287C4(struct Sprite *);
-void sub_8128800(struct Sprite *);
-void unc_grass_normal(struct Sprite *);
-void unc_grass_tall(struct Sprite *);
-u8 sub_8126B54(void);
-void objid_set_invisible(u8);
-void sub_8126BC4(u8 unk_1B, u8 r6, s16 x, s16 y);
+void UpdateShortGrassFieldEffect(struct Sprite *);
+void UpdateFootprintsTireTracksFieldEffect(struct Sprite *);
+void UpdateSplashFieldEffect(struct Sprite *);
+void UpdateHotSpringsWaterFieldEffect(struct Sprite *);
+void UpdateAshFieldEffect(struct Sprite *);
+void UpdateSurfBlobFieldEffect(struct Sprite *);
+void UpdateSandPileFieldEffect(struct Sprite *);
+void UpdateBubblesFieldEffect(struct Sprite *);
+void UpdateDisguiseFieldEffect(struct Sprite *);
+void UpdateSparkleFieldEffect(struct Sprite *);
+void UpdateJumpLandingFieldEffect(struct Sprite *);
+void WaitFieldEffectSpriteAnim(struct Sprite *);
+void UpdateTallGrassFieldEffect(struct Sprite *);
+void UpdateLongGrassFieldEffect(struct Sprite *);
+u8 CreateWarpArrowSprite(void);
+void SetSpriteInvisible(u8);
+void ShowWarpArrowSprite(u8 unk_1B, u8 r6, s16 x, s16 y);
 void sub_8127ED0(u8, u8);
 void sub_8127F28(u8, u8, s16);
 u8 sub_8128124(u8 id);
-void ash(s16, s16, u16, s16);
-void SetUpReflection(struct EventObject *eventObj, struct Sprite *sprite, u8 a);
+void StartAshFieldEffect(s16, s16, u16, s16);
+void InitObjectReflectionSprite(struct EventObject *eventObj, struct Sprite *sprite, u8 a);
 u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct EventObject *eventObject);
-u8 sub_8126FF0(u8, u8, u8, s16, s16);
+u8 FindTallGrassFieldEffectSpriteId(u8, u8, u8, s16, s16);
 
 #endif // GUARD_FIELD_EFFECT_HELPERS_H
diff --git a/include/gba/types.h b/include/gba/types.h
index 33ae7df9a..4d6c24a6c 100644
--- a/include/gba/types.h
+++ b/include/gba/types.h
@@ -32,7 +32,9 @@ struct BgCnt
 {
     u16 priority:2;
     u16 charBaseBlock:2;
-    u16 dummy:4;
+    u16 dummy:2;
+    u16 mosaic:1;
+    u16 palettes:1;
     u16 screenBaseBlock:5;
     u16 areaOverflowMode:1;
     u16 screenSize:2;
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 799a12a19..f15348689 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -238,8 +238,8 @@ struct EventObject
 struct EventObjectGraphicsInfo
 {
     /*0x00*/ u16 tileTag;
-    /*0x02*/ u16 paletteTag1;
-    /*0x04*/ u16 paletteTag2;
+    /*0x02*/ u16 paletteTag;
+    /*0x04*/ u16 bridgeReflectionPaletteTag;
     /*0x06*/ u16 size;
     /*0x08*/ s16 width;
     /*0x0A*/ s16 height;
diff --git a/include/item_menu.h b/include/item_menu.h
index 715d9131a..22ef3892c 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -3,6 +3,15 @@
 
 #include "string_util.h"
 
+enum
+{
+	ITEM_USE_SINGLE_MON,
+	ITEM_USE_GIVE_ITEM,
+	ITEM_USE_UNUSED,
+	ITEM_USE_GIVE_MAIL,
+	ITEM_USE_ALL_MONS,
+};
+
 struct PocketScrollState
 {
     u8 cursorPos;
diff --git a/include/item_use.h b/include/item_use.h
index ee7939824..1ba75a0ee 100644
--- a/include/item_use.h
+++ b/include/item_use.h
@@ -10,6 +10,7 @@ void ItemUseOutOfBattle_Rod(u8);
 void ItemUseOnFieldCB_Rod(u8);
 void ItemUseOutOfBattle_Itemfinder(u8);
 void ItemUseOnFieldCB_Itemfinder(u8);
+void ItemUseOutOfBattle_Berry(u8);
 void RunItemfinderResults(u8);
 void ExitItemfinder(u8);
 bool8 ItemfinderCheckForHiddenItems(struct MapEvents *, u8);
@@ -22,19 +23,13 @@ void RotatePlayerAndExitItemfinder(u8);
 void ItemUseOutOfBattle_PokeblockCase(u8);
 void ItemUseOutOfBattle_CoinCase(u8);
 void ItemUseOutOfBattle_SSTicket(u8);
-void sub_80C9D00(u8);
 void ItemUseOutOfBattle_WailmerPail(u8);
-void sub_80C9D74(u8);
 void ItemUseOutOfBattle_Medicine(u8);
 void ItemUseOutOfBattle_SacredAsh(u8);
 void ItemUseOutOfBattle_PPRecovery(u8);
 void ItemUseOutOfBattle_PPUp(u8);
 void ItemUseOutOfBattle_RareCandy(u8);
 void ItemUseOutOfBattle_TMHM(u8);
-void sub_80C9EE4(u8);
-void sub_80C9F10(u8);
-void sub_80C9F80(u8);
-void sub_80C9FC0(u8);
 void ItemUseOutOfBattle_Repel(u8);
 void ItemUseOutOfBattle_BlackWhiteFlute(u8);
 void task08_080A1C44(u8);
diff --git a/include/party_menu.h b/include/party_menu.h
index 9d2f57d7a..e687f48c4 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -192,7 +192,7 @@ void GetMedicineItemEffectMessage(u16);
 bool8 ExecuteTableBasedItemEffect__(u8, u16, u8);
 void UseMedicine(u8, u16, TaskFunc);
 bool8 IsBlueYellowRedFlute(u16);
-void sub_8070048(u8, u16, TaskFunc);
+void DoSacredAshItemEffect(u8, u16, TaskFunc);
 void sub_8070088(u8);
 void sub_80701DC(u8 taskId);
 void DoPPRecoveryItemEffect(u8, u16, TaskFunc);
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h
index 9ce2d5f3e..3942397eb 100644
--- a/include/rom_8077ABC.h
+++ b/include/rom_8077ABC.h
@@ -10,6 +10,12 @@ struct Struct_sub_8078914 {
     u8 field_8;
 };
 
+struct TransformStatus
+{
+    u16 unknown;
+    u16 species;
+};
+
 u8 GetBattlerSpriteCoord(u8, u8);
 u8 sub_8077E44(u8 slot, u16 species, u8 a3);
 u8 GetAnimBattlerSpriteId(u8 bank);
@@ -108,5 +114,6 @@ void sub_8079AB8(u8 sprite, u8 sprite2);
 u8 sub_807A4A0(int bank, u8 sprite, int species);
 void sub_80794A8(struct Sprite *sprite);
 void sub_807A9BC(struct Sprite *sprite);
+void sub_8078954(struct Struct_sub_8078914*, u8);
 
 #endif // GUARD_ROM_8077ABC_H