atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved pokedex flags to constants files andadded constants to header of event_scripts

Browse source
This commit is contained in:
pkmnsnfrn 2024-08-14 19:24:55 -07:00
parent 458340e043
commit dc06321054
5 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
asm/macros/event.inc
View file

@ -2349,7 +2349,7 @@
@ The result is stored in VAR_RESULT @ The result is stored in VAR_RESULT
.macro getseenmon species:req .macro getseenmon species:req
setvar VAR_0x8005, \species setvar VAR_0x8005, \species
setvar VAR_0x8006, 0 setvar VAR_0x8006, FLAG_GET_SEEN
specialvar VAR_RESULT, Script_GetSetPokedexFlag specialvar VAR_RESULT, Script_GetSetPokedexFlag
.endm .endm
@ -2357,21 +2357,21 @@
@ The result is stored in VAR_RESULT @ The result is stored in VAR_RESULT
.macro getcaughtmon species:req .macro getcaughtmon species:req
setvar VAR_0x8005, \species setvar VAR_0x8005, \species
setvar VAR_0x8006, 1 setvar VAR_0x8006, FLAG_GET_CAUGHT
specialvar VAR_RESULT, Script_GetSetPokedexFlag specialvar VAR_RESULT, Script_GetSetPokedexFlag
.endm .endm
@ Sets the Pokédex Seen flag of the specified Pokemon @ Sets the Pokédex Seen flag of the specified Pokemon
.macro setseenmon species:req .macro setseenmon species:req
setvar VAR_0x8005, \species setvar VAR_0x8005, \species
setvar VAR_0x8006, 2 setvar VAR_0x8006, FLAG_SET_SEEN
specialvar VAR_RESULT, Script_GetSetPokedexFlag specialvar VAR_RESULT, Script_GetSetPokedexFlag
.endm .endm
@ Sets the Pokédex Caught flag of the specified Pokemon @ Sets the Pokédex Caught flag of the specified Pokemon
.macro setcaughtmon species:req .macro setcaughtmon species:req
setvar VAR_0x8005, \species setvar VAR_0x8005, \species
setvar VAR_0x8006, 3 setvar VAR_0x8006, FLAG_SET_CAUGHT
specialvar VAR_RESULT, Script_GetSetPokedexFlag specialvar VAR_RESULT, Script_GetSetPokedexFlag
.endm .endm

1
data/event_scripts.s
View file

@ -42,6 +42,7 @@
#include "constants/metatile_labels.h" #include "constants/metatile_labels.h"
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/party_menu.h" #include "constants/party_menu.h"
#include "constants/pokedex.h"
#include "constants/pokemon.h" #include "constants/pokemon.h"
#include "constants/roulette.h" #include "constants/roulette.h"
#include "constants/script_menu.h" #include "constants/script_menu.h"

14
include/constants/pokedex.h
View file

@ -1327,4 +1327,18 @@ enum {
#define DEX_HGSS_Y_BOTTOM_PADDING 4 #define DEX_HGSS_Y_BOTTOM_PADDING 4
#define DEX_HGSS_MEASUREMENT_X_PADDING 51 #define DEX_HGSS_MEASUREMENT_X_PADDING 51
enum
{
DEX_MODE_HOENN,
DEX_MODE_NATIONAL
};
enum
{
FLAG_GET_SEEN,
FLAG_GET_CAUGHT,
FLAG_SET_SEEN,
FLAG_SET_CAUGHT
};
#endif // GUARD_CONSTANTS_POKEDEX_H #endif // GUARD_CONSTANTS_POKEDEX_H

14
include/pokedex.h
View file

@ -4,20 +4,6 @@
extern u8 gUnusedPokedexU8; extern u8 gUnusedPokedexU8;
extern void (*gPokedexVBlankCB)(void); extern void (*gPokedexVBlankCB)(void);
enum
{
DEX_MODE_HOENN,
DEX_MODE_NATIONAL
};
enum
{
FLAG_GET_SEEN,
FLAG_GET_CAUGHT,
FLAG_SET_SEEN,
FLAG_SET_CAUGHT
};
void ResetPokedex(void); void ResetPokedex(void);
u16 GetNationalPokedexCount(u8); u16 GetNationalPokedexCount(u8);
u16 GetHoennPokedexCount(u8); u16 GetHoennPokedexCount(u8);

2
src/field_specials.c
View file

@ -30,6 +30,7 @@
#include "overworld.h" #include "overworld.h"
#include "party_menu.h" #include "party_menu.h"
#include "pokeblock.h" #include "pokeblock.h"
#include "pokedex.h"
#include "pokemon.h" #include "pokemon.h"
#include "pokemon_storage_system.h" #include "pokemon_storage_system.h"
#include "random.h" #include "random.h"
@ -68,7 +69,6 @@
#include "constants/metatile_labels.h" #include "constants/metatile_labels.h"
#include "palette.h" #include "palette.h"
#include "battle_util.h" #include "battle_util.h"
#include "pokedex.h"
#define TAG_ITEM_ICON 5500 #define TAG_ITEM_ICON 5500