Hedara
4bdef731e4
Merge remote-tracking branch 'pret/master' into pret-merge
...
Conflicts:
include/constants/battle_ai.h
src/battle_ai_script_commands.c
src/battle_gfx_sfx_util.c
src/pokemon_summary_screen.c
src/trainer_pokemon_sprites.c
2026-01-01 22:16:58 +01:00
Josh
349da0484b
Document m4a xcmd_0C
2025-12-27 01:11:40 +00:00
AlexOn1ine
ce52d83343
25/08/25 Master merge
2025-08-25 17:30:38 +02:00
Hedara
da77dba59f
Merge remote-tracking branch 'pret/master' into pret-merge
...
Conflicts:
data/battle_scripts_1.s
include/constants/battle.h
src/battle_script_commands.c
src/battle_util.c
2025-08-21 15:40:38 +02:00
hedara90
1a39ebd7da
Changed default print level for DebugPrintf for mGBA to MGBA_LOG_WARN ( #7567 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-08-18 19:51:19 +02:00
AlexOn1ine
bc73f4654b
merge master 31/07/25
2025-08-01 12:18:11 +02:00
Josh
0dfec24967
Allow names for voicegroups and use a macro for use with drumsets ( #2149 )
...
mid2agb has been modified to allow more than just numbers when naming voicegroups and voicegroups have been renamed to match. A "voice_group" macro has been set up with a optional parameter for the starting note will shift the offset by the specified amount * 0xC which is the length of 1 voice in a voicegroup. All drumset voicegroups have a "starting_note" of 36.
2025-07-30 19:43:08 +01:00
Nephrite
7c6cff1fb3
Get/SetMonData optimisation ( #7313 )
2025-07-28 11:42:28 +01:00
Eduardo Quezada
d801556a97
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727
2025-07-27 11:59:07 -04:00
Nephrite
7d5a949b71
Bag refactor 2 ( #7166 )
2025-07-11 11:50:38 +02:00
Raymond Dodge
80b9c23d0a
Fix RL compressed data alignment
...
`RLUnComp`, like `LZ77UnComp`, expects the source data to be word-aligned.
So, to mirror how lz-compressed data is defined as `u32[]` to enforce
word-alignment, this changes rl-compressed data to be defined as `u32[]`
to enforce word-alignment.
2025-07-06 13:49:47 -04:00
cawtds
92b4b7f0a0
Keep removed headers ( #7261 )
2025-07-02 09:06:23 +02:00
Alex
66e8200d95
Use battler arguments for SetMoveEffect ( #7156 )
2025-06-23 15:26:31 +02:00
AlexOn1ine
b90fdd1b3c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
Hedara
3ecd8afab0
Merge commit 'bd0a02c45630d6b3666b079593e787de263d0a17' into pret-merge
...
Conflicts:
Makefile
2025-05-24 20:42:01 +02:00
Hedara
a90dd491d2
Merge commit 'e1e7d1cf3530799774fa13d4e409bed7067ffa25' into pret-merge
2025-05-24 19:35:01 +02:00
Kurausukun
bd0a02c456
Correct C23 Checks ( #2144 )
2025-05-19 15:43:06 +01:00
Kurausukun
e1e7d1cf35
Fixes for C23 Support ( #2138 )
...
* fixes for c23 support
* include global.h in m4a.c & remove <string.h> include
2025-05-19 09:11:59 +01: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
301ef288f5
Review comments
2025-04-11 11:37:36 +02:00
Eduardo Quezada
2428af66cd
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-02-20 19:17:59 -03:00
DizzyEggg
b2448ea002
Fix upcoming not working on no cash ( #6121 )
2025-01-26 20:25:57 -03: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
Ariel A
c1d105c31c
Merge branch 'lighting' into lighting-expanded-id
2025-01-25 21:45:23 -05:00
Ariel A
090c4f3936
feat: hardware fades now affect BLDALPHA too
2025-01-25 20:57:30 -05:00
Philipp AUER
7744298788
Fix fixed point damage calculation off-by-1s ( #5775 )
...
Co-authored-by: sbird <sbird@no.tld>
2024-12-05 11:35:56 +00:00
Eduardo Quezada
80447bee8e
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
2024-10-15 20:56:56 -03:00
luckytyphlosion
a55c75d350
Get rid of common syms ( #2040 )
2024-10-14 23:52:11 -04: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
Bassoonian
c1ee43254e
Clean up defines lacking spaces
2024-08-15 19:34:56 +02: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
Martin Griffin
41ddd911b7
Include gba/defines.h in gba/types.h ( #4364 )
...
If gba/types.h is included before gba/defines.h, it ends up declaring a
variable named PACKED rather than specifying that BgCnt should be
packed.
2024-04-07 13:08:35 +02:00
Eduardo Quezada
5d372b5f8a
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# README.md
# gflib/sprite.c
# graphics/object_events/pics/pokemon/togetic.png
# 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_followers.h
# src/event_object_movement.c
# src/field_effect_helpers.c
2024-01-18 08:12:09 -03:00
Biffalo XIII
4a3954ff34
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/birch_pc.c
# src/main.c
2024-01-09 09:19:12 -03:00
aronson
3c21e23555
Allocate initialized sections for EWRAM and IWRAM ( #3892 )
2024-01-02 14:24:52 +00:00
Martin Griffin
d1ab525552
Revert "Allocate initialized sections for EWRAM and IWRAM ( #3877 )" ( #3891 )
...
This reverts commit f24deb930131819e5ff3be401742b41162e4829a.
2024-01-02 13:54:42 +00:00
aronson
f24deb9301
Allocate initialized sections for EWRAM and IWRAM ( #3877 )
2024-01-02 13:46:01 +00:00
Ariel A
dcaaac92d9
Added support for compressed OW graphics.
...
Added CpuSmartCopy macros (Credit: luckytyphlosion)
2023-12-31 00:35:27 -05:00
DizzyEggg
726c6f48e3
Fix weird stat drop anim ( #3870 )
...
* Fix weird stat drop anim
* PACKED define
2023-12-30 22:53:46 +01: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
WhenGryphonsFly
5abeb6718d
Correct KEY_INTR_ENABLE
2023-08-27 14:30:57 -05:00
Philipp AUER
7d8bcce9a5
Optimize sprite.c ( #3175 )
2023-08-03 15:57:04 +03:00
Martin Griffin
0e5c78aeb6
Merge remote-tracking branch 'pret/master' into 'rhh/master'
2023-07-25 19:49:18 +01:00
Martin Griffin
31a3ada7de
Detect potential misalignment in modern
2023-07-24 19:42:56 +01:00
Martin Griffin
3f5daa8cf1
Add BENCHMARK to test runner
...
Counts the time spent in the block in arbitrary time units (64-cycles
currently). If the block takes more than ~4 million cycles (~0.25s) the
benchmark will wrap around.
Note that the time can be affected by the timeout IRQs, and should only
be taken as a loose indication of relative performance.
2023-07-24 15:18:28 +01:00
Eduardo Quezada
4c57b84cd9
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602
...
# Conflicts:
# graphics/pokemon/mawile/footprint.png
# src/battle_gfx_sfx_util.c
# src/fldeff_sweetscent.c
# src/pokedex.c
2023-06-02 11:45:28 -04:00
GriffinR
5100eef017
Merge pull request #1890 from GriffinRichards/pal-macro
...
Add some missing palette macro use
2023-05-28 18:28:50 -04:00
GriffinR
14f7e49099
Add some missing palette macro use
2023-05-25 15:09:16 -04:00
GriffinR
8b37b4292a
Document DrawFootprint
2023-05-09 22:43:25 -04:00
Martin Griffin
76f02774ea
Detect memory leaks in tests
...
Can use KNOWN_LEAKING; to specify that a test is known to leak memory.
The location information is available in regular game builds. Thus it is
available for use in debugging leaks in-game too. In the future we
should consider replacing it with NULL if NDEBUG is defined. This is not
currently possible because the tests do not force NDEBUG to be
undefined.
2023-04-20 20:35:22 +01:00
