Ruby
2740fdd6e6
Timemacros ( #6696 )
2025-05-11 12:34:54 +02:00
Bivurnum
668cd7e413
Rename follower npc macros for better specificity and to match documentation ( #6742 )
2025-05-02 21:08:42 +02:00
Bivurnum
47723c34e5
Follower NPCs (follow-me) ( #6500 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-27 14:56:18 +02:00
Ruby
aba34015db
Time menu for RTC in debug menu. ( #6634 )
...
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-23 19:34:37 +02:00
Eduardo Quezada
2428af66cd
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-02-20 19:17:59 -03:00
Eduardo Quezada
9c4fbbf274
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-13 13:06:32 -03:00
hedara90
7d1bbf62e1
Apply suggestions from code review
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-13 10:23:06 +01:00
Hedara
7426a98dc5
Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp-merge
2025-02-12 13:34:28 +01: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
hedara90
174bc2f29f
Fixed typo in requests_effects ( #6215 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-09 16:59:31 -05:00
Eduardo Quezada
11bdbfb658
Fix compile issues
2025-01-26 16:35:05 -03:00
Eduardo Quezada
00241cf569
Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2
...
# Conflicts:
# README.md
# asm/macros/event.inc
# data/scripts/pkmn_center_nurse.inc
# include/constants/event_objects.h
# include/constants/field_weather.h
# include/overworld.h
# include/palette.h
# include/sprite.h
# src/battle_controller_player.c
# src/data/object_events/object_event_graphics.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_weather.c
# src/overworld.c
# src/palette.c
# src/scrcmd.c
# src/sprite.c
2025-01-26 12:08:10 -03:00
Ariel A
c1d105c31c
Merge branch 'lighting' into lighting-expanded-id
2025-01-25 21:45:23 -05:00
Ariel A
bc034aaf73
Merge branch 'followers-expanded-id' into lighting-expanded-id
2025-01-25 21:42:02 -05:00
Ariel A
16c31d61b4
fix: removed fadescreenswapbuffers palette dependence, via hardware fade
2025-01-25 20:58:22 -05:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation ( #5982 )
2025-01-25 22:02:39 +01:00
Eduardo Quezada
26daf15ce0
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-24 18:29:28 -03:00
ghoulslash
774e61e74a
Add Script Cmd for Forcing Save Game ( #6090 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-01-24 20:42:16 +01:00
DizzyEggg
4e0eab9e27
Remove gDecompressionBuffer ( #6029 )
2025-01-23 09:47:14 +01:00
Eduardo Quezada
a756bb501c
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-19 22:31:33 -03:00
Eduardo Quezada
f6a86a65ef
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-19 10:32:57 -03:00
Eduardo Quezada
937b3106b4
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-17 19:33:48 -03:00
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
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
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
Ariel A
a515cb3c6b
Merge branch 'followers' into lighting
2025-01-01 00:37:09 -05: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
82252251e7
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220
2024-12-20 16:04:33 -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
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
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
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
pkmnsnfrn
1665423e52
Renamed scripts to match vanilla
...
Cleaned up descriptions
2024-09-14 07:11:04 -07:00
pkmnsnfrn
a509f28038
Changed Scripot_GetObjectFacingDirection to callnative
2024-09-14 06:32:47 -07:00
pkmnsnfrn
510af1bee6
Restored original functions and made script versions
2024-09-12 20:55:37 -07:00
pkmnsnfrn
ecd435cd84
Changed CheckChosenMOnMatchDesiredSpecies and CheckPartyHasSpecies to callnative
2024-09-12 20:45:14 -07:00
pkmnsnfrn
c2db77c4f6
Changed Script_GetSetPokedexFlag to callnative
2024-09-12 20:15:55 -07:00
pkmnsnfrn
be7938f322
Changed CheckObjectAtXY to callnative
2024-09-12 18:55:11 -07:00
pkmnsnfrn
10bb349b8c
Changed GetObjectPosition to callnative
2024-09-12 18:41:42 -07:00
pkmnsnfrn
22b0fdf5c3
Removed checkspecies_auto and made that the default behavior
2024-09-12 18:18:41 -07:00
pkmnsnfrn
979c9994f7
Set VAR_RESULT to the number of removed items from removeallitem per https://github.com/rh-hideout/pokeemerald-expansion/pull/5177\#issuecomment-2294980531
2024-09-12 05:47:12 -07:00
