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

204 Commits

Author SHA1 Message Date
AlexOn1ine
bc73f4654b merge master 31/07/25 2025-08-01 12:18:11 +02:00
Eduardo Quezada
d801556a97 Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727 2025-07-27 11:59:07 -04:00
GriffinR
6f8a1bbdb8
Add pack/unpack for data masks (#2163) 2025-07-23 09:28:34 +01:00
Bassoonian
c5c7bb13c9
Converts a bunch of defines to enums (#7041) 2025-06-02 15:54:37 +02:00
Hedara
9bfef357a2 Merge commit 'e4e90ea' into pret-merge 
Conflicts:
	src/battle_setup.c
	src/field_specials.c
	src/menu_helpers.c
	src/pokedex_area_screen.c
	src/roamer.c
	src/script.c
 2025-05-27 18:53:30 +02:00
Hedara
578c5f96cd Merge commit 'baf5be20354c9dfde182c0a2dd23ab40643fe57b' into pret-merge 
Conflicts:
	include/battle_gfx_sfx_util.h
	src/apprentice.c
	src/battle_controller_recorded_opponent.c
	src/battle_controller_recorded_player.c
	src/battle_dome.c
	src/battle_gfx_sfx_util.c
	src/battle_script_commands.c
	src/battle_tv.c
	src/item_menu.c
	src/move_relearner.c
	src/pokemon.c
	src/scrcmd.c
 2025-05-15 21:31:54 +02:00
GriffinR
929bc8b990 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2025-05-14 11:50:11 -04:00
Alex
baf5be2035
Replace: moveId -> move, moveIdx -> moveIndex (#2134) 2025-05-09 16:33:23 +01:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation (#5982) 2025-01-25 22:02:39 +01:00
Bassoonian
a1c47a931f
Revert "Converts a bunch of defines to enums" (#6082) 2025-01-22 21:50:39 +01:00
Bassoonian
a3ce3a569d
Converts a bunch of defines to enums (#6071) 2025-01-21 21:19:41 +01:00
Bassoonian
5fefd743a2 Fix defines in MAP_NUM and MAP_GROUP 2024-08-14 13:02:40 +02: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
a36cfb1093
unify monSpritesGfx sprites/ptr and fix various compiler errors on o3/os/og (#4252) 2024-03-06 22:26:33 +01: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
sbird
196038eaee [pokedex_plus] refactor #if to C if 2023-10-22 03:26:24 +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
GriffinR
18319e8da3 Misc missing constant use 2023-08-10 01:42:18 -04:00
Ariel A
5d5d97b46a Fixed most functions that take/return graphicsIds to accept u16s. 2023-01-12 21:44:56 -05:00
GriffinR
e434b0047f More missing constant usage 2022-11-09 15:53:47 -05:00
GriffinR
1d1c2d41bb Add list menu cursor constants 2022-11-09 15:16:46 -05: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
tustin2121
1cb659df8c Renaming Script Contexts 
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
 2022-08-15 15:18:12 -04:00
Eduardo Quezada
a37d8b1346 Documented boolean uses 2022-07-25 14:59:14 -04:00
GriffinR
36e5d5e759 Add missing menu array counts 2022-02-27 13:47:50 -05:00
GriffinR
a8b466dc80 Disambiguate fieldmap names 2022-01-19 10:15:32 -05:00
GriffinR
eb95ac0b9c Document field_tasks 2021-11-17 14:44:42 -05:00
GriffinR
04cc923d6c Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05:00
GriffinR
085f8adec6 Start remaining menu documentation 2021-11-03 17:38:08 -04:00
GriffinR
fdaf436960 Add font id constants 2021-10-30 19:54:15 -04:00
GriffinR
862febe03a Add MAP_OFFSET 2021-10-09 13:19:27 -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
bd5cf07059
Merge branch 'master' into doc-playerpc 2021-08-02 14:08:10 -04:00
GriffinR
06b909bcd8 Document player pc 2021-08-02 13:58:40 -04:00
GriffinR
aad090e154 Document TV 2021-04-26 12:35:35 -04:00
GriffinR
a240481d5f Document secret_base.c 2021-02-05 12:08:25 -05:00
GriffinR
9dd867689e Use ARRAY_COUNT in PrintMenuTable 2021-01-19 04:19:14 -05:00
aaaaaa123456789
1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05: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
PokeCodec
5f6e7e2279
Update secret_base.c 2020-07-27 14:59:37 -04:00
PokeCodec
c5aa91741b Change signedness and add casts to avoid implicit conversion warnings 2020-07-24 22:18:57 -04:00
GriffinR
24569583e4 Document contest results 2020-06-18 17:50:13 -04:00
Sierraffinity
74edaed426 Begin item_menu.c cleanup 2020-06-10 13:07:42 -07:00
GriffinR
8d3b7bd0b1 Use metatile labels for decor gfx 2020-04-13 14:43:50 -04:00
Martin Griffin
4485d51522 Document decoration.c 2020-03-06 09:47:20 +00:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05:00
GriffinR
6a470ddfda Some script clean up, document secret base secrets show 2020-01-12 19:39:30 -06:00
GriffinR
ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00