Martin Griffin
b53cca1a06
Declarations for 2- and 3-argument GetMonData ( #1756 )
...
* Type-safe GetMonData/GetBoxMonData
* Comments
2023-07-24 09:57:37 -04:00
gruxor
5fd881a1b6
Remove unused macro to fix syntax highlights
2023-07-12 14:44:23 -04:00
sbird
6482279fa3
[battle, math] refactor damage calculation to use proper fp type and inlined multiplication
2023-07-07 18:51:23 +02:00
Ariel A
d12efe8cd7
Merge branch 'master' into followers
2023-05-15 18:37:38 -04:00
ghoulslash
ee0652416d
merge w pret
2023-05-11 10:27:41 -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
Eduardo Quezada
7c29a24110
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413
2023-04-13 17:05:48 -04:00
sbird
aea5d79aa2
[trainer_parties] implement fully customizable npc trainer parties
...
fix nature related bug, fix hash generation, add tests
2023-03-25 20:00:04 +01:00
GriffinR
6be9a79b8c
Merge pull request #1871 from GriffinRichards/doc-trendy-sayings
...
Document the trendy sayings word group
2023-03-24 08:05:51 -04:00
Eduardo Quezada
51b716c9d9
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319
...
# Conflicts:
# data/battle_scripts_2.s
# include/constants/battle_string_ids.h
# include/constants/songs.h
# src/battle_message.c
# src/data/pokemon/species_info.h
2023-03-19 20:28:56 -03:00
Eduardo Quezada
2cb54c49da
Changed definitions of string conversion IDE macros to allow their use in compound literals without IDE errors
2023-03-14 15:38:18 -03:00
GriffinR
0c380862d6
Document the trendy saying word group
2023-03-13 15:58:40 -04:00
Martin Griffin
f1b9872bf0
Test moves, items, and abilities in battle
...
Thank you to SBird for providing mgba-rom-test binaries and Spikes/Toxic
Spikes tests!
Co-authored-by: sbird <sbird@no.tld>
2023-02-01 13:53:57 +00:00
Ariel A
66c57e3442
Merge branch 'master' into followers
2023-01-29 18:44:06 -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
36c89d345c
Merge branch 'master' into doc-wnews
2023-01-03 22:28:21 -05:00
Eduardo Quezada
e0802f13a2
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103
...
# Conflicts:
# include/link_rfu.h
2023-01-03 15:40:33 -03:00
Eduardo Quezada
66d1c9bc65
Documenting padding in structs used by Saveblocks
2022-12-17 22:55:43 -03:00
GriffinR
483c3d5c13
Document wonder news
2022-11-22 02:17:03 -05:00
Ariel A
1c011a9c1c
Merge branch 'master' into followers
2022-10-07 20:52:15 -04:00
Eduardo Quezada
1d7e8bd730
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
...
# Conflicts:
# asm/macros/battle_ai_script.inc
# asm/macros/battle_script.inc
# data/battle_ai_scripts.s
# include/link_rfu.h
# src/pokemon.c
# src/pokemon_summary_screen.c
# src/sound.c
2022-09-13 16:22:42 -03:00
Eduardo Quezada
65108c3192
Cleaned trailing whitespace
2022-09-11 14:14:49 -04:00
crater-git
940f9f1726
Moved branch defs to config.h, now only for compat
2022-08-24 16:10:32 -04: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
Eduardo Quezada
13672680b0
void pointer standarized
2022-07-29 10:52:35 -04:00
Eduardo Quezada
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
Eduardo Quezada
f3bebcd12c
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
...
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-22 22:57:02 -04:00
Ariel A
9beee311c4
Merge branch 'master' into romhack
2022-07-17 15:13:15 -04:00
Eduardo Quezada D'Ottone
e791cf90ad
Merge tag 'pretmaster' into BE_pretmerge2
...
# Conflicts:
# data/battle_anim_scripts.s
# include/battle_anim.h
# include/battle_controllers.h
# include/battle_interface.h
# include/battle_main.h
# include/battle_setup.h
# include/constants/battle_anim.h
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_anim_fire.c
# src/battle_anim_normal.c
# src/battle_controllers.c
# src/battle_dome.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/pokemon.c
2022-07-15 12:58:46 -04:00
GriffinR
7143865f6f
Add some battle frontier constant usage
2022-06-09 12:57:28 -04:00
Martin Griffin
1cc59acca9
Static assertion for size of save structs
2022-05-25 19:48:42 +01:00
LOuroboros
577791a6bc
Moved order of defined header files in include/global.h
2022-05-13 10:52:09 -03:00
LOuroboros
2263caef7a
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine
2022-05-13 03:17:31 -03:00
LOuroboros
f82c946ff3
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
2022-04-03 13:26:27 -03:00
LOuroboros
fa39dc76dc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
GriffinR
62f3f144ab
Clean up some trainer hill
2022-03-31 12:54:07 -04:00
ultima-soul
84a7f960c8
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2022-02-28 23:37:41 -08: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
3d0326106e
Z coord / height -> elevation
2022-01-21 12:48:19 -05:00
LOuroboros
43921e0894
Updated the default state and comments of FREE_BATTLE_TOWER_E_READER and FREE_MYSTERY_EVENT_BUFFERS
2022-01-13 20:05:01 -03:00
GriffinR
4024b3f1b3
Merge pull request #1590 from GriffinRichards/dex-enum
...
Convert pokedex defines to enums
2022-01-10 14:56:26 -05:00
GriffinR
5d033c2e4d
Convert pokedex defines to enums
2022-01-05 12:18:49 -05:00
GriffinR
aadab8b016
Move pokemon and easy chat constants to global, misc clean-up
2021-12-28 18:07:41 -05:00
Ariel A
26c38e8093
Removed lighting/day-night/shadow code from follower branch.
2021-12-22 22:58:52 -05:00
ghoulslash
f9856c2833
merge w pret
2021-12-20 12:32:24 -05:00
Ariel A
bdcbb5c700
Merge branch 'master' into romhack
2021-12-18 17:14:52 -05:00
ultima-soul
4f2e3bf214
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 21:23:54 -08:00
ultima-soul
a68a39e35f
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-12-01 20:17:49 -08: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
01a90ca6c2
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-27 22:17:05 -08:00
ultima-soul
0312c5be8b
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-27 21:38:26 -08:00
ultima-soul
57bf1c7824
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-21 10:41:12 -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
GriffinR
d414787932
Some TV clean-up
2021-11-16 16:22:17 -05:00
GriffinR
04cc923d6c
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
GriffinR
1548e902cd
Add MonCoods size macro
2021-11-08 09:41:23 -05:00
ghoulslash
c7a8d58eec
merge w pret
2021-11-04 10:03:33 -04:00
GriffinR
d6571f2355
Merge pull request #1525 from GriffinRichards/doc-recmix
...
Document remainder of Record Mixing
2021-10-26 14:18:38 -04:00
GriffinR
6dc3c9864c
Merge pull request #1520 from GriffinRichards/doc-random
...
Document random remaining symbols
2021-10-24 23:43:17 -04:00
GriffinR
ab80264921
Merge pull request #1519 from GriffinRichards/doc-mgift
...
Document Mystery Gift
2021-10-24 15:50:39 -04:00
GriffinR
7f3c529935
Document record mixing mail swap
2021-10-24 15:49:19 -04:00
Jademalo
62436d9f67
IDE support formatting and consistency
2021-10-23 10:10:00 +01:00
Jademalo
eb860a368e
Improve IDE support
2021-10-22 04:30:33 +01:00
GriffinR
24b4e898ad
More mauville_old_man clean up
2021-10-18 14:40:04 -04:00
GriffinR
db8ce5d7f9
Clean up mauville_old_man, drop ScrSpecial prefix
2021-10-18 01:09:41 -04:00
GriffinR
3cd27acbea
Document wonder news
2021-10-17 02:09:31 -04:00
GriffinR
5f9069628d
Clean up mevent2
2021-10-17 01:35:26 -04:00
GriffinR
c7d550e96c
Clean up wonder card/news view
2021-10-17 01:15:16 -04:00
GriffinR
845a5e99cc
General mystery gift documentation, finish mystery gift client/server/scripts
2021-10-16 23:35:17 -04:00
GriffinR
c02001c46d
Document mystery gift link scripts, general mystery gift
2021-10-15 12:05:06 -04:00
GriffinR
95406384f4
Start wonder card/news documenting
2021-10-14 13:24:20 -04:00
GriffinR
a6ab2eb883
Merge branch 'master' into trailingSpaces
2021-09-23 21:39:21 -04:00
GriffinR
cbf8863e5b
Clean up Lilycove Lady
2021-09-09 15:24:34 -04:00
ghoulslash
0daf330628
undefine FREE_TRAINER_HILL by default
2021-08-31 12:57:44 -04:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
ultima-soul
988320b89a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-08-17 11:25:13 -07:00
ExpoSeed
630d172393
Include expansion_branches.h in global.h
2021-07-04 12:41:21 -05:00
ExpoSeed
0ed1d29ece
Include expansion_branches.h in global.h
2021-07-04 12:39:30 -05:00
ExpoSeed
fb69b65337
Fix redefinition error in battle_config.h
2021-07-02 14:36:55 -05:00
ExpoSeed
788b9f675f
Fix redefinition error in pokemon_config.h
2021-07-02 14:36:02 -05:00
ghoulslash
bf4b5a926d
merge with pret
2021-06-11 12:23:16 -06:00
ultima-soul
0a87adad1a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-06-07 18:05:52 -07:00
Ariel Antonitis
c267dd6ee6
Added function to check for newer emulators/hardware.
2021-06-04 23:35:04 -04:00
Ariel Antonitis
3201422bbb
Merge branch 'master' into romhack
2021-05-04 22:14:50 -04:00
ultima-soul
cf0fd961b9
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-28 23:56:58 -07:00
ultima-soul
56fc420187
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 21:34:30 -07:00
ultima-soul
0da3f74a7e
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-28 18:58:38 -07:00
ultima-soul
14a0303e2f
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-27 18:36:37 -07:00
GriffinR
aad090e154
Document TV
2021-04-26 12:35:35 -04:00
Ariel Antonitis
221569a710
Merge branch 'master' into romhack
2021-04-18 22:17:53 -04:00
GriffinR
33ea2a1061
Remove unnecessary scope for TEST_BUTTON
2021-04-13 02:50:50 -04:00
GriffinR
4a1cfbead2
Document remaining overworld
2021-04-06 16:55:43 -04:00
ultima-soul
be7acc919a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-04-03 21:53:29 -07:00
ultima-soul
b8721034ef
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-02 13:42:05 -07:00
ultima-soul
939608f5b8
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-02 13:16:40 -07:00
Evan
ef6c4ddbb1
remove 1000ish bytes with ramscript (thx griffinR for advice)
2021-04-02 09:17:10 -06:00
Evan
741f62fc0b
merge 9fd576f37e021f119513a38d3d6e39a2c64f85ec
2021-04-02 09:17:00 -06:00
GriffinR
86856098a3
Document Dewford Trend
2021-03-31 16:08:42 -04:00
GriffinR
c40fb9288c
Merge pull request #1378 from GriffinRichards/doc-berrycrush
...
Document Berry Crush
2021-03-29 12:38:16 -04:00
Ariel Antonitis
6df5a71b0d
Merge branch 'master' into romhack
2021-03-23 18:42:00 -04:00
