diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/bg.h | 7 | ||||
| -rw-r--r-- | include/constants/pokemon.h | 4 | ||||
| -rw-r--r-- | include/link.h | 1 | ||||
| -rw-r--r-- | include/link_rfu.h | 2 | ||||
| -rw-r--r-- | include/pokemon_jump.h | 2 | ||||
| -rw-r--r-- | include/random.h | 5 | ||||
| -rw-r--r-- | include/task.h | 1 | ||||
| -rw-r--r-- | include/window.h | 2 |
8 files changed, 23 insertions, 1 deletions
diff --git a/include/bg.h b/include/bg.h index f6c307146..ca6264ca8 100644 --- a/include/bg.h +++ b/include/bg.h @@ -39,6 +39,13 @@ enum BG_ATTR_BASETILE = 10 }; +// Modes for ChangeBgX / ChangeBgY +enum { + BG_COORD_SET, + BG_COORD_ADD, + BG_COORD_SUB, +}; + enum AdjustBgMosaicMode { BG_MOSAIC_SET, diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 43a6231ca..43a3a59d4 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -225,6 +225,10 @@ #define EVO_MODE_ITEM_USE 2 #define EVO_MODE_ITEM_CHECK 3 // If an Everstone is being held, still want to show that the stone *could* be used on that Pokémon to evolve +#define MON_PIC_WIDTH 64 +#define MON_PIC_HEIGHT 64 +#define MON_PIC_SIZE (MON_PIC_WIDTH * MON_PIC_HEIGHT / 2) + // used by ShouldIgnoreDeoxysForm #define DEOXYS_CHECK_BATTLE_SPRITE 1 #define DEOXYS_CHECK_TRADE_MAIN 3 diff --git a/include/link.h b/include/link.h index e009c2724..e7dafadf6 100644 --- a/include/link.h +++ b/include/link.h @@ -58,6 +58,7 @@ #define LINKCMD_0x5FFF 0x5FFF #define LINKCMD_0x6666 0x6666 #define LINKCMD_0x7777 0x7777 +#define LINKCMD_COUNTDOWN 0x7FFF #define LINKCMD_CONT_BLOCK 0x8888 #define LINKCMD_0xAAAA 0xAAAA #define LINKCMD_0xAAAB 0xAAAB diff --git a/include/link_rfu.h b/include/link_rfu.h index 6d7e54129..7dac12fbb 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -6,6 +6,8 @@ #include "link.h" #include "AgbRfu_LinkManager.h" +#define RFUCMD_MASK 0xFF00 + #define RFUCMD_SEND_PACKET 0x2F00 #define RFUCMD_READY_CLOSE_LINK 0x5f00 #define RFUCMD_READY_EXIT_STANDBY 0x6600 diff --git a/include/pokemon_jump.h b/include/pokemon_jump.h index fa4105a0e..20f96ec10 100644 --- a/include/pokemon_jump.h +++ b/include/pokemon_jump.h @@ -3,7 +3,7 @@ #include "main.h" -void ResetPokeJumpResults(void); +void ResetPokemonJumpRecords(void); bool32 IsSpeciesAllowedInPokemonJump(u16 species); void StartPokemonJump(u16 species, MainCallback callback); diff --git a/include/random.h b/include/random.h index 139316f9d..bf4af42d0 100644 --- a/include/random.h +++ b/include/random.h @@ -13,6 +13,11 @@ u16 Random2(void); //Returns a 32-bit pseudorandom number #define Random32() (Random() | (Random() << 16)) +// The number 1103515245 comes from the example implementation of rand and srand +// in the ISO C standard. +#define ISO_RANDOMIZE1(val)(1103515245 * (val) + 24691) +#define ISO_RANDOMIZE2(val)(1103515245 * (val) + 12345) + //Sets the initial seed value of the pseudorandom number generator void SeedRng(u16 seed); void SeedRng2(u16 seed); diff --git a/include/task.h b/include/task.h index fd7f5a4e1..2f9f1c0d8 100644 --- a/include/task.h +++ b/include/task.h @@ -5,6 +5,7 @@ #define HEAD_SENTINEL 0xFE #define TAIL_SENTINEL 0xFF +#define TASK_NONE TAIL_SENTINEL #define NUM_TASKS 16 #define NUM_TASK_DATA 16 diff --git a/include/window.h b/include/window.h index 3cb904626..1c3d9be9c 100644 --- a/include/window.h +++ b/include/window.h @@ -41,6 +41,8 @@ struct WindowTemplate 0, \ } +#define WINDOW_NONE 0xFF + struct Window { struct WindowTemplate window; |