Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-30 13:57:40 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
7,840 Commits 3 Branches 0 Tags
2c1237365b935aa537c2f3d1e1b7c10728fe02a1
Commit Graph

7840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LOuroboros
2c1237365b Fixed Emergency Exit 
The ability was getting triggered even if the user was the only Pokémon alive in the party.
 2021-06-07 22:39:53 -03:00
ExpoSeed
339f297949 Merge pull request #1525 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2021-06-07 15:56:43 -05:00
ultima-soul
092f02f119 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-06-07 12:00:23 -07:00
ultima-soul
2563bc5c83 Merge pull request #1521 from DizzyEggg/largeexp 
Allow larger exp gains
 2021-06-06 13:33:33 -07:00
luckytyphlosion
7a7ebe1827 Merge pull request #1461 from Fontbane/patch-1 
Rename sText_WildPkmnAppeared2 to reflect its use
 2021-06-04 22:42:24 -04:00
ultima-soul
3448e19275 Merge pull request #1459 from ExpoSeed/BE/rename-flags 
Rename flags
 2021-06-04 19:33:45 -07:00
AJ Fontaine
2fe7184d10 Rename sText_WildPkmnAppeared2 to reflect its use 
sText_WildPkmnAppeared2 is used for Legendary battles, so sText_LegendaryPkmnAppeared would be more informative.
 2021-06-04 22:32:33 -04:00
ExpoSeed
12a155bd9a FLAG_DMG_2X_IN_AIR can now hit targets 2021-06-04 21:28:28 -05:00
ExpoSeed
aefd5e26d1 Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-04 21:26:15 -05:00
ExpoSeed
8810809849 Missed one rename! 2021-06-04 19:39:03 -05:00
ExpoSeed
4bb33367df Newline 2021-06-04 19:35:16 -05:00
ExpoSeed
ec2c140ecb Disambiguate Thousand Arrows flag from other flags 2021-06-04 19:34:37 -05:00
ExpoSeed
15914d7af8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/rename-flags 2021-06-04 19:00:29 -05:00
ultima-soul
6edec5bc3d Merge pull request #1437 from LOuroboros/oblivious 
Tweaked Oblivious
 2021-06-04 16:51:38 -07:00
ExpoSeed
0e96b47584 Review comments 2021-06-04 18:50:11 -05:00
LOuroboros
b552db7193 Tweaked the Oblivious immunities 
Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
 2021-06-04 19:23:07 -03:00
DizzyEggg
4b744374c8 Allow larger exp gains 2021-06-03 23:17:44 +02:00
ultima-soul
2813b4f9bf Merge pull request #1519 from DizzyEggg/flameburst 
Fix FlameBurst
 2021-06-03 09:30:50 -07:00
ultima-soul
e5a3123b8c Merge pull request #1505 from MissingNoL/Decaps-and-Miracle-Eye-Text-Fixes 
Decaps and Miracle Eye text fixes
 2021-06-03 09:06:15 -07:00
ultima-soul
9584b8539f Merge pull request #1492 from LOuroboros/battle_debug 
Tweaked src/battle_debug.c to comply with the PE
 2021-06-03 09:01:37 -07:00
ultima-soul
87db8c6f51 Merge pull request #1486 from LOuroboros/clanging_scales 
Implemented Clanging Scales' effect
 2021-06-03 08:51:00 -07:00
LOuroboros
b67e82c7c1 Syntax change #2 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-03 05:17:52 -03:00
LOuroboros
cb4f16a178 Syntax change #1 
Though I don't like it, personally.

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-03 05:17:41 -03:00
MissingNoL
1022d34218 Update src/data/text/move_descriptions.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-03 01:16:03 -07:00
LOuroboros
b215b44951 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into clanging_scales 2021-06-03 05:09:14 -03:00
DizzyEggg
85ff866998 Fix FlameBurst 2021-06-03 09:50:43 +02:00
ultima-soul
b7f9009c1e Merge pull request #1515 from DizzyEggg/battle_engine 
Get rid of SOUND_PAN_ATTACKER in launchtemplate
 2021-06-02 23:45:12 -07:00
ultima-soul
72f23ff7ba Merge pull request #1507 from ghoulslash/flower_gift 
Add Sunny Check to Flower Gift Ally Boosts
 2021-06-02 23:35:59 -07:00
ultima-soul
bb9a7b04f8 Merge pull request #1499 from LOuroboros/patch-1 
Made gAbilityNames and gAbilityDescriptionPointers read from ABILITIES_COUNT
 2021-06-02 23:07:50 -07:00
ultima-soul
c01247237d Merge pull request #1498 from AsparagusEduardo/fix_BE_X_items 
Fixed B_X_ITEMS_BUFF boosting 2 stages only in Gen 7
 2021-06-02 23:05:33 -07:00
Eduardo Quezada D'Ottone
3e611a9b01 Merge pull request #1518 from LOuroboros/z_moves_BE 
Commented out call to inexistent IsZMove func
 2021-06-02 19:27:34 -04:00
ExpoSeed
27516ed81c Merge pull request #1516 from LOuroboros/holdEffects_BE 
Adjusted the list of item hold effects
 2021-06-02 16:05:57 -05:00
LOuroboros
37875a7850 Commented out call to inexistent IsZMove func 2021-06-02 18:02:04 -03:00
LOuroboros
bf679fc99e Tweaked Task_ShowAiKnowledge too 2021-06-02 17:42:55 -03:00
LOuroboros
e65f8dfd0e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_debug 2021-06-02 17:40:17 -03:00
GriffinR
a21ceb2e3c Merge pull request #1457 from Kurausukun/const 
Re-add const to gEvolutionTable in daycare.c
 2021-06-02 16:28:39 -04:00
LOuroboros
6ccb493f12 Adjusted the list of item hold effects 2021-06-02 17:23:58 -03:00
LOuroboros
586c76d93a Changed Clanging Scales' secondaryEffectChance to 0 
Review request.
 2021-06-02 16:46:28 -03:00
LOuroboros
a60fd31b9f Added the MOVE_EFFECT_CERTAIN arg to BattleScript_EffectAttackerDefenseDownHit 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-02 16:42:02 -03:00
ultima-soul
255be1a0c4 Merge pull request #1423 from BuffelSaft/body-press 
Implement Body Press's effect
 2021-06-01 18:42:54 -07:00
BuffelSaft
2a6b989c92 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press 2021-06-02 12:41:28 +12:00
LOuroboros
c21a00a5d1 Replaced magic numbers with constants in BattleScript_NotAffectedAbilityPopUp 2021-06-01 18:20:33 -03:00
LOuroboros
d48a6e00d4 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into oblivious 2021-06-01 18:15:01 -03:00
Kurausukun
5c6b8ea8d6 re-add const to gEvolutionTable in daycare.c 2021-06-01 17:14:45 -04:00
DizzyEggg
dd88be659c Get rid of SOUND_PAN_ATTACKER in launchtemplate 2021-06-01 13:44:02 +02:00
DizzyEggg
72b7cb2dad Merge pull request #1474 from LOuroboros/overdrive 
Fixed Overdrive's animation
 2021-06-01 13:33:11 +02:00
Kurausukun
9f5bf65fb3 [PROBABLY LEAK-INFORMED] fix battle_transition fakematch, make 
consistent use of SOME_VRAM_STORE
 2021-05-31 18:12:35 -05:00
Kurausukun
2bbaf71998 [LEAK-INFORMED] fix CreateShedinja fakematch 
info: the header change is required. accesses to the struct need to be
treated as non-const, even though the array must be const. thanks to
jiang for figuring this out.
 2021-05-31 08:20:46 -05:00
Kurausukun
2705f2e5f4 [LEAK-INFORMED] also pretty dumb 2021-05-31 08:20:46 -05:00
Kurausukun
42021db743 [LEAK-INFORMED] literal dumbest fakematch ever 2021-05-31 08:20:46 -05:00