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

428 Commits

Author SHA1 Message Date
hedara90
6fdb6a9e34
Fixed broken palette load for shiny followers in the sprite visualizer (#6683) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-04-23 12:17:54 +02:00
Bassoonian
708bb4a831 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge10apr 2025-04-10 23:57:57 +02:00
cawtds
1672d99060 make linkDirection more robust to member reordering 2025-04-09 13:40:39 +02:00
Deokishisu
eaf7549854
Replace Incorrect Slow Stairs Movement with Correct One (#6275) 2025-03-16 14:51:36 -07:00
Eduardo Quezada
9c4fbbf274 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-13 13:06:32 -03:00
Alex
8448e745ea
Adds a follower flag define to disable followers on the fly (#6174) 2025-02-13 17:33:59 +01:00
Bassoonian
35324497a6
Update src/event_object_movement.c 2025-02-13 13:35:38 +01:00
hedara90
7d1bbf62e1
Apply suggestions from code review 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-02-13 10:23:06 +01: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
Eduardo Quezada
d3417b00a2
Fixed compilation error when turning P_GENDER_DIFFERENCES off (#6223) 2025-02-09 15:37:56 +01:00
Eduardo Quezada
e29e1c6ca7 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-07 15:33:26 -03:00
hedara90
f9d1fdcf4c
Follower Object Event refactor (#6129) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-02-06 21:12:42 +01:00
Ariel A
bc421740e8 fix: fixed compilation error when OW_GFX_COMPRESS is FALSE 2025-01-29 23:12:45 -05:00
Ariel A
8933b84e1c Merge branch 'followers' into followers-expanded-id 2025-01-25 21:40:51 -05:00
Ariel A
d73167e262 fix: treat 1-tile jumps as slow copyable movement for follower pokemon 2025-01-25 21:37:16 -05:00
DizzyEggg
4e0eab9e27
Remove gDecompressionBuffer (#6029) 2025-01-23 09:47:14 +01:00
Bassoonian
a1c47a931f
Revert "Converts a bunch of defines to enums" (#6082) 2025-01-22 21:50:39 +01:00
Bassoonian
a3ce3a569d
Converts a bunch of defines to enums (#6071) 2025-01-21 21:19:41 +01:00
Eduardo Quezada
cd1482bbaa
Expanded Pokémon Follower transformation functionality (#5048) 2025-01-18 23:19:06 +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
ghoulslash
d8ea4fa1ec Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav 2025-01-02 08:28:21 -05:00
Ariel A
a6ef9c7577 Merge branch 'followers' into followers-expanded-id 2025-01-01 00:39:14 -05:00
Eduardo Quezada
e1275594c5
Renamed OW type effectiveness function for clarity (#5917) 2024-12-31 22:55:42 +01:00
Ariel A
3fffb9fac6 feat: added configuration to restrict following pokemon. Closes #42 2024-12-30 21:38:18 -05:00
Ariel A
57a198bca0 feat: make follower sidestep or backstep with player during scripts 2024-12-30 21:38:18 -05:00
Ariel A
5536a5535c fix: made slitherTracks_Transitions a proper 2D array. Credit: jaizu 2024-12-30 20:52:05 -05:00
Ariel A
d12a24aef2 fix: gave MOVEMENT_TYPE_FOLLOW_PLAYER an initial facing direction 2024-12-14 23:07:02 -05:00
ghoulslash
b488ff9b53 merge w upcoming 2024-11-03 07:11:40 -05:00
Eduardo Quezada
dfa3690d74
Added config to disable gender differences (#5595) 2024-10-29 15:38:26 +01:00
Alex
76eae8ed00
Decouple Poke Ball ids from item ids (#5560) 2024-10-28 18:03:15 +01:00
hedara90
bcfdf41078
Follower female fix (#5475) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-10-22 12:38:06 -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
ghoulslash
cf78462fab merge w upcoming 2024-10-15 21:24:47 -04:00
psf
0ef3f7dedd
Merge branch 'upcoming' into scriptCommands 2024-10-11 16:27:02 -07:00
ghoulslash
2e52e3331f merge w upcoming 2024-10-04 12:56:21 -04:00
kittenchilly
19009c6d21
Add support for overworld sprite gender differences + add all the sprites (#5394) 2024-10-04 17:56:21 +02:00
kittenchilly
a135876dc0
Remove trailing whitespace pass 10-2-2024 (Upcoming) (#5456) 2024-10-02 21:20:23 +02:00
psf
58aa1e0034
Merge branch 'upcoming' into scriptCommands 2024-09-30 06:57:54 -07:00
ghoulslash
c8afe9bbde some formatting fixes 2024-09-29 13:34:11 -04:00
ghoulslash
be3ee1ba85 merge w upcoming 2024-09-29 13:33:20 -04:00
ghoulslash
b7246a018c merge w upcoming 2024-09-22 09:13:25 -04:00
pkmnsnfrn
a509f28038 Changed Scripot_GetObjectFacingDirection to callnative 2024-09-14 06:32:47 -07:00
Eduardo Quezada
8c0580828f
Apply suggestions from code review 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-09-13 09:27:16 -03:00
pkmnsnfrn
a0e914b749 Merge branch 'upcoming' into scriptCommands 2024-09-12 05:39:24 -07:00
Eduardo Quezada
60803cdba9 Fixed braces style 2024-09-09 13:58:23 -03:00