Commit Graph

11094 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
cc174b622c
Merge pull request #2278 from rh-hideout/DizzyEggg-dragontailweakarmor
Dragon Tail Weak Armor fix
2022-09-01 19:54:33 -04:00
Eduardo Quezada D'Ottone
875f656045
Merge pull request #2284 from StephenLynx/master
Fixed pickup running when it shouldn't in some cases.
2022-09-01 14:55:36 -04:00
Sérgio Augusto Vianna
60132b29fb Fixed pickup running when it shouldn't in some cases. 2022-09-01 15:37:52 -03:00
Eduardo Quezada D'Ottone
bf830fca41
Merge pull request #2280 from LOuroboros/laMoves
Added Legends: Arceus' move data
2022-08-31 22:51:04 -04:00
LOuroboros
b9a32a93f5 Update src/data/text/move_descriptions.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-08-31 23:39:59 -03:00
LOuroboros
7b8226a8af Added descriptions for LA's moves 2022-08-30 23:05:22 -03:00
LOuroboros
cc86b2fd96 Added Z-Move stats for LA's moves 2022-08-30 20:29:36 -03:00
LOuroboros
c167e2c6cc Added Legends: Arceus' move data 2022-08-30 19:32:44 -03:00
DizzyEggg
d167b4ea0a
Dragon Tail Weak Armor fix 2022-08-30 20:08:50 +02:00
ghoulslash
2cd01bd95d
Merge pull request #2239 from DizzyEggg/quash
Quash
2022-08-29 10:43:54 -04:00
Eduardo Quezada D'Ottone
280fd4b50b
Merge pull request #2177 from Blackforest92/Legends_Arceus_Expansion
Legends arceus pokemon expansion
2022-08-29 10:40:52 -04:00
Blackforest92
b209645b20 Changes Origin to Origin Forme 2022-08-29 21:33:28 +07:00
Eduardo Quezada D'Ottone
32a1017c2d
Fixed tab 2022-08-29 10:13:01 -04:00
Blackforest92
61c33f56a0 Updated to latest master branch + add PLA's data to teachable_learnsets.h 2022-08-29 21:01:31 +07:00
DizzyEggg
2d4ac679a6 tabs 2022-08-29 10:26:55 +02:00
DizzyEggg
27010e9ee6 quash faintclearsetdata 2022-08-29 10:23:26 +02:00
Eduardo Quezada D'Ottone
8ca2f949e3
Merge pull request #2233 from gruxor/tmhm_rework
Reworked TMHM into expandable list format
2022-08-29 04:20:45 -04:00
crater-git
1c735e1abe Restored bool32 type to shouldUseMove 2022-08-29 03:47:11 -04:00
DizzyEggg
57c929275f
Merge pull request #2269 from AsparagusEduardo/RHH/pr/fairyicon
Update Fairy icon
2022-08-29 09:20:18 +02:00
DizzyEggg
b9babd9ff1
Merge pull request #2264 from AsparagusEduardo/RHH_pretMerge20220826
Friday Night Mergin' (weekly merge)
2022-08-29 09:17:40 +02:00
Eduardo Quezada D'Ottone
78c44b5f41
Merge pull request #2271 from LOuroboros/patch-2
Removed unused local var in SetMonFormPSS
2022-08-28 12:01:42 -04:00
LOuroboros
5801047e50
Removed unused local var in SetMonFormPSS 2022-08-28 12:10:54 -03:00
Blackforest92
d6998d4579 Edited PLA' pokedex_text.h 2022-08-28 19:55:45 +07:00
crater-git
9f16d1dd12 Fixed battle frontier tutors (for real this time) 2022-08-27 22:45:10 -04:00
phxGAMMA
4577f635c9 Update fairy.png 2022-08-27 22:42:05 -04:00
Eduardo Quezada
7c86bd5d08 Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826
# Conflicts:
#	include/battle_interface.h
#	src/battle_anim_effects_1.c
#	src/battle_script_commands.c
#	src/field_specials.c
2022-08-26 22:23:37 -04:00
Eduardo Quezada D'Ottone
e5288449b4
Merge pull request #2263 from ThirdLemon/escaperopefix
Fix Escape Rope Message when on gen 8 mechanics
2022-08-26 21:03:38 -04:00
SomeLoserThatCantPickOriginalUsernames
bd81841c30 Fix Escape Rope Message when on gen 8 mechanics 2022-08-26 17:47:45 -07:00
GriffinR
578064d799 Add missing use of METATILE_ROW_WIDTH 2022-08-26 15:23:54 -04:00
Eduardo Quezada D'Ottone
bee36edd9c
Merge pull request #2173 from LOuroboros/yourAffection
Implement affection-now-friendship mechanics
2022-08-26 14:54:32 -04:00
GriffinR
0516f94837
Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore
Added constants for GetLeadMonFriendshipScore
2022-08-26 14:52:10 -04:00
crater-git
f8fb4e8cf2 Renamed funcs, lists, etc. - Teach->Teachable 2022-08-26 14:48:06 -04:00
GriffinR
c5e873aa2b
Merge pull request #1742 from GriffinRichards/sound-pan
Add missing usage of SOUND_PAN_*
2022-08-26 14:47:24 -04:00
crater-git
b8a3cc2846 Consolidated funcs, renamed CanMonLearnMove 2022-08-26 11:07:08 -04:00
crater-git
54ee960970 Fixed Battle Frontier tutor move IDs 2022-08-26 10:12:11 -04:00
ghoulslash
ae2ff4c1d8
Merge pull request #2258 from AsparagusEduardo/RHH_enableBugfix
Enable BUGFIX by default
2022-08-26 09:56:19 -04:00
DizzyEggg
3facc4875a
Merge pull request #2259 from AsparagusEduardo/RHH_fixNetBall
Fixed Net Ball Gen 7+ multiplier
2022-08-26 09:11:04 +02:00
Eduardo Quezada
77e2a2da32 Fixed Net Ball Gen 7+ multiplier 2022-08-25 23:19:46 -04:00
Eduardo Quezada D'Ottone
399a0c9d6f
Merge pull request #2142 from AgustinGDLV/exp_candy
Gen 8 EXP Candies
2022-08-25 23:03:24 -04:00
Eduardo Quezada D'Ottone
57d583b783
Fixed call to sExpCandyExperienceTable 2022-08-25 22:49:23 -04:00
Eduardo Quezada D'Ottone
6b414d9555
Apply suggestions from code review
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-08-25 22:40:19 -04:00
Eduardo Quezada
4c999b40b1 Enable BUGFIX by default 2022-08-25 22:35:33 -04:00
GriffinR
005c46f0da
Merge pull request #1754 from AsparagusEduardo/pret_citySigns
Corrected Oldale Town Sign labels
2022-08-25 22:09:56 -04:00
Eduardo Quezada
6fb4da68f3 Corrected Oldale Town Sign labels 2022-08-25 22:00:24 -04:00
Eduardo Quezada D'Ottone
0095b3181b
Merge pull request #2256 from DizzyEggg/hp
4digits HP display
2022-08-25 20:42:50 -04:00
crater-git
ed02c4b425 Removed tutor move distinction, combined llists 2022-08-25 19:56:47 -04:00
LOuroboros
410045028a Optimized General_AffectionHangedOn 2022-08-25 20:01:14 -03:00
AgustinGDLV
e204527f43 changed candy item parameters 2022-08-25 15:52:47 -07:00
LOuroboros
8bd7103b9d Even more review corrections 2022-08-25 17:32:12 -03:00
DizzyEggg
622a7f8141 merge with master 2022-08-25 22:10:59 +02:00