atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11500 commits 2 branches 40 tags 617 MiB
Commit graph

11500 commits

This branch
This branch
All branches
Author SHA1 Message Date
GriffinR
74b563f696
Merge pull request #1749 from GriffinRichards/ur-classes 
Fix names and constant usage for union room classes
 2022-09-06 21:35:10 -04:00
GriffinR
f334b61b44
Merge pull request #1769 from AsparagusEduardo/pret/pr/frontierTrainerMonAlign 
Aligned FRONTIER_MONS trainer macros with the rest for consistency
 2022-09-06 21:20:49 -04:00
LOuroboros
8705d1656b Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into teleport 2022-09-06 20:38:28 -03:00
LOuroboros
a7a1ab9aeb Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD 
There was never a reason not to.
 2022-09-06 19:20:11 -03:00
TheXaman
6062cf45fa
Merge branch 'master' into tx_debug_system_rhh 2022-09-07 00:03:58 +02:00
LOuroboros
f1c153e469 Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD 
There was never a reason not to.
 2022-09-06 18:37:16 -03:00
TheXaman
94995c54fb fix? 2022-09-06 23:35:05 +02:00
Eduardo Quezada
12bb32666b Aligned FRONTIER_MONS trainer macros with the rest for consistency 2022-09-06 17:05:56 -04:00
Eduardo Quezada D'Ottone
f79e9f02de
Merge pull request #2289 from Blackforest92/RHH-PR-Branch 
Tidying Graphics/Battle_Anims
 2022-09-06 17:02:25 -04:00
TheXaman
b249399a53 changed 'B_FLAG_NO_CATCHING' to be evaluated by 'GetBallThrowableState()' 2022-09-06 23:00:26 +02:00
Eduardo Quezada D'Ottone
3fe9ef26b5
Merge pull request #2299 from ghoulslash/readme_updates 
update readme with credits, wiki links
 2022-09-06 15:52:23 -04:00
ghoulslash
d33e4b0fe8
Merge pull request #2297 from AsparagusEduardo/RHH/pr/configRefactor 
Config refactor
 2022-09-06 15:32:37 -04:00
Eduardo Quezada
3a6318f1d9 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor 
# Conflicts:
#	include/constants/battle_config.h
 2022-09-06 15:20:54 -04:00
ghoulslash
79bfbfb1b0
Merge pull request #2198 from AsparagusEduardo/BE_BattlePikeComatose 
Comatose prevents Battle Pike's status effects.
 2022-09-06 15:18:48 -04:00
ghoulslash
59de7e48e5
Merge pull request #2265 from AsparagusEduardo/RHH_substructFix 
Fixed PokemonSubstruct3 alignment
 2022-09-06 15:14:45 -04:00
ghoulslash
971081b8fd
Merge pull request #2286 from AsparagusEduardo/RHH/pr/pretMerge_20220902 
Flat Merge Friday (Weekly merge)
 2022-09-06 15:13:47 -04:00
ghoulslash
51a569b66b
Merge pull request #2290 from AsparagusEduardo/RHH/pr/ballMulti_fix 
Fixed ball multiplier fallthroughs
 2022-09-06 15:10:28 -04:00
ghoulslash
9e4b18dfe2 update readme with credits, wiki links 2022-09-06 14:28:52 -04:00
Eduardo Quezada
7a0838a0f2 Adjusted GetFormChangeTargetSpeciesBoxMon to allow having form changes of the same method in the same table 2022-09-06 10:53:18 -03:00
LOuroboros
0b07f4a06e Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into zazaForms 2022-09-06 10:53:12 -03:00
LOuroboros
bb290d5ab0 Updates 
-Removed the pointless param1 setting in sXerneasFormChangeTable
-Updated the descriptions of Behemoth Blade and Behemoth Bash
-Added a new parameter to the struct FormChange
-Allowed FORM_BATTLE_BEGIN and FORM_BATTLE_END to replace a move through a new function called "TryToSetBattleFormChangeMoves".
-Added missing calls to "CalculateMonStats".
-Renamed BoxPokemon pointer in GetFormChangeTargetSpeciesBoxMon for consistency's sake
-Optimized check inside UndoFormChange (even though the plan is to get rid of that func entirely.)

Special thanks to Blecoutre who fixed my TryToSetBattleFormChangeMoves function. It just wasn't working correctly at all.
 2022-09-06 10:45:07 -03:00
sbird
584bfe0221 [debug] add support for mgba printf 
* adds support for mgba printf debugging as well as adding support for switching between debugging configuration
* adds `mini_printf` as an alternative to libc printf as well as switches to choose a pretty printing handler
* adds a pretty printing format to `mini_printf` to print preproc encoded strings
 2022-09-06 13:40:31 +02:00
GriffinR
7dac3c4b65
Merge pull request #1766 from tustin2121/tustin2121-patch-extern 
Adding missing externs
 2022-09-05 20:28:33 -04:00
GriffinR
c8afeea182 Generate trainer pic palettes from image 2022-09-05 16:09:45 -04:00
Eduardo Quezada
cb97f93ef6 Fixed B_SHADOW_TAG_ESCAPE use for Gen 3 config 2022-09-05 14:49:40 -04:00
Eduardo Quezada
e253a87bc5 Consolidated Gen constants into config.h, with a new const called GEN_LATEST, to help edit all at once. 2022-09-05 14:49:14 -04:00
Eduardo Quezada
7c7da8e176 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs 
# Conflicts:
#	src/battle_script_commands.c
 2022-09-05 14:43:04 -04:00
Eduardo Quezada D'Ottone
75c4e7dc13
Merge pull request #2295 from Yak-Attack-1012/water_sport_past_gens 
v -> STATUS4_WATER_SPORT (battle_script_commands.c)
 2022-09-05 13:37:04 -03:00
Eduardo Quezada
dbd56efaef Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	src/battle_util.c
 2022-09-05 12:20:57 -04:00
U-DESKTOP-K1J86FD\Owner
7dabd903ce v -> STATUS4_WATER_SPORT (applicable to Gens 3-5) 2022-09-05 12:07:38 -04:00
tustin2121
33f10d2139 Adding missing externs 
If there are not externs on these forward declarations, it's entirely possible for the program to link and missing data to be assigned to someplace presumed in IWRAM or something.
 2022-09-05 09:49:20 -04:00
Eduardo Quezada D'Ottone
99a9b9f859
Merge pull request #2218 from LOuroboros/patch-1 
Updated Serene Grace checks in AI_CheckViability
 2022-09-05 10:30:18 -03:00
Eduardo Quezada
d699ea3334 Fixed macro alignments 2022-09-05 08:38:35 -04:00
Eduardo Quezada D'Ottone
65a4d4ed44
Merge pull request #2294 from LOuroboros/patch-2 
Updated GetBattleMonMoveSlot
 2022-09-05 07:09:47 -03:00
TheXaman
f6d111d0c7
Update src/debug.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:17:21 +02:00
TheXaman
40e3379921 removed music expansion songs, added newline, removed all weekday remains 2022-09-05 11:15:18 +02:00
TheXaman
7696a78760
Update src/trainer_see.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:04:21 +02:00
TheXaman
57296dde71
Update src/field_control_avatar.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:03:23 +02:00
TheXaman
0b3eddc9a4
Update src/field_control_avatar.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:03:01 +02:00
TheXaman
6cab795c5c
Update include/constants/overworld_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:02:44 +02:00
LOuroboros
2deabc2f36
Quick update for GetBattleMonMoveSlot 2022-09-05 04:27:21 -03:00
Eduardo Quezada
2ee843c70d Proper label for species flags 2022-09-04 22:13:28 -03:00
Eduardo Quezada D'Ottone
d0d4c52d84
Update src/pokemon.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-09-04 22:03:17 -03:00
Eduardo Quezada
a4c242f2f8 Implemented Shiny Lock functionality 2022-09-04 21:55:59 -03:00
Eduardo Quezada
7500435a80 Implemented review changes from https://github.com/pret/pokefirered/pull/548 2022-09-04 21:24:12 -03:00
Eduardo Quezada
74c3fdfba7 Flag to allow certain species to always have perfect IVs (like Partner Pikachu and Eevee) 2022-09-04 19:41:01 -03:00
Eduardo Quezada
89550ed05d Updated Sport Ball's modifier. 2022-09-04 18:54:23 -03:00
Eduardo Quezada
ce3dec43a7 Fixed ball multiplier fallthroughs 2022-09-04 17:21:23 -03:00
Blackforest92
2a8d2df6e7 Fix minor oopsies of src/graphics.c - gBattleAnimSpritePal_PrimalParticles 2022-09-04 23:40:00 +07:00
Blackforest92
7e9d243677 Tidying graphics/battle_anims 2022-09-04 23:24:37 +07:00