Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,155 Commits 1 Branch 0 Tags
Commit Graph

198 Commits

Author SHA1 Message Date
Eduardo Quezada
35a76248d1 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	src/data/pokemon/species_info/gen_4_families.h
 2024-05-06 16:03:29 -04:00
Martin Griffin
e42a0a6dbe Narrower fonts 2024-04-25 18:40:37 +01: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
Eduardo Quezada
30851b0ad8
Fixed Egg's summary screen softlock (#4301) 2024-03-24 18:59:28 +01:00
Eduardo Quezada
39ed85635f Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	include/data.h
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info.h
#	src/data/pokemon/species_info/gen_1_families.h
#	src/data/pokemon/species_info/gen_2_families.h
#	src/data/pokemon/species_info/gen_3_families.h
#	src/data/pokemon/species_info/gen_4_families.h
#	src/data/pokemon/species_info/gen_5_families.h
#	src/data/pokemon/species_info/gen_6_families.h
#	src/data/pokemon/species_info/gen_7_families.h
#	src/data/pokemon/species_info/gen_8_families.h
 2024-03-17 23:41:23 -03:00
DizzyEggg
48d49b40c5 Merge branch 'master' of https://github.com/pret/pokeemerald into upcoming 2024-03-07 20:57:07 +01:00
DizzyEggg
3b45fda8e9
Use u32 in gflib functions and remove unused (#4250) 2024-03-06 22:22:05 +01:00
DizzyEggg
7da5cb421e
Make sure gHeap is always aligned 2024-03-06 16:13:06 +01:00
Eduardo Quezada
124c17d315 Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	README.md
#	data/field_effect_scripts.s
#	data/maps/AncientTomb/scripts.inc
#	data/maps/DesertRuins/scripts.inc
#	data/maps/IslandCave/scripts.inc
#	data/scripts/follower.inc
#	graphics/object_events/pics/pokemon/wailord.png
#	graphics/object_events/pics/pokemon_old/substitute.png
#	include/constants/event_objects.h
#	include/global.h
#	remote_build.sh
#	spritesheet_rules.mk
#	src/bike.c
#	src/data/object_events/object_event_anims.h
#	src/data/object_events/object_event_graphics.h
#	src/data/object_events/object_event_graphics_info_followers.h
#	src/data/object_events/object_event_pic_tables.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/field_screen_effect.c
#	src/overworld.c
#	src/palette.c
#	src/pokemon_summary_screen.c
#	src/scrcmd.c
#	src/trainer_see.c
 2024-02-17 23:40:08 -03:00
Ariel A
195d2bb79a Merge branch 'followers' into followers-expanded-id 2024-02-17 17:19:01 -05: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
Ariel A
a407c72235 Cleaned up follower code. 
Added support for asymmetrical follower pokemon.
Fixed bug with changing GraphicsInfo size.
Added follower Substitute gfx. Credit: shikashipx
 2024-02-12 20:37:01 -05:00
Eduardo Quezada
ec83b11354 Merge branch '_pret/master' into _RHH/pr/upcoming/pret_20240210 
# Conflicts:
#	gflib/malloc.c
 2024-02-10 18:05:20 -03:00
Eduardo Quezada
1aa7fea14f Made OW_GFX_COMPRESS into C ifs 2024-01-19 10:58:02 -03:00
Eduardo Quezada
8cab1b7094 Fixed braces style 2024-01-18 17:07:17 -03:00
Eduardo Quezada
381a0bf8a1 Fixed compile issues 2024-01-18 09:10:20 -03: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
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
8a52316dd2 Reformatted for code review. Moved config to include/config/decap.h. 2024-01-17 01:12:04 -05:00
Ariel A
499b4a6d42 Replaced if directives with conditions, where possible. 2024-01-09 19:34:29 -05:00
Ariel A
85aab338a9 Merge branch 'guillotine' into guillotine-expansion 2024-01-08 19:43:06 -05:00
Ariel A
1ce961768e Added automatic runtime decapitalization. 2024-01-07 20:21:14 -05:00
Ariel A
398a9ee8fa Merge branch 'followers' into followers-expanded-id 2023-12-31 01:49:56 -05:00
Ariel A
7d7531f2fa Merge branch 'master' into followers 2023-12-31 01:28:27 -05:00
Ariel A
dcaaac92d9 Added support for compressed OW graphics. 
Added CpuSmartCopy macros (Credit: luckytyphlosion)
 2023-12-31 00:35:27 -05:00
Jaizu
934a1fdd8c Remove old debug function 2023-12-25 16:06:34 -05:00
Martin Griffin
74a6b8764c
overworld_ascending_frames to simplify overworld_frames (#3625) 
Introduces relativeFrames which automates the process of using
overworld_frames with ascending frames.

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-18 13:47:15 +01:00
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