Eduardo Quezada
2428af66cd
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-02-20 19:17:59 -03:00
Frank DeBlasio
41882b267d
Consolidate duplicate dialogue of nature girl in Battle Frontier ( #6195 )
2025-02-08 12:51:22 -08:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation ( #5982 )
2025-01-25 22:02:39 +01:00
Eduardo Quezada
c363c28b22
Addressing a bunch of small things
2025-01-17 18:21:48 -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
Eduardo Quezada
a5b079d833
REVERT ME TO RESTORE HOENN MAP ADJUSTMENTS
2024-12-21 11:00:27 -03:00
Eduardo Quezada
1e6628b78d
Address Review comments Pt2
2024-12-21 10:49:59 -03: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
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
a0be2cbf7b
Fix Fallorbor typo
2024-10-12 23:50:12 -04:00
Eduardo Quezada
831b394ca1
Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909
...
# Conflicts:
# Makefile
# include/battle.h
# include/battle_main.h
# include/battle_util.h
# include/data.h
# make_tools.mk
# map_data_rules.mk
# src/battle_setup.c
# src/fieldmap.c
2024-09-11 15:26:14 -03:00
Eduardo Quezada
fc1212b060
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-09-11 08:09:09 -03:00
ghoulslash
28a9ad3399
(Default Off) Item Description Headers ( #4767 )
...
* add item descption headers and (default-off) config
* revert test script
* OW_SHOW_ITEM_DESCRIPTIONS can be 0(off), 1(first time) or 2(always), move code to overworld.c to prevent issues with users whove merged original branch. fix styling
* add ow item header config value labels
* Update include/config/overworld.h
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update src/overworld.c
* Update include/overworld.h
* ScriptShowItemDescription remove unused var
* fix ScriptShowItemDescription warning
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-03 20:22:01 +02:00
GriffinR
04197b4912
Fix swapped cycling road entrances
2024-08-31 01:54:25 -04:00
Greenphx9
ad969c968c
Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2
2024-08-25 17:54:28 +10:00
Bassoonian
a24b767276
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into masterintoupcoming18jun
2024-06-18 15:27:06 +02:00
Bassoonian
d9001a7923
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge18jun
2024-06-18 11:04:40 +02:00
Jaizu
189d542520
Fix Steven partner battle post-battle script ( #2001 )
2024-06-17 15:44:52 -04:00
Eduardo Quezada
64f82cdd5f
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_ai_util.c
# src/battle_util.c
2024-06-11 08:12:03 -04:00
Bassoonian
d6422da284
Fix partner palette problem ( #4736 )
2024-06-07 21:05:16 +02:00
Eduardo Quezada
1359966a14
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/event_object_movement.c
# src/scrcmd.c
2024-06-01 20:17:19 -04:00
Eduardo Quezada
25567070d6
Moved callfuncs to general macros folder + added comments + removed unused "emote" macro
2024-05-22 13:52:26 -04:00
Ariel A
a49d908254
Merge branch 'followers' into followers-expanded-id
2024-05-21 22:23:00 -04:00
Ariel A
f82b40178e
Merge branch 'followers' into lighting
2024-05-21 22:16:01 -04:00
Ariel A
b37d9b3000
fix: disable followers in Union Room
...
Fixed #17
2024-05-21 22:14:29 -04:00
Ariel A
9b6843442a
fix: add mart light sprite to Route102
2024-05-21 22:10:53 -04:00
Eduardo Quezada
2fe18c22f9
Style fixes
2024-05-21 18:57:09 -04:00
Eduardo Quezada
e479fa1007
Merge with latest merrp branch + starting to move the functionality of separate palettes to gSpeciesInfo
2024-03-25 16:03:56 -03:00
Ariel A
f1892cf797
Merge branch 'followers' into lighting
2024-03-06 22:21:13 -05:00
Ariel A
3486097ee9
Merge branch 'followers' into followers-expanded-id
2024-03-06 22:13:07 -05:00
Eduardo Quezada
ead108d28e
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/data/graphics/pokemon.h
2024-02-19 13:49:10 -03:00
Eduardo Quezada
124c17d315
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# README.md
# data/field_effect_scripts.s
# data/maps/AncientTomb/scripts.inc
# data/maps/DesertRuins/scripts.inc
# data/maps/IslandCave/scripts.inc
# data/scripts/follower.inc
# graphics/object_events/pics/pokemon/wailord.png
# graphics/object_events/pics/pokemon_old/substitute.png
# include/constants/event_objects.h
# include/global.h
# remote_build.sh
# spritesheet_rules.mk
# src/bike.c
# src/data/object_events/object_event_anims.h
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info_followers.h
# src/data/object_events/object_event_pic_tables.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_screen_effect.c
# src/overworld.c
# src/palette.c
# src/pokemon_summary_screen.c
# src/scrcmd.c
# src/trainer_see.c
2024-02-17 23:40:08 -03:00
Eduardo Quezada
ed4a291b37
Revert Object Event change from vanilla
2024-02-17 18:09:11 -05:00
Ariel A
7cf2d1eca0
Merge branch 'followers' into lighting
2024-02-17 17:51:30 -05:00
Ariel A
195d2bb79a
Merge branch 'followers' into followers-expanded-id
2024-02-17 17:19:01 -05:00
Ariel A
f861504cfc
Undo map.json changes.
2024-02-15 22:23:59 -05:00
psf
cc22fef6c8
- Fixes Seedot and Lotad House to give measurements based on the unit system and decimal seperator chosen by the developer. ( #4193 )
...
- Created `ConvertMonHeightToString` and `ConvertMonWeightToString` for developers to use
2024-02-15 10:23:11 +01:00
Eduardo Quezada
502a56efd1
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/global.h
# src/data.c
# src/data/pokemon/species_info/gen_7.h
2024-02-13 20:35:05 -03:00
Eduardo Quezada
afb1efe0d3
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_controller_player_partner.c
2024-01-28 18:11:44 -03:00
Bassoonian
e995927d13
Add extra key item bag space checks ( #4066 )
...
* Fix 4019
* I am exceedingly brilliant in my failure to build before pushing
2024-01-26 21:11:04 +01:00
Eduardo Quezada
ebbcb7d025
Whitespace, documentation and style
2024-01-22 19:12:52 -03:00
Eduardo Quezada
7e8ea89ded
Merge branch '_RHH/master' into _RHH/upcoming
2024-01-19 09:34:05 -03:00
fakuzatsu
cae58ca93e
fixed oversight causing chosen fossil to be lost if bag is full ( #3978 )
...
* fixed oversight causing chosen fossil to be lost
* fixed an error with my condition
* - conditional check and + underpass fossil check
2024-01-18 00:03:55 +01:00
Eduardo Quezada
ddc752eb14
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# asm/macros/event.inc
# data/field_effect_scripts.s
# data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
# data/script_cmd_table.inc
# graphics/pokemon/castform/sunny/anim_front.png
# graphics/pokemon/castform/sunny/normal.pal
# include/battle_util.h
# include/constants/event_object_movement.h
# include/constants/field_effects.h
# src/battle_controller_player.c
# src/battle_util.c
# src/data/object_events/movement_action_func_tables.h
# src/data/object_events/object_event_pic_tables.h
# src/data/trainer_graphics/back_pic_anims.h
# src/daycare.c
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/load_save.c
# src/scrcmd.c
# src/trainer_see.c
2024-01-17 18:11:35 -03:00
psf
bf8b09b1b6
Item Ball refactor / Pluralize item names for giveitem and finditem ( #3942 )
...
* Emptied out item_ball_scripts
Added GetObjectEventTrainerRangeFromTemplate
Added Common_EventScript_FindItem
* Replaced trainer_sight_or_berry_tree_id with item constant
Replaced scripts with Common_EventScript_FindItem
* Renamed to GetItemBallIdAndAmountFromTemplate
Moved to item_ball.c
* Updated ObjectEventTemplate
* Updated inc files to support plural item names
* Refactored CopyItemNameHandlePlural to handle all items
* Change failsafe in GetItemBallIdFromTemplate to be ITEM_NONE + 1 instead of ITEMS_COUNT
* Converted spaces to tabs
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415663
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415525
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415409
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415130
* Added warning on object_event macro to prevent silent failure
Reverted global.fieldmap to original state, per feedback
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-14 21:35:45 +01:00
