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

146 Commits

Author SHA1 Message Date
Eduardo Quezada
88028c0c37
Split Pokémon Object Events from Following Pokémon functionality (#4761) 
* Split Pokémon Object Events from Following Pokémon functionality

* Renamed follower pngs and palettes

* Define renames

* Reorder configs

* Renaming: SpeciesInfo fields, macros and palettes.
 2024-06-13 22:46:27 +02:00
Bassoonian
03cc0ae6b3
Add option to hide substitute followers (#4765) 
* Add option to hide substitute followers

* Update event_object_movement.c
 2024-06-12 13:53:01 -04:00
Eduardo Quezada
3202625ca5 Restored Gen 4-8 followers 
This reverts commit 24913f53392f6f1353d59a3975f1dfd5db9f2d00.

# Conflicts:
#	src/data/pokemon/species_info/gen_4_families.h
#	src/data/pokemon/species_info/gen_5_families.h
#	src/data/pokemon/species_info/gen_8_families.h
 2024-06-02 10:31:01 -04:00
Eduardo Quezada
569749f9c2 Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	Makefile
#	gflib/sprite.h
#	graphics/object_events/pics/pokemon/wailord.png
#	include/constants/event_objects.h
#	include/random.h
#	src/data/object_events/object_event_graphics.h
#	src/data/object_events/object_event_graphics_info.h
#	src/data/object_events/object_event_graphics_info_pointers.h
#	src/event_object_movement.c
#	src/random.c
#	src/scrcmd.c
 2024-05-18 10:12:17 -04:00
Ariel A
d3849f2fc6 Merge branch 'followers' into followers-expanded-id 2024-05-17 20:46:24 -04:00
Ariel A
6856bcf610 refactor: code review for expansion 2024-05-17 20:45:32 -04:00
Eduardo Quezada
24913f5339 TEMPORARY: Reverted Gen 4-8 followers 2024-05-17 14:40:45 -04:00
Eduardo Quezada
d5268b9f01 Final cleanup 2024-05-16 18:08:10 -04:00
Eduardo Quezada
45ee5b5c8f Multiple fixes (see commit description) 
- New Eternatus 32x32 sprite by Gerben BSc
- Fixed missing Hero Zamazenta sprite
- Fixed missing Single Strike Urshifu sprite
- Moved Alcremie Strawberry sprite to respective folder
 2024-05-11 19:09:05 -04:00
Ariel A
f3b637c115 fix: castform OW sprite & palette 
fixed #34
 2024-05-04 18:47:25 -04:00
Ariel A
e36a7c59cf Merge branch 'followers' into followers-expanded-id 2024-05-03 00:45:04 -04:00
Ariel A
758e4049cd fix: LARGE_OW_SUPPORT and affine OW movements 
fixed #33
 2024-05-03 00:43:39 -04:00
Ariel A
ee0d7a467a fix: reverted Wailord OW gfx back to 32x32 2024-04-28 20:37:08 -04:00
Eduardo Quezada
1a4bc69c5a Moved follower settings to overworld config 2024-02-18 00:16:59 -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
Ariel A
195d2bb79a Merge branch 'followers' into followers-expanded-id 2024-02-17 17:19:01 -05:00
Ariel A
6bceacf403 Added override table for standalone follower palettes. 2024-02-17 16:55:11 -05:00
Ariel A
725252905b Merge branch 'merrp/pr/style' into followers 2024-02-15 22:49:36 -05:00
Ariel A
a407c72235 Cleaned up follower code. 
Added support for asymmetrical follower pokemon.
Fixed bug with changing GraphicsInfo size.
Added follower Substitute gfx. Credit: shikashipx
 2024-02-12 20:37:01 -05:00
Eduardo Quezada
5119ee2d39 Can disable follower graphics 2024-01-24 20:13:07 -03:00
Eduardo Quezada
f5239aae3c Reading Follower data from gSpeciesInfo 2024-01-24 19:28:40 -03:00
Eduardo Quezada
2e1a3d4191 Pic table capitalization 2024-01-23 14:13:39 -03:00
Eduardo Quezada
45caead1c2 Missing ascending frames 2024-01-23 14:11:14 -03:00
Eduardo Quezada
c29a33ea78 Moved follower sprites to graphics/pokemon folder 2024-01-23 14:04:16 -03:00
Eduardo Quezada
ebbcb7d025 Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
Eduardo Quezada
ea10a1dc55 Fixed compile 2024-01-22 13:46:32 -03:00
Eduardo Quezada
19b4731c3b Added subfolders to follower sprites (to be moved to the general mon graphic folder 2024-01-22 13:09:26 -03:00
Ariel A
b56158428e Added new follower pokeballs & toggle. 
Credit: shikashipx
 2024-01-21 17:21:33 -05:00
Eduardo Quezada
89958a0dc0 Gen 4+ followers 2024-01-20 00:32:52 -03:00
Eduardo Quezada
48df87577b Ascending frames 2024-01-19 23:50:52 -03:00
Eduardo Quezada
9ff599963c 0xFFFF -> TAG_NONE 2024-01-19 23:50:38 -03:00
Eduardo Quezada
e452ee93b9 Preparing ready for Gen 4+ followers 2024-01-19 23:06:32 -03:00
Eduardo Quezada
11b97597c8 Moved old mon graphics to its own folder so it's easier for the script to run 2024-01-19 14:52:34 -03:00
Eduardo Quezada
17a7c26b90 Reverted accidental INCBIN_COMPs 2024-01-19 14:27:11 -03:00
Eduardo Quezada
9d27aa7b70 Fixed Steelix, Lugia, Ho-Oh, Wailord, Kyogre and Rayquaza sizes 2024-01-19 14:26:43 -03:00
Eduardo Quezada
d4f97c7a38 Fixed Groudon follower size 2024-01-19 10:42:21 -03:00
Eduardo Quezada
5233d0dc97 Showing followers in debug menu (no animation yet) 2024-01-18 12:00:11 -03:00
Eduardo Quezada
5d372b5f8a Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	README.md
#	gflib/sprite.c
#	graphics/object_events/pics/pokemon/togetic.png
#	src/data/object_events/object_event_graphics.h
#	src/data/object_events/object_event_graphics_info.h
#	src/data/object_events/object_event_graphics_info_followers.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c
 2024-01-18 08:12:09 -03: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
Bassoonian
7b0904c580 Fix extended berry stage palettes 2024-01-05 11:32:59 +01:00
Bassoonian
b948accc80 Remove redundant table 2024-01-04 16:07:12 +00:00
Ariel A
dcaaac92d9 Added support for compressed OW graphics. 
Added CpuSmartCopy macros (Credit: luckytyphlosion)
 2023-12-31 00:35:27 -05:00
Bassoonian
c2a5b71d46 Fix six stage berry graphical issues 2023-12-24 23:17:05 +01:00
Bassoonian
db0a9484ae Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion 2023-12-23 00:39:10 +01:00
Martin Griffin
74a6b8764c
overworld_ascending_frames to simplify overworld_frames (#3625) 
Introduces relativeFrames which automates the process of using
overworld_frames with ascending frames.

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-18 13:47:15 +01:00
Bassoonian
9d09b367a0 Refactor growth time and add six stage toggle 2023-12-07 13:22:01 +01:00
psf
fe16a2cdee
Port pokefirered's Vs. Seeker to pokeemerald (#3256) 
* First version of Vs. Seeker

* Update movement.inc

98f7e9978d (r1306721924)

* Update field_effect_scripts.s

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
Ariel A
9c77aa3c66 Improved support for 64x64 followers. Updated reflection code. 
Added 24x24 subsprite tables.
 2023-10-14 22:14:42 -04:00
Ariel A
8df538479a Merge branch 'master' into followers 2023-09-03 17:39:35 -04:00
Ariel A
d929aa60ed Added support for 48x48 and 64x64 followers. See event_objects.h 2023-09-03 16:51:43 -04:00