Merge pull request #534 from GriffinRichards/sync-scriptcmds

Sync script commands

include/constants/maps.h

@@ -12,4 +12,8 @@
 
 #define MAP(map) MAP_GROUP(map), MAP_NUM(map)
 
+// Used to indicate an invalid warp id, for dummy warps or when a warp should
+// use the given coordinates rather than the coordinates of a target warp.
+#define WARP_ID_NONE (-1)
+
 #endif  // GUARD_CONSTANTS_MAPS_H

include/constants/vars.h

@@ -334,4 +334,11 @@
 
 #define SPECIAL_VARS_END           0x8014
 
+// Text color ids for VAR_TEXT_COLOR / VAR_PREV_TEXT_COLOR
+#define NPC_TEXT_COLOR_MALE      0 // Blue, for male NPCs
+#define NPC_TEXT_COLOR_FEMALE    1 // Red, for female NPCs
+#define NPC_TEXT_COLOR_MON       2 // Black, for Pokémon
+#define NPC_TEXT_COLOR_NEUTRAL   3 // Black, for inanimate objects and messages from the game
+#define NPC_TEXT_COLOR_DEFAULT 255 // If an NPC is selected, use the color specified by GetColorFromTextColorTable, otherwise use Neutral.
+
 #endif // GUARD_CONSTANTS_VARS_H

include/event_object_lock.h

@@ -3,10 +3,10 @@
 
 #include "global.h"
 
-bool8 NativeScript_WaitPlayerStopMoving(void);
-void ScriptFreezeObjectEvents(void);
-bool8 NativeScript_WaitPlayerAndTargetNPCStopMoving(void);
-void LockSelectedObjectEvent(void);
+bool8 IsFreezePlayerFinished(void);
+void FreezeObjects_WaitForPlayer(void);
+bool8 IsFreezeSelectedObjectAndPlayerFinished(void);
+void FreezeObjects_WaitForPlayerAndSelected(void);
 void ClearPlayerHeldMovementAndUnfreezeObjectEvents(void);
 bool8 walkrun_is_standing_still(void);
 void UnionRoom_UnlockPlayerAndChatPartner(void);

include/event_object_movement.h

@@ -76,7 +76,7 @@ void SetSpritePosToOffsetMapCoords(s16 *, s16 *, s16, s16);
 void ObjectEventClearHeldMovement(struct ObjectEvent *);
 void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *);
 void SpawnObjectEventsInView(s16, s16);
-u8 sprite_new(u8, u8, s16, s16, u8, u8);
+u8 CreateVirtualObject(u8, u8, s16, s16, u8, u8);
 u8 AddPseudoObjectEvent(u16, SpriteCallback, s16, s16, u8);
 u8 TrySpawnObjectEvent(u8 localId, u8 mapNum, u8 mapGroup);
 int SpawnSpecialObjectEventParameterized(u8, u8, u8, s16, s16, u8);
@@ -88,11 +88,11 @@ void ObjectEventTurn(struct ObjectEvent *, u8);
 void ObjectEventTurnByLocalIdAndMap(u8, u8, u8, u8);
 void ObjectEventForceSetHeldMovement(struct ObjectEvent *, u8);
 const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8);
-void ShowOrHideObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 state);
+void SetObjectInvisibility(u8 localId, u8 mapNum, u8 mapGroup, u8 state);
 void FreeAndReserveObjectSpritePalettes(void);
 void SetObjectPositionByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
-void UnfixObjectPriorityByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup);
-void SetObjectPriorityByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority);
+void ResetObjectSubpriority(u8 localId, u8 mapNum, u8 mapGroup);
+void SetObjectSubpriority(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority);
 void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup);
 void ShiftObjectEventCoords(struct ObjectEvent *, s16, s16);
 void TryOverrideObjectEventTemplateCoords(u8, u8, u8);
@@ -138,7 +138,7 @@ bool8 UpdateWalkSlowerAnim(struct Sprite *sprite);
 void SetJumpSpriteData(struct Sprite *, u8, u8, u8);
 u8 DoJumpSpriteMovement(struct Sprite *);
 u8 DoJumpSpecialSpriteMovement(struct Sprite *);
-void TurnObjectEvent(u8, u8);
+void TurnVirtualObject(u8, u8);
 const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId);
 u8 GetFirstInactiveObjectEventId(void);
 u8 GetCollisionFlagsAtCoords(struct ObjectEvent * objectEvent, s16 x, s16 y, u8 direction);

include/field_weather.h

@@ -113,11 +113,11 @@ extern struct Weather *const gWeatherPtr;
 
 void FadeScreen(u8 mode, s8 delay);
 
-void SetSav1Weather(u32);
+void SetSavedWeather(u32);
 u8 GetSav1Weather(void);
 
 void DoCurrentWeather(void);
-void SetSav1WeatherFromCurrMapHeader(void);
+void SetSavedWeatherFromCurrMapHeader(void);
 void SlightlyDarkenPalsInWeather(u16 *, u16 *, u32);
 void PlayRainStoppingSoundEffect(void);
 bool8 IsWeatherNotFadingIn(void);

include/fieldmap.h

@@ -12,6 +12,14 @@
 #define MAX_MAP_DATA_SIZE 0x2800
 #define VIRTUAL_MAP_SIZE (MAX_MAP_DATA_SIZE)
 
+// Map coordinates are offset by 7 when using the map
+// buffer because it needs to load sufficient border
+// metatiles to fill the player's view (the player has
+// 7 metatiles of view horizontally in either direction).
+#define MAP_OFFSET 7
+#define MAP_OFFSET_W (MAP_OFFSET * 2 + 1)
+#define MAP_OFFSET_H (MAP_OFFSET * 2)
+
 extern struct BackupMapLayout VMap;
 extern const struct MapLayout Route1_Layout;
 

include/overworld.h

@@ -60,8 +60,8 @@ extern u8 gLocalLinkPlayerId;
 
 void IncrementGameStat(u8 index);
 
-void Overworld_SetMapObjTemplateCoords(u8, s16, s16);
-void Overworld_SetObjEventTemplateMovementType(u8, u8);
+void SetObjEventTemplateCoords(u8, s16, s16);
+void SetObjEventTemplateMovementType(u8, u8);
 
 void SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 
@@ -77,7 +77,7 @@ u8 IsMapTypeOutdoors(u8 mapType);
 void Overworld_ClearSavedMusic(void);
 bool32 Overworld_MusicCanOverrideMapMusic(u16 song);
 
-void Overworld_SetFlashLevel(s32 a1);
+void SetFlashLevel(s32 a1);
 u8 Overworld_GetFlashLevel(void);
 
 void Overworld_SetSavedMusic(u16);

include/script.h

@@ -61,7 +61,7 @@ bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objec
 const u8 *GetRamScript(u8 objectId, const u8 *script);
 bool32 ValidateRamScript(void);
 void MEventSetRamScript(u8 * script, u16 scriptSize);
-u8 * sub_8069E48(void);
+u8 * GetSavedRamScriptIfValid(void);
 void RegisterQuestLogInput(u8 var);
 void ClearMsgBoxCancelableState(void);
 void SetQuestLogInputIsDpadFlag(void);

include/script_menu.h

@@ -13,7 +13,7 @@ bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
 bool8 CreatePCMenu(void);
 void ScriptMenu_DisplayPCStartupPrompt(void);
 
-bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
+bool8 (*ScriptMenu_HidePokemonPic(void))(void);
 void QLPlaybackCB_DestroyScriptMenuMonPicSprites(void);
 void PicboxCancel(void);
 

include/text.h

@@ -169,7 +169,7 @@ enum {
     FONT_3,
     FONT_4,
     FONT_5,
-    FONT_6,
+    FONT_BRAILLE,
 };
 
 enum