ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,540 Commits 1 Branch 0 Tags 235 MiB
eb476f9f0c
Commit Graph

9557 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
25540a7fec
Fixed Rivalry's effect + Tests (#3381) 
- It was doing the opposite if neither attacker or target were genderless
- It wasn't accounting for genderless mon
 2023-10-09 12:14:18 +02:00
LOuroboros
70ed93e01b
Updated Hisuian form abilities to SV's standard (#3391) 2023-10-08 15:54:33 -03:00
Bassoonian
cee84f0f74 Fix issues and add more ability tests 2023-10-06 15:13:26 +02:00
Brandon Lourenco
89e4f30867
Roost suppresses the user's Flying-type rather than remove and re-add it. Added tests for EFFECT_ROOST. (#3258) 
* Fixed Roost clearing type3 when used by a pure Flying-type. (Gen 5+)

* Created a test file for Roost.

* Marked tests as TODO for now.

* Added more tests for HP healed and type changing.

* Created a function to handle Roost's Flying suppression when getting a battler's type. Added more tests.

* Added test for not-yet-aquired Flying-type. Fixed/rewrote some other tests.

* Now using GetBattlerType() in most relevant places. Fixed some tests.

* Added tests for interactions between Roost and Delta Stream, type-changing effects, Grassy Terrain healing, Levitate, Air Balloon, Magnet Rise, and Telekinesis.

* Added test for interaction between Roost and Reflect Type.

* Gen 4 tests merged with Gen 5+ tests.

* Removed errant space.

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>

---------

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2023-10-05 09:19:29 +02:00
Alex
b18d01878f
Fix Battle/Shell Armor + crit chance Tests (#3377) 
* Fix Battle/Shell Armor + crit chance Tests

* fix typos

* minor record ability change
 2023-10-04 16:46:42 +02:00
DizzyEggg
10adba3af4
Fixed entry hazards switch in issue (#3316) 
* fix entry hazards switch in issue

* accidental known failing fix
 2023-10-01 10:30:41 -03:00
kittenchilly
cc1d748b47
Fixed Shiny Charm doing too many rerolls by default (#3327) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-30 20:34:52 -03:00
DizzyEggg
8efc34eb7e
flinch tests + protect/flinch fix (#3345) 2023-09-30 20:30:28 -03:00
Eduardo Quezada D'Ottone
977860f834
Fixed deleting PC mon by placing another one on top with B (#3360) 2023-09-30 20:31:11 +02:00
kittenchilly
baca050724
Allow Sliggoo to evolve during overworld fog (#3343) 2023-09-26 17:05:44 -03:00
Eduardo Quezada
e1d1236d0b Merge remote-tracking branch 'RHH_origin/master' into RHH/upcoming 2023-09-26 15:55:32 -03:00
DizzyEggg
0fed4e8912
fix protect tests failing on upcoming (#3348) 2023-09-26 15:54:01 -03:00
Eduardo Quezada
f3a65c0315 Merge branch 'RHH/master' into RHH/upcoming 2023-09-26 09:12:28 -03:00
Eduardo Quezada
2d397030fa Incorporate upstream fixes 2023-09-26 08:22:26 -03:00
Eduardo Quezada
9144b36ac1 Merge remote-tracking branch 'pret/master' into RHH/upcoming 
# Conflicts:
#	include/graphics.h
#	src/anim_mon_front_pics.c
#	src/data/graphics/pokemon.h
#	src/data/pokemon/level_up_learnsets.h
#	src/data/pokemon/pokedex_text.h
#	src/data/pokemon_graphics/still_front_pic_table.h
#	src/wild_encounter.c
 2023-09-26 08:13:49 -03:00
Eduardo Quezada D'Ottone
de577f955a
Greatly reduce AI lag (#3308) 2023-09-26 07:28:18 -03:00
ghoulslash
0b9f12efe4
Adds support for placing Pokémon in the PC with the B button (#3329) 
Adds support for placing Pokémon in the PC with the B button
 2023-09-24 21:35:16 -04:00
ghoulslash
a2640838c9
Fix Seed Sower changing move targets when triggered in double battles (#3341) 
Fix Seed Sower changing move targets when triggered in double battles
 2023-09-24 21:33:29 -04:00
Eduardo Quezada
566ec93492 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	asm/macros/battle_script.inc
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
#	include/constants/battle_script_commands.h
#	include/constants/battle_string_ids.h
#	src/battle_script_commands.c
#	src/data/battle_moves.h
 2023-09-24 20:32:45 -03:00
DizzyEggg
996bc6ba24
Fix order of messages in gen6 exp share (#3339) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-24 17:07:56 -03:00
DizzyEggg
1f1308f2f5 merge ghoul fix and correct test 2023-09-24 14:42:27 +02:00
DizzyEggg
7d9555dadb change some more variables to u32 2023-09-24 11:06:45 +02:00
DizzyEggg
5d77123c50 merge with master 2023-09-24 10:52:41 +02:00
LOuroboros
35e76e9868
Fixed Ice Spinner, refactored battle terrain text string tables and ditched EFFECT_REMOVE_TERRAIN (#3247) 
Co-authored-by: Alex <alexthenotes@gmail.com>
 2023-09-24 00:01:18 -03:00
Kurausukun
6eb6282c89 add missing constant usage in m4a_1 2023-09-23 17:06:12 -04:00
ghoulslash
b77dec1234
Transform updates AI_PARTY data (#3295) 
* Cmd_transformdataexecution overwrite AI_PARTY data

* remove whitespace

* add RecordAllMoves

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-09-23 10:44:30 +02:00
DizzyEggg
662dd7d2c6
Fix give daycare egg option giving buggy eggs (#3335) 2023-09-22 12:20:00 -03:00
Eduardo Quezada D'Ottone
f564d4492b
GetBattlerHoldEffect usage optimizations (#3330) 
* GetBattlerHoldEffect optimizations

* Type fix
 2023-09-21 21:43:52 +02:00
DizzyEggg
8bf8c9e7a7
Fix flag debug screen corrupting subsequent message boxes (#3317) 2023-09-21 11:45:02 -03:00
Bassoonian
b673738ba5 Add config for pressing B in the PC 2023-09-21 16:26:00 +02:00
DizzyEggg
5b498e968f
Fix no return in isbattlergrounded (#3328) 2023-09-21 15:24:26 +02:00
kittenchilly
d4217739e6
Add type boosting held item power config (#3326) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-20 22:03:00 -03:00
Alex
415d6e9054
Fix Toxic Debris after user faints (#3323) 2023-09-19 15:54:52 +02:00
DizzyEggg
74fd561759 merge with upcoming 2023-09-17 11:27:18 +02:00
sbird
4ed4b69019 [BUGFIX] for abilities affecting wild encounter tables 
fixes a potential buffer overread in TryGetAbilityInfluencedWildMonIndex.
The bug can occur if an electric type mon is in the first slots of a fishing
encounter table and the player carries a mon with the `ABILITY_STATIC` ability.
This never happens in the vanilla codebase.
 2023-09-15 19:11:25 +02:00
Alex
a073e7bd59
Adds Gigaton Hammer and Salt Cure (#3297) 2023-09-15 11:18:47 -03:00
kittenchilly
4a3ee0db7f
Implement Exp Charm and unevolved Exp multipliers + Exp formula fixes (#3301) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-14 15:37:57 -03:00
Alex
80ec67482e
Bitter Blade and Double Shock animations (#3310) 2023-09-14 15:31:18 -03:00
DizzyEggg
4fb0b55664
Bug bite/Fling enigma berry interaction & tests (#3311) 2023-09-14 14:13:11 -03:00
Eduardo Quezada
f3217c18dc Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_util.c
 2023-09-14 09:12:12 -03:00
DizzyEggg
7936910f90
Bug Bite - Tests and small fix (#3282) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-14 08:57:30 -03:00
Eduardo Quezada
c9b2a8ae24 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_ai_util.c
 2023-09-14 08:34:47 -03:00
kittenchilly
2ce3f4db78
Implement Enigma Berry's hold effect + tests (#3300) 
* Fix Enigma Berry

* Tests

* Update enigma_berry.c
 2023-09-14 13:08:24 +02:00
Alex
db039ee4e2
Tera Shards Icons (#3307) 2023-09-14 07:38:45 -03:00
DizzyEggg
25459073e5 ai lag fixes ready 2023-09-14 11:44:44 +02:00
DizzyEggg
bb9501449c final ai optimizations 2023-09-14 11:05:00 +02:00
DizzyEggg
5ea66f3c0c more optimizations 2023-09-14 00:07:41 +02:00
DizzyEggg
38dcb3c66c ai weather optimization 2023-09-13 17:28:26 +02:00
DizzyEggg
b7d0d37757 fix conflicts 2023-09-13 15:14:09 +02:00
DizzyEggg
0081c3a8fd small improvement 2023-09-13 14:54:47 +02:00
DizzyEggg
94a3e80c8e
Remove redundant side macros/funcs (#3299) 
Co-authored-by: gruxor <gruxor@proton.me>
 2023-09-13 09:19:18 -03:00
DizzyEggg
9031f5a063 get battlers' speed only once 2023-09-13 14:04:25 +02:00
DizzyEggg
1a64938c9b optimize dmg move result and ai who is faster 2023-09-13 13:23:19 +02:00
Alex
ca9e784102
Fixes Toxic Debris + CanTargetFaintAi index issue (#3306) 
* Fixes Toxic Debris + CanTargetFaintAi index issue

* swap macro
 2023-09-13 10:31:20 +02:00
DizzyEggg
406209f738 score to s32 2023-09-13 09:27:49 +02:00
DizzyEggg
9778587935 optimize battle util and item functions by setting u32 variables 2023-09-13 00:02:26 +02:00
DizzyEggg
44bd830d2a optimize dmg calc and ai dmg calc to reduce lag 2023-09-12 23:20:09 +02:00
DizzyEggg
2d9cbef684 exclude wild battles from ai lag meter 2023-09-12 20:19:14 +02:00
Eduardo Quezada
b89722500f Fixed Mr. Mime capitalization 2023-09-12 13:09:56 -03:00
DizzyEggg
bd48cca8a2 ai delay timer 2023-09-12 10:35:05 +02:00
Eduardo Quezada D'Ottone
13dedfb511
Revert "Implement Enigma Berry's hold effect" (#3298) 2023-09-11 10:37:17 -03:00
ghoulslash
b861f6dd9a
Fix overworld snow weather + make overworld fog cause misty terrain (#3241) 2023-09-11 09:28:44 -04:00
ghoulslash
8279ec385c
Added missing Evolution data (#3287) 2023-09-11 09:20:22 -04:00
ghoulslash
582cfb0ae7
Convert various to callnatives - Part 1 (#3269) 2023-09-11 09:19:56 -04:00
ghoulslash
181a0b35a5
Removed unused itemId field (#3293) 2023-09-11 09:13:27 -04:00
ghoulslash
ccdf72ad31
Updated Big Nugget's Fling power to Gen 8+ (#3296) 2023-09-11 09:10:50 -04:00
Eduardo Quezada
bfcbd37d78 Updated Big Nugget's Fling power to Gen 8+ 2023-09-11 02:43:39 -03:00
ghoulslash
3298312faf add script context to callnative functions 2023-09-10 21:29:13 -04:00
Eduardo Quezada
6a70b06240 Removed unused itemId field 2023-09-10 19:42:33 -03:00
DizzyEggg
4dff0362df
Fix ai vs ai battles switch issue (#3283) 2023-09-10 19:01:12 -03:00
Eduardo Quezada
755e260da4 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	include/constants/battle_move_effects.h
#	test/battle/move_effect/multi_hit.c
 2023-09-10 18:38:46 -03:00
kittenchilly
2642b81303 Merge branch 'upcoming' into overworldsnow 2023-09-10 13:21:28 -05:00
kittenchilly
daf8e6ca0b Merge branch 'master' into enigmaberry 2023-09-10 13:20:24 -05:00
Alex
18577ce598
Fix Scale Shot bug and use Canceller Multihit Moves (#3290) 2023-09-10 11:57:19 -03:00
LOuroboros
e75ed112d3
Added missing FONT_* labels in ItemUseOutOfBattle_ExpShare (#3291) 2023-09-10 11:52:50 -03:00
AaghatIsLive
49e791f128
Fixed some hisuian abilities (#3292) 2023-09-10 11:51:05 -03:00
Eduardo Quezada
b114baa07d Updated Nosepass evolution with PLA's 2023-09-09 00:01:45 -03:00
kittenchilly
7a24167b4d Merge remote-tracking branch 'upstream/upcoming' into overworldsnow 2023-09-08 11:47:35 -05:00
kittenchilly
73cbe9e37b Merge branch 'master' into enigmaberry 2023-09-08 11:44:33 -05:00
Gabriel Cowley
d585c520ff
Fix Z effect descriptions being cut off (#3286) 2023-09-08 07:09:11 -03:00
Eduardo Quezada
6332870a3b Crabominable can now evolve via Ice Stone 2023-09-08 00:30:10 -03:00
psf
75d06bb599
Generation 6 Experience Share (#3276) 2023-09-07 23:18:18 -03:00
kittenchilly
40ac214764 Fix enigma berry 2023-09-07 17:10:25 -05:00
kittenchilly
8f8705929a Update battle_util.c 2023-09-07 15:37:58 -05:00
kittenchilly
b4db3b6a81 Add enigma berry effect 2023-09-07 15:32:26 -05:00
DizzyEggg
dd3334aa82
Battle bond tests and small fix (#3279) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-07 17:23:43 -03:00
kittenchilly
e20383b0a4 Merge branch 'upcoming' into overworldsnow 2023-09-07 14:29:30 -05:00
Eduardo Quezada
3333395ff7 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/variousGone1 
# Conflicts:
#	include/constants/battle_script_commands.h
#	src/battle_script_commands.c
 2023-09-07 15:54:55 -03:00
Eduardo Quezada
820113d883 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/battle_scripts.h
#	include/battle_util.h
#	src/battle_script_commands.c
#	src/battle_util.c
 2023-09-07 15:13:06 -03:00
DizzyEggg
cfd802423b
Fling fixes and tests (#3191) 
* begin fling tests

* fling fixes and tests

* Update test/move_effect_fling.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/move_effect_fling.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/move_effect_fling.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/move_effect_fling.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/move_effect_fling.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/move_effect_fling.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/move_effect_fling.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/move_effect_fling.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* scripts names change

* fix fling's test file

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-05 06:56:36 -03:00
ghoulslash
675aa5db41
fix GetBattleAnimMoveTargets logic (#3278) 
* fix GetBattleAnimMoveTargets logic

* more efficient GetBattleAnimMoveTargets

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-09-05 09:21:14 +02:00
kittenchilly
1e10bbe007 Merge branch 'upcoming' into overworldsnow 2023-09-04 17:57:20 -05:00
kittenchilly
2fa4206bf1
Add new Substitute doll sprites (#3263) 2023-09-04 19:48:43 -03:00
DizzyEggg
d9677763e5 remove gActiveBattler replacement 2023-09-04 10:26:37 +02:00
DizzyEggg
7c2ad314d4 merge with upcoming 2023-09-04 09:40:48 +02:00
kittenchilly
0a781217ea Merge branch 'upcoming' into overworldsnow 2023-09-02 15:17:23 -05:00
Eduardo Quezada
c4553c71aa 5 more callnatives 
- jumpifshelltrap
- jumpifemergencyexited
- jumpifrodaffected
- jumpifabsorbaffected
- jumpifmotoraffected
 2023-08-31 23:43:48 -04:00
Eduardo Quezada
4ac61ad15f handleultraburst, handleprimalreversion, handlemegaevo 2023-08-31 22:34:57 -04:00
Eduardo Quezada
35d7201935 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	data/battle_scripts_1.s
#	include/battle_scripts.h
 2023-08-31 20:46:53 -04:00
Eduardo Quezada D'Ottone
c4e88760f5
Pret merge (2023/08/31) (#3268) 2023-08-31 14:52:18 -04:00