ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,534 Commits 1 Branch 0 Tags 235 MiB
0a2aacd446
Commit Graph

13534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
DizzyEggg
e0e49a9933
Fix protect recoil issue and add tests for protect (#3321) 
* fix protect recoil issue and add tests for protect

* test for #3312 and baneful bunker fix

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* more recoil moves for protect test

* Update test/battle/move_effect/protect.c

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

* rename spiky shield test

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-26 07:26:23 -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
ba03992abd test for seed sower 2023-09-24 14:28:06 +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
GriffinR
7cc75eb5b8
Merge pull request #1927 from Kurausukun/m4asym 
Add Missing Constant Usage in m4a_1
 2023-09-23 21:49:12 -04: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
GriffinR
003d7d7e2e
Merge pull request #1923 from SBird1337/bugfix/ability-wild-mons 
[BUGFIX] for abilities affecting wild encounter tables
 2023-09-19 14:47:25 -04:00
Alex
415d6e9054
Fix Toxic Debris after user faints (#3323) 2023-09-19 15:54:52 +02:00
DizzyEggg
136ea395ac
Fix tests breaking on modern (#3319) 
* Fix tests breaking on modern

* modern tests fix - macro and rodata changes

* ld script rodata modern
 2023-09-19 12:15:03 +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
ghoulslash
623015bd8d
Add ai delay timer (#3302) 2023-09-13 08:00:29 -04: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
GriffinR
de3493ff0e
Merge pull request #1921 from citrusbolt/blockboxrs 
[LEAK-INFORMED] Add `blockBoxRS` field to `struct BoxPokemon`
 2023-09-12 18:48:05 -04:00
DizzyEggg
9778587935 optimize battle util and item functions by setting u32 variables 2023-09-13 00:02:26 +02:00