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

68 Commits

Author SHA1 Message Date
Zimmermann Gyula
772abe6e7d
Implement GSC berry/apricorn tree functionality. (#7777) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-11-14 20:28:55 +01:00
Greenphx9
ad969c968c Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2 2024-08-25 17:54:28 +10: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
05bf03975a Merge branch 'followers' into lighting 2024-05-17 21:40:20 -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
Ariel A
ee0d7a467a fix: reverted Wailord OW gfx back to 32x32 2024-04-28 20:37:08 -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
Jaizu
ad839d0333 Lower followers gfx 2024-03-06 19:10:51 -08: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
7cf2d1eca0 Merge branch 'followers' into lighting 2024-02-17 17:51:30 -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
c29a33ea78 Moved follower sprites to graphics/pokemon folder 2024-01-23 14:04:16 -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
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
Ariel A
d800d71461 Merge branch 'followers' into lighting 2023-09-03 17:49:27 -04:00
Ariel A
712669c822 Added support for follower bobbing. See event_objects.h 2023-07-29 17:23:32 -04:00
Eduardo Quezada
db5e3342ac Follower Pokemon 2023-06-16 21:27:14 -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
LOuroboros
db02cd05f6 Purged the bKGD warning once and for all 2023-02-24 02:01:55 -03:00
Ariel A
2ddd292b36 Merge branch 'followers' into lighting 2023-02-10 19:27:23 -05:00
Ariel A
ac6e8cd54e Updated Squirtle & evolutions OW graphics. Credit: andrian_timeswift 2023-01-12 21:33:16 -05:00
Ariel A
0b1c81af66 Merge branch 'romhack' into lighting 2022-08-17 19:59:58 -04:00
Ariel A
1991f65954 Fixed Magnemite & Magneton OW sprite colors. 2022-08-14 15:16:26 -04:00
Ariel A
671fa68410 Merge branch 'romhack' into lighting 2022-07-17 16:07:50 -04:00
Ariel A
0aff5fc780 Updated Whismur follower sprite. 2022-07-15 19:34:48 -04:00
Ariel A
53a4708e72 Updated Snubbull follower sprite. 2022-07-04 16:50:06 -04:00
Ariel A
090dc6b294 Merge branch 'romhack' into lighting 2022-06-28 00:07:23 -04:00
Ariel A
3a1be34d24 Updated Skiploom & Shuppet OW sprites. Credit: Jaizu 2022-06-21 20:00:11 -04:00
Ariel A
326cb5d1b3 Updated Combusken follower sprite. Credit: Jaizu 2022-05-26 20:34:41 -04:00
Ariel A
6d79b6dbaa Merge branch 'romhack' into lighting 2022-05-18 20:14:22 -04:00
Ariel A
5727a467c4 Updated Chansey, Espeon, Gyarados and Magikarp sprites. Credit: Jaizu 2022-05-18 19:53:27 -04: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
Ariel A
8672530f10 Fixed missing include in event_object_movement. Fixed Lombre follower palette. Credit: Jaizu 2022-05-13 22:21:23 -04:00
Ariel A
6e621d80a1 Added day/night palette swapping. 
Updated lighting for lava, Petalburg, Slateport, Dewford, Verdanturf, Oldale, Mossdeep, Lilycove, Fallarbor.
Improved lantern appearance & added neon signs on PokeCenter & Mart.
Optimized gamma shift code.
Removed obselete CacheLightMetatiles.
 2022-04-18 00:23:11 -04:00
Ariel A
dd07688268 Merge branch 'romhack' into lighting 2022-01-22 17:41:28 -05:00
Ariel A
d8a5fbdf70 Updated Donphan, Taillow, Swellow follower sprites. Credit: SonikkuA-DatH 2022-01-22 17:41:00 -05:00
BuffelSaft
adcf563ba1 Add missing berry data 
Certain gen 4+ berries were missing graphics and berry data. Adding this data allows them to be viewed and planted.
 2021-10-26 14:42:06 +13:00
Ariel Antonitis
79b05ca0a0 Merge branch 'romhack' into lighting 2021-09-30 00:04:16 -04:00
Ariel Antonitis
38a21c436f Updated Silcoon & Cascoon object events. Contributed by @SonikkuA-DatH. 2021-09-30 00:00:54 -04: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
a20d127ebd Merge branch 'romhack' into lighting 2021-09-02 20:28:31 -04:00
Ariel Antonitis
ff2f8735c9 Edited OW sprites to better use vanilla palettes. Contributed by @ShinyDragonHunter (Regirock & Registeel) and @SonikkuA-DatH (others). 2021-09-02 20:25:41 -04:00
Ariel Antonitis
bfe0c58326 Merge branch 'romhack' into lighting 2021-05-05 20:01:15 -04:00
Ariel Antonitis
7d420b22e8 Added affine animations for followers entering/exiting pokeball. 2021-05-05 19:58:44 -04:00
Ariel Antonitis
73d060b3b6 Added glowing colors for some follower pokemon (Ampharos). 2021-04-25 16:26:23 -04:00
Ariel Antonitis
42d5fe07fa Start of implementation for time of day filter. 2021-03-03 02:05:21 -05:00