Bassoonian
36fcd9c6b2
Adds `Item` enum ( #8897 )
2026-01-17 02:26:09 -08:00
Hedara
b0ccddac69
Merge branch 'master' into master-to-upcoming
...
Conflicts:
include/constants/expansion.h
2025-11-03 11:11:07 +01:00
Hedara
dd17524fc9
Merge commit '7fd0029ed7b9a245f866b6a7467f6d0bd7c0f717' into pret-merge
...
sha1sum changed
Conflicts:
include/global.h
include/overworld.h
include/pokemon.h
src/map_name_popup.c
src/pokedex_area_screen.c
src/pokemon.c
2025-11-01 15:09:20 +01:00
Bassoonian
f7cbe4853b
Add type enum ( #8054 )
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
2025-10-27 16:41:22 +00:00
DavidJCobb
7fd0029ed7
Add typedefs for MAPSEC and METLOC values ( #2183 )
...
Added typedefs: mapsec_t, metloc_t, and variants for MAPSEC and METLOC values. There are some rough edges that could do with smoothing out, but for now, this gets us close to ideal with a ROM that compares equal.
Per feedback, all typedefs to mention the underlying type within the typedef name. The documentation comments reflect and explain the naming convention.
Updated comments to reflect the fact that we're no longer using SET8 for a Pokemon's met locations, in favor of a new macro (added by this PR) that adjusts to match the width of whatever is being set.
2025-10-19 17:37:13 +01:00
Bassoonian
c5c7bb13c9
Converts a bunch of defines to enums ( #7041 )
2025-06-02 15:54:37 +02:00
AlexOn1ine
b90fdd1b3c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
Hedara
2b92ba315a
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
...
Conflicts:
include/battle_anim.h
include/battle_controllers.h
include/battle_gfx_sfx_util.h
include/battle_interface.h
include/battle_main.h
include/battle_script_commands.h
include/battle_util.h
include/easy_chat.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/field_player_avatar.h
include/intro.h
include/item_use.h
include/metatile_behavior.h
include/move_relearner.h
include/pokedex.h
include/pokemon.h
include/pokemon_icon.h
include/roamer.h
include/script_pokemon_util.h
include/sprite.h
include/text.h
include/wild_encounter.h
src/battle_controllers.c
2025-05-24 20:38:21 +02:00
Bassoonian
59d315734d
Update header files to match source files ( #2143 )
2025-05-19 09:18:04 +01:00
Hedara
d78afca94f
More shadow options and documentation
2025-04-10 22:41:38 +02:00
Eduardo Quezada
3fc9b0195d
Cleaned up code to align with previous review comments
2025-01-26 17:14:00 -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
Bassoonian
a1c47a931f
Revert "Converts a bunch of defines to enums" ( #6082 )
2025-01-22 21:50:39 +01:00
hedara90
2a8f4b03dc
Revert "Revert map related enum conversion" ( #6079 )
2025-01-22 21:25:24 +01:00
hedara90
2b9c5fe4e7
Revert map related enum conversion ( #6078 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-22 19:37:56 +01:00
Bassoonian
a3ce3a569d
Converts a bunch of defines to enums ( #6071 )
2025-01-21 21:19:41 +01:00
Eduardo Quezada
937b3106b4
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-17 19:33:48 -03:00
Eduardo Quezada
ffc8903f93
More review addressing
2025-01-17 18:47:38 -03:00
khbsd
76964dd96a
Fly from Pokenav ( #5679 )
2025-01-05 00:24:58 +01: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
d1056f887b
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-09-30 15:52:49 -03:00
Eduardo Quezada
53414cb8bb
Form changes and evolutions happen based on fake RTC
2024-09-16 16:15:30 -03:00
Eduardo Quezada
56859e35e0
Using TIME instead of TIME_OF_DAY
2024-09-12 10:26:58 -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
1143da0c1c
Merge branch 'upcoming' into stairWarps
2024-09-05 17:09:45 -07:00
ghoulslash
28a9ad3399
(Default Off) Item Description Headers ( #4767 )
...
* add item descption headers and (default-off) config
* revert test script
* OW_SHOW_ITEM_DESCRIPTIONS can be 0(off), 1(first time) or 2(always), move code to overworld.c to prevent issues with users whove merged original branch. fix styling
* add ow item header config value labels
* Update include/config/overworld.h
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update src/overworld.c
* Update include/overworld.h
* ScriptShowItemDescription remove unused var
* fix ScriptShowItemDescription warning
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-03 20:22:01 +02:00
pkmnsnfrn
fe428fc89b
original merge of branch
2024-08-25 16:46:22 -07:00
Greenphx9
fc3a700357
Fix up some auto merge stuff
2024-08-25 18:01:23 +10:00
Greenphx9
ad969c968c
Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2
2024-08-25 17:54:28 +10:00
gruxor
fc8ee625b6
Fixed outstanding UB with -fanalyzer on modern
2023-07-21 15:51:03 -04:00
ghoulslash
906622f04d
add gExitStairsMovementDisabled
2022-07-29 11:26:21 -04:00
Ariel A
671fa68410
Merge branch 'romhack' into lighting
2022-07-17 16:07:50 -04:00
Ariel A
9beee311c4
Merge branch 'master' into romhack
2022-07-17 15:13:15 -04:00
GriffinR
34438e6bc4
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
Ariel A
28ec60a776
Fixed some field effect palettes. Removed leftover CacheLightMetatiles.
2022-05-10 23:21:54 -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
GriffinR
f127e64a3c
Name overworld tilemaps for their bg, add layer type constants
2022-01-19 09:37:12 -05:00
Ariel A
5e3c48acfc
Fixed bug where lighting branch wouldn't build on modern. Credit: Jaizu
2022-01-16 17:12:13 -05:00
Ariel A
11c7eee285
Restored lighting & shadows code removed from follower branch.
2021-12-22 23:20:11 -05:00
Ariel A
e1c56d76ac
Merge branch 'romhack-no-lighting' into lighting
2021-12-22 23:08:32 -05:00
Ariel A
26c38e8093
Removed lighting/day-night/shadow code from follower branch.
2021-12-22 22:58:52 -05:00
Ariel A
9de9442c39
Merge branch 'romhack' into lighting
2021-12-18 17:25:56 -05:00
Ariel A
bdcbb5c700
Merge branch 'master' into romhack
2021-12-18 17:14:52 -05:00
GriffinR
c1130592fa
Drop some overworld prefixes
2021-11-15 10:58:05 -05:00
GriffinR
afb9ff3a40
Document files with a few remaining symbols
2021-11-02 18:06:06 -04:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
Ariel Antonitis
65e616342b
Changed time blending to work with FadeScreen.
2021-05-02 02:53:30 -04:00
Ariel Antonitis
4454a6397b
Fixed bug where TOD was updated too frequently.
2021-04-25 22:01:33 -04:00
Ariel Antonitis
22c429d0d6
Added inter-time-of-day blending.
2021-04-25 16:26:22 -04:00
