ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-15 08:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,031 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

5233 Commits

Author SHA1 Message Date
Eduardo Quezada
5eb9312250 Added missing labels in headers 2022-09-12 21:14:15 -03:00
GriffinR
d3d8b4a181
Merge pull request #1762 from GriffinRichards/sync-fieldmap 
Sync fieldmap
 2022-09-12 14:32:27 -04:00
Eduardo Quezada
0944232059 Added shiny rerolls to Lures + reverted repel var name 2022-09-12 10:21:57 -03:00
Eduardo Quezada
e3005e5275 Item config for repel prompt 2022-09-12 10:21:52 -03:00
Eduardo Quezada
2d78ac0192 Implemented Lures using the same vars as repels 2022-09-12 10:21:49 -03:00
Deokishisu
e3c19f5df5 Implement B2W2 Repel System 
The game now asks if the player would like to use another Repel when the one they used runs out.

# Conflicts:
#	include/constants/vars.h
 2022-09-12 10:21:38 -03:00
Eduardo Quezada
66177e7958 Reworked shiny charm rerolls allow adding additional rerolls when necessary 2022-09-12 10:21:21 -03:00
Eduardo Quezada
65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
Eduardo Quezada
61752a4977 Added parenthesis to GET_SHINY_VALUE 2022-09-11 13:35:58 -04:00
Eduardo Quezada
4b1aca19cb Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 
# Conflicts:
#	src/battle_controller_link_opponent.c
#	src/battle_controller_opponent.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controllers.c
#	src/data/pokemon_graphics/back_pic_coordinates.h
#	src/data/pokemon_graphics/front_pic_coordinates.h
#	src/pokemon.c
 2022-09-10 00:17:03 -04:00
LOuroboros
12fee71008 Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE 2022-09-09 15:39:48 -03:00
Eduardo Quezada D'Ottone
69d3fafdcf
Merge pull request #2273 from LOuroboros/zazaForms 
Introduced FORM_BATTLE form changes
 2022-09-09 14:15:53 -04:00
Blackforest92
29529a0c47 Remove primal_particle leftovers 2022-09-09 22:28:11 +07:00
Blackforest92
d870d71dbe Remove windstorm_brew leftovers 2022-09-09 22:26:29 +07:00
Blackforest92
431cb6fa7c Tidying graphics - Trio Weather 2022-09-09 21:57:40 +07:00
Eduardo Quezada
8449f237c2 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonFlags 
# Conflicts:
#	src/pokemon.c
 2022-09-09 09:02:35 -04:00
Eduardo Quezada
21df8c279b Added SPECIES_FLAG_CANNOT_BE_TRADED 
- Also corrected Cylarex's forms not having the legendary flag
 2022-09-09 08:59:53 -04:00
Eduardo Quezada
9144779634 Removed repeated extern consts in strings.h 2022-09-09 08:49:16 -04:00
Blackforest92
caf323a653 Erase ghost data in include/constants/map_groups.h 2022-09-09 00:40:30 +07:00
Blackforest92
3acb32acb8 Tyding graphics - Acupressure 2022-09-09 00:25:43 +07:00
Eduardo Quezada
7fe1e706b7 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonConfig 
# Conflicts:
#	include/constants/pokemon_config.h
 2022-09-08 08:52:13 -04: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
47a50b3dac
Merge branch 'master' into weather_forms_fixes 2022-09-07 23:07:25 -04:00
sbird
3a0759d458 [doc] fix misnamed dma <--> aslr 2022-09-07 14:37:03 +02: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
c8f4a44380 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux 2022-09-06 20:40:34 -03:00
LOuroboros
8705d1656b Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into teleport 2022-09-06 20:38:28 -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
b249399a53 changed 'B_FLAG_NO_CATCHING' to be evaluated by 'GetBallThrowableState()' 2022-09-06 23:00:26 +02: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
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
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
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
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
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
Eduardo Quezada
2ee843c70d Proper label for species flags 2022-09-04 22:13:28 -03:00
Eduardo Quezada
a4c242f2f8 Implemented Shiny Lock functionality 2022-09-04 21:55:59 -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 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
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
03a98c72bc Sync fieldmap 2022-09-02 19:29:35 -04:00
Eduardo Quezada
c7fc2e13f7 Renamed TM flags to keep consistency with the rest of the repo 2022-09-02 16:54:58 -04:00