ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,409 Commits 1 Branch 0 Tags 235 MiB
e1d1236d0b
Commit Graph

71 Commits

Author SHA1 Message Date
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
SphericalIce
17052d4547 Use the ITEM_NONE constant for the registeredItem save block field 2022-12-18 21:05:37 +00: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
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
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
23bf41713c Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-12-01 20:17:08 -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
04cc923d6c Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05: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
7f3c529935 Document record mixing mail swap 2021-10-24 15:49:19 -04:00
GriffinR
ece7ef3410 Correct usage of MysteryEvent to MysteryGift 2021-10-17 03:00:48 -04:00
GriffinR
845a5e99cc General mystery gift documentation, finish mystery gift client/server/scripts 2021-10-16 23:35:17 -04:00
ghoulslash
1ad8448532 remove saveblock field 2021-10-06 13:54:33 -04:00
ghoulslash
c06029bc72 add last used ball 2021-06-25 13:37:59 -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
GriffinR
bc9fc38254 Misc contest cleanup 2021-04-22 15:51:04 -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
GriffinR
8c6e89e994 Bit shifts from hex to decimal 2021-03-30 17:38:09 -04:00
GriffinR
117b90a261 Document pokemon jump 2021-02-26 17:26:39 -05:00
Sahith Nallapareddy
dafca0ba22 changing to use constants 2021-02-21 19:27:59 -05:00
DizzyEggg
ff5fc97859 Merge with master 2020-07-11 14:07:10 +02:00
GriffinR
7632404ba5 Document union_room_chat.c 2020-06-02 18:35:00 -04:00
DizzyEggg
88bdeed1a6 Merge with master 2020-04-15 14:40:16 +02:00
GriffinR
dde4a0416c Label GCN link flags field 2020-04-13 08:42:31 -04:00
DizzyEggg
26e109d788 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-01-18 15:06:43 +01:00
GriffinR
58e64b9524 Clean up some of save.c 2020-01-12 18:42:41 -06:00
DizzyEggg
7ff3f32a95 Merge 2019-11-29 21:05:44 +01:00
GriffinR
63ee15fc28 Document Frontier Util 2019-11-25 18:37:48 -06:00
DizzyEggg
4c462a726e Merge with master and learnsets 2019-10-06 15:57:33 +02:00
GriffinR
b46c4b6703 more constant usage 2019-09-16 19:21:23 -05:00
DizzyEggg
58b313956d Merge with master 2019-08-25 12:51:09 +02:00
GriffinR
7fc99f3952 favor lady funcs 2019-08-21 17:06:55 -05:00
DizzyEggg
4881e48994 Merge with master 2019-08-04 23:57:53 +02:00
DizzyEggg
a4a382a004 Match sub_81D2278 and poke jump clean 2019-07-29 16:22:50 +02:00
DizzyEggg
00dcc05516 Add new dex flags 2019-05-14 11:54:58 +02:00
Phlosioneer
50350cc2e1 Merge branch 'master' into contest-ai-cleanup 2019-04-07 20:20:22 -04:00
Marcus Huderle
033580da96 Document secret base 2019-04-05 16:24:57 -05:00
Phlosioneer
8f13e991d2 Found a debug system for pokemon contests 2019-04-02 21:51:21 -04:00
Marcus Huderle
aebc676913 Decompile union_room_chat.c up to sub_801F5B8 2019-03-27 19:09:12 -05:00
Marcus Huderle
d7a9fcb975 Cleanup mevent2 2019-03-24 18:29:00 -05:00
Marcus Huderle
cf917a8733 Decompile berry_powder.c 2019-03-24 14:50:16 -05:00
Phlosioneer
93e9b9fe5d Fix some names 2019-02-18 01:33:41 -05:00
Phlosioneer
986d3d8b2f Finish and polish new_game.c 
Only one function is left undocumented. I tried to go into the assembly
to at least name it, but it clears fields in the save block that aren't
even documented yet.
 2019-02-15 03:40:57 -05:00
Phlosioneer
45297797e6 Document the intro movie state machine 
Need to study the water droplet animation more closely before they can
be renamed; otherwise, this names every major symbol in this file.
 2019-02-09 21:07:07 -05:00
Marcus Huderle
abebd2b864 Cleanup externs in overworld.c 2019-02-08 11:48:51 -06:00
DizzyEggg
edddd847c5 Document and clean up trainer hill 2019-01-13 20:50:08 +01:00
Marcus Huderle
e1092028ec Decompile match_call.c 2019-01-02 19:46:15 -06:00
Marcus Huderle
d59f5a8e56 Misc overworld documentation 2018-12-27 16:52:13 -06:00
Marcus Huderle
2c0f5f58e9 Use constants for warp into MAP_INSIDE_OF_TRUCK 2018-12-27 11:24:34 -06:00
nullableVoidPtr
f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00