Bivurnum
6ddabde582
New Feature: ORAS Dowsing ( #7211 )
2025-10-27 17:41:07 +01:00
AlexOn1ine
bd919e3219
11/08/25 Master to upcoming merge
2025-08-11 08:31:12 +02:00
cornixsenex
80a3a3b7ef
Remove shadow and hide follower on stair warp ( #7368 )
2025-08-08 11:22:42 +02:00
AlexOn1ine
d3a5ddcb4b
remove leftover
2025-08-05 21:14:21 +02:00
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
Bassoonian
c5c7bb13c9
Converts a bunch of defines to enums ( #7041 )
2025-06-02 15:54:37 +02:00
hedara90
6e64f6f5ef
New sprite compressor ( #5627 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: DizzyEggg
Co-authored-by: Raymond Dodge <git@rayrobdod.name>
2025-05-30 23:10:54 +02:00
Bivurnum
47723c34e5
Follower NPCs (follow-me) ( #6500 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-27 14:56:18 +02:00
hedara90
d1aa49cca3
Remove compressed palettes ( #6455 )
2025-04-26 22:58:40 +02: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
Eduardo Quezada
26daf15ce0
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-24 18:29:28 -03:00
DizzyEggg
4e0eab9e27
Remove gDecompressionBuffer ( #6029 )
2025-01-23 09:47:14 +01:00
Bassoonian
a1c47a931f
Revert "Converts a bunch of defines to enums" ( #6082 )
2025-01-22 21:50:39 +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
khbsd
76964dd96a
Fly from Pokenav ( #5679 )
2025-01-05 00:24:58 +01:00
Eduardo Quezada
89f90e1f69
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-03 13:58:10 -03:00
ghoulslash
d8ea4fa1ec
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav
2025-01-02 08:28:21 -05:00
Eduardo Quezada
1e6628b78d
Address Review comments Pt2
2024-12-21 10:49:59 -03:00
Eduardo Quezada
82252251e7
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220
2024-12-20 16:04:33 -03:00
Eduardo Quezada
5483e05db6
Fixed brace style inconsistencies
2024-12-05 12:46:50 -03:00
Eduardo Quezada
458bd5ad4d
Review changes pt 1
2024-12-05 07:56:49 -03:00
ghoulslash
229525d122
some cleanup
2024-10-18 22:13:49 -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
ghoulslash
80db140d2b
merge w pret
2024-08-04 12:32:13 -04:00
ghoulslash
48d2bff553
merge w upcoming
2024-07-08 14:12:00 -04:00
psf
2a5e4343c8
Implemented OW_IGNORE_EGGS_ON_HEAL ( #4888 )
...
* Implemented OW_IGNORE_EGGS_ON_HEAL
* Removed videos and change nPokemon to u32
* Changed OW_IGNORE_EGGS_ON_HEAL to GEN_LATEST per https://github.com/rh-hideout/pokeemerald-expansion/pull/4888\#issuecomment-2205271486
* Update include/config/overworld.h
Fixed spelling error per https://github.com/rh-hideout/pokeemerald-expansion/pull/4888#discussion_r1664454436
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-04 16:03:42 +02: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
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
6856bcf610
refactor: code review for expansion
2024-05-17 20:45:32 -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
Bassoonian
8329d8368d
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergemidapril
2024-04-12 12:16:28 +02:00
pkmnsnfrn
71b8d20397
Replaced magic numbers regarding triggerGroundEffectsOnMove to TRUE / FALSE
2024-04-04 16:21:34 -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
GriffinR
b08d62b615
Merge pull request #1961 from GriffinRichards/doc-camera-sprite
...
Document camera sprite functions
2024-03-21 21:23:53 -04:00
Ariel A
7cf2d1eca0
Merge branch 'followers' into lighting
2024-02-17 17:51:30 -05:00
Eduardo Quezada
502a56efd1
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/global.h
# src/data.c
# src/data/pokemon/species_info/gen_7.h
2024-02-13 20:35:05 -03:00
Eduardo Quezada D'Ottone
7afa20029c
Fix braces style ( #4023 )
...
* Fix braces style
* Unified 2 conditions
---------
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-31 10:26:44 +01:00
Eduardo Quezada
ebbcb7d025
Whitespace, documentation and style
2024-01-22 19:12:52 -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
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
Bassoonian
9e051aa058
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergenewyears
2023-12-30 20:49:05 +01:00
Martin Griffin
3ad66028e9
Backwards-compatible BoxPokémon Refactor ( #3438 )
...
* Check progress in non-battle PARAMETRIZEd tests
* Overworld Script Tests
* Backward-compatible BoxPokemon Refactor
Reuses space that contains zeros to provide space for:
- HP/status in the box
- 12-character nicknames
- Up to 63 PokéBalls
- Shininess separate from PID
- Hidden Nature
- Hyper Training
- Dynamax Level
- Gigantamax Factor
- Terastallization Types
- Shadow
Implements:
- OW_PC_HEAL to switch between Gen7- and Gen8+ behavior
- Nature Mints
- Dynamax Candy
- Hyper Training commands (canhypertrain/hypertrain)
- Gigantamax Factor commands (hasgigantamaxfactor/togglegigantamaxfactor)
- Terastallization Type on the summary screen
- Prevents Gigantamax Factor Pokémon from evolving into a species without a Gigantamax form
* fixup! Backward-compatible BoxPokemon Refactor
* displaydexinfo fix from Jasper
2023-12-27 17:48:17 +01:00
Frank DeBlasio
5cdee87489
Refactor Trainer sprites ( #3597 )
...
* Added TrainerSprite struct with coordinates
* Added .frontPic to struct
* Added .palette to TrainerSprite struct
* Added .animation to the struct
* Added define for sprite size
* Condensed animations since they were all the same
* Improved TRAINER_SPRITE/PAL defines
* Simplified seemingly unused .y_offset and TRAINER_PIC_SIZE values
* Condensed TRAINER_SPRITE and TRAINER_PAL into TRAINER_PIC
* Renamed .size to .y_offset since that what it appears to actually be
* Moved y_offset into TRAINER_PIC
* Moved animation inside of TRAINER_PIC
* Added array number to preproc
* Removed trailing spaces
* Added sprite/palette files to preproc
* Revert adding sprites to preproc as it fails agbcc
This reverts commit dce57f8d1bfab70b4c6630a9c4e5b43495891459.
* Added backsprite struct
* Added animations to backsprite struct
* Changed TRAINER_PIC to TRAINER_SPRITE
* Added animation to backsprite preproc
* Added .backPic to struct
* Moved array number into backsprite preproc
* Removed definitions for trainer sprites
* Hardcoded sAnims_Trainer into struct since every sprite uses it
* Fixed TRAINER_SPRITE arguments
2023-12-20 23:14:33 +01:00
