dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document PLAYER_HAS constants, consolidate poke constants

Browse Source
This commit is contained in:
GriffinR
2019-09-17 15:24:44 -04:00
committed by huderlem
parent 459fca289c
commit 80f58f7b24
7 changed files with 219 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+1
View File
@@ -16,6 +16,7 @@
#include "constants/map_scripts.h" #include "constants/map_scripts.h"
#include "constants/maps.h" #include "constants/maps.h"
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/trainers.h" #include "constants/trainers.h"
data/scripts/cable_club.inc
+2 -2
View File
@@ -392,7 +392,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23
OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E
special HasEnoughMonsForDoubleBattle special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, 0 compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_276F47 goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_276F47
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
goto OldaleTown_PokemonCenter_2F_EventScript_276F60 goto OldaleTown_PokemonCenter_2F_EventScript_276F60
@@ -1174,7 +1174,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E
OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899 OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899
special HasEnoughMonsForDoubleBattle special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, 0 compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_2778B2 goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_2778B2
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
goto OldaleTown_PokemonCenter_2F_EventScript_277931 goto OldaleTown_PokemonCenter_2F_EventScript_277931
data/scripts/trainer_battle.inc
+2 -2
View File
@@ -26,7 +26,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 827138A
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_ne EventScript_NoDoubleTrainerBattle goto_if_ne EventScript_NoDoubleTrainerBattle
special HasEnoughMonsForDoubleBattle special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, 0 compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne EventScript_NotEnoughMonsForDoubleBattle goto_if_ne EventScript_NotEnoughMonsForDoubleBattle
special SetUpTrainerEncounterMusic special SetUpTrainerEncounterMusic
special SetUpTrainerMovement special SetUpTrainerMovement
@@ -69,7 +69,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 82713F8
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq EventScript_NoDoubleRematchTrainerBattle goto_if_eq EventScript_NoDoubleRematchTrainerBattle
special HasEnoughMonsForDoubleBattle special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, 0 compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle
special SetUpTrainerEncounterMusic special SetUpTrainerEncounterMusic
special SetUpTrainerMovement special SetUpTrainerMovement
include/constants/pokemon.h
+154 -20
View File
@@ -2,26 +2,26 @@
#define GUARD_CONSTANTS_POKEMON_H #define GUARD_CONSTANTS_POKEMON_H
// Pokemon types // Pokemon types
#define TYPE_NONE 0xFF #define TYPE_NONE 255
#define TYPE_NORMAL 0x00 #define TYPE_NORMAL 0
#define TYPE_FIGHTING 0x01 #define TYPE_FIGHTING 1
#define TYPE_FLYING 0x02 #define TYPE_FLYING 2
#define TYPE_POISON 0x03 #define TYPE_POISON 3
#define TYPE_GROUND 0x04 #define TYPE_GROUND 4
#define TYPE_ROCK 0x05 #define TYPE_ROCK 5
#define TYPE_BUG 0x06 #define TYPE_BUG 6
#define TYPE_GHOST 0x07 #define TYPE_GHOST 7
#define TYPE_STEEL 0x08 #define TYPE_STEEL 8
#define TYPE_MYSTERY 0x09 #define TYPE_MYSTERY 9
#define TYPE_FIRE 0x0a #define TYPE_FIRE 10
#define TYPE_WATER 0x0b #define TYPE_WATER 11
#define TYPE_GRASS 0x0c #define TYPE_GRASS 12
#define TYPE_ELECTRIC 0x0d #define TYPE_ELECTRIC 13
#define TYPE_PSYCHIC 0x0e #define TYPE_PSYCHIC 14
#define TYPE_ICE 0x0f #define TYPE_ICE 15
#define TYPE_DRAGON 0x10 #define TYPE_DRAGON 16
#define TYPE_DARK 0x11 #define TYPE_DARK 17
#define NUMBER_OF_MON_TYPES 0x12 #define NUMBER_OF_MON_TYPES 18
// Pokemon egg groups // Pokemon egg groups
@@ -85,4 +85,138 @@
// Shiny odds // Shiny odds
#define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536 #define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536
// Mon Data
#define MON_DATA_PERSONALITY 0
#define MON_DATA_OT_ID 1
#define MON_DATA_NICKNAME 2
#define MON_DATA_LANGUAGE 3
#define MON_DATA_SANITY_IS_BAD_EGG 4
#define MON_DATA_SANITY_HAS_SPECIES 5
#define MON_DATA_SANITY_IS_EGG 6
#define MON_DATA_OT_NAME 7
#define MON_DATA_MARKINGS 8
#define MON_DATA_CHECKSUM 9
#define MON_DATA_ENCRYPT_SEPARATOR 10
#define MON_DATA_SPECIES 11
#define MON_DATA_HELD_ITEM 12
#define MON_DATA_MOVE1 13
#define MON_DATA_MOVE2 14
#define MON_DATA_MOVE3 15
#define MON_DATA_MOVE4 16
#define MON_DATA_PP1 17
#define MON_DATA_PP2 18
#define MON_DATA_PP3 19
#define MON_DATA_PP4 20
#define MON_DATA_PP_BONUSES 21
#define MON_DATA_COOL 22
#define MON_DATA_BEAUTY 23
#define MON_DATA_CUTE 24
#define MON_DATA_EXP 25
#define MON_DATA_HP_EV 26
#define MON_DATA_ATK_EV 27
#define MON_DATA_DEF_EV 28
#define MON_DATA_SPEED_EV 29
#define MON_DATA_SPATK_EV 30
#define MON_DATA_SPDEF_EV 31
#define MON_DATA_FRIENDSHIP 32
#define MON_DATA_SMART 33
#define MON_DATA_POKERUS 34
#define MON_DATA_MET_LOCATION 35
#define MON_DATA_MET_LEVEL 36
#define MON_DATA_MET_GAME 37
#define MON_DATA_POKEBALL 38
#define MON_DATA_HP_IV 39
#define MON_DATA_ATK_IV 40
#define MON_DATA_DEF_IV 41
#define MON_DATA_SPEED_IV 42
#define MON_DATA_SPATK_IV 43
#define MON_DATA_SPDEF_IV 44
#define MON_DATA_IS_EGG 45
#define MON_DATA_ABILITY_NUM 46
#define MON_DATA_TOUGH 47
#define MON_DATA_SHEEN 48
#define MON_DATA_OT_GENDER 49
#define MON_DATA_COOL_RIBBON 50
#define MON_DATA_BEAUTY_RIBBON 51
#define MON_DATA_CUTE_RIBBON 52
#define MON_DATA_SMART_RIBBON 53
#define MON_DATA_TOUGH_RIBBON 54
#define MON_DATA_STATUS 55
#define MON_DATA_LEVEL 56
#define MON_DATA_HP 57
#define MON_DATA_MAX_HP 58
#define MON_DATA_ATK 59
#define MON_DATA_DEF 60
#define MON_DATA_SPEED 61
#define MON_DATA_SPATK 62
#define MON_DATA_SPDEF 63
#define MON_DATA_MAIL 64
#define MON_DATA_SPECIES2 65
#define MON_DATA_IVS 66
#define MON_DATA_CHAMPION_RIBBON 67
#define MON_DATA_WINNING_RIBBON 68
#define MON_DATA_VICTORY_RIBBON 69
#define MON_DATA_ARTIST_RIBBON 70
#define MON_DATA_EFFORT_RIBBON 71
#define MON_DATA_GIFT_RIBBON_1 72
#define MON_DATA_GIFT_RIBBON_2 73
#define MON_DATA_GIFT_RIBBON_3 74
#define MON_DATA_GIFT_RIBBON_4 75
#define MON_DATA_GIFT_RIBBON_5 76
#define MON_DATA_GIFT_RIBBON_6 77
#define MON_DATA_GIFT_RIBBON_7 78
#define MON_DATA_FATEFUL_ENCOUNTER 79
#define MON_DATA_OBEDIENCE 80
#define MON_DATA_KNOWN_MOVES 81
#define MON_DATA_RIBBON_COUNT 82
#define MON_DATA_RIBBONS 83
#define MON_DATA_ATK2 84
#define MON_DATA_DEF2 85
#define MON_DATA_SPEED2 86
#define MON_DATA_SPATK2 87
#define MON_DATA_SPDEF2 88
#define MAX_LEVEL 100
#define OT_ID_PLAYER_ID 0
#define OT_ID_PRESET 1
#define OT_ID_RANDOM_NO_SHINY 2
#define MON_GIVEN_TO_PARTY 0
#define MON_GIVEN_TO_PC 1
#define MON_CANT_GIVE 2
#define PLAYER_HAS_TWO_USABLE_MONS 0
#define PLAYER_HAS_ONE_MON 1
#define PLAYER_HAS_ONE_USABLE_MON 2
#define MON_MALE 0x00
#define MON_FEMALE 0xFE
#define MON_GENDERLESS 0xFF
#define FRIENDSHIP_EVENT_GROW_LEVEL 0
#define FRIENDSHIP_EVENT_VITAMIN 1 // unused
#define FRIENDSHIP_EVENT_BATTLE_ITEM 2 // unused
#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 3
#define FRIENDSHIP_EVENT_LEARN_TMHM 4
#define FRIENDSHIP_EVENT_WALKING 5
#define FRIENDSHIP_EVENT_FAINT_SMALL 6
#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 7
#define FRIENDSHIP_EVENT_FAINT_LARGE 8
#define STATUS_PRIMARY_NONE 0
#define STATUS_PRIMARY_POISON 1
#define STATUS_PRIMARY_PARALYSIS 2
#define STATUS_PRIMARY_SLEEP 3
#define STATUS_PRIMARY_FREEZE 4
#define STATUS_PRIMARY_BURN 5
#define STATUS_PRIMARY_POKERUS 6
#define STATUS_PRIMARY_FAINTED 7
#define MAX_TOTAL_EVS 510
#define EV_ITEM_RAISE_LIMIT 100
#define UNOWN_FORM_COUNT 28
#endif // GUARD_CONSTANTS_POKEMON_H #endif // GUARD_CONSTANTS_POKEMON_H
include/pokemon.h
-130
View File
@@ -4,136 +4,6 @@
#include "constants/pokemon.h" #include "constants/pokemon.h"
#include "sprite.h" #include "sprite.h"
#define MON_DATA_PERSONALITY 0
#define MON_DATA_OT_ID 1
#define MON_DATA_NICKNAME 2
#define MON_DATA_LANGUAGE 3
#define MON_DATA_SANITY_IS_BAD_EGG 4
#define MON_DATA_SANITY_HAS_SPECIES 5
#define MON_DATA_SANITY_IS_EGG 6
#define MON_DATA_OT_NAME 7
#define MON_DATA_MARKINGS 8
#define MON_DATA_CHECKSUM 9
#define MON_DATA_ENCRYPT_SEPARATOR 10
#define MON_DATA_SPECIES 11
#define MON_DATA_HELD_ITEM 12
#define MON_DATA_MOVE1 13
#define MON_DATA_MOVE2 14
#define MON_DATA_MOVE3 15
#define MON_DATA_MOVE4 16
#define MON_DATA_PP1 17
#define MON_DATA_PP2 18
#define MON_DATA_PP3 19
#define MON_DATA_PP4 20
#define MON_DATA_PP_BONUSES 21
#define MON_DATA_COOL 22
#define MON_DATA_BEAUTY 23
#define MON_DATA_CUTE 24
#define MON_DATA_EXP 25
#define MON_DATA_HP_EV 26
#define MON_DATA_ATK_EV 27
#define MON_DATA_DEF_EV 28
#define MON_DATA_SPEED_EV 29
#define MON_DATA_SPATK_EV 30
#define MON_DATA_SPDEF_EV 31
#define MON_DATA_FRIENDSHIP 32
#define MON_DATA_SMART 33
#define MON_DATA_POKERUS 34
#define MON_DATA_MET_LOCATION 35
#define MON_DATA_MET_LEVEL 36
#define MON_DATA_MET_GAME 37
#define MON_DATA_POKEBALL 38
#define MON_DATA_HP_IV 39
#define MON_DATA_ATK_IV 40
#define MON_DATA_DEF_IV 41
#define MON_DATA_SPEED_IV 42
#define MON_DATA_SPATK_IV 43
#define MON_DATA_SPDEF_IV 44
#define MON_DATA_IS_EGG 45
#define MON_DATA_ABILITY_NUM 46
#define MON_DATA_TOUGH 47
#define MON_DATA_SHEEN 48
#define MON_DATA_OT_GENDER 49
#define MON_DATA_COOL_RIBBON 50
#define MON_DATA_BEAUTY_RIBBON 51
#define MON_DATA_CUTE_RIBBON 52
#define MON_DATA_SMART_RIBBON 53
#define MON_DATA_TOUGH_RIBBON 54
#define MON_DATA_STATUS 55
#define MON_DATA_LEVEL 56
#define MON_DATA_HP 57
#define MON_DATA_MAX_HP 58
#define MON_DATA_ATK 59
#define MON_DATA_DEF 60
#define MON_DATA_SPEED 61
#define MON_DATA_SPATK 62
#define MON_DATA_SPDEF 63
#define MON_DATA_MAIL 64
#define MON_DATA_SPECIES2 65
#define MON_DATA_IVS 66
#define MON_DATA_CHAMPION_RIBBON 67
#define MON_DATA_WINNING_RIBBON 68
#define MON_DATA_VICTORY_RIBBON 69
#define MON_DATA_ARTIST_RIBBON 70
#define MON_DATA_EFFORT_RIBBON 71
#define MON_DATA_GIFT_RIBBON_1 72
#define MON_DATA_GIFT_RIBBON_2 73
#define MON_DATA_GIFT_RIBBON_3 74
#define MON_DATA_GIFT_RIBBON_4 75
#define MON_DATA_GIFT_RIBBON_5 76
#define MON_DATA_GIFT_RIBBON_6 77
#define MON_DATA_GIFT_RIBBON_7 78
#define MON_DATA_FATEFUL_ENCOUNTER 79
#define MON_DATA_OBEDIENCE 80
#define MON_DATA_KNOWN_MOVES 81
#define MON_DATA_RIBBON_COUNT 82
#define MON_DATA_RIBBONS 83
#define MON_DATA_ATK2 84
#define MON_DATA_DEF2 85
#define MON_DATA_SPEED2 86
#define MON_DATA_SPATK2 87
#define MON_DATA_SPDEF2 88
#define MAX_LEVEL 100
#define OT_ID_RANDOM_NO_SHINY 2
#define OT_ID_PRESET 1
#define OT_ID_PLAYER_ID 0
#define MON_GIVEN_TO_PARTY 0x0
#define MON_GIVEN_TO_PC 0x1
#define MON_CANT_GIVE 0x2
#define PLAYER_HAS_TWO_USABLE_MONS 0x0
#define PLAYER_HAS_ONE_MON 0x1
#define PLAYER_HAS_ONE_USABLE_MON 0x2
#define MON_MALE 0x00
#define MON_FEMALE 0xFE
#define MON_GENDERLESS 0xFF
#define FRIENDSHIP_EVENT_GROW_LEVEL 0x0
#define FRIENDSHIP_EVENT_VITAMIN 0x1 // unused
#define FRIENDSHIP_EVENT_BATTLE_ITEM 0x2 // unused
#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 0x3
#define FRIENDSHIP_EVENT_LEARN_TMHM 0x4
#define FRIENDSHIP_EVENT_WALKING 0x5
#define FRIENDSHIP_EVENT_FAINT_SMALL 0x6
#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 0x7
#define FRIENDSHIP_EVENT_FAINT_LARGE 0x8
#define STATUS_PRIMARY_NONE 0x0
#define STATUS_PRIMARY_POISON 0x1
#define STATUS_PRIMARY_PARALYSIS 0x2
#define STATUS_PRIMARY_SLEEP 0x3
#define STATUS_PRIMARY_FREEZE 0x4
#define STATUS_PRIMARY_BURN 0x5
#define STATUS_PRIMARY_POKERUS 0x6
#define STATUS_PRIMARY_FAINTED 0x7
#define MAX_TOTAL_EVS 510
#define UNOWN_FORM_COUNT 28
struct PokemonSubstruct0 struct PokemonSubstruct0
{ {
u16 species; u16 species;
src/pokemon.c
+6 -6
View File
@@ -4817,11 +4817,11 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
{ {
if (evCount >= MAX_TOTAL_EVS) if (evCount >= MAX_TOTAL_EVS)
return TRUE; return TRUE;
if (dataSigned >= 100) if (dataSigned >= EV_ITEM_RAISE_LIMIT)
break; break;
if (dataSigned + r2 > 100) if (dataSigned + r2 > EV_ITEM_RAISE_LIMIT)
r5 = 100 - (dataSigned + r2) + r2; r5 = EV_ITEM_RAISE_LIMIT - (dataSigned + r2) + r2;
else else
r5 = r2; r5 = r2;
@@ -5021,11 +5021,11 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
{ {
if (evCount >= MAX_TOTAL_EVS) if (evCount >= MAX_TOTAL_EVS)
return TRUE; return TRUE;
if (dataSigned >= 100) if (dataSigned >= EV_ITEM_RAISE_LIMIT)
break; break;
if (dataSigned + r2 > 100) if (dataSigned + r2 > EV_ITEM_RAISE_LIMIT)
r5 = 100 - (dataSigned + r2) + r2; r5 = EV_ITEM_RAISE_LIMIT - (dataSigned + r2) + r2;
else else
r5 = r2; r5 = r2;
src/script_pokemon_util_80F87D8.c
+6 -6
View File
@@ -585,14 +585,14 @@ void HasEnoughMonsForDoubleBattle(void)
{ {
switch (GetMonsStateToDoubles()) switch (GetMonsStateToDoubles())
{ {
case 0: case PLAYER_HAS_TWO_USABLE_MONS:
gSpecialVar_Result = 0; gSpecialVar_Result = PLAYER_HAS_TWO_USABLE_MONS;
break; break;
case 1: case PLAYER_HAS_ONE_MON:
gSpecialVar_Result = 1; gSpecialVar_Result = PLAYER_HAS_ONE_MON;
break; break;
case 2: case PLAYER_HAS_ONE_USABLE_MON:
gSpecialVar_Result = 2; gSpecialVar_Result = PLAYER_HAS_ONE_USABLE_MON;
break; break;
} }
} }