Eduardo Quezada D'Ottone
|
d59d8b92af
|
Merge branch 'dev' into AI
|
2022-09-24 11:07:09 -03:00 |
|
Eduardo Quezada D'Ottone
|
bb564d805f
|
Merge pull request #2353 from LOuroboros/siTypes
Fixed Z-Moves showing the wrong type in battle
|
2022-09-24 10:36:38 -03:00 |
|
Eduardo Quezada D'Ottone
|
6bf794eb1c
|
Merge pull request #2350 from LOuroboros/yagami
Fixed Light That Burns The Sky's animation
|
2022-09-24 09:44:39 -03:00 |
|
LOuroboros
|
696d90880e
|
Made Z-Moves always show the right type
|
2022-09-24 09:33:31 -03:00 |
|
LOuroboros
|
c64593cb9c
|
Fixed LTBTS's animation
|
2022-09-24 09:04:15 -03:00 |
|
Eduardo Quezada D'Ottone
|
88f22e92ff
|
Merge pull request #2349 from LOuroboros/patch-2
Updated IsViableZMove
|
2022-09-24 08:57:57 -03:00 |
|
LOuroboros
|
64405250ae
|
Updated IsViableZMove
|
2022-09-24 08:50:48 -03:00 |
|
Eduardo Quezada D'Ottone
|
29c3f57772
|
Merge pull request #2343 from StubbornOne/GetAiLogicData
Replace battle-type flags in GetAiLogicData with BATTLE_TYPE_HAS_AI
|
2022-09-21 12:54:13 -03:00 |
|
StubbornOne
|
cad8922d7b
|
Replace battle-type flags in GetAiLogicData with BATTLE_TYPE_HAS_AI
|
2022-09-21 23:42:40 +08:00 |
|
Eduardo Quezada D'Ottone
|
5261645c7e
|
Merge pull request #2340 from LOuroboros/patch-2
Update debug.c
|
2022-09-20 06:33:29 -03:00 |
|
LOuroboros
|
d04a852e91
|
Update debug.c
|
2022-09-20 02:31:20 -03:00 |
|
Eduardo Quezada D'Ottone
|
24aebf0624
|
Merge pull request #2337 from LOuroboros/patch-2
Renamed some misclassified labels in src/debug.c
|
2022-09-19 14:33:51 -03:00 |
|
Eduardo Quezada D'Ottone
|
6868d8aa2a
|
Merge pull request #2338 from LOuroboros/BoxMonMon
Fixed typo in BoxMonKnowsMove
|
2022-09-19 14:33:12 -03:00 |
|
Eduardo Quezada D'Ottone
|
6e0481e723
|
Merge pull request #2336 from ghoulslash/be/aiswitch
fix natural cure, shed skin, early bird check in ShouldSwitchIfGameSt…
|
2022-09-19 12:10:38 -03:00 |
|
LOuroboros
|
5f67335212
|
Fixed typo in BoxMonKnowsMove
|
2022-09-19 05:21:54 -03:00 |
|
LOuroboros
|
c137b01dd8
|
Update debug.c
|
2022-09-19 04:19:19 -03:00 |
|
ghoulslash
|
add3625589
|
fix natural cure, shed skin, early bird check in ShouldSwitchIfGameStatePrompt
|
2022-09-18 22:47:30 -04:00 |
|
Eduardo Quezada D'Ottone
|
f3ac3e4dc3
|
Merge remote-tracking branch 'RHH_origin/master' into RHH/dev_1.x
|
2022-09-18 01:12:06 -03:00 |
|
Eduardo Quezada D'Ottone
|
2c287b779f
|
Merge pull request #2334 from Porygon23/Critical-Bug-Fix
Fixed ACE_POKEMON_FUNCTIONALITY
|
2022-09-18 00:57:37 -03:00 |
|
Eduardo Quezada D'Ottone
|
41ae8ecdb7
|
Update src/battle_controller_opponent.c
|
2022-09-18 00:51:34 -03:00 |
|
Eduardo Quezada D'Ottone
|
293a880238
|
Apply suggestions from code review
|
2022-09-18 00:50:21 -03:00 |
|
Ct11217
|
5f74781a7d
|
Remove ACE_POKEMON_FUNCTIONALITY
|
2022-09-17 17:44:50 -06:00 |
|
ghoulslash
|
b75c8e0525
|
Merge pull request #2330 from rh-hideout/1.1.0
Version 1.1.0
|
2022-09-17 10:46:34 -04: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 |
|
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 |
|