Hedara
|
b0ccddac69
|
Merge branch 'master' into master-to-upcoming
Conflicts:
include/constants/expansion.h
|
2025-11-03 11:11:07 +01:00 |
|
Hedara
|
67e30c96c0
|
Merge commit '0965dffe70bb7d4bc229e24e4bc0266a6be6b8c8' into pret-merge
Conflicts:
include/item_menu.h
|
2025-11-01 14:56:09 +01:00 |
|
AlexOn1ine
|
d4e7e7ad36
|
10/11/25 Master to upcoming merge
|
2025-11-01 11:54:17 +01:00 |
|
Eduardo Quezada
|
8de86ba243
|
Fixed Belly Drum/Contrary interaction at max Attack (#8078)
|
2025-10-30 17:14:07 +01:00 |
|
Bivurnum
|
6ddabde582
|
New Feature: ORAS Dowsing (#7211)
|
2025-10-27 17:41:07 +01:00 |
|
Estellar
|
0965dffe70
|
Use TaskFunc wherever posible (#2188)
|
2025-10-18 17:53:50 +01:00 |
|
FosterProgramming
|
a595696086
|
Update fishing odds to match official games (#7574)
|
2025-10-04 09:05:28 -07:00 |
|
FosterProgramming
|
2156651313
|
No bag use flag changed to a varable (#7780)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-01 14:51:09 +02:00 |
|
AlexOn1ine
|
ce52d83343
|
25/08/25 Master merge
|
2025-08-25 17:30:38 +02:00 |
|
RavePossum
|
cc705a580d
|
Fix Form Change Item Task Data and Clean Up Field Use Funcs (#7535)
|
2025-08-19 08:57:35 +02:00 |
|
Alex
|
f4c91b5539
|
Convert statuses3 to volatiles (#7514)
|
2025-08-11 23:19:36 +02:00 |
|
AlexOn1ine
|
bd919e3219
|
11/08/25 Master to upcoming merge
|
2025-08-11 08:31:12 +02:00 |
|
RavePossum
|
bf68865e0d
|
Implement using party menu items from field (#7481)
|
2025-08-07 21:21:33 +02:00 |
|
RavePossum
|
729abca058
|
Fix using town map as registered item (#7482)
|
2025-08-07 19:53:01 +02:00 |
|
Alex
|
acc82e7d79
|
Convert Status4 to volatiles (#7411)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-08-05 19:28:33 +02:00 |
|
AlexOn1ine
|
bc73f4654b
|
merge master 31/07/25
|
2025-08-01 12:18:11 +02:00 |
|
Eduardo Quezada
|
d801556a97
|
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727
|
2025-07-27 11:59:07 -04:00 |
|
Nephrite
|
a1e67572b6
|
Replaces STATUS2 usage with volatiles in code (#7262)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-07-11 22:53:49 +02:00 |
|
Nephrite
|
e8abfbce49
|
Untangled TMs and HMs from item ids (#7173)
|
2025-07-04 19:07:53 +02:00 |
|
GriffinR
|
0c7c81e02f
|
Merge branch 'master' into _pret/pr/pyramidLocation
|
2025-06-30 11:51:45 -04:00 |
|
Bassoonian
|
c5c7bb13c9
|
Converts a bunch of defines to enums (#7041)
|
2025-06-02 15:54:37 +02:00 |
|
Hedara
|
9d80ad530d
|
Merge branch 'master' into master-to-upcoming
Conflicts:
Makefile
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
data/maps/MtChimney/scripts.inc
data/maps/MtPyre_Summit/scripts.inc
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
include/constants/event_objects.h
include/constants/expansion.h
src/battle_script_commands.c
src/battle_util.c
src/field_screen_effect.c
|
2025-05-28 14:26:15 +02:00 |
|
Hedara
|
c27930eabf
|
Merge commit '678fdf9' into pret-merge
Conflicts:
data/maps/BirthIsland_Exterior/scripts.inc
data/maps/DesertUnderpass/scripts.inc
data/maps/Route117/scripts.inc
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
data/maps/SootopolisCity/scripts.inc
include/constants/event_objects.h
src/battle_setup.c
src/event_object_movement.c
src/field_control_avatar.c
src/item_use.c
src/scrcmd.c
tools/mapjson/mapjson.cpp
|
2025-05-27 19:22:40 +02:00 |
|
Hedara
|
9bfef357a2
|
Merge commit 'e4e90ea' into pret-merge
Conflicts:
src/battle_setup.c
src/field_specials.c
src/menu_helpers.c
src/pokedex_area_screen.c
src/roamer.c
src/script.c
|
2025-05-27 18:53:30 +02:00 |
|
GriffinR
|
0c32d840fa
|
Merge pull request #2141 from pret/porymap-6
Update for Porymap 6
|
2025-05-27 10:53:17 -04:00 |
|
AlexOn1ine
|
b90fdd1b3c
|
Master to upcoming merge
|
2025-05-26 10:41:11 +02:00 |
|
Hedara
|
2e4833240f
|
Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge
Conflicts:
include/item.h
src/battle_ai_script_commands.c
src/battle_main.c
src/battle_pyramid_bag.c
src/battle_script_commands.c
src/battle_util.c
src/item.c
src/item_menu.c
src/item_use.c
src/pokemon.c
src/pokemon_summary_screen.c
src/shop.c
|
2025-05-24 21:24:56 +02:00 |
|
Eduardo Quezada
|
17e570407e
|
Remove trailing whitespace (#6968)
|
2025-05-23 22:33:12 +02:00 |
|
Alex
|
b31a73f990
|
Rename ItemId_GetX to GetItemX (#2116)
|
2025-05-22 13:27:52 +01:00 |
|
GriffinR
|
929bc8b990
|
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
|
2025-05-14 11:50:11 -04: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 |
|
Hedara
|
06d31bc8ea
|
Merge branch 'master' into final-1.10-master-upcoming-merge
|
2025-02-26 22:07:10 +01:00 |
|
hedara90
|
766b9b00ca
|
Fixed curing status2 with items in double battles (#6335)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-25 13:10:17 +01: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
|
2a656ff1a5
|
Applied review changes
|
2024-12-27 12:40:25 -03:00 |
|
Eduardo Quezada
|
25075239a2
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2024-12-21 08:46:33 -03:00 |
|
Eduardo Quezada
|
53aebc34dd
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2024-12-20 20:48:13 -03:00 |
|
Eduardo Quezada
|
82252251e7
|
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220
|
2024-12-20 16:04:33 -03:00 |
|
iriv24
|
c7a2ef3371
|
Prevent Key Items that open other menus from causing a crash if registered and used from the field (#5810)
|
2024-12-15 16:04:06 +01:00 |
|
Eduardo Quezada
|
29ef1cf9ad
|
Stick to the new name
|
2024-12-05 21:00:55 -03:00 |
|
Eduardo Quezada
|
720b2daecc
|
Improve Pyramid location documentaion
|
2024-12-05 18:25:27 -03:00 |
|
Eduardo Quezada
|
5483e05db6
|
Fixed brace style inconsistencies
|
2024-12-05 12:46:50 -03:00 |
|
Frank DeBlasio
|
1b880a1185
|
Converted item-related variables to COMPOUND_STRINGs (#5714)
|
2024-12-03 23:11:59 +01:00 |
|
GriffinR
|
f61c0099b9
|
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
|
2024-10-12 23:34:02 -04:00 |
|
kittenchilly
|
44bf14e6fd
|
Add functionality to Poké Flute and Town Map (#5405)
* Add functionality to Poké Flute and Town Map
* Poke flute in-battle
* Address reviews
* Update item_use.c
* Update battle_message.c
* Update battle_script_commands.c
* Update battle_script_commands.c
* Update battle_script_commands.c
* Update battle_script_commands.c
* Update battle_script_commands.c
* Update battle_script_commands.c
|
2024-10-03 10:52:59 +02:00 |
|
Bassoonian
|
832a7b286d
|
Update item_use.c (#5415)
|
2024-09-21 21:22:30 +02:00 |
|
Bassoonian
|
63a1f85d81
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge14aug
|
2024-08-14 12:33:04 +02:00 |
|