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

3072 Commits

Author SHA1 Message Date
Bassoonian
bcf9a1eff8 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan 2025-01-17 21:57:25 +01: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
Eduardo Quezada
15a034a1d9
Fixed multiple transform/form change graphical issues (#6005) 2025-01-12 09:49:19 +01:00
Eduardo Quezada
21bc5cfd30
Debug menu and createmon additions/cleanup (#5994) 2025-01-11 10:07:47 +01: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
Eduardo Quezada
40ba25dd3e
Converted 2 various to callnative (#5950) 2025-01-05 17:47:49 +01:00
psf
a7f77ed08d
Adds B_VAR_DIFFICULTY and related functions READ DESC (#5337) 
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: hedara90 <90hedara@gmail.com>
 2025-01-04 14:25:03 +01:00
Eduardo Quezada
89f90e1f69 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-03 13:58:10 -03:00
Eduardo Quezada
9669a0554d
Encapsulate move data (#5852) 2025-01-01 20:34:33 +01:00
Ariel A
a515cb3c6b Merge branch 'followers' into lighting 2025-01-01 00:37:09 -05:00
Eduardo Quezada
3bc4126558 Merge branch '_RHH/master' into _RHH/upcoming 2024-12-28 15:28:07 -03:00
Alex
f61a0f6a30
Sheer Force fix and move effect cleanup (#5812) 2024-12-21 19:45:50 +01:00
Eduardo Quezada
dbc3cc28b8 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-12-21 09:31:23 -03:00
Eduardo Quezada
25075239a2 Merge branch '_RHH/master' into _RHH/upcoming 2024-12-21 08:46:33 -03:00
Eduardo Quezada
82252251e7 Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
Eduardo Quezada
05f300f6cc Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-12-20 15:22:14 -03:00
Pawkkie
da2a1e2aba
Destiny Bond fails on repeated use in Gen 7+ (#5652) 2024-12-05 22:29:20 +01:00
Eduardo Quezada
720b2daecc Improve Pyramid location documentaion 2024-12-05 18:25:27 -03:00
Eduardo Quezada
3f98c78297
Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
Eduardo Quezada
d151e00c70 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-12-04 19:15:48 -03:00
Eduardo Quezada
e4f8b4ccf0 Addressed review changes (minus encapsulation) 2024-12-04 11:31:28 -03:00
AlexOn1ine
d95dbadccc merge rhh/upcoming 2024-12-02 19:00:55 +01:00
AlexOn1ine
aa61f24e81 clean up 2024-12-02 18:25:24 +01:00
Pawkkie
2b7905beb1
Add B_FLAG_SLEEP_CLAUSE (#5566) 
Co-authored-by: Isaac Rivera <isaacrivera2020@u.northwestern.edu>
Co-authored-by: iriv24 <40581123+iriv24@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-12-02 09:06:03 +01:00
Eduardo Quezada
1a581c407c Merge branch '_RHH/master' into _RHH/upcoming 2024-12-01 08:11:32 -03:00
Alex
b3b0973fbb
Fixes Population Bomb / Triple Kick missing message (#5747) 2024-11-30 18:06:17 -05:00
AlexOn1ine
97b30cb712 simultaneous hp reduction 2024-11-23 08:35:01 +01:00
Alex
b55c87f73f
Fixes Take heart (#5658) 
Co-authored-by: KyleLaporte <moog272@gmail.com>
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
 2024-11-11 14:58:09 -05:00
Eduardo Quezada
b48e5770be Merge branch '_RHH/master' into _RHH/upcoming 2024-11-11 15:58:42 -03:00
Eduardo Quezada
e005ffb576 Merge branch '_RHH/master' into _RHH/upcoming 2024-11-06 10:01:48 -03:00
Alex
8581646c22
Convert 3 variouses to callnatives (#5646) 2024-11-06 10:09:49 +01:00
Alex
dc740b4e9a
Fixes Magic Coat message (#5645) 2024-11-06 10:09:00 +01:00
Eduardo Quezada
ee2535be96 Merge branch '_RHH/master' into _RHH/upcoming 2024-11-03 12:21:22 -03:00
Alex
45d063dcf8
Fixes Dragon Tail using the effect twice during a Parental Bond attack (#5630) 
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-11-02 09:38:29 -03:00
Ariel A
0f706ac9e0 Merge branch 'followers' into followers-expanded-id 2024-10-21 00:05:26 -04:00
Ariel A
4056804575 feat: improved follower handling during scripted movements 2024-10-20 23:55:05 -04:00
Eduardo Quezada
ee9c6d4912 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-17 00:16:01 -03:00
Eduardo Quezada
80447bee8e Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015 2024-10-15 20:56:56 -03:00
GriffinR
9f31b0fe90 Generate local IDs from map.json files 2024-10-12 03:04:24 -04:00
psf
0ef3f7dedd
Merge branch 'upcoming' into scriptCommands 2024-10-11 16:27:02 -07:00
Eduardo Quezada
1d9557811b Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-10-08 15:58:17 -03:00
kittenchilly
44bf14e6fd
Add functionality to Poké Flute and Town Map (#5405) 
* Add functionality to Poké Flute and Town Map

* Poke flute in-battle

* Address reviews

* Update item_use.c

* Update battle_message.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c
 2024-10-03 10:52:59 +02:00
Eduardo Quezada
d1056f887b Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-09-30 15:52:49 -03:00
psf
58aa1e0034
Merge branch 'upcoming' into scriptCommands 2024-09-30 06:57:54 -07:00
Alex
42c43a3f8f
Adds Commander and Order Up (#5246) 
* Adds Commander

* review points

* new line

* correction

* regression / double targeting still broken

* fix wrong target order

* transform fixes

* haze test

* fixes, tests

* bring back wrongly removed else if case

* Eject Pack / Button test + fix

* red card fix

* test fixes

* Fixes Tatsu being hit by multi hit move

* change transform check

* fix test + revert change

* Fix Tatsugiri attacking after freed up from Dozo in the same turn

* Dragon Darts tests

* fix test

* review comments

* assumtion in wrong file

* Order Up test fixes

---------

Co-authored-by: hedara90 <90hedara@gmail.com>
 2024-09-29 22:45:50 +02:00
Eduardo Quezada
5130ea9da3 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-28 11:45:49 -03:00
ghoulslash
d695a6240d
Convert settotemboost command to callnative (#5418) 
* settotemboost use callnative

* Update src/battle_main.c

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-09-22 11:25:42 +02:00
pkmnsnfrn
d76ccddad3 spaces to tabs in inc files 2024-09-14 09:03:49 -07:00
pkmnsnfrn
60fb0b34fd Modified getobjectxy to allow for custom destinations 2024-09-14 07:48:24 -07:00