14 files changed, 68 insertions, 54 deletions
diff --git a/include/cereader_tool.h b/include/cereader_tool.h
index 5ae797ac0..6275eaabf 100644
--- a/include/cereader_tool.h
+++ b/include/cereader_tool.h
@@ -25,11 +25,12 @@ struct TrainerTowerFloor
     /* 0x3DC */ u32 checksum;
 };
 
-struct Unk_203F458_Header
+struct EReaderTrainerHillSetSubstruct
 {
-    u8 unk0;
-    u8 unk1;
-    u32 unk4;
+    u8 count;
+    u8 id;
+    u16 dummy;
+    u32 checksum;
 };
 
 struct EReaderTrainerHillSet
@@ -41,7 +42,9 @@ struct EReaderTrainerHillSet
     struct TrainerTowerFloor floors[8];
 };
 
-bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * a0);
-bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * a0);
+bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * ttdata);
+bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerHillSet * ttdata);
+bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerHillSet * ttdata);
+u8 sub_815D654(void);
 
 #endif //GUARD_CEREADER_TOOL_H
diff --git a/include/config.h b/include/config.h
index 491eadf13..70d76ca53 100644
--- a/include/config.h
+++ b/include/config.h
@@ -11,9 +11,25 @@
 // #define NDEBUG
 
 // Fire Red likely forgot to define NDEBUG/NOAGBPRN before release, leading
-// to the inclusion of asserts in the retail ROM. Don't try to re-enable this yet
-// since not all baseroms and pointers have been dumped yet and will result in
-// a broken ROM.
+// to the inclusion of asserts in the retail ROM.
+
+// Define the game version for use elsewhere
+#if defined(FIRERED)
+#define GAME_VERSION VERSION_FIRE_RED
+#elif defined(LEAFGREEN)
+#define GAME_VERSION VERSION_LEAF_GREEN
+#else
+#error unknown version
+#endif
+
+// rev1 renamed the source folder for reasons
+#if REVISION == 0
+#define CODE_ROOT "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/"
+#else
+#define CODE_ROOT "C:/WORK/POKeFRLG/Src/pm_lgfr_ose/source/"
+#endif
+
+#define ABSPATH(x) (CODE_ROOT x)
 
 #ifdef ENGLISH
 #define UNITS_IMPERIAL
diff --git a/include/constants/object_events.h b/include/constants/object_events.h
index c1793827e..60783a793 100644
--- a/include/constants/object_events.h
+++ b/include/constants/object_events.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_CONSTANTS_MAP_OBJECTS_H
-#define GUARD_CONSTANTS_MAP_OBJECTS_H
+#ifndef GUARD_CONSTANTS_OBJECT_EVENTS_H
+#define GUARD_CONSTANTS_OBJECT_EVENTS_H
 
 #define OBJECT_EVENT_GFX_RED_NORMAL 0
 #define OBJECT_EVENT_GFX_RED_BIKE 1
@@ -183,4 +183,4 @@
 #define TRACKS_FOOT       1
 #define TRACKS_BIKE_TIRE  2
 
-#endif  // GUARD_CONSTANTS_MAP_OBJECTS_H
+#endif  // GUARD_CONSTANTS_OBJECT_EVENTS_H
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 9c642bb36..e7ec52fd1 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_EASYCHAT_H
-#define GUARD_EASYCHAT_H
+#ifndef GUARD_EASY_CHAT_H
+#define GUARD_EASY_CHAT_H
 
 #include "global.h"
 #include "constants/easy_chat.h"
@@ -45,6 +45,6 @@ u16 GetDisplayedWordByIndex(u16 index);
 u16 GetNumDisplayedWords(void);
 const u8 *GetEasyChatWordGroupName(u8);
 u8 *CopyEasyChatWordPadded(u8 *, u16, u16);
-void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback); // TODO: currently in link_rfu.s. further file split needed? 
+void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback);
 
-#endif // GUARD_EASYCHAT_H
+#endif // GUARD_EASY_CHAT_H
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 5b7c3f784..b81a61664 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -104,5 +104,6 @@ void sub_8069058(u8, u8);
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 extern const struct SpritePalette gUnknown_83A5348;
 extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[];
+extern const struct OamData gObjectEventBaseOam_32x32;
 
 #endif // GUARD_EVENT_OBJECT_MOVEMENT_H
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 2ad1485c2..b899a217b 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -708,9 +708,8 @@ extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni5[];
 extern const u8 gOtherText_NewName[];
 extern const u8 gNameChoice_Green[];
 extern const u8 gNameChoice_Red[];
-extern const u8 gNameChoice_Red[];
-extern const u8 gNameChoice_Fire[];
 extern const u8 gNameChoice_Fire[];
+extern const u8 gNameChoice_Leaf[];
 extern const u8 gNameChoice_Gary[];
 extern const u8 gNameChoice_Kaz[];
 extern const u8 gNameChoice_Toru[];
diff --git a/include/graphics.h b/include/graphics.h
index 89541e748..dc0389420 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4297,17 +4297,17 @@ extern const u32 gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet[];
 extern const u32 gBattleAnimSpritePal_FlyingDirt[];
 
 // title_screen
-extern const u16 gGraphics_TitleScreen_PokemonFireRedLogoPals[];
-extern const u8 gGraphics_TitleScreen_PokemonFireRedLogoTiles[];
-extern const u8 gGraphics_TitleScreen_PokemonFireRedLogoMap[];
-extern const u16 gGraphics_TitleScreen_CharizardPals[];
-extern const u8 gGraphics_TitleScreen_CharizardTiles[];
-extern const u8 gGraphics_TitleScreen_CharizardMap[];
+extern const u16 gGraphics_TitleScreen_GameTitleLogoPals[];
+extern const u8 gGraphics_TitleScreen_GameTitleLogoTiles[];
+extern const u8 gGraphics_TitleScreen_GameTitleLogoMap[];
+extern const u16 gGraphics_TitleScreen_BoxArtMonPals[];
+extern const u8 gGraphics_TitleScreen_BoxArtMonTiles[];
+extern const u8 gGraphics_TitleScreen_BoxArtMonMap[];
 extern u16 gGraphics_TitleScreen_BackgroundPals[]; // If this is const, title_screen.c does not match
 extern const u8 gGraphics_TitleScreen_CopyrightPressStartTiles[];
 extern const u8 gGraphics_TitleScreen_CopyrightPressStartMap[];
-extern const u16 gGraphics_TitleScreen_FirePals[];
-extern const u8 gGraphics_TitleScreen_BlankObjTiles[];
+extern const u16 gGraphics_TitleScreen_FireOrLeafPals[];
+extern const u32 gGraphics_TitleScreen_BlankObjTiles[];
 
 // battle_gfx_sfx_util
 extern const u32 gHealthboxSinglesPlayerGfx[];
diff --git a/include/load_save.h b/include/load_save.h
index 6162c30b9..10d1083a8 100644
--- a/include/load_save.h
+++ b/include/load_save.h
@@ -28,5 +28,6 @@ void ApplyNewEncryptionKeyToWord(u32 * word, u32 encryptionKey);
 void ApplyNewEncryptionKeyToHword(u16 * hword, u32 encryptionKey);
 void ClearContinueGameWarpStatus2(void);
 void SetContinueGameWarpStatusToDynamicWarp(void);
+void sub_804C1AC(void);
 
 #endif // GUARD_LOAD_SAVE_H
diff --git a/include/overworld.h b/include/overworld.h
index 08f9be912..845550a17 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -146,4 +146,6 @@ void c2_8056854(void);
 void sub_8054F38(u32 newKey);
 void sub_8055778(int);
 
+void sub_8055738(u8 loc);
+
 #endif //GUARD_OVERWORLD_H
diff --git a/include/pokedex_screen.h b/include/pokedex_screen.h
index dfcbda05a..128fc1ad3 100644
--- a/include/pokedex_screen.h
+++ b/include/pokedex_screen.h
@@ -1,6 +1,20 @@
 #ifndef GUARD_POKEDEX_SCREEN_H
 #define GUARD_POKEDEX_SCREEN_H
 
+#define DEX_CATEGORY_GRASSLAND     0
+#define DEX_CATEGORY_FOREST        1
+#define DEX_CATEGORY_WATERS_EDGE   2
+#define DEX_CATEGORY_SEA           3
+#define DEX_CATEGORY_CAVE          4
+#define DEX_CATEGORY_MOUNTAIN      5
+#define DEX_CATEGORY_ROUGH_TERRAIN 6
+#define DEX_CATEGORY_URBAN         7
+#define DEX_CATEGORY_RARE          8
+
+#include "pokedex.h"
+
+extern const struct PokedexEntry gPokedexEntries[];
+
 void CB2_OpenPokedexFromStartMenu(void);
 s8 sub_8104AB0(u16 nationalDexNo, u8 caseId, bool8 indexIsSpecies);
 
diff --git a/include/rom_818CFC8.h b/include/rom_818CFC8.h
deleted file mode 100644
index 048825778..000000000
--- a/include/rom_818CFC8.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Created by Scott Norton on 9/6/17.
-//
-
-#ifndef GUARD_ROM_818CFC8_H
-#define GUARD_ROM_818CFC8_H
-
-#include "global.h"
-
-bool8 InBattlePyramid(void);
-u8 sub_81AAA40(void);
-
-#endif //GUARD_ROM_818CFC8_H
diff --git a/include/rom_81BE66C.h b/include/rom_81BE66C.h
deleted file mode 100644
index 17b02ffa4..000000000
--- a/include/rom_81BE66C.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// Created by Scott Norton on 9/6/17.
-//
-
-#ifndef GUARD_ROM_81BE66C_H
-#define GUARD_ROM_81BE66C_H
-
-#include "global.h"
-
-bool32 InTrainerHill(void);
-bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *);
-u32 sub_81D427C(void);
-
-#endif //GUARD_ROM_81BE66C_H
diff --git a/include/strings.h b/include/strings.h
index bc1aee889..90fd49b52 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -777,6 +777,11 @@ extern const u8 gText_Clefairy_500Coins[];
 extern const u8 gText_Dratini_2800Coins[];
 extern const u8 gText_Scyther_5500Coins[];
 extern const u8 gText_Porygon_9999Coins[];
+extern const u8 gText_Abra_120Coins[];
+extern const u8 gText_Clefairy_750Coins[];
+extern const u8 gText_Pinsir_2500Coins[];
+extern const u8 gText_Dratini_4600Coins[];
+extern const u8 gText_Porygon_6500Coins[];
 extern const u8 gText_NoThanks_2[];
 extern const u8 gText_HelixFossil[];
 extern const u8 gText_DomeFossil[];
diff --git a/include/trade.h b/include/trade.h
index b3b1de23b..030a03a83 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -11,7 +11,7 @@ extern u8 gSelectedTradeMonPositions[2];
 extern const u16 gUnknown_826601C[];
 void CB2_ReturnFromLinkTrade(void);
 s32 sub_804FB34(void);
-s32 CanRegisterMonForTradingBoard(struct UnkLinkRfuStruct_02022B14Substruct rfuPlayer, u16 species2, u16 species, u8 isObedientBitSet); // TODO: currently in link_rfu_2.s. further file split needed? 
+s32 CanRegisterMonForTradingBoard(struct UnkLinkRfuStruct_02022B14Substruct rfuPlayer, u16 species2, u16 species, u8 isObedientBitSet);
 s32 GetUnionRoomTradeMessageId(struct UnkLinkRfuStruct_02022B14Substruct rfuPlayer, struct UnkLinkRfuStruct_02022B14Substruct rfuPartner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, u8 isObedientBitSet);
 
 #endif //GUARD_TRADE_H