Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,045 Commits 1 Branch 0 Tags
Commit Graph

4228 Commits

Author SHA1 Message Date
Alex
3def0e751b
Fixes crash damage move against absorbing abilities (#6361) 2025-03-09 20:54:58 +01:00
ghoulslash
d44eff4e0c fix red card overwriting gBattlerAttacker causing subsequent MOVEEND cases checking attacker not to trigger properly 2025-03-03 14:56:08 -05:00
Hedara
06d31bc8ea Merge branch 'master' into final-1.10-master-upcoming-merge 2025-02-26 22:07:10 +01:00
hedara90
37abce1992
Made some move animations fit in VRAM (#6289) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-02-26 14:56:36 +01:00
Alex
13acf18d74
Fixes effect paralyze not being absorbed by absorbing abilities (#6338) 2025-02-25 22:28:10 +01:00
PhallenTree
320c6cf11f
Fixes Coaching on semi-invulnerable ally, Air Balloon being stolen, Immunity abilities being ignored by Mold Breaker (#6327) 2025-02-23 20:50:52 +01:00
Eduardo Quezada
fe7ed22f5b Merge branch '_RHH/master' into _RHH/upcoming 2025-02-20 19:44:00 -03:00
Alex
767ea38dbf
Fixes doesnt effect message for Thunder Wave (#6304) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-02-20 19:18:27 -03:00
PhallenTree
f6ff64cdbe
Fixes Brick Break/Psychic Fangs/Raging Bull breaking screens if target is immune (#6308) 2025-02-20 12:55:10 -03:00
PhallenTree
5340dc8687
Fixes non-Ghost type Curse animation (#6299) 2025-02-19 18:09:06 +01:00
Alex
b2f45fcf1f
Restoretarget in Rototiller script + Tests (#6296) 2025-02-18 20:43:07 +01:00
Alex
502b1c5087
Rename SetPhotonGeyser to a more general use and clean up (#6272) 2025-02-17 22:07:30 +01:00
PhallenTree
b1c597495b
Fixes Called moves ignoring redirection (#6267) 2025-02-14 13:47:02 +01:00
Eduardo Quezada
9c4fbbf274 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-13 13:06:32 -03:00
Hedara
a859f40e37 Review comments 2025-02-12 14:31:42 +01:00
Hedara
7426a98dc5 Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp-merge 2025-02-12 13:34:28 +01:00
Eduardo Quezada
3507862164 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-12 09:30:59 -03:00
Ariel A
c8fb56d73b Merge branch 'followers' into followers-expanded-id 2025-02-10 00:24:50 -05:00
Ariel A
ef05bbf394 Merge remote-tracking branch 'upstream/master' into followers 2025-02-10 00:11:38 -05:00
PhallenTree
cf5b95cee8
Fixes Expanding Force and Spectral Thief move animations (#6185) 2025-02-09 22:34:48 +01:00
Eduardo Quezada
a2ad5d2ca3
Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes (#6210) 2025-02-09 21:54:03 +01:00
Zatsu
43bce41796
Add caught mon to full party by sending a different mon to the Box (#6058) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-02-09 00:54:58 +01:00
ghoulslash
6f541bb449
Fix Liquid Ooze + Leech Seed Test (#6217) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2025-02-08 22:42:25 +01:00
Frank DeBlasio
41882b267d
Consolidate duplicate dialogue of nature girl in Battle Frontier (#6195) 2025-02-08 12:51:22 -08:00
Alex
de9e9af1b7
Fixes Spectral Thief stealing boost at the wrong time (#6197) 
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
 2025-02-07 16:24:05 -05:00
Alex
765a12f520
Convert max effects to normal move effects (#6143) 2025-02-06 21:02:39 -03:00
Hedara
27da389d1e Merge branch 'master' into master-to-upcoming 2025-02-06 13:05:02 +01:00
hedara90
cad1a37566
Tachyon Cutter and Salt Cure animations (#6182) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-02-05 15:27:21 +01:00
PhallenTree
5238665a7a
Fixes Suction Cups ability popup and Red Card + Guard Dog interaction (#6171) 2025-02-03 18:31:14 +01:00
Eduardo Quezada
64c5113b23 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-02 14:18:13 -03:00
Alex
97d8bd2646
Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs (#6154) 2025-01-31 22:02:26 +01:00
Alex
89cfd85b8f
Fixes battler mutation during the intim script (#6151) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-01-31 21:49:26 +01:00
hedara90
e1e3bcfa91
Tera starstorm (#6073) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-01-26 11:08:46 +01:00
Ariel A
8933b84e1c Merge branch 'followers' into followers-expanded-id 2025-01-25 21:40:51 -05:00
Pawkkie
43e41bbed8
Add Code Entry functionality (#5951) 2025-01-25 22:03:08 +01:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation (#5982) 2025-01-25 22:02:39 +01:00
Ariel A
c492bb3fec fix: follower field movements after scripted movement update 2025-01-21 23:27:28 -05:00
Pawkkie
44ebf33f1d
Add Steven Multi to debug menu (#6064) 2025-01-20 22:29:21 +01:00
Eduardo Quezada
f6a86a65ef Merge branch '_RHH/master' into _RHH/upcoming 2025-01-19 10:32:57 -03:00
Alex
9ed3b176f0
Pret merge (17 of January) (#6045) 2025-01-18 19:53:29 +01:00
ghoulslash
37cbae5e54
Fix Symbiosis Needing battler Argument + Tests (#6039) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2025-01-18 14:44:07 +01:00
Bassoonian
bcf9a1eff8 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan 2025-01-17 21:57:25 +01:00
GriffinR
2f67b17571
Document bard music (#2053) 
* Missing bard song limit constants
* Index bard sound arrays with word constants
* Document bard music
 2025-01-17 17:54:38 +00:00
Raymond Dodge
b5b0ffd511
Define field script opcode constants (#2005) 
Replace the magic number opcodes in field script command macros with
these new constants
 2025-01-17 17:04:00 +00:00
Eduardo Quezada
ce40c3356c Merge branch '_RHH/master' into _RHH/upcoming 2025-01-12 08:42:57 -03:00
hedara90
9c7c94d474
Fixed a bunch of move anims (#5936) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-01-12 10:01:44 +01:00
Eduardo Quezada
15a034a1d9
Fixed multiple transform/form change graphical issues (#6005) 2025-01-12 09:49:19 +01:00
Eduardo Quezada
8821779815 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-11 08:07:15 -03:00
Martin Griffin
1551a33069
Fix leftover test change from #5033 (#5987) 2025-01-09 17:28:09 -03:00
Martin Griffin
bb781f21a1
Arbitrary trainer scripts + map script/trigger softlock prevention (#5033) 
Script_RunImmediatelyUntilEffect runs a script until either a specified
effect may occur or it reaches an end.

All existing script commands and natives, and some specials, call
Script_RequestEffects which allows us to analyze them.

Any downstream script commands/natives/specials will be statically known
not to call Script_RequestEffects and treated as if they have all
effects. Manually tagging them with requests_effects=1 and calling
Script_RequestEffects will make them analyzable.

Using these, we're able to execute scripts until they either exit with
no effect, or would possibly have an effect. This allows us to:
1. Not run on frame map scripts or triggers if they would have no
   effect.
2. Immediately run triggers if they only affect flags/vars. This removes
   the lag frames when biking into the Cycling Road, for example.
3. Migrate on load/on transition/on resume/on return to field/on dive
   warp scripts onto the global script context if they would block
   (approximated via SCREFF_HARDWARE).
4. Support arbitrary control flow in trainer scripts. The trainer does
   not see the player if the script has no effect, and the trainer will
   use whichever trainerbattle command is branched to.
5. Support arbitrary scripts in trainer scripts. cant_see and
   cant_see_if_* commands have been introduced so that scripts are able
   to do something when the player interacts with the trainer even if
   that trainer wouldn't see them.
 2025-01-08 10:27:00 +00:00