Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,156 Commits 1 Branch 0 Tags
Commit Graph

12991 Commits

Author SHA1 Message Date
GriffinR
4941e2602a
Merge pull request #1909 from GriffinRichards/stat-anim 
Document stat change animation
 2023-08-20 14:29:11 -04:00
kittenchilly
5e98891577 Snow doesn't cause shade anymore 2023-08-20 13:24:20 -05:00
CyanSMP64
4e5809a0d0 tweak graveler, pikachu 2023-08-20 22:08:54 +12:00
GriffinR
6792028254 Document title screen task data 2023-08-20 01:18:44 -04:00
GriffinR
5beec06d9d Document Task_MapNamePopUpWindow 2023-08-19 17:20:53 -04:00
kittenchilly
0ad3919f22 Fix overworld snow weather 2023-08-19 01:40:31 -05:00
CyanSMP64
ec24754489 fix arcanine, change bg colour of green pokemon 2023-08-18 17:24:30 +12:00
Eduardo Quezada
d3333812dd Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer 2023-08-17 17:52:28 -04:00
kittenchilly
4ca4b2dd76 Update battle_interface.c 2023-08-17 13:29:27 -05:00
kittenchilly
4e0e70ae81 Fix memory corruption when handling the ultra burst trigger sprite 2023-08-17 13:29:04 -05:00
kittenchilly
f95b4fdb4c Merge branch 'upcoming' into ultraburst 2023-08-17 13:25:00 -05:00
Eduardo Quezada
a6dbb68bac Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	data/battle_scripts_1.s
#	src/battle_util.c
#	src/battle_z_move.c
 2023-08-17 13:42:09 -04:00
Philipp AUER
cd90fdec5d
[Critical] fix memory corruption when handling trigger sprites (#3238) 
Co-authored-by: sbird <sbird@no.tld>
 2023-08-16 20:21:16 -04:00
ghoulslash
01a91c4a56 reset gDexnavBattle in FreeResetData_ReturnToOvOrDoEvolutions 2023-08-16 20:08:58 -04:00
GriffinR
bdc0ea1037 Add MOD to match mod with powers of 2 2023-08-16 16:44:45 -04:00
GriffinR
057928438a Document ChooseMoveAndTargetInBattlePalace 2023-08-16 16:41:29 -04:00
GriffinR
aca7998b93 Add missing use of ALL_MOVES_MASK 2023-08-16 14:33:15 -04:00
Jaizu
693f7509bb
Make use of MULTI_B_PRESSED constant. (#4) 2023-08-16 14:49:44 +02:00
CyanSMP64
74de0ef3ca set background colour 2023-08-16 13:58:31 +12:00
GriffinR
10a10e914b
Merge pull request #1910 from GriffinRichards/misc-constants 
Use miscellaneous missing constants
 2023-08-15 17:53:41 -04:00
CyanSMP64
0c27db10d6 Review mon sprites 0001-0080 2023-08-15 20:24:07 +12:00
kittenchilly
dba28cf93f
Allow Z-Moves to be selected after Mega Evolution (#3233) 
* Allow Z-Moves to be selected after Mega Evolution

* You cannot do Wish Mega Evolution at all if you hold a z crystal

* Rebase to master
 2023-08-14 19:10:15 -04:00
LOuroboros
2d45b9b8fe
Corrected conditionals used for B_SPEED_BUFFING_RAPID_SPIN and I_GEM_BOOST_POWER (#3232) 2023-08-14 16:14:12 -04:00
LOuroboros
c414a0103c
Made Cmd_jumpifnopursuitswitchdmg and Cmd_pursuitdoubles use Pursuit's effect ID instead of its move ID (#3231) 
* Made jumpifnopursuitswitchdmg use Pursuit's effect ID instead of its move ID

* Made Cmd_pursuitdoubles use Pursuit's effect ID too, even though it's unused
 2023-08-14 08:45:37 -04:00
sbird
6a622eb006 Merge remote-tracking branch 'pret/master' into feature/dynmulti 2023-08-14 13:20:03 +02:00
PCG
b8a22eb119
Remove soundMove from Steam Eruption and replace it with sheerForceBoost (#3229) 
Co-authored-by: PCG06 <prajithgomes06@gmail.com>
 2023-08-13 00:53:22 -04:00
GriffinR
4c2b12541b
Merge pull request #1908 from GriffinRichards/name-buffer 
Automatically update nickname buffer sizes
 2023-08-12 23:36:19 -04:00
GriffinR
344fe4dd65 Stop double-counting EOS in assert 2023-08-12 23:13:11 -04:00
kittenchilly
5e8caa8d45 Merge branch 'upcoming' into ultraburst 2023-08-12 12:36:11 -05:00
kittenchilly
2b27b0bf00 Constants 2023-08-12 12:30:36 -05:00
Eduardo Quezada
952bacd858 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
#	.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
#	.github/ISSUE_TEMPLATE/04_other_errors.yaml
 2023-08-11 17:50:28 -04:00
Eduardo Quezada D'Ottone
ada29313de
Fix for wild double battles with an in-game partner (#3210) 
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
 2023-08-11 17:29:10 -04:00
Philipp AUER
59da940283
Refactor damage formula to match Gen5+ (#3196) 
* [battle, damage] refactor damage formula to match gen5+

* [test] use exact values for dry skin, swarm tests

* fixup: assume stats for dry-skin, swarm tests

---------

Co-authored-by: sbird <sbird@no.tld>
 2023-08-11 16:28:38 -04:00
GriffinR
b248791f47
Merge pull request #1904 from GriffinRichards/temp-alias 
Add temp flag and var aliases
 2023-08-11 15:45:00 -04:00
kittenchilly
c3a8edae32 Sprites and fixes 2023-08-11 13:36:01 -05:00
Eduardo Quezada
f026b51b48 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer 
# Conflicts:
#	src/battle_main.c
#	src/battle_tower.c
#	src/match_call.c
 2023-08-11 11:41:44 -04:00
GriffinR
60a6c9d160
Merge pull request #1903 from GriffinRichards/frontier-gfx 
Fix some frontier gfx, adjacent cleanup
 2023-08-10 14:49:44 -04:00
Alex
bcb6f723d9 Use AI_DATA->holdEffects instead AI_GetHoldEffect 2023-08-10 16:24:29 +02:00
Alex
275e5ef5e6 Make more use of AI_GetHoldEffect + Fake Out changes 
fix ShouldTryToFlinch

fix some mess up

fix of fix of mess up
 2023-08-10 15:33:12 +02:00
GriffinR
d5d46bb438 More DISPLAY_WIDTH/HEIGHT constant usage 2023-08-10 01:42:38 -04:00
GriffinR
18319e8da3 Misc missing constant use 2023-08-10 01:42:18 -04:00
GriffinR
079f2da0f6 Fix some missing constant use in Apprentice 2023-08-10 00:38:23 -04:00
kittenchilly
c3e31af5f3 Ultra burst trigger 2023-08-09 22:12:26 -05:00
GriffinR
d1c2a30149
Merge pull request #1907 from GriffinRichards/fix-tv 
Fix Bravo Trainer Tower member names
 2023-08-09 15:25:45 -04:00
GriffinR
6eaaa50ad5
Correct berry fix graphics colors, more PLTT constant use (#1892) 2023-08-09 12:49:21 -04:00
Martin Griffin
912a80e27a
Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
DizzyEggg
5f7819f697 no exp for ai mons 2023-08-09 16:03:02 +02:00
DizzyEggg
fec8f14fff IsAiAiBattle function 2023-08-09 15:57:22 +02:00
DizzyEggg
d0fe75b06a fixes 2023-08-09 09:57:42 +02:00
DizzyEggg
a0c34813f1 small fixes 2023-08-09 09:34:41 +02:00