Eduardo Quezada
d801556a97
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727
2025-07-27 11:59:07 -04:00
GriffinR
6f8a1bbdb8
Add pack/unpack for data masks ( #2163 )
2025-07-23 09:28:34 +01: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
950dbe7897
Merge commit '16357c7' into pret-merge
...
Conflicts:
include/battle.h
include/battle_controllers.h
include/battle_script_commands.h
include/contest.h
include/list_menu.h
src/battle_controllers.c
src/battle_gfx_sfx_util.c
src/battle_main.c
src/battle_message.c
src/battle_tower.c
src/berry_crush.c
src/contest.c
src/ereader_helpers.c
src/evolution_scene.c
src/hall_of_fame.c
src/mauville_old_man.c
src/mystery_gift_menu.c
src/pokedex.c
src/pokenav_conditions_search_results.c
src/pokenav_menu_handler_gfx.c
src/pokenav_ribbons_list.c
src/rom_header_gf.c
src/union_room.c
src/union_room_battle.c
src/union_room_player_avatar.c
2025-05-24 19:22:31 +02:00
Bassoonian
16357c7e29
Streamline pointer notation ( #2139 )
2025-05-16 12:04:44 +01:00
Pawkkie
3f5335c4ba
Refactor AI flags to u64 ( #6753 )
...
Co-authored-by: DizzyEggg
2025-05-04 17:16:34 +02:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation ( #5982 )
2025-01-25 22:02:39 +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
Philipp AUER
36c8332cd3
Fix Trainer Hill OOB array access ( #5930 )
...
Co-authored-by: sbird <sbird@no.tld>
2025-01-02 06:41:46 -03:00
GriffinR
9f31b0fe90
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
hedara90
e4c81ba6e0
Removed all instances of gBitTable[x] ( #5123 )
...
* Replaced all the gBitTable[X] usages with 1 << X, and cleaned up script output
* Fixed failed merge in online viewer
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-17 10:28:09 -05:00
Bassoonian
5fefd743a2
Fix defines in MAP_NUM and MAP_GROUP
2024-08-14 13:02:40 +02:00
Bassoonian
db95a06ae0
Fix FREE_TRAINER_HILL
2024-02-02 15:24:46 +01:00
Bassoonian
495ee6698c
Clean up code
2024-02-02 13:13:27 +01:00
Bassoonian
acf5d8133a
Convert ifndef configs to standard configs
2024-02-02 12:43:31 +01:00
Bassoonian
d1bb078919
Merge branch 'saveblock' of https://github.com/ghoulslash/pokeemerald into ghoulsaveblock
2024-02-02 11:27:48 +01:00
Eduardo Quezada
7ae37ab79c
Merge branch 'pret_master' into RHH/upcoming
...
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/event_scripts.s
2023-10-27 11:03:37 -03:00
GriffinR
6f71fbe521
Add some missing trainer hill constant usage
2023-10-06 15:17:55 -04:00
Eduardo Quezada
a6940c9e03
Merge branch 'pret_master' into RHH/pr/upcoming/pret_Merge20231002
...
# Conflicts:
# src/battle_ai_script_commands.c
# src/battle_controller_player.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_controllers.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/mystery_gift_menu.c
# src/pokemon.c
2023-10-02 17:17:41 -03:00
Eduardo Quezada
af210da972
Solved a bunch of -Wall errors on modern
2023-09-20 19:01:08 -03:00
Eduardo Quezada
0d5b00aaf2
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
...
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
2023-08-31 14:28:01 -04:00
Martin Griffin
912a80e27a
Reference TMs and HMs by move instead of number ( #1732 )
2023-08-09 10:51:01 -04:00
ghoulslash
ee0652416d
merge w pret
2023-05-11 10:27:41 -04:00
Eduardo Quezada
7c29a24110
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413
2023-04-13 17:05:48 -04:00
GriffinR
dbf757be88
Treat map data as const
2023-03-08 12:00:30 -05:00
Eduardo Quezada
749225ace1
Matching merge from upstream pret
...
# Conflicts:
# graphics/interface/menu_info.png
# include/pokemon.h
# src/battle_ai_switch_items.c
# src/battle_anim_mons.c
# src/battle_anim_water.c
# src/battle_controller_opponent.c
# src/battle_gfx_sfx_util.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/data/pokemon/species_info.h
# src/pokemon.c
# src/pokemon_summary_screen.c
2023-01-20 12:31:54 -03:00
GriffinR
0cc10a1ada
Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize
2023-01-18 11:07:12 -05:00
Eduardo Quezada
e858b4e709
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
...
# Conflicts:
# include/battle.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_dome.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/battle_tower.c
# src/data/pokemon/species_info.h
# src/pokemon.c
2022-11-24 15:36:00 -03:00
Eduardo Quezada
3ed485632f
Renamed gBaseStats to gSpeciesInfo
2022-10-24 17:01:48 -03:00
Eduardo Quezada
afcc1178b2
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
...
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
2022-08-22 20:30:45 -04:00
Martin Griffin
d57442a511
Decimal paletteNums
2022-08-19 17:05:22 +01:00
Martin Griffin
6fed961ed6
Write palette IDs in hex
2022-08-19 15:29:35 +01:00
Eduardo Quezada
e8a05e92e4
Corrected additional inconsistent uses of whitespace
2022-08-15 17:04:34 -04:00
LOuroboros
b59f7aed7f
Added a constant for NPC trainer name length ( #1712 )
2022-07-25 22:59:13 -04:00
LOuroboros
2263caef7a
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine
2022-05-13 03:17:31 -03:00
GriffinR
00e0eefe09
Document trainer hill prize selection
2022-04-01 01:37:48 -04:00
GriffinR
62f3f144ab
Clean up some trainer hill
2022-03-31 12:54:07 -04:00
ultima-soul
86089ce935
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2022-02-28 22:13:14 -08:00
GriffinR
2efbd5f549
Merge pull request #1608 from GriffinRichards/fix-fieldmap
...
Fix some incorrect fieldmap names
2022-01-26 17:51:56 -05:00
GriffinR
a8b466dc80
Disambiguate fieldmap names
2022-01-19 10:15:32 -05:00
GriffinR
4dec9b83a3
Move more graphics out of misc
2022-01-14 12:29:30 -05:00
GriffinR
aadab8b016
Move pokemon and easy chat constants to global, misc clean-up
2021-12-28 18:07:41 -05:00
ghoulslash
f9856c2833
merge w pret
2021-12-20 12:32:24 -05:00
ultima-soul
23bf41713c
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-12-01 20:17:08 -08:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
