Merge branch 'master' into doc-tilesets

include/constants/metatile_labels.h

@@ -103,6 +103,17 @@
 #define METATILE_CinnabarGym_Floor_WallLeftEdge     0x2CF
 #define METATILE_CinnabarGym_Wall_RetractedBarrier  0x2D1
 
+// gTileset_PokemonLeague
+#define METATILE_PokemonLeague_Door_Top_Open             0x28E
+#define METATILE_PokemonLeague_Door_Mid_Open             0x296
+#define METATILE_PokemonLeague_Entry_TopLeft_Closed      0x29D
+#define METATILE_PokemonLeague_Entry_TopMid_Closed       0x29E
+#define METATILE_PokemonLeague_Entry_TopRight_Closed     0x29F
+#define METATILE_PokemonLeague_Entry_BottomLeft_Closed   0x2A5
+#define METATILE_PokemonLeague_Entry_BottomMid_Closed    0x2A6
+#define METATILE_PokemonLeague_Entry_BottomRight_Closed  0x2A7
+#define METATILE_PokemonLeague_Floor_ShadeFull_Lance     0x311
+
 // gTileset_MtEmber
 #define METATILE_MtEmber_CaveEntrance  0x346
 

include/librfu.h

@@ -4,6 +4,8 @@
 #include "global.h"
 #include "main.h"
 
+#define LIBRFU_VERSION 1024
+
 /* TODOs:
  * - documentation
  * - check if any field needs to be volatile
@@ -307,7 +309,11 @@ struct STWIStatus
     u8 ackActiveCommand;
     u8 timerSelect;
     u8 unk_b;
-    u32 timerState; // this field is s32 in emerald
+#if LIBRFU_VERSION >= 1026
+    s32 timerState;
+#else
+    u32 timerState;
+#endif
     vu8 timerActive;
     u8 unk_11;
     vu16 error;
@@ -472,7 +478,7 @@ extern struct RfuFixed *gRfuFixed;
 extern struct RfuSlotStatusNI *gRfuSlotStatusNI[RFU_CHILD_MAX];
 extern struct RfuSlotStatusUNI *gRfuSlotStatusUNI[RFU_CHILD_MAX];
 
-// librfu_s32id
+// librfu_sio32id
 s32 AgbRFU_checkID(u8 maxTries);
 
 // Arguments with "bm..." specify slots of the form (0x01 << slot number) that are the object of a function operation.