LOuroboros
af6ea91e72
Applied Eduardo's suggestion
2022-12-14 10:48:12 -03:00
LOuroboros
37151e4a2d
Updated SetMoveEffect
2022-12-14 10:46:11 -03:00
ghoulslash
90dd59c039
Merge pull request #2513 from LOuroboros/patch-1
...
Update battle.h
2022-12-13 11:54:18 -05:00
LOuroboros
6ef30da492
Update battle.h
2022-12-13 02:44:49 -03:00
ghoulslash
657e0d755b
Merge pull request #2511 from AsparagusEduardo/RHH/pr/cleanup/SpecialStatus
...
Reorganized SpecialStatus struct to minimize padding.
2022-12-11 22:50:17 -05:00
Eduardo Quezada
1290a9411d
Reorganized SpecialStatus struct to minimize padding.
2022-12-12 00:37:00 -03:00
ghoulslash
340278c83b
Merge pull request #2452 from LOuroboros/intimidate
...
Optimized Intimidate's code
2022-12-11 22:04:16 -05:00
LOuroboros
8eff1a13c1
Updated BattleScript_IntimidateEffect to comply with BattleScript_TryAdrenalineOrb's demands
2022-12-11 23:17:59 -03:00
LOuroboros
e6a3396b0f
Added Adrenaline Orb check and removed silly comment
2022-12-11 19:24:36 -03:00
Eduardo Quezada D'Ottone
db32032781
Merge pull request #2475 from Bassoonian/gen9moves
...
Set FLAG_SYS_POKEMON_GET when debug gifting yourself a Pokémon
2022-12-11 18:39:25 -03:00
Bassoonian
07a8af5975
Set FLAG_SYS_POKEMON_GET when debug gifting yourself a Pokémon
2022-12-11 22:09:23 +01:00
ghoulslash
e3e0d60222
Merge pull request #2467 from Bassoonian/gen9moves
...
Generation IX Moves
2022-12-11 14:47:47 -05:00
GriffinR
5c90df73ba
Merge pull request #1825 from AsparagusEduardo/pret/pr2/AnimationMacros
...
Species animation tables into macros
2022-12-10 10:00:34 -05:00
Eduardo Quezada
2f96344cd9
Removed ANIM_CMD macro from unused_anims.h
2022-12-10 11:46:41 -03:00
GriffinR
f87c5be45a
Merge pull request #1827 from SBird1337/fix/debugprint
...
[fix] DebugPrintf with no format arguments
2022-12-09 12:54:19 -05:00
sbird
0d5adac1e1
[debug, printf] add DebugPrintfLevel macro
2022-12-07 00:03:25 +01:00
sbird
fab26b99f1
[fix] DebugPrintf with no format arguments
2022-12-06 15:59:59 +01:00
Eduardo Quezada D'Ottone
3718f58a0a
Merge pull request #2469 from LOuroboros/patch-1
...
Updated TryChangeBattleTerrain
2022-12-05 23:40:52 -03:00
LOuroboros
f9458117ee
Updated TryChangeBattleTerrain
2022-12-05 23:31:41 -03:00
Eduardo Quezada
2d694a84e3
Trying to fix remote reference
2022-12-05 21:57:28 -03:00
Eduardo Quezada D'Ottone
63310df7c6
Merge pull request #2468 from LOuroboros/patch-1
...
Update INSTALL.md
2022-12-04 20:57:29 -03:00
LOuroboros
4d1494bf95
Update INSTALL.md
2022-12-04 20:48:17 -03:00
Bassoonian
8c77ae59d6
Use official Double Shock message
2022-12-04 21:57:02 +01:00
Bassoonian
06ab4fc842
Update move flags
2022-12-04 21:56:40 +01:00
Bassoonian
b0ead44ee8
Update battle_tv.c
2022-12-04 21:23:45 +01:00
Bassoonian
58a54c90d2
Restore GEN_LATEST to GEN_8
2022-12-04 18:16:37 +01:00
Bassoonian
5bcb6b8afd
Update B_METRONOME_MOVES
2022-12-04 18:16:15 +01:00
Bassoonian
dc97a31c31
Change battle_debug.c to MOVES_COUNT
2022-12-04 18:15:35 +01:00
Bassoonian
c14fa82f43
Fix Headlong Rush description
2022-12-04 18:14:27 +01:00
Bassoonian
051ad7bf69
Update src/data/text/move_descriptions.h
...
Co-Authored-By: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-12-04 00:26:05 +01:00
GriffinR
f55443656f
Add NUM_TILES_PER_METATILE
2022-12-03 17:29:02 -05:00
Eduardo Quezada D'Ottone
14e35a4831
Merge pull request #2466 from ghoulslash/be/slidefix
...
Set battler before BattleScript_TrainerSlideMsgRet
2022-11-29 22:22:19 -03:00
ghoulslash
6140cacbef
set BS_SCRIPING before BattleScript_TrainerSlideMsgRet
2022-11-29 18:28:33 -05:00
Eduardo Quezada D'Ottone
816bc46694
Merge pull request #2456 from AsparagusEduardo/RHH/pr/sync/pretmerge_20221124
...
Gen 9 when? (Pret sync 2022/11/24)
2022-11-29 17:46:16 -03:00
Eduardo Quezada
9d1149c423
Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221124
...
# Conflicts:
# src/pokemon.c
2022-11-29 17:40:09 -03:00
Eduardo Quezada D'Ottone
7ab3d37a7c
Merge pull request #2464 from ghoulslash/be/callnative
...
add callnative bs func, convert metal burst dmg calc
2022-11-28 16:16:04 -03:00
ghoulslash
510fb56d74
distinguish callnative vs. various macrso
2022-11-28 11:57:34 -05:00
ghoulslash
b869b836cc
add callnative bs func, convert metal burst dmg calc
2022-11-28 10:34:27 -05:00
ghoulslash
1037613b0e
Merge pull request #2418 from LOuroboros/zPP
...
Made Z-Moves unusable without PP
2022-11-28 09:52:28 -05:00
ghoulslash
ac30ebd5a4
Merge pull request #2453 from AsparagusEduardo/RHH/pr/cleanup/configShiny
...
Refactored Shiny configs + cleanup
2022-11-28 09:51:39 -05:00
ghoulslash
33873eff6f
Merge pull request #2460 from LOuroboros/rareCandiesLv100
...
Allow Lv100 'mons to access level based evos
2022-11-28 09:48:55 -05:00
GriffinR
dc24fde7f6
Sync calcrom fixes
2022-11-27 17:33:09 -05:00
GriffinR
e5260c9aa1
Merge pull request #1823 from tustin2121/patch-6
...
Use multi-include incbins for stormy_water animation
2022-11-27 12:26:52 -05:00
tustin2121
cf6f343726
Use multi-include incbins for stormy_water
...
- Removes a special case rule from the make files.
2022-11-26 23:38:39 -05:00
BuffelSaft
70a10ebda0
Merge pull request #2462 from AsparagusEduardo/RHH/pr/fix/cries
...
Fix cry table alignment due to missing placeholder Enamorus Therian cry
2022-11-27 02:12:38 +13:00
Eduardo Quezada
65a33ed442
Fix cry table alignment due to missing placeholder Enamorus Therian cry
2022-11-26 09:20:54 -03:00
LOuroboros
add75d84c0
Applied a couple of tweaks
...
-Made it so only Rare Candies can evolve Lv100 'mons. Game Freak dumb. The Exp. Candies SHOULD work too.
-Made sure to remove the candy that was used from the bag.
2022-11-25 18:12:51 -03:00
LOuroboros
53110a0ff6
Allow Lv100 'mons to access level based evos
2022-11-25 17:34:11 -03:00
Eduardo Quezada
e858b4e709
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
...
# Conflicts:
# include/battle.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_dome.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/battle_tower.c
# src/data/pokemon/species_info.h
# src/pokemon.c
2022-11-24 15:36:00 -03:00
GriffinR
004ce32da0
Sync text ctrl codes with pokefirered
2022-11-23 21:13:00 -05:00
