dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-ttower

Browse Source
This commit is contained in:
GriffinR
2020-02-15 20:44:57 -05:00
committed by GitHub
parent 34deceb136 fee980decd
commit a4cd331634
327 changed files with 14966 additions and 18895 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/battle.h
+3
View File
@@ -81,6 +81,9 @@
#define IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && !((flags) & BATTLE_TYPE_GHOST_UNVEILED))
#define IS_BATTLE_TYPE_GHOST_WITH_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && (flags) & BATTLE_TYPE_GHOST_UNVEILED)
#define RIVAL_BATTLE_HEAL_AFTER 1
#define RIVAL_BATTLE_TUTORIAL 3
// Battle Outcome defines
#define B_OUTCOME_WON 0x1
#define B_OUTCOME_LOST 0x2
include/constants/battle_setup.h
+1 -1
View File
@@ -10,6 +10,6 @@
#define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE 6
#define TRAINER_BATTLE_REMATCH_DOUBLE 7
#define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC 8
#define TRAINER_BATTLE_TUTORIAL 9
#define TRAINER_BATTLE_EARLY_RIVAL 9
#endif // GUARD_CONSTANTS_BATTLE_SETUP_H
include/constants/easy_chat.h
+1 -16
View File
@@ -6,22 +6,7 @@
#define EASY_CHAT_TYPE_BATTLE_WON 2
#define EASY_CHAT_TYPE_BATTLE_LOST 3
#define EASY_CHAT_TYPE_MAIL 4
#define EASY_CHAT_TYPE_INTERVIEW 5
#define EASY_CHAT_TYPE_BARD_SONG 6
#define EASY_CHAT_TYPE_FAN_CLUB 7
#define EASY_CHAT_TYPE_UNK_8 8
#define EASY_CHAT_TYPE_TRENDY_PHRASE 9
#define EASY_CHAT_TYPE_GABBY_AND_TY 10
#define EASY_CHAT_TYPE_CONTEST_INTERVIEW 11
#define EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW 12
#define EASY_CHAT_TYPE_GOOD_SAYING 13
#define EASY_CHAT_TYPE_FAN_QUESTION 14
#define EASY_CHAT_TYPE_QUIZ_ANSWER 15
#define EASY_CHAT_TYPE_QUIZ_QUESTION 16
#define EASY_CHAT_TYPE_QUIZ_SET_QUESTION 17
#define EASY_CHAT_TYPE_QUIZ_SET_ANSWER 18
#define EASY_CHAT_TYPE_APPRENTICE 19
#define EASY_CHAT_TYPE_QUESTIONNAIRE 20
#define EASY_CHAT_TYPE_QUESTIONNAIRE 14
#define EC_GROUP_POKEMON_2 0x0
#define EC_GROUP_TRAINER 0x1
include/constants/global.h
+5
View File
@@ -40,6 +40,10 @@
#define FEMALE 1
#define GENDER_COUNT 2
#define BARD_SONG_LENGTH 6
#define NUM_STORYTELLER_TALES 4
#define NUM_TRADER_ITEMS 4
#define OPTIONS_BUTTON_MODE_HELP 0
#define OPTIONS_BUTTON_MODE_LR 1
#define OPTIONS_BUTTON_MODE_L_EQUALS_A 2
@@ -64,6 +68,7 @@
#define MAX_MON_MOVES 4
#define TRAINER_ID_LENGTH 4
#define PARTY_SIZE 6
#define MULTI_PARTY_SIZE (PARTY_SIZE / 2)
include/constants/metatile_labels.h
+35
View File
@@ -4,6 +4,41 @@
// General
#define METATILE_General_CalmWater 0x12B
// PokeMart
#define METATILE_Shop_CounterMid_Top 0x2BF
#define METATILE_Shop_CounterMid_Bottom 0x2C0
// Vermilion Gym
#define METATILE_VermilionGym_Floor 0x281
#define METATILE_VermilionGym_Beam_MidTop 0x285
#define METATILE_VermilionGym_Beam_MidBottom 0x28D
#define METATILE_VermilionGym_Beam_Node_TopLeft_Off 0x293
#define METATILE_VermilionGym_Beam_Node_TopLeft_Edge_Off 0x294
#define METATILE_VermilionGym_Beam_Node_TopRight_Edge_Off 0x295
#define METATILE_VermilionGym_Beam_Node_TopRight_Off 0x296
#define METATILE_VermilionGym_Beam_Node_BottomLeft_Off 0x29B
#define METATILE_VermilionGym_Beam_Node_BottomLeft_Edge_Off 0x29C
#define METATILE_VermilionGym_Beam_Node_BottomRight_Edge_Off 0x29D
#define METATILE_VermilionGym_Beam_Node_BottomRight_Off 0x29E
#define METATILE_VermilionGym_Beam_Node_TopLeft_On 0x2A9
#define METATILE_VermilionGym_Beam_Node_TopLeft_Edge_On 0x2AA
#define METATILE_VermilionGym_Beam_Node_TopRight_Edge_On 0x2AB
#define METATILE_VermilionGym_Beam_Node_TopRight_On 0x2AC
#define METATILE_VermilionGym_Beam_Node_BottomLeft_On 0x2B1
#define METATILE_VermilionGym_Beam_Node_BottomLeft_Edge_On 0x2B2
#define METATILE_VermilionGym_Beam_Node_BottomRight_Edge_On 0x2B3
#define METATILE_VermilionGym_Beam_Node_BottomRight_On 0x2B4
#define METATILE_VermilionGym_Beam_Node_TopLeft_HalfOn 0x2BB
#define METATILE_VermilionGym_Beam_Node_TopLeft_Edge_HalfOn 0x2BC
#define METATILE_VermilionGym_Beam_MidTop_HalfOn 0x2BD
#define METATILE_VermilionGym_Beam_Node_TopRight_Edge_HalfOn 0x2BE
#define METATILE_VermilionGym_Beam_Node_TopRight_HalfOn 0x2BF
#define METATILE_VermilionGym_Beam_Node_BottomLeft_HalfOn 0x2C3
#define METATILE_VermilionGym_Beam_Node_BottomLeft_Edge_HalfOn 0x2C4
#define METATILE_VermilionGym_Beam_MidBottom_HalfOn 0x2C5
#define METATILE_VermilionGym_Beam_Node_BottomRight_Edge_HalfOn 0x2C6
#define METATILE_VermilionGym_Beam_Node_BottomRight_HalfOn 0x2C7
// Pokemon Mansion
#define METATILE_PokemonMansion_Floor 0x284
#define METATILE_PokemonMansion_Floor_ShadeFull 0x285
include/constants/object_events.h
+1 -1
View File
@@ -35,7 +35,7 @@
#define OBJECT_EVENT_GFX_WOMAN_3 31
#define OBJECT_EVENT_GFX_OLD_MAN_1 32
#define OBJECT_EVENT_GFX_OLD_MAN_2 33
#define OBJECT_EVENT_GFX_VIRIDIAN_DRUNK 34
#define OBJECT_EVENT_GFX_OLD_MAN_LYING_DOWN 34
#define OBJECT_EVENT_GFX_OLD_WOMAN 35
#define OBJECT_EVENT_GFX_TUBER_M_1 36
#define OBJECT_EVENT_GFX_TUBER_F 37
include/constants/union_room.h
+45
View File
@@ -1,6 +1,48 @@
#ifndef GUARD_CONSTANTS_UNION_ROOM_H
#define GUARD_CONSTANTS_UNION_ROOM_H
#define UNION_ROOM_SPAWN_NONE 0
#define UNION_ROOM_SPAWN_IN 1
#define UNION_ROOM_SPAWN_OUT 2
#define ACTIVITY_NONE 0
#define ACTIVITY_BATTLE 1
#define ACTIVITY_DBLBATTLE 2
#define ACTIVITY_MLTBATTLE 3
#define ACTIVITY_TRADE 4
#define ACTIVITY_CHAT 5
#define ACTIVITY_WCARD 6
#define ACTIVITY_WNEWS 7
#define ACTIVITY_CARD 8
#define ACTIVITY_PJUMP 9
#define ACTIVITY_BCRUSH 10
#define ACTIVITY_BPICK 11
#define ACTIVITY_SEARCH 12
#define ACTIVITY_SPINTRADE 13
#define ACTIVITY_ITEMTRADE 14
// Player response
#define ACTIVITY_ACCEPT 17
#define ACTIVITY_DECLINE 18
#define ACTIVITY_NPCTALK 19
#define ACTIVITY_PLYRTALK 20
// Duplicate IDs?
#define ACTIVITY_WCARD2 21
#define ACTIVITY_WNEWS2 22
#define IN_UNION_ROOM 0x40
// Used in UR_AddTextPrinterParameterized
#define UR_COLOR_DKE_WHT_LTE 0
#define UR_COLOR_RED_WHT_LTR 1
#define UR_COLOR_GRN_WHT_LTG 2
#define UR_COLOR_WHT_WHT_LTE 3
#define UR_COLOR_WHT_DKE_LTE 4
#define UR_COLOR_GRN_DN6_LTB 5
#define UR_COLOR_DN5_DN6_LTB 6
#define LINK_GROUP_SINGLE_BATTLE 0
#define LINK_GROUP_DOUBLE_BATTLE 1
#define LINK_GROUP_MULTI_BATTLE 2
@@ -12,4 +54,7 @@
#define LINK_GROUP_WONDER_NEWS 8
#define NUM_LINK_GROUP_TYPES 9
#define LINK_GROUP_UNION_ROOM_RESUME 9
#define LINK_GROUP_UNION_ROOM_INIT 10
#endif //GUARD_CONSTANTS_UNION_ROOM_H