ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-23 03:40:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,352 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

8050 Commits

Author SHA1 Message Date
LOuroboros
a127cb32bb Removed pointless use of preproc directives 2022-03-30 02:05:54 -03:00
LOuroboros
434f6cf5ad Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-03-26 08:43:55 -03:00
BuffelSaft
4b769901bc
Merge pull request #2059 from AsparagusEduardo/BE_SandForce 
Remove repeated ability check in battle_ai_util.c
 2022-03-26 15:40:47 +13:00
ExpoSeed
5fd468f507 Review comments. Commented code removed, ShouldAIUseZMove moved to battle_ai_util and renamed to be consistent with other fns 2022-03-22 13:10:24 -05:00
ExpoSeed
f50a406b18 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2022-03-22 12:56:23 -05:00
LOuroboros
0a65fd316c Fixed Enigma Berry check in CanMegaEvolve 2022-03-20 12:21:15 -03:00
TheXaman
192969c492 small fix 2022-03-18 20:47:12 +01:00
ghoulslash
0036a4dc36 pc acccess 2022-03-18 13:30:08 -04:00
LOuroboros
315813d186 Update debug.c 2022-03-16 10:39:59 -03:00
GriffinR
5160520639
Merge pull request #1642 from GriffinRichards/bstrings 
Add usage of battle strings table offset constant
 2022-03-14 16:40:54 -04:00
GriffinR
33c05cefe2
Merge pull request #1644 from GriffinRichards/name-jump-long-grass 
Name unknown_16.png
 2022-03-14 16:32:08 -04:00
GriffinR
058783c148 Fix comment mistake 2022-03-14 16:01:17 -04:00
GriffinR
0a0157b62c Name unknown_16.png 2022-03-14 15:54:47 -04:00
Eduardo Quezada D'Ottone
c00873cbc4
Merge pull request #2073 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2022-03-13 18:15:45 -03:00
GriffinR
ce227aa055
Merge pull request #1640 from GriffinRichards/doc-egg-hatch 
Improve egg hatch documentation
 2022-03-12 09:41:14 -05:00
GriffinR
d664135572 Add usage of battle strings table offset constant 2022-03-10 10:44:04 -05:00
SubzeroEclipse
d3589103b3 Fixed some move descriptions 2022-03-09 15:23:08 +01:00
ghoulslash
f53de6ae87 fix toxic/flame orb. use CanBeX'ed functions 2022-03-08 15:16:17 -05:00
Eduardo Quezada D'Ottone
e088552398 Fixed going out of bounds when choosing a move for detailed Give Mon 2022-03-07 21:17:31 -03:00
GriffinR
b1d61b9227
Merge pull request #1641 from GriffinRichards/subsprite-arr-count 
Use ARRAY_COUNT for obj event subsprite tables
 2022-03-03 23:08:52 -05:00
GriffinR
f78f46a1e2 Use ARRAY_COUNT for obj event subsprite tables 2022-03-03 14:54:05 -05:00
GriffinR
8bf7e7b6f5 Improve egg hatch documentation 2022-03-03 01:33:49 -05:00
ultima-soul
2d3ba500c9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2022-03-01 15:10:19 -08:00
ultima-soul
84a7f960c8 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2022-02-28 23:37:41 -08:00
ultima-soul
86089ce935 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2022-02-28 22:13:14 -08:00
GriffinR
a2ee0c8393
Merge pull request #1639 from GriffinRichards/typo-hoppy 
Fix bunny hoppy typo
 2022-02-28 22:34:24 -05:00
GriffinR
5d58cdd297 Fix bunny hoppy typo 2022-02-28 13:34:39 -05:00
GriffinR
2142ad96d5
Merge pull request #1638 from GriffinRichards/menu-arr-count 
Add missing menu array counts
 2022-02-28 01:49:09 -05:00
GriffinR
3d0663fe81 Additional trader clean up 2022-02-27 13:58:48 -05:00
GriffinR
36e5d5e759 Add missing menu array counts 2022-02-27 13:47:50 -05:00
Eduardo Quezada D'Ottone
054f667446 Config for Kadabra ignoring Everstone upon evolving 2022-02-26 22:04:24 -03:00
Eduardo Quezada D'Ottone
ed1ea69759 Fixed Shelmet and Karrablast being able to evolve if the partner is holding an Everstone 2022-02-26 21:40:20 -03:00
Eduardo Quezada D'Ottone
b1227af13b Reverted to separate form change tables for Forces of Nature. 
It was causing form changes with holding items to break
 2022-02-26 12:58:49 -03:00
Eduardo Quezada D'Ottone
e2daf2c258 Fixed bug where switching between 2 forms with the same method would cause only one to change 2022-02-26 12:23:37 -03:00
Eduardo Quezada D'Ottone
755b31bee0 Enable form change for the Forces of Nature 2022-02-26 12:19:38 -03:00
Eduardo Quezada D'Ottone
9a31fdf7be Updated Applin, Sinistea and Galarian Slowpoke evolution data 2022-02-26 11:38:08 -03:00
Eduardo Quezada D'Ottone
ed464a9e8d
Merge pull request #2068 from ghoulslash/be/strugglebug 
Fix struggle bug anim
 2022-02-25 12:50:55 -03:00
ghoulslash
7c2bbf1df3 fix struggle bug anim 2022-02-25 08:54:35 -05:00
ghoulslash
92487db470 add config check for B_GLARE_GHOST 2022-02-25 08:20:56 -05:00
ghoulslash
e4ef3cc3b4 move glare effectiveness exception to code 2022-02-24 22:06:18 -05:00
cbt6
f826a5a82d Use constants for PC locations 2022-02-23 15:07:22 +08:00
sphericalice
40efac0ddf Rename GetBattlePyramindTrainerEncounterMusicId to fix typo 2022-02-22 19:13:17 +00:00
Eduardo Quezada D'Ottone
224b9a1549 Fixed softlock when pressing the start button while in link room 2022-02-21 20:29:46 -03:00
GriffinR
eca5233abe
Merge pull request #1633 from abaresk/slot-cleanup 
Clean up and document Slot Machines more
 2022-02-20 17:59:14 -05:00
hondew
08bf2587ce Fix typos 2022-02-20 17:47:24 -05:00
hondew
39fc1cd414 Switch to 'symbol' nomenclature 2022-02-20 17:02:37 -05:00
hondew
26e87eed0a Address comments 2022-02-20 15:32:32 -05:00
hondew
a578fa5e2b Minor fixes 2022-02-20 12:06:29 -05:00
hondew
50cb504d4c Remove stuff 2022-02-20 10:15:07 -05:00
Abaresk
c39b0ff6d7 Document slot machine more (unabridged) 2022-02-20 10:09:49 -05:00