AlexOn1ine
0eb715de11
Add rock climb history from ghoul
2025-08-05 20:47:05 +02:00
pokesidv
4d31693005
Rock climb by ghoulslash ( #7432 )
...
Co-authored-by: Evan <eroelke@gmail.com>
Co-authored-by: Jaizu <jaizu85@gmail.com>
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-08-03 14:52:07 +02:00
Hedara
301ef288f5
Review comments
2025-04-11 11:37:36 +02:00
Eduardo Quezada
b00b2a9ded
Fixed the rest of the conditions
2025-01-17 18:11:25 -03:00
Eduardo Quezada
89f90e1f69
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-03 13:58:10 -03:00
ghoulslash
2e52e3331f
merge w upcoming
2024-10-04 12:56:21 -04:00
Eduardo Quezada
396a390114
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-08-29 19:58:17 -04:00
hedara90
74c309e2b0
Replaced all usages of tabs in C files with spaces ( #5261 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-26 16:55:54 -07:00
Greenphx9
ad969c968c
Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2
2024-08-25 17:54:28 +10:00
ghoulslash
cb1696384c
merge in original dexnav code with some rhh specific tweaks
2024-06-16 10:39:28 -04:00
Eduardo Quezada
8854eaa880
Removed duplicated object event tags
2024-05-28 14:16:34 -04:00
Eduardo Quezada
d5268b9f01
Final cleanup
2024-05-16 18:08:10 -04: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
afbb88d77a
Undo (most) indentation changes.
2024-02-15 22:24:20 -05:00
Eduardo Quezada
f5239aae3c
Reading Follower data from gSpeciesInfo
2024-01-24 19:28:40 -03:00
Eduardo Quezada
ebbcb7d025
Whitespace, documentation and style
2024-01-22 19:12:52 -03:00
ghoulslash
f55dee986f
merge w pret
2023-05-11 10:02:25 -04:00
ghoulslash
4775e0372a
merge w pret
2022-10-17 09:06:27 -04:00
Eduardo Quezada
65108c3192
Cleaned trailing whitespace
2022-09-11 14:14:49 -04:00
ghoulslash
deddda451b
merge w pret
2022-07-30 18:35:41 -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
593e2c9be0
Fix inconsistent static s/g names
2022-05-17 14:00:02 -04:00
Ariel A
9862b0f63d
Merge branch 'romhack' into lighting
2022-05-11 20:44:48 -04:00
Ariel A
28ec60a776
Fixed some field effect palettes. Removed leftover CacheLightMetatiles.
2022-05-10 23:21:54 -04:00
Ariel A
2d376d8317
Removed shadows in puddles or sand piles. Optimized shadow tile loading.
2022-04-18 01:30:10 -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
ab6b14868b
Merge branch 'romhack' into lighting
2022-02-21 15:58:45 -05:00
Ariel A
ea5e081f74
Fixed shadow palette tag. Fully removed permanent shadows.
2022-02-21 15:54:49 -05: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 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
ghoulslash
8461ea7c16
merge rock climb
2021-12-20 12:59:06 -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
ghoulslash
222d1d3194
merge with pret
2021-10-26 13:21:50 -04:00
GriffinR
42d2fefe02
Merge branch 'master' into tag-none
2021-09-24 10:17:34 -04:00
GriffinR
f8f7617946
Add TAG_NONE
2021-09-14 13:14:14 -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
ghoulslash
77e7c259bd
merge with pret
2021-06-14 11:33:03 -06:00
ghoulslash
3c4bf808f1
merge with pret
2021-05-18 09:31:34 -06:00
Ariel Antonitis
7b59eabbcf
Changed fog to be compatible with transparent shadows.
2021-05-02 02:54:55 -04:00
Ariel Antonitis
221569a710
Merge branch 'master' into romhack
2021-04-18 22:17:53 -04:00
GriffinR
806abe2999
Document some objev anims, make objevgfx info static
2021-04-05 19:52:35 -04:00
ghoulslash
5e948e746b
add dexnav
2021-04-02 12:28:00 -06:00
Ariel Antonitis
d45335f1dc
Fixed graphics & naming inconsistencies with master branch.
2021-03-03 03:28:03 -05:00
Ariel Antonitis
42d5fe07fa
Start of implementation for time of day filter.
2021-03-03 02:05:21 -05:00
Ariel Antonitis
8598c59fad
Fixed tree disguise for dynamic palettes.
2021-03-03 01:24:30 -05:00
Ariel Antonitis
66dd1aecf9
Made (most) field effects use dynamic palettes.
2021-03-03 01:21:40 -05:00
