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

745 Commits

Author SHA1 Message Date
Hedara
c0a50096f3 Merge commit '75642625439306f0cc5aed81177dc191f0d5950e' into merrp-merge 
Conflicts:
	include/constants/event_objects.h
	src/event_object_movement.c
	src/follower_helper.c
 2025-06-25 17:54:59 +02:00
Hedara
1916703e5a Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge 
Conflicts:
	include/battle_script_commands.h
	include/constants/event_objects.h
	include/event_object_movement.h
	include/field_effect.h
	include/field_effect_helpers.h
	include/sprite.h
	src/battle_controller_player.c
	src/event_object_movement.c
	src/pokeball.c
 2025-06-25 17:49:19 +02:00
Ariel A
7564262543 Merge branch 'followers' into lighting 2025-06-24 20:44:44 -04:00
Ariel A
685a8a9118 Merge remote-tracking branch 'upstream/master' into followers 2025-06-24 20:39:12 -04:00
Hedara
726f18f360 Merge remote-tracking branch 'pret/master' into pret-merge 
Conflicts:
	asm/macros/event.inc
	data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
	data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
	data/scripts/trainer_hill.inc
	include/graphics.h
 2025-06-24 10:42:24 +02:00
GriffinR
e2e3438674 Add missing uses of LOCALID_NONE for trainerbattle 2025-06-20 15:33:12 -04:00
Hedara
9d80ad530d Merge branch 'master' into master-to-upcoming 
Conflicts:
	Makefile
	data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
	data/maps/MtChimney/scripts.inc
	data/maps/MtPyre_Summit/scripts.inc
	data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
	include/constants/event_objects.h
	include/constants/expansion.h
	src/battle_script_commands.c
	src/battle_util.c
	src/field_screen_effect.c
 2025-05-28 14:26:15 +02:00
Hedara
647c786c53 Merge commit '07c897a' into pret-merge 
Conflicts:
	include/constants/heal_locations.h
	map_data_rules.mk
 2025-05-27 19:46:13 +02:00
Hedara
c27930eabf Merge commit '678fdf9' into pret-merge 
Conflicts:
	data/maps/BirthIsland_Exterior/scripts.inc
	data/maps/DesertUnderpass/scripts.inc
	data/maps/Route117/scripts.inc
	data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
	data/maps/SootopolisCity/scripts.inc
	include/constants/event_objects.h
	src/battle_setup.c
	src/event_object_movement.c
	src/field_control_avatar.c
	src/item_use.c
	src/scrcmd.c
	tools/mapjson/mapjson.cpp
 2025-05-27 19:22:40 +02:00
Hedara
4a442cc3e6 Merge commit '091b726' into pret-merge 
Conflicts:
	include/constants/heal_locations.h
	map_data_rules.mk
 2025-05-27 19:02:53 +02:00
Hedara
9bfef357a2 Merge commit 'e4e90ea' into pret-merge 
Conflicts:
	src/battle_setup.c
	src/field_specials.c
	src/menu_helpers.c
	src/pokedex_area_screen.c
	src/roamer.c
	src/script.c
 2025-05-27 18:53:30 +02:00
GriffinR
929bc8b990 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2025-05-14 11:50:11 -04:00
Eduardo Quezada
2428af66cd Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-02-20 19:17:59 -03:00
Ariel A
a4e032c28d Merge branch 'followers' into lighting 2025-02-10 00:19:48 -05:00
Ariel A
ef05bbf394 Merge remote-tracking branch 'upstream/master' into followers 2025-02-10 00:11:38 -05:00
Frank DeBlasio
41882b267d
Consolidate duplicate dialogue of nature girl in Battle Frontier (#6195) 2025-02-08 12:51:22 -08:00
GriffinR
cdadd7d2ed Generate heal location constants automatically, move data back to a single file. 2025-02-03 20:25:11 -05: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
GriffinR
0eb6d1d74c Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants 2024-10-15 22:04:45 -04:00
GriffinR
da9c0239d9 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-10-15 22:02:40 -04: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
GriffinR
f61c0099b9 OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA 2024-10-12 23:34:02 -04:00
GriffinR
bf17d54b52 Finish adding local IDs to map.json files 2024-10-12 23:32:28 -04:00
GriffinR
cb66ea6653 Continue adding local IDs to map.json files 2024-10-12 12:24:57 -04:00
GriffinR
9f31b0fe90 Generate local IDs from map.json files 2024-10-12 03:04:24 -04:00
GriffinR
091b7269df
Move heal locations data to their associated map.json (#2034) 2024-10-11 15:15:55 -04:00
GriffinR
a551efea43 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-09-19 12:33:34 -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
5fefd743a2 Fix defines in MAP_NUM and MAP_GROUP 2024-08-14 13:02:40 +02: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