ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,460 Commits 1 Branch 0 Tags 235 MiB
4aabd09ab3
Commit Graph

13460 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eduardo Quezada D'Ottone
1ba70a46f2
Fixed Jump Kick's recoil not happening after Spiky Shield's damage (#3208) 
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
 2023-08-11 17:26:43 -04:00
Eduardo Quezada
33b16cb82d 2nd pass 2023-08-11 16:55:27 -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
063d83b58e Fix build 2023-08-11 14:01:45 -05:00
kittenchilly
c3a8edae32 Sprites and fixes 2023-08-11 13:36:01 -05:00
Eduardo Quezada D'Ottone
bd7960ef21
Updated versions for issue templates (#3220) 2023-08-11 12:04:03 -04: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
a0b42d0cd6
Merge pull request #1911 from Kermalis/remove-ewram-in-headers 
Remove ewram in headers
 2023-08-10 20:16:12 -04:00
Kermalis
9226b23fb8 Remove ewram in headers 2023-08-10 20:11:07 -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
Martin Griffin
f6e6a1f383
Initialize save to empty in test runner (#3215) 2023-08-09 10:06:03 -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
DizzyEggg
8d5ba6c6d1 allow ai vs ai battles 2023-08-09 09:15:42 +02:00
GriffinR
6598cb30bc Document stat change animation 2023-08-08 23:56:16 -04:00
GriffinR
65fee186f8 Automatically update nickname buffer sizes 2023-08-08 16:28:09 -04:00
GriffinR
087a2cecef Fix Bravo Trainer Tower member names 2023-08-08 14:38:00 -04:00
DizzyEggg
be0861b746
Update src/battle_ai_main.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2023-08-08 20:03:19 +02:00
Eduardo Quezada
8a3eaadf7b Renamed "ButItFailed" script name to align with names below it 2023-08-08 08:58:57 -04:00
DizzyEggg
f72ec368fc improve switching with ai bad moves 2023-08-08 12:55:47 +02:00
Alex
42992ca5ce
Fix Teleport ending trainer battles (#3166) 2023-08-07 11:23:12 -04:00
DizzyEggg
1fb42e4497
Sticky web / Court Change / Mirror Armor tests + small fixes (#3160) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: Martin Griffin <martin.griffin@algosport.co.uk>
 2023-08-07 10:27:57 -04:00
Eduardo Quezada D'Ottone
fc66a8c476
Adds Mortal Spin and Population Bomb (#3178) 2023-08-07 08:54:18 -04:00
Alex
8ee3a3c5bb solve conflics 2023-08-07 14:25:30 +02:00
DizzyEggg
ce18df46e6 replace global usage of gActiveBattler in controller files 2023-08-07 12:51:58 +02:00
DizzyEggg
b8ba6139cb health bar update 2023-08-07 10:29:02 +02:00
DizzyEggg
546b0c7e97 handle move anim 2023-08-07 09:26:03 +02:00
Eduardo Quezada
d74cbca0b9 LF shenanigans 2023-08-06 21:02:16 -04:00
Eduardo Quezada
34d38bdbae Merge branch 'RHH/master' into RHH/upcoming 2023-08-06 20:31:45 -04:00
Eduardo Quezada
833f7dd9d3 LF shenanigans 2023-08-06 20:25:23 -04:00
DizzyEggg
e8d6c99e6d more controllers work 2023-08-07 01:05:09 +02:00
DizzyEggg
ef8024d8c5 draw trainer pic 2023-08-06 21:50:59 +02:00
Eduardo Quezada
d9a17467cf Kept previous check while using gTestRunnerEnabled 2023-08-06 14:28:02 -04:00
DizzyEggg
a9483c361b trainer intro ball throw 2023-08-06 12:41:36 +02:00
DizzyEggg
af899c9679 stuff 2023-08-06 00:44:22 +02:00