TheXaman
|
8cf2933658
|
added preproc directive to main debug.c code
|
2022-08-29 19:46:03 +02:00 |
|
TheXaman
|
bed5639074
|
Changed preproc defines to TRUE/FALSE, small cleanup
|
2022-08-29 19:36:44 +02:00 |
|
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 |
|
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 |
|
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 |
|
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
|
8612300020
|
Merge branch 'master' into patch-1
|
2022-08-29 04:22:48 -04: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 |
|
GriffinR
|
0a2ac61b0f
|
Merge pull request #1757 from AsparagusEduardo/pret_clean2
Cleanup based on previous PRs
|
2022-08-27 11:40:33 -04:00 |
|
Eduardo Quezada
|
1c8d3a4922
|
Removed unnecessary parenthesis
|
2022-08-27 11:19:50 -04:00 |
|
Eduardo Quezada
|
12b32606f5
|
Fixed PokemonSubstruct3 alignment
|
2022-08-27 03:05:06 -04:00 |
|
Eduardo Quezada
|
99fbad92e2
|
IS_BATTLER_OF_TYPE
|
2022-08-27 02:50:55 -04:00 |
|
Eduardo Quezada
|
69f4c226f0
|
Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs
# Conflicts:
# src/battle_ai_main.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_script_commands.c
# src/pokemon.c
# src/pokemon_summary_screen.c
|
2022-08-27 02:42:22 -04:00 |
|
Eduardo Quezada
|
866d916f2f
|
SpriteTemplate formatting
|
2022-08-27 02:07:58 -04:00 |
|
Eduardo Quezada
|
1f0a952546
|
Usage of BATTLE_OPPOSITE
|
2022-08-27 01:44:39 -04:00 |
|
Eduardo Quezada
|
15d611ba65
|
Usage of BATTLE_PARTNER
|
2022-08-27 01:26:13 -04:00 |
|
Eduardo Quezada
|
6c457f42af
|
Corrected uses of GetBattlerSide
|
2022-08-27 00:59:12 -04:00 |
|
Eduardo Quezada
|
0a34d47041
|
Merge remote-tracking branch 'pret/master' into pret_clean2
|
2022-08-27 00:56:00 -04:00 |
|
Eduardo Quezada
|
481210b7f3
|
Missing uses of MAX_SPRITES
|
2022-08-27 00:54:30 -04:00 |
|
GriffinR
|
8aead3b4c8
|
Merge pull request #1747 from GriffinRichards/contest-ai-bug
Incorporate commented bug fixes in contest AI scripts
|
2022-08-26 23:53:44 -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
|
6331931ba3
|
Fix Magic Coat targets
|
2022-08-26 15:01:51 +02: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 |
|