atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15394 commits 2 branches 40 tags 617 MiB
Commit graph

55 commits

Author SHA1 Message Date
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
6856bcf610 refactor: code review for expansion 2024-05-17 20:45:32 -04:00
Eduardo Quezada
4f87975a78 Forgot to stage Eternatus' spritesheet rule 2024-05-11 19:58:13 -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
Eduardo Quezada
2a7298b918 Fixed sprites for Kyogre/Jangmo-O family/Female Meostic/Calyrex forms 2024-05-06 17:48:36 -04:00
Eduardo Quezada
7c5357ca58 Fixed placeholder follower 2024-04-28 13:24:19 -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
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
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
c29a33ea78 Moved follower sprites to graphics/pokemon folder 2024-01-23 14:04:16 -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
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
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
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
Ariel A
9beee311c4 Merge branch 'master' into romhack 2022-07-17 15:13:15 -04:00
Eduardo Quezada D'Ottone
f78bb4fb84 Merge remote-tracking branch 'pret/master' into item_expansion 
# Conflicts:
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-12 17:42:32 -04:00
sneed
bcf9ed3fb8 Update spritesheet_rules.mk 2022-05-30 03:11:56 +03:00
Ariel A
01f73f54e1 Added follower transform effect and Castform forms. Credit: larryturbo 
Castform forms from https://www.deviantart.com/larryturbo/art/351-Castform-Froms-830190053
 2022-05-18 19:12:30 -04:00
GriffinR
5c8e1e81ea Color single-palette door anim graphics 2022-05-18 12:41:20 -04:00
LOuroboros
eb1834ce84 Merge branch 'master' of https://github.com/pret/pokeemerald into iePret 2022-04-11 01:22:48 -03:00
GriffinR
0a0157b62c Name unknown_16.png 2022-03-14 15:54:47 -04:00
Ariel A
7daa78311b Added more follower footprint types. Credit: Sonikku-DatH 
https://www.pokecommunity.com/showthread.php?p=10410294#post10410294
 2022-02-07 23:06:38 -05:00
Ariel Antonitis
b2f901058e Changed 64x64 follower sprites to 32x32 ones, by LarryTurbo. 
Sprite resource: 
https://www.deviantart.com/larryturbo/art/Resized-OWs-for-Gen-1-4-mons-larger-than-32x32-878575906
 2021-09-23 23:30:46 -04:00
Ariel Antonitis
875c4edd50 Added some conditional messages. 
Added emote graphics.
 2021-04-18 21:00:27 -04:00
Ariel Antonitis
418cab092c Fixed old graphics info collisions. 2021-03-03 02:00:22 -05:00
Ariel Antonitis
04ce1eaf83 Added Mr. Mime & Farfetch'd. Fixed transparency issues. 2021-03-03 01:48:45 -05:00
Ariel Antonitis
bd01b80c1d Added Castform. 2021-03-03 01:47:37 -05:00
Ariel Antonitis
693246f711 Added Unown OW forms. 2021-03-03 01:47:20 -05:00
Ariel Antonitis
6969f3d6f7 Added Nidoran M & Nidoran F sprites. 2021-03-03 01:47:09 -05:00
Ariel Antonitis
6692cd992f Added all 386 follower sprites. 
Allow NPC pokemon objects via a custom script header.
 2021-03-03 01:46:43 -05:00
Ariel Antonitis
be60824263 Add Banette event object. 2021-03-03 01:33:26 -05:00
Ariel Antonitis
e52b70e46f Updated follower scripting (applymovement). 2021-03-03 01:04:37 -05:00
Ariel Antonitis
8a3dfbf252 Added pokemon followers & script commands. 2021-03-03 01:04:22 -05:00
Ariel Antonitis
2e32a27d75 Testing follower pokemon. 2021-03-03 00:51:43 -05:00
Syreldar
a2794ae351
Updated berries' path on spritesheet_rules.mk 2021-01-15 09:52:19 +01:00
DizzyEggg
35559d6b71 Merge with master 2020-08-27 10:58:31 +02:00
GriffinR
1ce929157f Clean up field effect doc 2020-07-02 05:05:13 -04:00
GriffinR
eb80012757 Document more misc field effects 2020-06-29 16:32:46 -04:00
GriffinR
4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
GriffinR
18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -04:00
DizzyEggg
13c0c64d70 Merge with master 2020-02-23 12:41:36 +01:00
Marcus Huderle
6b966d20e5 Update spritesheet rules 2020-02-12 18:07:13 -06:00
DizzyEggg
9a2888fdbf Merge into master 2019-12-23 16:46:03 +01:00
GriffinR
68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
GriffinR
d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00