Commit Graph

7232 Commits

Author SHA1 Message Date
LOuroboros
a6b03d45a8 Made the Thick Club's effect use the new GET_BASE_SPECIES_ID macro 2021-01-20 18:16:02 -03:00
LOuroboros
c90cbc0021 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into thick_club 2021-01-20 18:15:37 -03:00
ghoulslash
71f18bfbf4
Merge pull request #1316 from ultima-soul/form_species_tables_be
Add Form Species ID Tables
2021-01-20 13:54:39 -07:00
ultima-soul
d3b0e98325 Merge branch 'form_species_tables' into form_species_tables_be 2021-01-20 11:40:48 -08:00
ultima-soul
267900bdcb Add Form Species ID tables and functions to access them. 2021-01-20 11:31:20 -08:00
SphericalIce
86297398e6 Move the definition of RETURN_REFLECTION_TYPE_AT and make use of REFL_TYPE_NONE 2021-01-20 10:34:33 +00:00
SphericalIce
4334f7a379 Include NUM_REFLECTION_TYPES in the ReflectionTypes enum 2021-01-20 10:17:07 +00:00
ultima-soul
f8550603e1
Merge pull request #1362 from rh-hideout/revert-1361-global
Revert "Included global.h into battle_config.h"
2021-01-19 20:56:19 -08:00
ExpoSeed
61db82e64a
Revert "Included global.h into battle_config.h" 2021-01-19 22:55:08 -06:00
GriffinR
18b8e0ee8e
Merge pull request #1311 from GriffinRichards/clean-unused
Remove unused local variables and functions
2021-01-19 23:22:44 -05:00
GriffinR
6999b237eb
Merge pull request #1309 from GriffinRichards/misc-macro
Use constants for item data, misc other constants/fixes
2021-01-19 20:49:58 -05:00
ExpoSeed
3698b4f304
Merge pull request #1361 from LOuroboros/global
Included global.h into battle_config.h
2021-01-19 18:09:50 -06:00
SphericalIce
2746fd1f95 Name object event ID arguments properly 2021-01-19 23:35:57 +00:00
SphericalIce
6dd973012b Correct ground effect flag names for reflections & document sprite data usage 2021-01-19 23:21:50 +00:00
GriffinR
b65980cd4e Remove unused local variables and functions 2021-01-19 18:19:33 -05:00
Evan
6b59a9ac01 add ai info debug option 2021-01-19 12:58:58 -07:00
N
e5e390d64b
Revert zero initialization 2021-01-19 14:33:11 -05:00
GriffinR
c2ddb92c9e
Merge pull request #1310 from sphericalice/pokeemerald
Make broader use of RGB macros
2021-01-19 13:53:30 -05:00
N
d720520de8
Clarified comment again 2021-01-19 13:47:09 -05:00
N
b6c483394e
Clarified comments
Made comments clearer.
2021-01-19 13:43:57 -05:00
GriffinR
752982552e Add FIRST_BALL, some FIRST_BERRY_INDEX usage 2021-01-19 13:39:18 -05:00
SphericalIce
2dfaba9472 Name color return values more accurately 2021-01-19 17:59:36 +00:00
GriffinR
305ebdbc4a Parentheses for GET_UNOWN_LETTER 2021-01-19 12:36:36 -05:00
SphericalIce
8de76ed533 Make broader use of RGB macros 2021-01-19 17:15:12 +00:00
Evan
455899acf7 fix AI_DATA->battlerAtk 2021-01-19 08:54:39 -07:00
Evan
71185dbf67 fix DoesBattlerIgnoreAbilityChecks 2021-01-19 08:50:36 -07:00
GriffinR
cf9f8d01c5 Add misc item data constants 2021-01-19 05:49:20 -05:00
GriffinR
de52df5613 Fix some mislabeled scripts 2021-01-19 04:51:34 -05:00
GriffinR
1a40202ea4 Note bug in Foresight AI 2021-01-19 04:46:31 -05:00
GriffinR
4e845b6395 Use constants for contestLinkResults 2021-01-19 04:40:06 -05:00
GriffinR
c6a81c5277 Use MON_MALE/FEMALE for get_gender 2021-01-19 04:37:17 -05:00
GriffinR
3f36529cba Use NUMBER_OF_MON_TYPES in pokedex search 2021-01-19 04:34:50 -05:00
GriffinR
9dd867689e Use ARRAY_COUNT in PrintMenuTable 2021-01-19 04:19:14 -05:00
GriffinR
3f9037d63a Use ARRAY_COUNT in InitBgsFromTemplates 2021-01-19 04:14:07 -05:00
GriffinR
bc20fda604 Use GET_UNOWN_LETTER macro 2021-01-19 04:03:16 -05:00
N
7134763b73
Update task.c 2021-01-17 13:00:53 -05:00
N
8297090267
Update task.c 2021-01-17 12:49:50 -05:00
N
ad6ab09e30
Update comment 2021-01-17 12:46:08 -05:00
N
3b80f3caf1
Make variable name shorter 2021-01-17 12:44:08 -05:00
N
d3259ebe2c renamed taskNum to followupFuncDataIndex 2021-01-16 21:56:49 -05:00
N
72e8683975 FIxed the comments 2021-01-16 21:50:59 -05:00
N
e7436ab4c8 Update task.c 2021-01-16 21:35:40 -05:00
N
0159c0c1ae Update task.c 2021-01-16 21:09:51 -05:00
N
a950167d89 Remove define 2021-01-16 21:05:35 -05:00
N
6b5ce647df Update task.c 2021-01-16 20:31:09 -05:00
N
26246ce281 Update task.c 2021-01-16 20:29:42 -05:00
N
926ef40c52 Get rid of Task_data_OP macro
This macro is so annoying. Can we please do away with it?
2021-01-16 20:19:00 -05:00
LOuroboros
77d714ead5 Included global.h into battle_config.h
Fixes the dupplicated defines issue.
2021-01-16 20:37:34 -03:00
ultima-soul
8647895f1a
Merge pull request #1259 from ghoulslash/be_config
anim particle configs false by default
2021-01-16 10:41:18 -08:00
Eduardo Quezada D'Ottone
4ce3572f80
Merge pull request #1357 from LOuroboros/focus_blast
Fixed Focus Blast animation
2021-01-16 14:22:13 -03:00