battle 1 is decompiled

7 files changed, 98 insertions, 13 deletions

diff --git a/include/battle.h b/include/battle.h
index 7c8c81f52..f40ba3e8a 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -8,6 +8,7 @@
 #include "battle_ai_switch_items.h"
 #include "battle_gfx_sfx_util.h"
 #include "battle_util2.h"
+#include "battle_bg.h"
 
 /*
     Banks are a name given to what could be called a 'battlerId' or 'monControllerId'.
@@ -298,7 +299,6 @@ struct TrainerMonNoItemDefaultMoves
     u16 species;
 };
 
-u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg);
 u8 GetBankSide(u8 bank);
 
 struct TrainerMonItemDefaultMoves
@@ -867,16 +867,6 @@ struct BattleScripting
 
 extern struct BattleScripting gBattleScripting;
 
-// functions
-
-// battle_1
-void LoadBattleTextboxAndBackground(void);
-void LoadBattleEntryBackground(void);
-void ApplyPlayerChosenFrameToBattleMenu(void);
-bool8 LoadChosenBattleElement(u8 caseId);
-void DrawMainBattleBackground(void);
-void task00_0800F6FC(u8 taskId);
-
 enum
 {
     BACK_PIC_BRENDAN,
diff --git a/include/battle_bg.h b/include/battle_bg.h
new file mode 100644
index 000000000..7fc09fbf7
--- /dev/null
+++ b/include/battle_bg.h
@@ -0,0 +1,13 @@
+#ifndef GUARD_BATTLE_BG_H
+#define GUARD_BATTLE_BG_H
+
+void sub_8035658(void);
+void sub_80356D0(void);
+void ApplyPlayerChosenFrameToBattleMenu(void);
+void DrawMainBattleBackground(void);
+void LoadBattleTextboxAndBackground(void);
+void sub_8035D74(u8 taskId);
+void LoadBattleEntryBackground(void);
+bool8 LoadChosenBattleElement(u8 caseId);
+
+#endif // GUARD_BATTLE_BG_H
diff --git a/include/gba/types.h b/include/gba/types.h
index e9a380023..9f63489aa 100644
--- a/include/gba/types.h
+++ b/include/gba/types.h
@@ -49,7 +49,7 @@ struct OamData
              u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode
              u32 size:2;
 
-    /*0x04*/ u16 tileNum:10;    // 0x33F
+    /*0x04*/ u16 tileNum:10;    // 0x3FF
              u16 priority:2;    // 0x400, 0x800 -> 0xC00
              u16 paletteNum:4;
     /*0x06*/ u16 affineParam;
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index ed5054b7d..abab1b5c4 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -39,7 +39,7 @@ enum
     MAP_BATTLE_SCENE_PHOEBE,       // 5
     MAP_BATTLE_SCENE_GLACIA,       // 6
     MAP_BATTLE_SCENE_DRAKE,        // 7
-    MAP_BATTLE_SCENE_BATTLE_TOWER, // 8
+    MAP_BATTLE_SCENE_FRONTIER,     // 8
 };
 
 typedef void (*TilesetCB)(void);
diff --git a/include/graphics.h b/include/graphics.h
index 4a522a429..95429230a 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -136,4 +136,82 @@ extern const u8 gUnknown_08DDB020[];
 extern const u8 gUnknown_08DDB2C4[];
 extern const u16 gUnknown_08DDAFE0[];
 
+extern const u8 gBattleTextboxTiles[];
+extern const u8 gBattleTextboxTilemap[];
+extern const u8 gBattleTextboxPalette[];
+extern const u8 gUnknown_08D778F0[];
+extern const u8 gUnknown_08D77B0C[];
+extern const u8 gUnknown_08D77AE4[];
+extern const u8 gUnknown_08D779D8[];
+extern const u8 gUnknown_08D857A8[];
+extern const u8 gUnknown_08D85A1C[];
+extern const u8 gUnknown_08D85600[];
+
+// battle terrains
+extern const u8 gBattleTerrainTiles_TallGrass[];
+extern const u8 gBattleTerrainTilemap_TallGrass[];
+extern const u8 gBattleTerrainAnimTiles_TallGrass[];
+extern const u8 gBattleTerrainAnimTilemap_TallGrass[];
+extern const u8 gBattleTerrainPalette_TallGrass[];
+extern const u8 gBattleTerrainTiles_LongGrass[];
+extern const u8 gBattleTerrainTilemap_LongGrass[];
+extern const u8 gBattleTerrainAnimTiles_LongGrass[];
+extern const u8 gBattleTerrainAnimTilemap_LongGrass[];
+extern const u8 gBattleTerrainPalette_LongGrass[];
+extern const u8 gBattleTerrainTiles_Sand[];
+extern const u8 gBattleTerrainTilemap_Sand[];
+extern const u8 gBattleTerrainAnimTiles_Sand[];
+extern const u8 gBattleTerrainAnimTilemap_Sand[];
+extern const u8 gBattleTerrainPalette_Sand[];
+extern const u8 gBattleTerrainTiles_Underwater[];
+extern const u8 gBattleTerrainTilemap_Underwater[];
+extern const u8 gBattleTerrainAnimTiles_Underwater[];
+extern const u8 gBattleTerrainAnimTilemap_Underwater[];
+extern const u8 gBattleTerrainPalette_Underwater[];
+extern const u8 gBattleTerrainTiles_Water[];
+extern const u8 gBattleTerrainTilemap_Water[];
+extern const u8 gBattleTerrainAnimTiles_Water[];
+extern const u8 gBattleTerrainAnimTilemap_Water[];
+extern const u8 gBattleTerrainPalette_Water[];
+extern const u8 gBattleTerrainTiles_PondWater[];
+extern const u8 gBattleTerrainTilemap_PondWater[];
+extern const u8 gBattleTerrainAnimTiles_PondWater[];
+extern const u8 gBattleTerrainAnimTilemap_PondWater[];
+extern const u8 gBattleTerrainPalette_PondWater[];
+extern const u8 gBattleTerrainTiles_Rock[];
+extern const u8 gBattleTerrainTilemap_Rock[];
+extern const u8 gBattleTerrainAnimTiles_Rock[];
+extern const u8 gBattleTerrainAnimTilemap_Rock[];
+extern const u8 gBattleTerrainPalette_Rock[];
+extern const u8 gBattleTerrainTiles_Cave[];
+extern const u8 gBattleTerrainTilemap_Cave[];
+extern const u8 gBattleTerrainAnimTiles_Cave[];
+extern const u8 gBattleTerrainAnimTilemap_Cave[];
+extern const u8 gBattleTerrainPalette_Cave[];
+extern const u8 gBattleTerrainTiles_Building[];
+extern const u8 gBattleTerrainTilemap_Building[];
+extern const u8 gBattleTerrainAnimTiles_Building[];
+extern const u8 gBattleTerrainAnimTilemap_Building[];
+extern const u8 gBattleTerrainPalette_Building[];
+extern const u8 gBattleTerrainPalette_Plain[];
+extern const u8 gBattleTerrainPalette_Frontier[];
+extern const u8 gBattleTerrainTiles_Stadium[];
+extern const u8 gBattleTerrainTilemap_Stadium[];
+extern const u8 gBattleTerrainTiles_Rayquaza[];
+extern const u8 gBattleTerrainTilemap_Rayquaza[];
+extern const u8 gBattleTerrainAnimTiles_Rayquaza[];
+extern const u8 gBattleTerrainAnimTilemap_Rayquaza[];
+extern const u8 gBattleTerrainPalette_Rayquaza[];
+extern const u8 gBattleTerrainPalette_Kyogre[];
+extern const u8 gBattleTerrainPalette_Groudon[];
+extern const u8 gBattleTerrainPalette_BuildingGym[];
+extern const u8 gBattleTerrainPalette_BuildingLeader[];
+extern const u8 gBattleTerrainPalette_StadiumAqua[];
+extern const u8 gBattleTerrainPalette_StadiumMagma[];
+extern const u8 gBattleTerrainPalette_StadiumSidney[];
+extern const u8 gBattleTerrainPalette_StadiumPhoebe[];
+extern const u8 gBattleTerrainPalette_StadiumGlacia[];
+extern const u8 gBattleTerrainPalette_StadiumDrake[];
+extern const u8 gBattleTerrainPalette_StadiumWallace[];
+
 #endif //GUARD_GRAPHICS_H
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index c52184972..dad819c51 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -14,5 +14,6 @@ void sub_8197434(u8 a0, u8 a1);
 void SetStandardWindowBorderStyle(u8 a0, u8 a1);
 void sub_8197930(void);
 u8 GetPlayerTextSpeed(void);
+void sub_81978B0(u16 arg0);
 
 #endif // GUARD_NEW_MENU_HELPERS_H
diff --git a/include/strings.h b/include/strings.h
index a2745d382..9c54e1b6e 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -84,5 +84,8 @@ extern const u8 gText_RegisteredDataDeleted[];
 extern const u8 gUnknown_085EA79D[];
 extern const u8 gText_PkmnFainted3[];
 extern const u8 gText_Coins[];
+extern const u8 gText_Draw[];
+extern const u8 gText_Loss[];
+extern const u8 gText_Win[];
 
 #endif //GUARD_STRINGS_H