atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16112 commits 2 branches 40 tags 600 MiB
Commit graph

221 commits

Author SHA1 Message Date
Eduardo Quezada
1fc712f153 Merge remote-tracking branch '_pret/master' into RHH/pr/upcoming/pret_20231210 
# Conflicts:
#	Makefile
#	data/battle_scripts_1.s
#	gflib/malloc.c
#	gflib/malloc.h
#	include/battle.h
#	ld_script.ld
#	ld_script_modern.ld
#	src/battle_ai_script_commands.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
 2023-12-10 13:27:09 -03:00
Bassoonian
3b337672e9 Fix static variable names 2023-12-08 12:46:52 +00:00
Icedude907
e5ac2a103e Incorporate review changes 2023-11-24 10:25:39 +13:00
Icedude907
a0bf504bc1 Linkerscript now tracks RAM/ROM usage 2023-11-12 15:24:10 +13:00
sbird
b77bc71862 fix -Warray-parameter, -Waddress, -Warray-bounds warnings 
those are introduced by some compiler between gcc 10 and gcc 13
when using -Wall
 2023-10-16 09:36:36 +01:00
Martin Griffin
cbdba65218
Move battle tests off the heap (#3413) 
* Catch OOM in tests

* Alias gBattleTestRunnerState with sBackupMapData

Reverts #3398 "Fix Broken Move Anims in Tests" which moved the AI logs
to statically-allocated EWRAM_DATA instead of being part of
gBattleTestRunnerState.
 2023-10-13 20:29:30 +02:00
DizzyEggg
a7b9d139da
Fix Wall Werrors on modern (#3412) 
* Fix Wall Werror errors

* fix hgss pokedex modern errors

* tests build on modern

* learnset change

* Update src/battle_ai_util.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/battle_anim_new.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/pokedex_plus_hgss.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* review changes

* unused cmd args

* various args back

---------

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
 2023-10-13 18:39:35 +02: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
Ariel A
8df538479a Merge branch 'master' into followers 2023-09-03 17:39:35 -04:00
Ariel A
d929aa60ed Added support for 48x48 and 64x64 followers. See event_objects.h 2023-09-03 16:51:43 -04: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
GriffinR
6eaaa50ad5
Correct berry fix graphics colors, more PLTT constant use (#1892) 2023-08-09 12:49:21 -04:00
Martin Griffin
b08b6a37cb Optimize BuildOamBuffer 2023-08-02 12:22:30 +01:00
Eduardo Quezada
bf814e11cd Cleanup 
- Proper whitespace
- Bracket pret style
- Simplified RemoveObjectEventInternal
- SImplified GetMonInfo
- Made IsFollowerVisible easier to read
 2023-06-18 01:19:46 -04: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
Eduardo Quezada
49ffd4a2e9 Easy Chat always shows words in uppercase 2023-06-06 10:55:42 -04: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
Martin Griffin
412f6f5352
Separate build directory for tests and TESTING define (#3002) 
* Separate build directory for tests and TESTING define

* fixup! Separate build directory for tests and TESTING define

* fixup! Separate build directory for tests and TESTING define

* fixup! Separate build directory for tests and TESTING define
 2023-05-31 09:38:37 -04:00
GriffinR
14f7e49099 Add some missing palette macro use 2023-05-25 15:09:16 -04:00
Ariel A
d12efe8cd7 Merge branch 'master' into followers 2023-05-15 18:37:38 -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
GriffinR
57396026b2 Replace NUM_TEXT_PRINTERS with WINDOWS_MAX 2023-03-31 14:57:51 -04:00
Eduardo Quezada
b62e5aa72e Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 
# Conflicts:
#	src/battle_main.c
#	src/field_specials.c
#	src/trade.c
 2023-02-15 14:11:03 -03:00
GriffinR
62aed217fe Remove unused common symbols in window.c 2023-02-01 16:14:32 -05: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
0cc10a1ada Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize 2023-01-18 11:07:12 -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
sbird
214718110a [doc] remove mislabled metatile attributes from WriteSequenceToBgTilemapBuffer 2022-12-27 15:38:13 +01: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
GriffinR
004ce32da0 Sync text ctrl codes with pokefirered 2022-11-23 21:13:00 -05:00
Ariel A
1c011a9c1c Merge branch 'master' into followers 2022-10-07 20:52:15 -04:00
Eduardo Quezada
f969effd36 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925 2022-09-25 12:51:39 -03:00
Eduardo Quezada
8a68596b64 Removed free macro 2022-09-16 20:36:44 -03:00
Eduardo Quezada
e412ec30a0 Removed calloc macro 2022-09-16 20:34:22 -03:00
Eduardo Quezada
63156b4398 Removed malloc macro 2022-09-16 20:24:26 -03: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
GriffinR
91c040b081
Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace 
Cleaned trailing whitespace
 2022-09-13 14:00:11 -04:00
Eduardo Quezada
5eb9312250 Added missing labels in headers 2022-09-12 21:14:15 -03:00
Eduardo Quezada
65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
Eduardo Quezada
5403cd036e Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	include/battle.h
#	include/battle_controllers.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2022-09-02 23:24:08 -04:00
Eduardo Quezada
0a34d47041 Merge remote-tracking branch 'pret/master' into pret_clean2 2022-08-27 00:56:00 -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
Martin Griffin
6fed961ed6 Write palette IDs in hex 2022-08-19 15:29:35 +01:00
Eduardo Quezada
59f89bde9e Misc cleanup 2022-08-18 14:23:45 -04:00
Eduardo Quezada
e8a05e92e4 Corrected additional inconsistent uses of whitespace 2022-08-15 17:04:34 -04:00
Eduardo Quezada
2e1bf0d965 OamData mosaic FALSE 2022-07-29 21:27:39 -04:00
Eduardo Quezada
01558ff8f3 Struct pointers star standarizing 2022-07-29 11:15:33 -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
GriffinR
a8c93dcf35 Add missing font constants after EXT_CTRL_CODE_FONT 2022-07-18 02:36:25 -04:00
Ariel A
9beee311c4 Merge branch 'master' into romhack 2022-07-17 15:13:15 -04:00
GriffinR
34438e6bc4 Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
GriffinR
a8b466dc80 Disambiguate fieldmap names 2022-01-19 10:15:32 -05:00
MCboy
1a33187bad
Move enum to bg.h 2022-01-14 13:48:46 +03:30
MCboy
998900bd1b
Give sensical names to Unused_AdjustBgMosaic 2022-01-14 13:37:27 +03:30
Ariel A
bdcbb5c700 Merge branch 'master' into romhack 2021-12-18 17:14:52 -05:00
GriffinR
83be1bfc8f Remove sFiller from malloc.c 2021-11-29 11:19:30 -05:00
GriffinR
1b35f9adad Use specific name limits for string limit functions 2021-11-17 22:11:03 -05:00
GriffinR
b9fa18bdd4 Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros 2021-11-17 22:03:37 -05:00
GriffinR
c1970a4bc8 Remove dead sub references 2021-11-17 15:47:47 -05:00
GriffinR
7e27a0746d Misc text clean-up 2021-11-14 22:21:17 -05:00
GriffinR
be7d0bd3b0
Merge branch 'master' into doc-menu 2021-11-04 12:11:31 -04:00
GriffinR
c291fa8e7f Propagate BG_COORD constants 2021-11-03 23:02:06 -04:00
GriffinR
50d3003a0d Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW 2021-11-03 19:54:20 -04:00
GriffinR
9a0618afc3 Add COPYWIN constants 2021-11-03 15:29:18 -04:00
GriffinR
3e49ac804b
Merge branch 'master' into doc-finalmisc 2021-11-03 13:56:22 -04:00
GriffinR
e14210ce1f
Merge pull request #1536 from GriffinRichards/clean-braille 
Add font id constants, better braille support
 2021-11-03 13:17:29 -04:00
GriffinR
0ba22ca112
Merge pull request #1534 from GriffinRichards/doc-btrans 
Document battle transition
 2021-11-03 11:26:20 -04:00
GriffinR
929aade0fd Fix braille slash 2021-11-02 18:34:05 -04:00
GriffinR
afb9ff3a40 Document files with a few remaining symbols 2021-11-02 18:06:06 -04:00
GriffinR
36039e1b86 Convert fonts.s to C 2021-10-31 01:44:18 -04:00
GriffinR
fdaf436960 Add font id constants 2021-10-30 19:54:15 -04:00
GriffinR
13cd2a41f0 Better braille support 2021-10-30 16:19:10 -04:00
LOuroboros
cde0ce878c EXT_CTRL_CODE_SIZE -> EXT_CTRL_CODE_FONT 2021-10-29 19:00:07 -03:00
GriffinR
901cd476b6 Fix incorrect arguments on CopyRectToBgTilemapBufferRect 2021-10-29 11:51:47 -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
24b4e898ad More mauville_old_man clean up 2021-10-18 14:40:04 -04:00
GriffinR
f2e0c9ec9d Some pokedex clean up 2021-10-17 21:32:09 -04:00
GriffinR
95406384f4 Start wonder card/news documenting 2021-10-14 13:24:20 -04:00
GriffinR
28de627913 Add TRACKS_ALL, remove BGCntrlBitfield 2021-10-09 11:34:51 -04:00
GriffinR
e270ee1a74
Merge pull request #1506 from GriffinRichards/single-doc 
Document some single-remaining symbols
 2021-09-29 00:10:09 -04:00
GriffinR
db057eb86b Relocate battle_message comment 2021-09-24 17:33:18 -04:00
GriffinR
a66d7e1b43 Document some single-remaining symbols 2021-09-24 17:14:20 -04:00
GriffinR
42d2fefe02
Merge branch 'master' into tag-none 2021-09-24 10:17:34 -04:00
GriffinR
f8f7617946 Add TAG_NONE 2021-09-14 13:14:14 -04:00
Ariel Antonitis
8a3b04e837 Merge branch 'master' into romhack 2021-09-02 01:03:13 -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
GriffinR
3e60a78406
Merge branch 'master' into doc-frontierpass2 2021-07-31 13:30:40 -04:00
GriffinR
602855ea99 Document frontier pass 2021-07-31 13:28:08 -04:00
PikalaxALT
810ca5f8ff Flatten pos fields in struct Sprite 2021-07-07 09:11:52 -04:00
Ariel Antonitis
dda599e929 Updated README & Improved efficiency of tracking palette unloads. 2021-06-15 19:35:51 -04:00
Ariel Antonitis
9a6f6212b2 Fixed bug where selling items freed sprite palettes too early. 2021-06-15 18:27:58 -04:00
Ariel Antonitis
e4b9bb75e2 Merge branch 'master' into romhack 2021-06-04 23:36:21 -04:00
gAlfonso-bit
c9c5586068
Fixed ChangeBgY_ScreenOff‘s signature. (#1447) 
* Fix Functions

* Fix ChangeBgY_ScreenOff signature

* Remove unneeded changes

* Fix argument mismatch

Just to get this out of the way

* Not needed

* Update palette.c
 2021-05-27 07:32:09 -05:00
Kurausukun
94939e395b one last goto 2021-05-24 13:31:54 -05:00
gAlfonso-bit
aca96a1510 Mark 0xFFF8 as ~7 
Since 7 is used as a mask, I wondered if 0xFFF8 was used to undo the mask and it turns out it was.
 2021-05-24 07:36:08 -05:00