ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-28 12:44:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,401 Commits 1 Branch 0 Tags 235 MiB
dfdfb72365
Commit Graph

11401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DizzyEggg
d167b4ea0a
Dragon Tail Weak Armor fix 2022-08-30 20:08:50 +02:00
DizzyEggg
7cb010d71e fix magic bounce conflicts and fix magic coat 2022-08-30 19:36:06 +02:00
TheXaman
c13561e5ba simplified filed controls code for debug menu 2022-08-30 18:15:06 +02:00
TheXaman
3debf0442d changed the locations of tx_debug_system related #defines to its own file 'constants/debug_config.h' 2022-08-30 18:02:23 +02:00
TheXaman
04c40677bd Changed the way debug flags are handled, now in constants/battle_config.h 2022-08-30 17:41:35 +02:00
TheXaman
e09ba650f3 imrpoved code formatting in field_control_avatar as per suggestion 2022-08-30 17:12:23 +02:00
TheXaman
d9bd272452 removed the entries ld_script as per pret#1738, added newline to debug.h 2022-08-30 17:08:35 +02:00
TheXaman
5fed45e40b
Update src/item_use.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:04:14 +02:00
TheXaman
2f61407c78
Update src/field_control_avatar.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:04:02 +02:00
TheXaman
725a9102ee
Update src/new_game.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:03:44 +02:00
TheXaman
155465a919
Update src/pokemon_storage_system.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:03:28 +02:00
TheXaman
79c4fa560f
Update src/start_menu.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:03:07 +02:00
TheXaman
cc921c62d7
Update src/field_control_avatar.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:01:59 +02:00
TheXaman
61c95421eb
Update src/event_object_movement.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-30 17:01:46 +02:00
LOuroboros
df88317a98 Introduced FORM_BATTLE form changes 
For species such as Xerneas and Zacian.
 2022-08-29 19:10:52 -03:00
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