Multiple changes

- BATTLESTRINGS_ID_ADDER ->BATTLESTRINGS_TABLE_START
- Defines for battle windows
- MAIL_NONE
- MON_DATA_FILLER -> MON_DATA_UNUSED_RIBBONS
- Usage of BattlePutTextOnWindow with masks
- PlayCry1 -> PlayCry_Normal
- BlendPalettes(0xFFFFFFFF -> BlendPalettes(PALETTES_ALL
- FillPalette(0 -> FillPalette(RGB_BLACK

include/battle_main.h

@@ -69,7 +69,7 @@ void VBlankCB_Battle(void);
 void SpriteCB_VsLetterDummy(struct Sprite *sprite);
 void SpriteCB_VsLetterInit(struct Sprite *sprite);
 void CB2_InitEndLinkBattle(void);
-u32 GetBattleBgAttribute(u8 arrayId, u8 caseId);
+u32 GetBattleBgTemplateData(u8 arrayId, u8 caseId);
 void SpriteCB_EnemyMon(struct Sprite *sprite);
 void SpriteCallbackDummy_2(struct Sprite *sprite);
 void SpriteCB_FaintOpponentMon(struct Sprite *sprite);

include/battle_string_ids.h

@@ -1,8 +1,6 @@
 #ifndef GUARD_BATTLE_STRING_IDS_H
 #define GUARD_BATTLE_STRING_IDS_H
 
-#define BATTLESTRINGS_ID_ADDER  12 // all battlestrings have its ID + 12, because first 5 are reserved
-
 #define STRINGID_INTROMSG   0
 #define STRINGID_INTROSENDOUT   1
 #define STRINGID_RETURNMON  2
@@ -389,4 +387,9 @@
 
 #define BATTLESTRINGS_COUNT     374
 
+// This is the string id that gBattleStringsTable starts with.
+// String ids before this (e.g. STRINGID_INTROMSG) are not in the table,
+// and are instead handled explicitly by BufferStringBattle.
+#define BATTLESTRINGS_TABLE_START  STRINGID_TRAINER1LOSETEXT
+
 #endif // GUARD_BATTLE_STRING_IDS_H

include/constants/battle.h

@@ -314,4 +314,34 @@
 #define BATTLE_RUN_FORBIDDEN      1
 #define BATTLE_RUN_FAILURE        2
 
+// Window Ids for sStandardBattleWindowTemplates
+#define B_WIN_MSG                 0
+#define B_WIN_ACTION_PROMPT       1 // "What will {x} do?"
+#define B_WIN_ACTION_MENU         2 // "Fight/Pokémon/Bag/Run" menu
+#define B_WIN_MOVE_NAME_1         3 // Top left
+#define B_WIN_MOVE_NAME_2         4 // Top right
+#define B_WIN_MOVE_NAME_3         5 // Bottom left
+#define B_WIN_MOVE_NAME_4         6 // Bottom right
+#define B_WIN_PP                  7
+#define B_WIN_MOVE_TYPE           8
+#define B_WIN_PP_REMAINING        9
+#define B_WIN_DUMMY              10
+#define B_WIN_SWITCH_PROMPT      11 // "Switch which?"
+#define B_WIN_YESNO              14
+#define B_WIN_VS_PLAYER          15
+#define B_WIN_VS_OPPONENT        16
+#define B_WIN_VS_MULTI_PLAYER_1  17
+#define B_WIN_VS_MULTI_PLAYER_2  18
+#define B_WIN_VS_MULTI_PLAYER_3  19
+#define B_WIN_VS_MULTI_PLAYER_4  20
+#define B_WIN_VS_OUTCOME_DRAW    21
+#define B_WIN_VS_OUTCOME_LEFT    22
+#define B_WIN_VS_OUTCOME_RIGHT   23
+#define B_WIN_OAK_OLD_MAN        24
+
+#define B_TEXT_FLAG_NONE                (0 << 0)
+#define B_TEXT_FLAG_NPC_CONTEXT_FONT    (1 << 6)
+#define B_TEXT_FLAG_WINDOW_CLEAR        (1 << 7)
+#define B_TEXT_FLAG_BOTH                (B_TEXT_FLAG_NPC_CONTEXT_FONT | B_TEXT_FLAG_WINDOW_CLEAR)
+
 #endif // GUARD_CONSTANTS_BATTLE_H

include/constants/global.h

@@ -30,6 +30,7 @@
 #define GAME_LANGUAGE (LANGUAGE_ENGLISH)
 #endif
 
+// capacities of various saveblock objects
 #define DAYCARE_MON_COUNT   2
 #define PC_ITEMS_COUNT      30
 #define BAG_ITEMS_COUNT     42
@@ -53,6 +54,9 @@
 #define POCKET_BERRY_POUCH  5
 #define NUM_BAG_POCKETS 5
 
+// Contests
+#define CONTEST_CATEGORIES_COUNT  5
+
 // string lengths
 #define ITEM_NAME_LENGTH 14
 #define POKEMON_NAME_LENGTH 10

include/constants/items.h

@@ -447,6 +447,7 @@
 #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY
 #define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY
 #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1))
+#define MAIL_NONE 0xFF
 
 #define NUM_TECHNICAL_MACHINES 50
 #define NUM_HIDDEN_MACHINES     8

include/constants/pokemon.h

@@ -81,7 +81,7 @@
 #define MON_DATA_NATIONAL_RIBBON   76
 #define MON_DATA_EARTH_RIBBON      77
 #define MON_DATA_WORLD_RIBBON      78
-#define MON_DATA_FILLER            79
+#define MON_DATA_UNUSED_RIBBONS    79
 #define MON_DATA_EVENT_LEGAL       80
 #define MON_DATA_KNOWN_MOVES       81
 #define MON_DATA_RIBBON_COUNT      82

include/evolution_graphics.h

@@ -5,12 +5,12 @@
 
 void LoadEvoSparkleSpriteAndPal(void);
 
-u8 LaunchTask_PreEvoSparklesSet1(u16 arg0);
-u8 LaunchTask_PreEvoSparklesSet2(void);
-u8 LaunchTask_PostEvoSparklesSet1(void);
-u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 species);
-u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 species);
-u8 LaunchTask_PrePostEvoMonSprites(u8 preEvoSpriteId, u8 postEvoSpriteId);
+u8 EvolutionSparkles_SpiralUpward(u16 arg0);
+u8 EvolutionSparkles_ArcDown(void);
+u8 EvolutionSparkles_CircleInward(void);
+u8 EvolutionSparkles_SprayAndFlash(u16 species);
+u8 EvolutionSparkles_SprayAndFlash_Trade(u16 species);
+u8 CycleEvolutionMonSprite(u8 preEvoSpriteId, u8 postEvoSpriteId);
 
 #define EvoGraphicsTaskEvoStop  data[8]
 

include/pokemon.h

@@ -73,7 +73,7 @@ struct PokemonSubstruct3
  /* 0x0B */ u32 nationalRibbon:1;
  /* 0x0B */ u32 earthRibbon:1;
  /* 0x0B */ u32 worldRibbon:1; // distributed during Pokémon Festa '04 and '05 to tournament winners
- /* 0x0B */ u32 filler:4;
+ /* 0x0B */ u32 unusedRibbons:4; // discarded in Gen 4
  /* 0x0B */ u32 eventLegal:1; // controls Mew & Deoxys obedience; if set, Pokémon is a fateful encounter in FRLG & Gen 4+ summary screens; set for in-game event island legendaries, some distributed events, and Pokémon from XD: Gale of Darkness.
 };
 

include/sound.h

@@ -24,7 +24,7 @@ bool8 IsBGMPausedOrStopped(void);
 void FadeInBGM(u8 speed);
 void FadeOutBGM(u8 speed);
 bool8 IsBGMStopped(void);
-void PlayCry1(u16 species, s8 pan);
+void PlayCry_Normal(u16 species, s8 pan);
 void PlayCry2(u16 species, s8 pan, s8 volume, u8 priority);
 void PlayCry3(u16 species, s8 pan, u8 mode);
 void PlayCry4(u16 species, s8 pan, u8 mode);

include/trade_scene.h

@@ -9,7 +9,7 @@ u16 GetInGameTradeSpeciesInfo(void);
 u16 GetTradeSpecies(void);
 void InitTradeSequenceBgGpuRegs(void);
 void LinkTradeDrawWindow(void);
-void LoadTradeAnimGfx(void);
+void InitTradeBg(void);
 
 extern const u16 gTradeOrHatchMonShadowTilemap[];
 extern const struct WindowTemplate gTradeEvolutionSceneYesNoWindowTemplate;