AlexOn1ine
0fc3ef056a
27/02/26 Master to upcoming merge
2026-02-27 23:53:24 +01:00
Bassoonian
d7106b7ef1
Regularise switch indentation ( #9368 )
2026-02-27 15:54:21 +01:00
Hedara
4dba49657a
Merge remote-tracking branch 'pret/master' into pret-merge
...
Conflicts:
data/battle_anim_scripts.s
src/battle_anim_water.c
src/event_object_movement.c
src/field_player_avatar.c
2026-02-26 15:33:26 +01:00
Marky
25ffb2c12c
Add enum for Elevations ( #2233 )
2026-02-20 01:17:42 -05:00
cawtds
97e83ebe6a
Add FRLG ( #7423 )
2026-01-28 17:41:12 +01: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
GriffinR
6f8a1bbdb8
Add pack/unpack for data masks ( #2163 )
2025-07-23 09:28:34 +01: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
hedara90
d1aa49cca3
Remove compressed palettes ( #6455 )
2025-04-26 22:58:40 +02:00
Hedara
08a2ad2c98
Merge branch 'upcoming' into merrps-dns
2025-04-09 10:01:51 +02:00
Hedara
a3a48c59b8
Merge remote-tracking branch 'pret/master' into pret-merge-2025-03-29
2025-03-29 14:21:29 +01:00
Raymond Dodge
7b6b9ab655
Remove casts in decoration.c ( #2110 )
2025-03-18 18:41:51 -04:00
Eduardo Quezada
937b3106b4
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-17 19:33:48 -03:00
hedara90
7c6c9120ea
Ewram and unused function cleanup sweep ( #6019 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-15 14:07:12 +01:00
Greenphx9
ad969c968c
Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2
2024-08-25 17:54:28 +10:00
Eduardo Quezada
1be5581f19
Revert NUM_DECORATION_FLAGS definition
2024-05-22 14:17:11 -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
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
8cab1b7094
Fixed braces style
2024-01-18 17:07:17 -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
Eduardo Quezada
af210da972
Solved a bunch of -Wall errors on modern
2023-09-20 19:01:08 -03:00
Ariel A
d800d71461
Merge branch 'followers' into lighting
2023-09-03 17:49:27 -04:00
Ariel A
8df538479a
Merge branch 'master' into followers
2023-09-03 17:39:35 -04:00
GriffinR
18319e8da3
Misc missing constant use
2023-08-10 01:42:18 -04:00
Martin Griffin
31a3ada7de
Detect potential misalignment in modern
2023-07-24 19:42:56 +01:00
Eduardo Quezada
341ce6fd95
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
...
# Conflicts:
# .github/workflows/build.yml
# README.md
# gflib/sprite.c
# graphics/pokemon/banette/anim_front.png
# graphics/pokemon/banette/normal.pal
# graphics/pokemon/sentret/normal.pal
# graphics/pokemon/togetic/anim_front.png
# graphics/pokemon/togetic/normal.pal
# include/battle_script_commands.h
# include/data.h
# ld_script.txt
# src/battle_controller_player.c
# src/bike.c
# src/event_object_movement.c
2023-06-16 21:25:16 -04:00
GriffinR
14f7e49099
Add some missing palette macro use
2023-05-25 15:09:16 -04:00
Ariel A
ad9a77fe2c
Merge branch 'followers' into lighting
2023-04-23 17:40:33 -04:00
Ariel A
0d3061574c
Made follower disappear when decorating.
...
Decreased number of max sprite decorations to 13.
2023-04-23 17:26:13 -04:00
Ariel A
07995f8925
Fixed some decoration icons being darkened at night in outdoor shops.
2023-03-13 18:11:05 -04:00
GriffinR
0cc10a1ada
Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize
2023-01-18 11:07:12 -05:00
GriffinR
f55443656f
Add NUM_TILES_PER_METATILE
2022-12-03 17:29:02 -05:00
GriffinR
431a7ef8dd
Add missing cursorKind field usage
2022-11-09 15:37:47 -05:00
Eduardo Quezada
8a68596b64
Removed free macro
2022-09-16 20:36:44 -03:00
Eduardo Quezada
63156b4398
Removed malloc macro
2022-09-16 20:24:26 -03:00
Eduardo Quezada
65108c3192
Cleaned trailing whitespace
2022-09-11 14:14:49 -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
tustin2121
1cb659df8c
Renaming Script Contexts
...
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
2022-08-15 15:18:12 -04:00
Eduardo Quezada
a72d4c4168
Cleanup from syncing pss and mon markings
2022-07-30 12:43:14 -04:00
Eduardo Quezada
2e1bf0d965
OamData mosaic FALSE
2022-07-29 21:27:39 -04:00
Eduardo Quezada
a37d8b1346
Documented boolean uses
2022-07-25 14:59:14 -04:00
BlackShark
75a44fdd79
use more true & false constants
2022-05-27 02:18:52 +02: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
3d0326106e
Z coord / height -> elevation
2022-01-21 12:48:19 -05:00
GriffinR
062cdbe01c
Merge pull request #1599 from GriffinRichards/fix-tilemaps
...
Break up graphics/interface and graphics/misc
2022-01-20 08:53:44 -05:00
