Commit Graph

53 Commits

Author SHA1 Message Date
pkmnsnfrn 71b8d20397 Replaced magic numbers regarding triggerGroundEffectsOnMove to TRUE / FALSE 2024-04-04 16:21:34 -04:00
Eduardo Quezada af210da972 Solved a bunch of -Wall errors on modern 2023-09-20 19:01:08 -03:00
GriffinR e70577d59b Add missing sizeof in trainer_see 2023-08-20 17:22:29 -04:00
GriffinR 7681340966 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-trade 2023-01-23 14:45:51 -05:00
Jaizu a3ae182fc2 Add constants when using GetMonsStateToDoubles_2 2023-01-15 09:50:31 +01:00
GriffinR 347a02ace1 Sync trade 2022-12-15 15:40:59 -05: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 2e1bf0d965 OamData mosaic FALSE 2022-07-29 21:27:39 -04:00
GriffinR 1ff0b0efa9 Add missing collision constant usage 2022-01-29 21:13:46 -05:00
GriffinR 4dec9b83a3 Move more graphics out of misc 2022-01-14 12:29:30 -05:00
cbt6 b3d779fd0d Document field player functions 2021-10-27 01:39:00 +08:00
GriffinR f8f7617946 Add TAG_NONE 2021-09-14 13:14:14 -04:00
PikalaxALT 810ca5f8ff Flatten pos fields in struct Sprite 2021-07-07 09:11:52 -04:00
SphericalIce 2d7b25428a Use the field effects palette tag constant for the heart icon 2021-02-22 15:35:09 +00:00
SphericalIce 70ff6c3b84 Rename 'hidden' Trainers/obj events to 'buried' 2021-02-14 19:25:23 +00:00
GriffinR 9e59581220 Document object lock and some trainer approach 2021-01-26 04:42:18 -05:00
Kurausukun 58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
Kaz 1404cf3330 field_player_avatar.c: Fix TryInterruptObjectEventSpecialAnim fakematch. 2020-09-17 18:24:11 -04: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
GriffinR e06de33cbd Merge branch 'master' into doc-overworld 2020-07-28 17:46:17 -04:00
PokeCodec c5aa91741b Change signedness and add casts to avoid implicit conversion warnings 2020-07-24 22:18:57 -04:00
GriffinR 4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
GriffinR cb5b8da77b More trainer type usage 2020-04-28 19:59:08 -05:00
GriffinR b93101bbeb Merge master into ObjEvent rename 2019-12-06 21:37:33 -05:00
GriffinR c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
GriffinR 4c52cf9ed1 Fix event constant file names 2019-11-21 14:03:35 -05:00
GriffinR 82cb741d8b Standardize EVENT_OBJECT to OBJECT_EVENT 2019-11-20 23:12:51 -05:00
GriffinR ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
GriffinR dd01942c4f Document aqua/magma hideout scripts 2019-11-01 17:22:45 -05:00
PikalaxALT cd876292d1 Merge branch 'master' into pokenav_unk_2 2019-08-04 15:35:35 -04:00
Phlosioneer 9848f84b9e Use constants for Oam .shape and .size fields
Also some general formatting fixes for constants.
2019-03-16 12:37:04 -05:00
Phlosioneer 49bef25856 Clean up the last extern functions 2019-03-02 03:18:08 -05:00
Marcus Huderle 36a1825bbe Document trainer approach funcs, and use movement type constants in scripts 2019-01-29 14:36:02 -06:00
DizzyEggg edddd847c5 Document and clean up trainer hill 2019-01-13 20:50:08 +01:00
nullableVoidPtr 8a8baaeaaa Merge remote-tracking branch 'upstream/master' 2018-12-08 12:13:15 +08:00
DizzyEggg 6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -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
Melody bad5323642 cleans up trainer battle scripts
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
2018-12-02 15:08:19 -05:00
DizzyEggg 4e37723288 Document Battle Pyramid 2018-11-18 17:52:22 +01:00
Slawter666 1d46507110 Move field effects enum to defines 2018-11-13 14:19:04 +00:00
Marcus Huderle 4d13e3394a Bring all movement function names up-to-date with pokeruby 2018-06-13 17:51:26 -05:00
Marcus Huderle aa9a45c16f Rebrand 'map object' and 'field object' to 'event object' 2018-06-11 19:11:48 -05:00
Marcus Huderle 89edf6d9e9 Move all field object data into src/data and event_object_movement.c 2018-06-11 17:33:50 -05:00
Marcus Huderle 4018acfae1 Update event object struct members 2018-06-11 09:19:17 -05:00
Marcus Huderle 38a126df66 Rename field_map_obj to event_object_movement 2018-06-11 08:46:33 -05:00
ProjectRevoTPP 05bd37bf46 rename header 2018-01-30 18:30:59 -05:00
ProjectRevoTPP 3eaaa59c04 start decompiling field_map_obj_helpers 2018-01-29 04:13:15 -05:00
DizzyEggg 4abc2eea8a ram vars to C files 2017-12-19 17:33:07 +01:00
DizzyEggg b7a2335347 clean up trainer see file 2017-12-19 17:18:44 +01:00
DizzyEggg 5744356989 decompile trainer see 2017-12-18 23:26:44 +01:00