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

104 Commits

Author SHA1 Message Date
Eduardo Quezada
03d3245a39
Easier expandability of debug menu (#6910) 2025-06-25 15:57:41 +02:00
Hedara
51c3709a56 Review comments 2025-04-12 08:58:23 +02:00
Hedara
301ef288f5 Review comments 2025-04-11 11:37:36 +02:00
Eduardo Quezada
be74612b9e u32 in FadeScreenHardware 2025-01-26 17:17:37 -03:00
Eduardo Quezada
3fc9b0195d Cleaned up code to align with previous review comments 2025-01-26 17:14:00 -03:00
Eduardo Quezada
11bdbfb658 Fix compile issues 2025-01-26 16:35:05 -03:00
Eduardo Quezada
0b8aa7b0dc Temp fixes 2025-01-26 12:08:26 -03:00
Eduardo Quezada
00241cf569 Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2 
# Conflicts:
#	README.md
#	asm/macros/event.inc
#	data/scripts/pkmn_center_nurse.inc
#	include/constants/event_objects.h
#	include/constants/field_weather.h
#	include/overworld.h
#	include/palette.h
#	include/sprite.h
#	src/battle_controller_player.c
#	src/data/object_events/object_event_graphics.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/field_weather.c
#	src/overworld.c
#	src/palette.c
#	src/scrcmd.c
#	src/sprite.c
 2025-01-26 12:08:10 -03:00
Ariel A
16c31d61b4 fix: removed fadescreenswapbuffers palette dependence, via hardware fade 2025-01-25 20:58:22 -05:00
Eduardo Quezada
a756bb501c Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-19 22:31:33 -03:00
Eduardo Quezada
cd1482bbaa
Expanded Pokémon Follower transformation functionality (#5048) 2025-01-18 23:19:06 +01:00
Eduardo Quezada
ffc8903f93 More review addressing 2025-01-17 18:47:38 -03:00
Eduardo Quezada
c363c28b22 Addressing a bunch of small things 2025-01-17 18:21:48 -03:00
Ariel A
4047f9b764 feat: added FadeScreenHardware utility 2025-01-01 00:37:35 -05:00
Ariel A
faf773a54b feat: added time-blend override 2025-01-01 00:37:21 -05:00
Eduardo Quezada
458bd5ad4d Review changes pt 1 2024-12-05 07:56:49 -03:00
Eduardo Quezada
f913f2884b Add config for shadow intensity 2024-10-08 12:21:06 -03:00
Eduardo Quezada
fc1212b060 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-09-11 08:09:09 -03:00
psf
2477f1d5ca
Made BuildColorMaps redundant by using static tables (#5289) 
* Added config for ColorMaps

* Fixed delclartion of static maps

* First commit complete

* Removed config

* Removed config

* fixed overworld config per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289\#discussion_r1747583812

* Fixed pointer alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289\#pullrequestreview-2286973040

* Update overworld.h

Removed new lines per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289/files#r1749325673
 2024-09-10 14:44:08 +02:00
Ariel A
d3a4839808 meta: included COLOR_MAP constants in field_effect_script. Credit: SDH 2024-09-08 16:02:51 -04:00
Ariel A
8795c15ab9 feat: Allowed custom COLOR_MAP_* in field_effect_scripts. Credit: SDH 2024-09-01 17:22:44 -04:00
Eduardo Quezada
aa6d540b75 Code style adjustments 2024-08-30 12:17:31 -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
Ariel A
0745eaf2e0 fix: Uninitialized value used in LightenSpritePaletteInFog 2024-08-12 22:42:31 -04:00
Eduardo Quezada
7df0219003
BW2 Style Map Pop-Ups (#4396) 2024-06-09 16:03:41 -04:00
RavePossum
69b367e350 PR feedback - 32 bit params, multiline condition formatting 2024-06-03 00:10:10 -04:00
RavePossum
afb66b4d2b preproc assets, move config to overworld config, add some antialiasing to graphics, consistency in naming gens 2024-05-07 23:58:29 -04:00
Ariel A
7939894b18 fix: object event palettes can be loaded during fadeout 2024-04-28 18:52:33 -04: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
RavePossum
406f87c534 first stab at making configable BW map pop-ups in expansion 2024-04-15 16:56:14 -04:00
Eduardo Quezada
3d181e5c70 Merge remote-tracking branch '_pret/master' into _RHH/pr/master/pret_sync20240324 
# Conflicts:
#	src/battle_anim_fight.c
 2024-03-24 13:52:18 -03:00
DizzyEggg
82f8636502 Simplify division in berry_crush and field weather functions 2024-03-09 20:06:58 +01: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
Ariel A
72c81db042 Merge branch 'followers' into lighting 2023-12-31 01:45:07 -05:00
Ariel A
7d7531f2fa Merge branch 'master' into followers 2023-12-31 01:28:27 -05:00
sbird
b77bc71862 fix -Warray-parameter, -Waddress, -Warray-bounds warnings 
those are introduced by some compiler between gcc 10 and gcc 13
when using -Wall
 2023-10-16 09:36:36 +01:00
Eduardo Quezada
a6940c9e03 Merge branch 'pret_master' into RHH/pr/upcoming/pret_Merge20231002 
# Conflicts:
#	src/battle_ai_script_commands.c
#	src/battle_controller_player.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_controllers.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/mystery_gift_menu.c
#	src/pokemon.c
 2023-10-02 17:17:41 -03:00
Eduardo Quezada
af210da972 Solved a bunch of -Wall errors on modern 2023-09-20 19:01:08 -03:00
Ariel A
d800d71461 Merge branch 'followers' into lighting 2023-09-03 17:49:27 -04:00
Ariel A
8df538479a Merge branch 'master' into followers 2023-09-03 17:39:35 -04:00
kittenchilly
5e98891577 Snow doesn't cause shade anymore 2023-08-20 13:24:20 -05:00
kittenchilly
0ad3919f22 Fix overworld snow weather 2023-08-19 01:40:31 -05:00
Martin Griffin
31a3ada7de Detect potential misalignment in modern 2023-07-24 19:42:56 +01: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
GriffinR
14f7e49099 Add some missing palette macro use 2023-05-25 15:09:16 -04:00
Ariel A
159faf8ff4 Fixed tall grass field effect discoloration in fog. 
Improved/optimized fog blending during fades.
 2023-04-23 17:47:18 -04:00
Ariel A
095994dc96 Fixed gamma shift for special sprite palette tags (lights, emotes). 
Supersedes c82510e22bffb98fd9c63dc246c332dd1da602cd
 2023-04-23 17:40:54 -04:00
Ariel A
9fd7542629 Fixed nighttime WEATHER_DOWNPOUR gamma shift. 2023-02-10 19:33:54 -05:00
Ariel A
2ddd292b36 Merge branch 'followers' into lighting 2023-02-10 19:27:23 -05:00
Ariel A
66c57e3442 Merge branch 'master' into followers 2023-01-29 18:44:06 -05:00