ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,108 Commits 1 Branch 0 Tags 235 MiB
8c9a59ec1c
Commit Graph

11108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheXaman
8c9a59ec1c Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh 2022-08-29 19:13:11 +02:00
TheXaman
006d28fd69 tiny fix for wrong "give pokemon" window 2022-08-29 14:51:40 +02:00
TheXaman
94183b45c7 Added options for ttoggling battle frontier pass and giving max BPs 2022-08-29 14:48:40 +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
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
LOuroboros
2cf2c00b29 Updated friendship labels 2022-08-25 17:10:11 -03:00
LOuroboros
7539051942 Further tweaked the affection animation 2022-08-25 17:05:57 -03:00
ghoulslash
552d1f3d7b
Merge pull request #2237 from gruxor/compat_define 
Reworked branch defines into single compatibility define
 2022-08-25 15:36:01 -04:00
ghoulslash
15a368163d
Merge pull request #2247 from AsparagusEduardo/RHH_specialPic 
LoadSpecialPokePic adjustments
 2022-08-25 15:35:21 -04:00
ghoulslash
591bac25c4
Merge pull request #2243 from AsparagusEduardo/RHH_placeholderMoves 
Moves with EFFECT_PLACEHOLDER can't be used.
 2022-08-25 15:34:23 -04:00
ghoulslash
b45e1887d8
Merge pull request #2242 from AsparagusEduardo/RHH_fixOrbPower 
Fixed creation trio orbs not boosting power for non-base forms.
 2022-08-25 15:18:02 -04:00
LOuroboros
5dd143f19d Applied Blackforest's changes to General_AffectionHangedOn 2022-08-25 13:07:52 -03:00
LOuroboros
1bfff42ad2 Fixed ENDTURN_STATUS_HEAL 2022-08-25 12:38:47 -03:00
DizzyEggg
1b9c2816c2 fix updatehptextinhealthbox arguments 2022-08-25 17:37:47 +02:00
DizzyEggg
63370b065d Party menu supports 4digit hp 2022-08-25 17:31:14 +02:00
LOuroboros
1fc63c3431 More review corrections 2022-08-25 11:52:21 -03:00
LOuroboros
23bf67c63f Removed unnecessary inclusion of header in src/field_specials.c 2022-08-25 11:43:01 -03:00
DizzyEggg
a0ec8a5a80 4 digit hp in battle 2022-08-25 16:40:56 +02:00
LOuroboros
11d6ae4820 Renamed the GetLeadMonFriendshipScore constants 2022-08-25 11:34:37 -03:00