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
GriffinR
04197b4912
Fix swapped cycling road entrances
2024-08-31 01:54:25 -04:00
Eduardo Quezada
4d6452e14e
Move general config file to the config folder ( #4805 )
2024-06-19 13:42:01 +02:00
Eduardo Quezada
3d9c7732f6
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/event_object_movement.h
# src/data.c
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info/gen_4_families.h
2024-04-20 13:23:14 -04:00
Damon Murdoch
ecf70d365c
[Rebase of #4286 ] Reordered Debug_EventScript_InflictStatus1 ( #4372 )
...
* Update debug.inc
Created new merge as per discussion in discord, previous pull request https://github.com/rh-hideout/pokeemerald-expansion/pull/4286
* Added new file 'config.inc' as per feedback
Added new file 'config.inc' as per feedback
* Restore order
* fixed, my bad
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-04-14 17:31:39 -04: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
psf
fe16a2cdee
Port pokefirered's Vs. Seeker to pokeemerald ( #3256 )
...
* First version of Vs. Seeker
* Update movement.inc
98f7e9978d (r1306721924)https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722004
* Update field_effect_scripts.s
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722024
* Update item_use.h
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722401
* Update movement_action_func_tables.h
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722828
* Update event_object_movement.c
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722887
* Update overworld.c
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306723396
* Update vs_seeker.h
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306724158
* Update vs_seeker.c
Addressed some cleanup comments from SBird
* Update UpdateRandomTrainerRematches
Fixed typo in ClearAllTrainerRematchStates
Fixed types in GetRematchableTrainerLocalId
* Updated UseVsSeekerEffect_2
* Updated UseVsSeekerEffect_3
* Updated UseVsSeekerEffect_4
* Fixed bug that allowed Vs Seeker to be used indoors in correct places
Moved VsSeeker function declarations into header
* Refactored FieldUseFunc_VsSeeker
* Added curly braces to else case in FieldUseFunc_VsSeeker
* renamed data[x] in Task_ResetObjectsRematchWantedState
* Refactored Task_ResetObjectsRematchWantedState
* Refactored VsSeekerResetObjectMovementAfterChargeComplete
* Refactored ResetMovementOfRematchableTrainers
* Refactored GatherNearbyTrainerInfo
* Refactored Task_VsSeeker_3
* CanUseVsSeeker
* Refactored GetVsSeekerResponseInArea
* GetCurVsSeekerResponse refactored
* Cleaned up GetTrainerFlagFromScript
* Gave sensible names to Task_VsSeeker
* Fixed two bugs where player would not have the right gfx state after using VsSeeker on a Bike or Underwater
* Renamed UseVsSeeker Functions
* Added I_VS_SEEKER_CHARGING to make Vs. Seeker broken until flag is assigned
Removed extra VsSeeker animation code
* Addressed PR feedback
* Fixed issue with building non-modern
* Refactored GetRunningBehaviorFromGraphicsId and renamed to GetResponseMovementTypeFromTrainerGraphicsId
* Addresses Lunos's PR feedback: https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1623547850
Removed the check to see if a map was not indoors to improve readability
Made IsValidLocationForVsSeeker into a static function
* Added changes in response to Jasper's feedback
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1725276522
* Updated with Edu's discord feedback https://discord.com/channels/419213663107416084/1135040810082123907/1176872015085453392
* Removed ifdef tags around the repo unless needed
b5dc744ced
2023-11-26 18:58:43 +01:00
Eduardo Quezada
8e0991475c
Incorporated upstream fixes
2023-10-27 11:04:10 -03:00
GriffinR
a5c2ac5e49
Use BUGFIX in assembly files
2023-10-20 09:10:49 -04:00
Eduardo Quezada
341ce6fd95
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
...
# Conflicts:
# .github/workflows/build.yml
# README.md
# gflib/sprite.c
# graphics/pokemon/banette/anim_front.png
# graphics/pokemon/banette/normal.pal
# graphics/pokemon/sentret/normal.pal
# graphics/pokemon/togetic/anim_front.png
# graphics/pokemon/togetic/normal.pal
# include/battle_script_commands.h
# include/data.h
# ld_script.txt
# src/battle_controller_player.c
# src/bike.c
# src/event_object_movement.c
2023-06-16 21:25:16 -04:00
Eduardo Quezada
011ec16f1e
Organized conffig files into their own folder and cleaned up
2022-11-14 11:03:49 -03:00
Eduardo Quezada
e3005e5275
Item config for repel prompt
2022-09-12 10:21:52 -03:00
TheXaman
8c9a59ec1c
Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh
2022-08-29 19:13:11 +02:00
Ariel A
9beee311c4
Merge branch 'master' into romhack
2022-07-17 15:13:15 -04:00
TheXaman
c54bf21b01
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system
2022-04-16 23:18:35 +02:00
LOuroboros
fa39dc76dc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
Ariel A
c29516bc2f
Fixed bug with follower update after the party was healed. Credit: Jaizu
2021-12-22 22:14:28 -05:00
LOuroboros
e28fa7f91c
Update event_scripts.s
2021-12-21 22:10:54 -03:00
Ariel A
bdcbb5c700
Merge branch 'master' into romhack
2021-12-18 17:14:52 -05:00
ultima-soul
23bf41713c
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-12-01 20:17:08 -08:00
ultima-soul
0312c5be8b
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-27 21:38:26 -08:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
GriffinR
e66ea0cb99
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
TheXaman
2f8896f2f0
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system
2021-11-18 15:13:04 +01:00
GriffinR
c4f8f4d11a
Add STR_VAR_# ids to string buffer macros
2021-11-17 22:00:44 -05:00
GriffinR
f85de6eca5
Start event macro comment updates
2021-11-15 10:54:57 -05:00
GriffinR
b14fe9dce3
Merge pull request #1547 from GriffinRichards/doc-sounddata
...
Clean up sound, add CRY_MODE constants
2021-11-13 15:54:40 -05:00
GriffinR
54b254a829
Add CRY_MODE constants
2021-11-07 13:33:05 -05:00
cbt6
32aaf6912f
Rename movement scripts to use Faster over Fastest
2021-11-05 02:22:28 +08:00
GriffinR
fbf3bf2ce8
Replace 'mystery_event_club'
2021-10-26 22:43:56 -04:00
GriffinR
ece7ef3410
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00
Ariel Antonitis
8a3b04e837
Merge branch 'master' into romhack
2021-09-02 01:03:13 -04:00
ultima-soul
02c9e040df
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-11 16:33:10 -07:00
GriffinR
06351bf63c
Remove address comments
2021-07-20 15:18:31 -04:00
ultima-soul
092f02f119
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-06-07 12:00:23 -07:00
Ariel Antonitis
e4b9bb75e2
Merge branch 'master' into romhack
2021-06-04 23:36:21 -04:00
ExpoSeed
6a977bdbfc
Document second parameter of playbgm
2021-05-21 15:08:00 -05:00
Ariel Antonitis
8a3dfbf252
Added pokemon followers & script commands.
2021-03-03 01:04:22 -05:00
Evan
d26605c9fe
fix bad bg fade if no permanent terrain
2021-01-13 16:01:47 -07:00
TheXaman
6456009a44
Implementation if Pyredrid and AsparagusEduardo debug menu plus huge rewrite and tons of additions
...
V2: Fly, Warp, Flags, Vars, give items, give pkm 2 versions
Improved cheats, reworked the vars system
vars function now starts at VARS_START and end VARS_END
Figured out how to display FieldMessages, reimplemented CheckSafeBlock, cleanup
DebugAction_DestroyExtraWindow instead of multiple, renamed text variables
cleanup + pokemon simple
give pokemon complex nearly done
Complex pkm works, items now with icons
if statement cleanup
alter build tools to include maps per map group
Warp functionallity
added hex value to flags and vars
cleanup
Credits
2020-10-20 20:37:02 +02:00
GriffinR
f5495d1220
Give proper names to underwater maps
2020-09-01 03:03:14 -04:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
GriffinR
22b5b6b074
Start documenting roulette
2020-07-30 19:37:16 -04:00
GriffinR
fac6288156
Add local object event ids for referenced objects
2020-06-22 17:18:58 -04:00
GriffinR
ea8b1011d3
Merge master into fix-eventobj
2020-01-15 16:11:20 -05:00
GriffinR
22931846d6
Fix Colosseum name porymap issue
2020-01-13 20:20:48 -06:00
GriffinR
e92cc7752b
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
GriffinR
c19289596d
Give/Take to Add/Remove for silent script macros
2020-01-12 23:24:52 -05:00
GriffinR
f2e7b1507e
Port some macro/script fixes from pokefirered
2020-01-11 14:12:31 -05:00
