Merge remote-tracking branch 'upstream/main' into Pokedex_Menu_Text

pret · Jan 19, 2025 · 7d0ff8a · 7d0ff8a
2 parents 9beed2f + 22f622f
commit 7d0ff8a
Show file tree

Hide file tree

Showing 677 changed files with 6,957 additions and 3,527 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -228,7 +228,7 @@ the repository](#2-downloading-the-repository).
     sudo mkdir -pm755 /etc/apt/keyrings
     sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
     sudo apt update
-    sudo apt install --install-recommends winehq-stable
+    sudo apt install --install-recommends wine-stable
     ```
 
 2. Install the following packages via `apt`:
@@ -319,10 +319,11 @@ in the lower right corner.
 
 ### Unix Systems
 
-Export the environment variable as above to your terminal profile:
+Export the environment variable as above to your terminal profile. To do so, run the
+following commands from the root of your repository:
 
 ```bash
-echo 'export LM_LICENSE_FILE="/path/to/pokeplatinum/tools/cw/license.dat"' >> ~/.bashrc
+echo "export LM_LICENSE_FILE=\"$(pwd)/tools/cw/license.dat\"" >> ~/.bashrc
 source ~/.bashrc
 ```
 

diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc
@@ -4475,10 +4475,10 @@
     .short \arg0
     .endm
 
-    .macro ScrCmd_337 arg0, arg1
+    .macro HasSeenSpecies species, ret
     .short 823
-    .short \arg0
-    .short \arg1
+    .short \species
+    .short \ret
     .endm
 
     .macro ScrCmd_338

diff --git a/consts/catching_show.json b/consts/catching_show.json
@@ -8,6 +8,27 @@
                 "CATCHING_SHOW_TYPE_POINTS",
                 "CATCHING_SHOW_TOTAL_POINTS"
             ]
+        },
+        "@PalParkLandArea": {
+            "type": "enum",
+            "values": [
+                "PAL_PARK_AREA_LAND_NONE",
+                "PAL_PARK_AREA_LAND_NORTH_WEST",
+                "PAL_PARK_AREA_LAND_NORTH_EAST",
+                "PAL_PARK_AREA_LAND_SOUTH_WEST",
+                "PAL_PARK_AREA_LAND_SOUTH_EAST",
+                "PAL_PARK_AREA_LAND_END"
+            ]
+        },
+        "@PalParkWaterArea": {
+            "type": "enum",
+            "values": [
+                "PAL_PARK_AREA_WATER_NONE",
+                "PAL_PARK_AREA_WATER_NORTH_WEST",
+                "PAL_PARK_AREA_WATER_NORTH_EAST",
+                "PAL_PARK_AREA_WATER_SOUTH_WEST",
+                "PAL_PARK_AREA_WATER_SOUTH_EAST"
+            ]
         }
     }
 }
diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
@@ -73,7 +73,7 @@ or Uproar is in effect.
 **Fix:** Edit [`res/battle/res/scripts/subscript_pursuit.s`](https://github.com/pret/pokeplatinum/blob/main/res/battle/scripts/subscripts/subscript_pursuit.s)
 
 ```diff
-     UpdateVar OPCODE_ADD, BTLVAR_FAINTED_MON, BATTLER_ENEMY_SLOT_1
+     UpdateVar OPCODE_ADD, BTLVAR_FAINTED_MON, BATTLER_ENEMY_1
      UpdateVar OPCODE_RIGHT_SHIFT, BTLVAR_CALC_TEMP, 0x00000001
      CompareVarToValue OPCODE_NEQ, BTLVAR_CALC_TEMP, 0x00000000, _208
 -    // BUG: Acid Rain (see docs/bugs_and_glitches.md)

diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h
diff --git a/include/constants/battle.h b/include/constants/battle.h
@@ -100,11 +100,11 @@ enum BattlerBootState {
  *
  *      PLAYER_SLOT_1   PLAYER_SLOT_2
  */
-#define BATTLER_PLAYER_SLOT_1 0
-#define BATTLER_ENEMY_SLOT_1  1
-#define BATTLER_PLAYER_SLOT_2 2
-#define BATTLER_ENEMY_SLOT_2  3
-#define BATTLER_NONE          0xFF
+#define BATTLER_PLAYER_1 0
+#define BATTLER_ENEMY_1  1
+#define BATTLER_PLAYER_2 2
+#define BATTLER_ENEMY_2  3
+#define BATTLER_NONE     0xFF
 
 #define BATTLER_TYPE_SOLO_PLAYER        0
 #define BATTLER_TYPE_SOLO_ENEMY         1

diff --git a/include/constants/map_object.h b/include/constants/map_object.h
@@ -24,9 +24,9 @@
 #define MAP_OBJ_STATUS_12              (1 << 12)
 #define MAP_OBJ_STATUS_13              (1 << 13)
 #define MAP_OBJ_STATUS_14              (1 << 14)
-#define MAP_OBJ_STATUS_15              (1 << 15)
-#define MAP_OBJ_STATUS_16              (1 << 16)
-#define MAP_OBJ_STATUS_17              (1 << 17)
+#define MAP_OBJ_STATUS_SHOW_SHADOW     (1 << 15)
+#define MAP_OBJ_STATUS_START_JUMP      (1 << 16)
+#define MAP_OBJ_STATUS_END_JUMP        (1 << 17)
 #define MAP_OBJ_STATUS_18              (1 << 18)
 #define MAP_OBJ_STATUS_19              (1 << 19)
 #define MAP_OBJ_STATUS_HIDE_SHADOW     (1 << 20)

diff --git a/include/field_battle_data_transfer.h b/include/field_battle_data_transfer.h
@@ -19,7 +19,7 @@
 #include "game_options.h"
 #include "game_records.h"
 #include "journal.h"
-#include "poketch_data.h"
+#include "poketch.h"
 #include "rtc.h"
 #include "savedata.h"
 #include "trainer_info.h"
@@ -35,14 +35,14 @@ typedef struct FieldBattleDTO {
     Party *parties[MAX_BATTLERS];
     int resultMask;
     int trainerIDs[MAX_BATTLERS];
-    TrainerData trainerData[MAX_BATTLERS];
+    Trainer trainer[MAX_BATTLERS];
     TrainerInfo *trainerInfo[MAX_BATTLERS];
     Bag *bag;
     BagCursor *bagCursor;
-    PokedexData *pokedex;
+    Pokedex *pokedex;
     PCBoxes *pcBoxes;
     ChatotCry *chatotCries[MAX_BATTLERS];
-    PoketchData *poketchData;
+    Poketch *poketch;
     UnkStruct_0202C878 *unk_104;
     Options *options;
     UnkStruct_0206D140 *unk_10C;

diff --git a/include/game_records.h b/include/game_records.h
@@ -37,6 +37,6 @@ u32 GameRecords_AddToRecordValue(GameRecords *records, int id, u32 toAdd);
 u32 GameRecords_GetRecordValue(GameRecords *records, int id);
 void GameRecords_IncrementTrainerScore(GameRecords *records, int scoreID);
 u32 GameRecords_GetTrainerScore(GameRecords *records);
-void GameRecords_IncrementTrainerScoreOnCatch(GameRecords *records, const PokedexData *pokedex, const u16 species);
+void GameRecords_IncrementTrainerScoreOnCatch(GameRecords *records, const Pokedex *pokedex, const u16 species);
 
 #endif // POKEPLATINUM_GAME_RECORDS_H
diff --git a/include/map_header.h b/include/map_header.h
@@ -1,5 +1,5 @@
-#ifndef POKEPLATINUM_UNK_0203A024_H
-#define POKEPLATINUM_UNK_0203A024_H
+#ifndef POKEPLATINUM_MAP_HEADER_H
+#define POKEPLATINUM_MAP_HEADER_H
 
 typedef struct {
     u8 unk_00;
@@ -24,40 +24,40 @@ typedef struct {
     u16 isFlyAllowed : 1;
 } MapHeader;
 
-u32 MapHeader_IDBoundsCheck(u32 param0);
-const u16 sub_0203A038(u32 param0);
-const u16 sub_0203A04C(u32 param0);
-const u16 MapHeader_GetMapMatrixID(u32 param0);
-u32 MapHeader_GetMsgArchiveID(u32 param0);
-u32 MapHeader_GetScriptsArchiveID(u32 param0);
-u32 MapHeader_GetInitScriptsArchiveID(u32 param0);
-u16 MapHeader_GetDayMusicID(u32 param0);
-u16 MapHeader_GetNightMusicID(u32 param0);
-BOOL MapHeader_HasWildEncounters(u32 param0);
-u32 MapHeader_GetWildEncountersArchiveID(u32 param0);
-u32 MapHeader_GetEventsArchiveID(u32 param0);
-u32 MapHeader_GetMapLabelTextID(u32 param0);
-u8 MapHeader_GetMapLabelWindowID(u32 param0);
-u32 MapHeader_GetWeatherType(u32 param0);
-u32 MapHeader_GetCameraType(u32 param0);
-u32 MapHeader_GetBattleBG(u32 param0);
-BOOL MapHeader_IsEscapeRopeAllowed(u32 param0);
-BOOL MapHeader_IsFlyAllowed(u32 param0);
-BOOL MapHeader_IsBikeAllowed(u32 param0);
+u32 MapHeader_IDBoundsCheck(u32 headerID);
+const u16 sub_0203A038(u32 headerID);
+const u16 sub_0203A04C(u32 headerID);
+const u16 MapHeader_GetMapMatrixID(u32 headerID);
+u32 MapHeader_GetMsgArchiveID(u32 headerID);
+u32 MapHeader_GetScriptsArchiveID(u32 headerID);
+u32 MapHeader_GetInitScriptsArchiveID(u32 headerID);
+u16 MapHeader_GetDayMusicID(u32 headerID);
+u16 MapHeader_GetNightMusicID(u32 headerID);
+BOOL MapHeader_HasWildEncounters(u32 headerID);
+u32 MapHeader_GetWildEncountersArchiveID(u32 headerID);
+u32 MapHeader_GetEventsArchiveID(u32 headerID);
+u32 MapHeader_GetMapLabelTextID(u32 headerID);
+u8 MapHeader_GetMapLabelWindowID(u32 headerID);
+u32 MapHeader_GetWeatherType(u32 headerID);
+u32 MapHeader_GetCameraType(u32 headerID);
+u32 MapHeader_GetBattleBG(u32 headerID);
+BOOL MapHeader_IsEscapeRopeAllowed(u32 headerID);
+BOOL MapHeader_IsFlyAllowed(u32 headerID);
+BOOL MapHeader_IsBikeAllowed(u32 headerID);
 u32 MapHeader_GetMapType(u32 headerID);
-BOOL MapHeader_IsTeleportAllowed(u32 param0);
-BOOL MapHeader_IsOnMainMatrix(u32 param0);
-BOOL MapHeader_IsPokemonCenter(u32 param0);
-BOOL MapHeader_IsCave(u32 param0);
-BOOL MapHeader_IsBuilding(u32 param0);
-BOOL MapHeader_IsOutdoors(u32 param0);
-BOOL sub_0203A2C8(u32 param0);
-BOOL MapHeader_IsUnionRoom(const u32 param0);
-BOOL MapHeader_HasFeebasTiles(const u32 param0);
-BOOL MapHeader_IsTrophyGarden(const u32 param0);
-BOOL MapHeader_IsAmitySquare(const u32 param0);
-BOOL MapHeader_IsAzureFluteAllowed(const u32 param0);
-BOOL MapHeader_IsPokemonCenter2F(const u32 param0);
-u32 MapHeader_GetMapEvolutionMethod(u32 param0);
+BOOL MapHeader_IsTeleportAllowed(u32 headerID);
+BOOL MapHeader_IsOnMainMatrix(u32 headerID);
+BOOL MapHeader_IsPokemonCenter(u32 headerID);
+BOOL MapHeader_IsCave(u32 headerID);
+BOOL MapHeader_IsBuilding(u32 headerID);
+BOOL MapHeader_IsOutdoors(u32 headerID);
+BOOL sub_0203A2C8(u32 headerID);
+BOOL MapHeader_IsUnionRoom(const u32 headerID);
+BOOL MapHeader_HasFeebasTiles(const u32 headerID);
+BOOL MapHeader_IsTrophyGarden(const u32 headerID);
+BOOL MapHeader_IsAmitySquare(const u32 headerID);
+BOOL MapHeader_IsAzureFluteAllowed(const u32 headerID);
+BOOL MapHeader_IsPokemonCenter2F(const u32 headerID);
+enum PokemonEvoMethod MapHeader_GetMapEvolutionMethod(u32 headerID);
 
-#endif // POKEPLATINUM_UNK_0203A024_H
+#endif // POKEPLATINUM_MAP_HEADER_H