ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-22 19:30:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,352 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

8050 Commits

Author SHA1 Message Date
LOuroboros
db6d285f00
Small syntax fix for CanLearnTeachableMove 2022-09-08 17:53:15 -03:00
Blackforest92
3acb32acb8 Tyding graphics - Acupressure 2022-09-09 00:25:43 +07:00
Jaizu
d58af1ba92
Fix 'y' actually being 'x' in CreatePCMultichoice 2022-09-08 10:38:52 +02:00
Eduardo Quezada D'Ottone
066a5bee85
Merge pull request #2277 from TheXaman/tx_debug_system_rhh 
Inclusion of the tx_debug_system
 2022-09-08 00:26:37 -04:00
Eduardo Quezada D'Ottone
4a6d3d1deb
Whitespace 2022-09-08 00:19:13 -04:00
Eduardo Quezada D'Ottone
47a50b3dac
Merge branch 'master' into weather_forms_fixes 2022-09-07 23:07:25 -04:00
LOuroboros
05c13614c6
Undefined temporary preproc macro HIBYTE 2022-09-07 13:41:48 -03:00
sbird
3a0759d458 [doc] fix misnamed dma <--> aslr 2022-09-07 14:37:03 +02:00
GriffinR
281bddcd3d
Merge pull request #1765 from AsparagusEduardo/pret/pokefirered_sync4 
Implemented review changes from https://github.com/pret/pokefirered/pull/548
 2022-09-06 21:40:37 -04:00
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
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
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
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
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
Eduardo Quezada
cb97f93ef6 Fixed B_SHADOW_TAG_ESCAPE use for Gen 3 config 2022-09-05 14:49:40 -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
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
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
LOuroboros
2deabc2f36
Quick update for GetBattleMonMoveSlot 2022-09-05 04:27:21 -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
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
Eduardo Quezada D'Ottone
1287c3d263
Fixed call to ItemIdToBattleMoveId 2022-09-03 21:27:29 -04:00
Eduardo Quezada D'Ottone
4017fc3e20
Apply style suggestions from code review 2022-09-03 21:22:15 -04:00
Eduardo Quezada
41bf6bde25 Removed pointless macro 2022-09-03 00:28:53 -04:00
Eduardo Quezada
790bdd69f8 Using GET_BATTLER_SIDE and GET_BATTLER_SIDE2 2022-09-03 00:28:32 -04:00
Eduardo Quezada
03498d7240 Applied remaining instances of BATTLE_OPPOSITE and BATTLE_PARTNER 2022-09-02 23:57:43 -04:00
Eduardo Quezada
5403cd036e Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	include/battle.h
#	include/battle_controllers.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2022-09-02 23:24:08 -04:00
GriffinR
97021baec6 Drop usage of global directive 2022-09-02 21:53:44 -04:00
GriffinR
8b7230c3c4 CpuFastFill -> CpuFastFill16 in fieldmap 2022-09-02 19:41:28 -04:00