Merge pull request #1807 from pret/porymap-5

Update for Porymap 5.0.0

include/constants/heal_locations.h

@@ -1,6 +1,7 @@
 #ifndef GUARD_CONSTANTS_HEAL_LOCATIONS_H
 #define GUARD_CONSTANTS_HEAL_LOCATIONS_H
 
+#define HEAL_LOCATION_NONE 0
 #define HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F 1
 #define HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F 2
 #define HEAL_LOCATION_PETALBURG_CITY 3

include/constants/maps.h

@@ -3,14 +3,17 @@
 
 #include "map_groups.h"
 
-#define MAP_NONE (0x7F | (0x7F << 8))
+// Warps using this map will instead use the warp data stored in gSaveBlock1Ptr->dynamicWarp.
+// Used for warps that need to change destinations, e.g. when stepping off an elevator.
+#define MAP_DYNAMIC (0x7F | (0x7F << 8))
+
 #define MAP_UNDEFINED (0xFF | (0xFF << 8))
 
 #define MAP_GROUP(map) (MAP_##map >> 8)
 #define MAP_NUM(map) (MAP_##map & 0xFF)
 
 // IDs for dynamic warps. Both are used in the dest_warp_id field for warp events, but they
-// are never read in practice. A dest_map of MAP_NONE is used to indicate that a
+// are never read in practice. A dest_map of MAP_DYNAMIC is used to indicate that a
 // dynamic warp should be used, at which point the warp id is ignored. It can be passed to
 // SetDynamicWarp/SetDynamicWarpWithCoords as the first argument, but this argument is unused.
 // As only one dynamic warp is saved at a time there's no need to distinguish between them.

include/event_object_movement.h

@@ -3,6 +3,28 @@
 
 #include "constants/event_object_movement.h"
 
+// Palette slots for overworld NPCs.
+// The same standard set of palettes for overworld objects are normally always loaded at the same
+// time while walking around the overworld. The only exceptions are the palettes for the player and
+// the "special" NPC, which can be swapped out. This also means that e.g. two "special" NPCs
+// with competing palettes cannot be properly loaded at the same time.
+enum {
+    PALSLOT_PLAYER,
+    PALSLOT_PLAYER_REFLECTION,
+    PALSLOT_NPC_1,
+    PALSLOT_NPC_2,
+    PALSLOT_NPC_3,
+    PALSLOT_NPC_4,
+    PALSLOT_NPC_1_REFLECTION,
+    PALSLOT_NPC_2_REFLECTION,
+    PALSLOT_NPC_3_REFLECTION,
+    PALSLOT_NPC_4_REFLECTION,
+    PALSLOT_NPC_SPECIAL,
+    PALSLOT_NPC_SPECIAL_REFLECTION,
+    OBJ_PALSLOT_COUNT
+    // the remaining sprite palette slots (12-15) are used by field effects, the interface, etc.
+};
+
 enum SpinnerRunnerFollowPatterns
 {
     RUNFOLLOW_ANY,

include/global.fieldmap.h

@@ -39,10 +39,10 @@ struct Tileset
 {
     /*0x00*/ bool8 isCompressed;
     /*0x01*/ bool8 isSecondary;
-    /*0x04*/ void *tiles;
-    /*0x08*/ void *palettes;
-    /*0x0c*/ u16 *metatiles;
-    /*0x10*/ u16 *metatileAttributes;
+    /*0x04*/ const u32 *tiles;
+    /*0x08*/ const u16 (*palettes)[16];
+    /*0x0c*/ const u16 *metatiles;
+    /*0x10*/ const u16 *metatileAttributes;
     /*0x14*/ TilesetCB callback;
 };
 

include/tileset_anims.h

@@ -6,4 +6,30 @@ void InitSecondaryTilesetAnimation(void);
 void UpdateTilesetAnimations(void);
 void TransferTilesetAnimsBuffer(void);
 
+void InitTilesetAnim_General(void);
+void InitTilesetAnim_Petalburg(void);
+void InitTilesetAnim_Rustboro(void);
+void InitTilesetAnim_Dewford(void);
+void InitTilesetAnim_Slateport(void);
+void InitTilesetAnim_Mauville(void);
+void InitTilesetAnim_Lavaridge(void);
+void InitTilesetAnim_Fallarbor(void);
+void InitTilesetAnim_Fortree(void);
+void InitTilesetAnim_Lilycove(void);
+void InitTilesetAnim_Mossdeep(void);
+void InitTilesetAnim_EverGrande(void);
+void InitTilesetAnim_Pacifidlog(void);
+void InitTilesetAnim_Sootopolis(void);
+void InitTilesetAnim_BattleFrontierOutsideWest(void);
+void InitTilesetAnim_BattleFrontierOutsideEast(void);
+void InitTilesetAnim_Building(void);
+void InitTilesetAnim_Cave(void);
+void InitTilesetAnim_BikeShop(void);
+void InitTilesetAnim_Underwater(void);
+void InitTilesetAnim_SootopolisGym(void);
+void InitTilesetAnim_MauvilleGym(void);
+void InitTilesetAnim_EliteFour(void);
+void InitTilesetAnim_BattleDome(void);
+void InitTilesetAnim_BattlePyramid(void);
+
 #endif // GUARD_TILESET_ANIMS_H

include/tilesets.h

@@ -1,13 +1,10 @@
 #ifndef GUARD_tilesets_H
 #define GUARD_tilesets_H
 
-// Exported type declarations
+extern const u32 gTilesetTiles_General[];
+extern const u16 gTilesetPalettes_General[][16];
 
-// Exported RAM declarations
-
-// Exported ROM declarations
-
-extern struct Tileset *gTilesetPointer_SecretBase;
-extern struct Tileset *gTilesetPointer_SecretBaseRedCave;
+extern const struct Tileset * const gTilesetPointer_SecretBase;
+extern const struct Tileset * const gTilesetPointer_SecretBaseRedCave;
 
 #endif //GUARD_tilesets_H