Bivurnum
6ddabde582
New Feature: ORAS Dowsing ( #7211 )
2025-10-27 17:41:07 +01: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
Eduardo Quezada
17e570407e
Remove trailing whitespace ( #6968 )
2025-05-23 22:33:12 +02:00
Hedara
fff6bd3ed8
Removed legacy handling, fix if statment argument style
2025-04-11 21:27:49 +02:00
Hedara
b075163c57
Cleanup and config options
2025-04-10 21:17:20 +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
Ariel A
c1d105c31c
Merge branch 'lighting' into lighting-expanded-id
2025-01-25 21:45:23 -05: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
Eduardo Quezada
161c3aadea
OW_OBJECT_SUBPRIORITY
2025-01-03 13:51:11 -03:00
Ariel A
3e32291907
fix: fixed shadows not spawning across maps for OWs with the same localId
2024-09-08 17:05:17 -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
ghoulslash
cb1696384c
merge in original dexnav code with some rhh specific tweaks
2024-06-16 10:39:28 -04:00
ghoulslash
652cb007ce
merge w pret master, add USE_DEXNAV_SEARCH_LEVELS flag
2024-06-16 09:45:38 -04:00
Bassoonian
03cc0ae6b3
Add option to hide substitute followers ( #4765 )
...
* Add option to hide substitute followers
* Update event_object_movement.c
2024-06-12 13:53:01 -04:00
Eduardo Quezada
a6bfcc1194
More style fixes
2024-05-18 14:36:06 -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
9eac31641d
Merge branch 'followers-expanded-id' into lighting-expanded-id
2024-02-17 17:58:32 -05:00
Ariel A
7cf2d1eca0
Merge branch 'followers' into lighting
2024-02-17 17:51:30 -05:00
Ariel A
195d2bb79a
Merge branch 'followers' into followers-expanded-id
2024-02-17 17:19:01 -05:00
Ariel A
afbb88d77a
Undo (most) indentation changes.
2024-02-15 22:24:20 -05:00
Eduardo Quezada
ebbcb7d025
Whitespace, documentation and style
2024-01-22 19:12:52 -03:00
Eduardo Quezada
5d372b5f8a
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# README.md
# gflib/sprite.c
# graphics/object_events/pics/pokemon/togetic.png
# 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_followers.h
# src/event_object_movement.c
# src/field_effect_helpers.c
2024-01-18 08:12:09 -03: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
98221c4f70
Merge branch 'followers-expanded-id' into lighting-expanded-id
2023-12-31 02:48:37 -05:00
Ariel A
398a9ee8fa
Merge branch 'followers' into followers-expanded-id
2023-12-31 01:49:56 -05: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
Ariel A
dcaaac92d9
Added support for compressed OW graphics.
...
Added CpuSmartCopy macros (Credit: luckytyphlosion)
2023-12-31 00:35:27 -05:00
Ariel A
eaff8abefb
Merge branch 'followers-expanded-id' into lighting-expanded-id
2023-10-26 19:41:07 -04:00
Ariel A
a63242d96f
Merge branch 'followers' into lighting
2023-10-15 00:43:54 -04:00
Ariel A
9c77aa3c66
Improved support for 64x64 followers. Updated reflection code.
...
Added 24x24 subsprite tables.
2023-10-14 22:14:42 -04:00
GriffinR
f01a6afc98
Merge branch 'master' into misc-tasks
2023-10-07 17:25:20 -04:00
Eduardo Quezada
af210da972
Solved a bunch of -Wall errors on modern
2023-09-20 19:01:08 -03:00
Ariel A
f8ca559378
Merge branch 'followers-expanded-id' into lighting-expanded-id
2023-09-03 18:17:50 -04:00
Ariel A
d800d71461
Merge branch 'followers' into lighting
2023-09-03 17:49:27 -04:00
Ariel A
d929aa60ed
Added support for 48x48 and 64x64 followers. See event_objects.h
2023-09-03 16:51:43 -04:00
GriffinR
56ff4ce998
Add defines for field effect sprite data, misc task data
2023-08-20 17:45:58 -04:00
Eduardo Quezada
03a4793324
Added LoadPlayerObjectEventPalette to load gender pals
2023-06-18 02:24:18 -04:00
Eduardo Quezada
bf814e11cd
Cleanup
...
- Proper whitespace
- Bracket pret style
- Simplified RemoveObjectEventInternal
- SImplified GetMonInfo
- Made IsFollowerVisible easier to read
2023-06-18 01:19:46 -04:00
Eduardo Quezada
4bbe3278d6
Cleanup pt1
...
- Moved Tracks to the end of field effect scripts
- Restored whitespace in scripts to minimize conflicts
- Restored data/maps/map_groups.json
- Proper tab uses in scripts
- Allow SHADOW_SIZE_XL to be used
2023-06-17 23:34:01 -04:00
PSF
0790882fd8
Merged with pret
2023-02-04 14:03:38 -08:00
Ariel A
3a86c8bd4c
Merge branch 'followers' into lighting
2022-10-07 21:08:06 -04:00
Ariel A
1c011a9c1c
Merge branch 'master' into followers
2022-10-07 20:52:15 -04:00
GriffinR
6db489e2d5
Use constants for overworld object palette slots
2022-09-27 20:16:48 -04:00
ghoulslash
deddda451b
merge w pret
2022-07-30 18:35:41 -04:00
Eduardo Quezada
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
