Steve
|
1e9cddd848
|
Align gSpecialVars
|
2025-12-14 23:03:33 -05:00 |
|
Zimmermann Gyula
|
772abe6e7d
|
Implement GSC berry/apricorn tree functionality. (#7777)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-11-14 20:28:55 +01:00 |
|
Frank DeBlasio
|
6d09eb2402
|
Added contest config and cleaned up contest category variables (#8178)
|
2025-11-13 11:29:38 +01:00 |
|
PCG
|
d2425c1468
|
Move Relearners for TMs, Tutors and Egg moves (#8040)
Co-authored-by: khbsd <khb.dev@gmail.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-11-09 12:54:01 -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
|
5c31b58b81
|
Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge
Conflicts:
spritesheet_rules.mk
tools/mapjson/mapjson.cpp
|
2025-11-01 15:13:16 +01:00 |
|
Martin Griffin
|
d1d5435487
|
Improve undefined map assembler messages (#2196)
|
2025-10-29 21:34:03 -04:00 |
|
FosterProgramming
|
5348de4abb
|
Banned species list (#8003)
|
2025-10-23 21:29:33 +02:00 |
|
mudskipper13
|
59a214828e
|
Implement field_name_box (#7697)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-09-14 20:45:18 +02:00 |
|
cawtds
|
21499cbee1
|
Refactor field moves (#6660)
|
2025-05-31 09:03:12 +02:00 |
|
psf
|
9656400f88
|
Moved time constants to dedicated files (#7019)
|
2025-05-30 16:39:01 +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 |
|
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 |
|
Eduardo Quezada
|
2428af66cd
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-02-20 19:17:59 -03:00 |
|
Salem
|
01e8d8233e
|
Trainer Battle Parameter Consolidation (#5982)
|
2025-01-25 22:02:39 +01:00 |
|
Eduardo Quezada
|
a756bb501c
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-01-19 22:31:33 -03:00 |
|
Eduardo Quezada
|
f6a86a65ef
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-19 10:32:57 -03:00 |
|
Eduardo Quezada
|
937b3106b4
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-01-17 19:33:48 -03:00 |
|
Bassoonian
|
bcf9a1eff8
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan
|
2025-01-17 21:57:25 +01:00 |
|
Raymond Dodge
|
b5b0ffd511
|
Define field script opcode constants (#2005)
Replace the magic number opcodes in field script command macros with
these new constants
|
2025-01-17 17:04:00 +00:00 |
|
psf
|
a7f77ed08d
|
Adds B_VAR_DIFFICULTY and related functions READ DESC (#5337)
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-01-04 14:25:03 +01: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
|
d151e00c70
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2024-12-04 19:15:48 -03:00 |
|
ghoulslash
|
54484593b3
|
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav
|
2024-10-18 21:46:54 -04:00 |
|
Eduardo Quezada
|
ee9c6d4912
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2024-10-17 00:16:01 -03:00 |
|
ghoulslash
|
bb78d45400
|
some fixes
|
2024-10-15 21:24:53 -04:00 |
|
ghoulslash
|
cf78462fab
|
merge w upcoming
|
2024-10-15 21:24:47 -04:00 |
|
GriffinR
|
f61c0099b9
|
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
|
2024-10-12 23:34:02 -04:00 |
|
GriffinR
|
cb66ea6653
|
Continue adding local IDs to map.json files
|
2024-10-12 12:24:57 -04:00 |
|
ghoulslash
|
2e52e3331f
|
merge w upcoming
|
2024-10-04 12:56:21 -04:00 |
|
Eduardo Quezada
|
d1056f887b
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2024-09-30 15:52:49 -03:00 |
|
psf
|
58aa1e0034
|
Merge branch 'upcoming' into scriptCommands
|
2024-09-30 06:57:54 -07:00 |
|
Frank DeBlasio
|
1ba0875654
|
Removed FRONTIER_BRAIN_SPRITES and updated TRAINER_SPRITE, TRAINER_BACK_SPRITE, and TRAINER_CLASS (#5166)
* Removed FRONTIER_BRAIN_SPRITES
* Updated TRAINER_SPRITE and TRAINER_BACK_SPRITE
* Updated TRAINER_CLASS macro
* Removed FRONTIER_BRAIN_TEXTS
* Turned Frontier Brain text to COMPOUND_STRINGs
* Removed frontier_brain.inc from event_scripts.s
* Addressed front sprite comment
* Addressed backsprite comments
|
2024-09-22 09:54:01 +02:00 |
|
pkmnsnfrn
|
a0e914b749
|
Merge branch 'upcoming' into scriptCommands
|
2024-09-12 05:39:24 -07:00 |
|
Eduardo Quezada
|
831b394ca1
|
Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909
# Conflicts:
# Makefile
# include/battle.h
# include/battle_main.h
# include/battle_util.h
# include/data.h
# make_tools.mk
# map_data_rules.mk
# src/battle_setup.c
# src/fieldmap.c
|
2024-09-11 15:26:14 -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
|
0e1b62c732
|
Merge branch 'upcoming' into signpost
|
2024-09-05 17:11:32 -07:00 |
|
Frank DeBlasio
|
3aa24f527e
|
Converted Mechadoll text to COMPOUND_STRINGs (#5276)
|
2024-09-04 14:56:19 -04:00 |
|
GriffinR
|
04197b4912
|
Fix swapped cycling road entrances
|
2024-08-31 01:54:25 -04:00 |
|
psf
|
23134cec85
|
Merge branch 'upcoming' into signpost
|
2024-08-27 21:31:07 -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 |
|
pkmnsnfrn
|
dc06321054
|
Moved pokedex flags to constants files andadded constants to header of event_scripts
|
2024-08-14 19:24:55 -07:00 |
|
cawtds
|
3af93bdfee
|
FRLG+ whiteout message (#4967)
* FRLG whiteout message + post whiteout event
|
2024-08-02 08:28:05 -07:00 |
|
pkmnsnfrn
|
8445d44fb6
|
Renamed DoPicboxCancel to UseBlankMessageToCancelPokemonPic
|
2024-07-15 21:48:24 -07:00 |
|
pkmnsnfrn
|
28183ec299
|
first merge of ghoul's branch
|
2024-07-15 21:35:58 -07:00 |
|
ghoulslash
|
48d2bff553
|
merge w upcoming
|
2024-07-08 14:12:00 -04:00 |
|
Eduardo Quezada
|
4d6452e14e
|
Move general config file to the config folder (#4805)
|
2024-06-19 13:42:01 +02:00 |
|
ghoulslash
|
cb1696384c
|
merge in original dexnav code with some rhh specific tweaks
|
2024-06-16 10:39:28 -04:00 |
|