Eduardo Quezada
|
720cb249d6
|
Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/reworkScald
# Conflicts:
# include/constants/battle_config.h
|
2022-09-16 12:06:06 -03:00 |
|
ghoulslash
|
8bbe1b9037
|
Merge pull request #2327 from AsparagusEduardo/RHH/pr/Metronome
Config to limit the moves called by Metronome (by generation)
|
2022-09-16 11:03:33 -04:00 |
|
ghoulslash
|
62815d9763
|
Merge pull request #2308 from AsparagusEduardo/RHH/pr/pretmerge_20220909
Friday merge, what a concept (weekly pret merge 2022/09/09)
|
2022-09-16 11:03:01 -04:00 |
|
Eduardo Quezada
|
6b79c7772c
|
Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909
# Conflicts:
# src/battle_interface.c
|
2022-09-16 11:56:50 -03:00 |
|
Eduardo Quezada
|
672f572ff8
|
Config to limit the moves called by Metronome (by generation)
|
2022-09-16 11:04:30 -03:00 |
|
Eduardo Quezada
|
77696ca686
|
Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change
|
2022-09-16 10:31:02 -03:00 |
|
ghoulslash
|
ed81ec41bc
|
Merge pull request #2324 from ghoulslash/be/aiswitch
fix ai switch semi invulnerable
|
2022-09-15 23:15:02 -04:00 |
|
ghoulslash
|
95a3ead254
|
styling fix
|
2022-09-15 22:10:39 -04:00 |
|
Eduardo Quezada D'Ottone
|
7825153bb2
|
Merge pull request #2282 from AsparagusEduardo/RHH/pr/tutorFix
Exp Candy Fixes
|
2022-09-15 22:46:59 -03:00 |
|
ghoulslash
|
20190ac85a
|
fix ai switch semi invulnerable
|
2022-09-15 18:34:15 -04:00 |
|
ghoulslash
|
133aa9e28d
|
Merge pull request #2306 from AsparagusEduardo/RHH/pr/autogenNames
Generating music names for the debug menu based on their labels
|
2022-09-15 18:02:27 -04:00 |
|
ghoulslash
|
6616c89451
|
Merge pull request #2303 from Blackforest92/RHH-PR-Branch
Tidying graphics - Trio Weather
|
2022-09-15 18:01:43 -04:00 |
|
ghoulslash
|
6cfacb396e
|
Merge pull request #2307 from AsparagusEduardo/RHH/pr/debugMapCount
Automated creation of MAP_GROUP_COUNT for the debug menu
|
2022-09-15 18:01:05 -04:00 |
|
ghoulslash
|
5bdd292dc3
|
Merge pull request #2310 from AsparagusEduardo/RHH/pr/FairyUses
Added missing uses of Fairy type for Union Room and Battle Factory
|
2022-09-15 18:00:38 -04:00 |
|
ghoulslash
|
354a8256e4
|
Merge pull request #2226 from Porygon23/AI-Logic-Updates
Added corner case logic for AI Switching.
|
2022-09-15 17:56:35 -04:00 |
|
Eduardo Quezada D'Ottone
|
8f0054a0cd
|
Merge pull request #2315 from TheXaman/rhh_debug_flicker_fix
Debug menu: removes flickering, adds weather menu, misc. fixes
|
2022-09-14 11:05:46 -03:00 |
|
TheXaman
|
ef4e64c2f7
|
-added a submenu to set the weather
-lowest flag is 1
|
2022-09-14 15:19:23 +02:00 |
|
TheXaman
|
1e03b4747f
|
debug menu: object events now frozen while open
|
2022-09-14 13:43:26 +02:00 |
|
TheXaman
|
2c20514035
|
improved debug menu function declaration consistency
|
2022-09-14 13:39:35 +02:00 |
|
Eduardo Quezada
|
c68ca72fb0
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
|
2022-09-13 16:26:59 -03:00 |
|
Eduardo Quezada
|
de32940fdf
|
Further removed trailing whitespaces
|
2022-09-13 16:26:36 -03:00 |
|
Eduardo Quezada
|
1d7e8bd730
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
# Conflicts:
# asm/macros/battle_ai_script.inc
# asm/macros/battle_script.inc
# data/battle_ai_scripts.s
# include/link_rfu.h
# src/pokemon.c
# src/pokemon_summary_screen.c
# src/sound.c
|
2022-09-13 16:22:42 -03:00 |
|
GriffinR
|
c1dfd3c9ec
|
Merge pull request #1763 from GriffinRichards/rm-global
Drop usage of global directive
|
2022-09-13 15:08:37 -04:00 |
|
GriffinR
|
509f1d59cd
|
Merge pull request #1782 from LOuroboros/patch-2
Removed unused extern declaration of old gUnknown func
|
2022-09-13 14:51:20 -04:00 |
|
LOuroboros
|
2d841a25f9
|
Removed unused extern declaration of old gUnknown func
|
2022-09-13 15:45:01 -03:00 |
|
GriffinR
|
91c040b081
|
Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace
Cleaned trailing whitespace
|
2022-09-13 14:00:11 -04:00 |
|
Ct11217
|
96d190f5ad
|
Updated Toxic Status Counter
|
2022-09-12 20:39:21 -06:00 |
|
GriffinR
|
4c34babb4d
|
Merge pull request #1780 from LOuroboros/raquaza
Fixed a typo and scripting vars alignment
|
2022-09-12 22:02:46 -04:00 |
|
GriffinR
|
e7a459c778
|
Merge pull request #1781 from AsparagusEduardo/pret/pr/argumentsHeaders
Added missing labels in headers
|
2022-09-12 21:27:57 -04:00 |
|
LOuroboros
|
14c6d8b91a
|
Fixed alignment for the value of vars 0x4020 to 0x40FF
|
2022-09-12 21:33:03 -03:00 |
|
LOuroboros
|
cb83a09203
|
Fixed vars alignment
|
2022-09-12 21:27:53 -03:00 |
|
LOuroboros
|
222362e804
|
Fixed Raquaza typo
|
2022-09-12 21:26:22 -03:00 |
|
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 |
|
TheXaman
|
806106b537
|
removed flickering in debug menu @Jaizu
|
2022-09-12 12:12:26 +02:00 |
|
Eduardo Quezada D'Ottone
|
17fecd5996
|
Merge pull request #2313 from LOuroboros/intrepidDoges
Fixed the hero duo's abilities
|
2022-09-11 21:45:18 -04:00 |
|
Eduardo Quezada D'Ottone
|
6cbcbf41da
|
Merge pull request #2314 from LOuroboros/abilityPopUps
Fixed ability pop ups
|
2022-09-11 21:41:51 -04:00 |
|
LOuroboros
|
fc65a483aa
|
Fixed ability pop ups
|
2022-09-11 22:34:24 -03:00 |
|
LOuroboros
|
717d06bd17
|
Fixed the hero duo's abilities in doubles
|
2022-09-11 21:57:42 -03:00 |
|
LOuroboros
|
e624f205ba
|
Added CompareStat checks for the hero duo's abilities
|
2022-09-11 21:46:40 -03:00 |
|
Eduardo Quezada
|
65108c3192
|
Cleaned trailing whitespace
|
2022-09-11 14:14:49 -04:00 |
|
GriffinR
|
91cba0e648
|
Merge pull request #1776 from AsparagusEduardo/pret/pr/ShinyValue
Added parenthesis to GET_SHINY_VALUE
|
2022-09-11 13:49:50 -04:00 |
|
Eduardo Quezada
|
61752a4977
|
Added parenthesis to GET_SHINY_VALUE
|
2022-09-11 13:35:58 -04:00 |
|
Eduardo Quezada
|
69f01d73cd
|
Added missing uses of Fairy type for Union Room and Battle Factory
|
2022-09-11 12:41:56 -04:00 |
|
Eduardo Quezada D'Ottone
|
c340f8f051
|
Merge pull request #2309 from Jaizu/patch-28
Fix Lure prices
|
2022-09-11 12:13:26 -04:00 |
|
Jaizu
|
0daeee83f3
|
Fix Lure prices
This change reflects the original prices used in Pokémon let's go pikachu/eevee
|
2022-09-11 18:06:05 +02: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 |
|
Eduardo Quezada
|
a462db5e69
|
Automated creation of MAP_GROUP_COUNT for the debug menu
|
2022-09-09 23:34:05 -04:00 |
|
Eduardo Quezada
|
503b85aa2d
|
Generating music names for the debug menu based on their labels
|
2022-09-09 16:44:34 -04:00 |
|
Eduardo Quezada D'Ottone
|
6e7f139716
|
Merge pull request #2304 from LOuroboros/shashaForms
Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE
|
2022-09-09 15:35:09 -04:00 |
|