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 f24deb9301
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
GriffinR
0cc10a1ada
Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize
2023-01-18 11:07:12 -05:00
Eduardo Quezada
66d1c9bc65
Documenting padding in structs used by Saveblocks
2022-12-17 22:55:43 -03:00
sbird
0d5adac1e1
[debug, printf] add DebugPrintfLevel macro
2022-12-07 00:03:25 +01:00
sbird
fab26b99f1
[fix] DebugPrintf with no format arguments
2022-12-06 15:59:59 +01:00
GriffinR
e515e52abb
Add DISPLAY_TILE_* constants
2022-09-26 19:52:17 -04:00
sbird
343d7f7d26
[debug] do not use heap allocation for MgbaPrintf
2022-09-23 04:12:57 +02:00
sbird
12670e8e3e
[debug] simplify macros, add EX versions
2022-09-23 03:48:58 +02:00
sbird
22329d3318
[debug] use boolean constants for nStopProgram
2022-09-23 03:23:44 +02:00
sbird
44a5a8d31e
[debug] fix AGBAssert for AGBPrintf debug block
2022-09-23 03:22:57 +02:00
sbird
584bfe0221
[debug] add support for mgba printf
...
* adds support for mgba printf debugging as well as adding support for switching between debugging configuration
* adds `mini_printf` as an alternative to libc printf as well as switches to choose a pretty printing handler
* adds a pretty printing format to `mini_printf` to print preproc encoded strings
2022-09-06 13:40:31 +02:00
Martin Griffin
6fed961ed6
Write palette IDs in hex
2022-08-19 15:29:35 +01:00
Eduardo Quezada
13672680b0
void pointer standarized
2022-07-29 10:52:35 -04:00
GriffinR
34438e6bc4
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
GriffinR
2495d18132
Add missing :req, remove old macros
2022-01-23 18:52:04 -05:00
GriffinR
4590887359
Clean up some register constant use
2021-11-10 17:01:21 -05:00
GriffinR
343ac99049
Start pokenav conditions doc
2021-11-10 17:00:54 -05:00
GriffinR
28de627913
Add TRACKS_ALL, remove BGCntrlBitfield
2021-10-09 11:34:51 -04:00
gAlfonso-bit
2be29cdb77
Update IsPokemonCryPlaying
2021-05-13 11:23:11 -05:00
GriffinR
1b8d405b5e
Add missing include guard suffixes
2021-04-02 12:54:40 -04:00
GriffinR
d62f89b20c
Minor window/bg cleanup
2021-02-18 10:00:07 -05:00
Michael Panzlaff
91ccf9e343
fix typo
2020-12-12 13:07:56 +01:00
Michael Panzlaff
f177c736fc
more CgbSound decipher work
2020-12-11 16:33:58 +01:00
Michael Panzlaff
15ff55eee5
use better m4a variable/constant names
2020-12-11 16:33:55 +01:00
aaaaaa123456789
7dc95a0103
Undo PokeCodec's PRs
...
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.
Reverts #1104 , #1108 , #1115 , #1118 , #1119 , #1124 , #1126 , #1127 , #1132 , #1136 ,
#1137 , #1139 , #1140 , #1144 , #1148 , #1149 , #1150 , #1153 , #1155 , #1177 , #1179 ,
#1180 , #1181 , #1182 and #1183 .
2020-09-13 06:30:55 -03:00
GriffinR
4ad147f75d
Merge pull request #1156 from GriffinRichards/doc-rayscene
...
Document Rayquaza cutscene
2020-09-01 14:46:14 -04:00
pi1024e
bdb976dc27
fixed mistakes
2020-08-29 13:18:35 -04:00
