Commit Graph

106 Commits

Author SHA1 Message Date
GriffinR
4ce83c7d96 Merge pull request #2104 from GriffinRichards/fix-collision-comparison
Fix collision comparison in PlayerNotOnBikeMoving
2025-06-22 20:05:30 -04:00
GriffinR
0c32d840fa Merge pull request #2141 from pret/porymap-6
Update for Porymap 6
2025-05-27 10:53:17 -04:00
Kurausukun
e1e7d1cf35 Fixes for C23 Support (#2138)
* fixes for c23 support
* include global.h in m4a.c & remove <string.h> include
2025-05-19 09:11:59 +01:00
GriffinR
929bc8b990 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2025-05-14 11:50:11 -04:00
Eduardo Quezada
a3075325a0 GENDER_COUNT in sPlayer/RivalAvatarGfxIds (#2117) 2025-04-05 20:18:07 -04:00
GriffinR
b464fdbbde Fix collision comparison in PlayerNotOnBikeMoving 2025-02-13 15:37:18 -05:00
GriffinR
f61c0099b9 OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA 2024-10-12 23:34:02 -04:00
GriffinR
9f31b0fe90 Generate local IDs from map.json files 2024-10-12 03:04:24 -04:00
Bassoonian
5fefd743a2 Fix defines in MAP_NUM and MAP_GROUP 2024-08-14 13:02:40 +02:00
pkmnsnfrn
7ee921e9da Added BUGFIX for groundEffectsOnMove when the player stops Surfing 2024-04-04 16:17:48 -04:00
GriffinR
2db9ab2a2f Document camera sprite functions 2023-11-22 13:52:56 -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
a72d4c4168 Cleanup from syncing pss and mon markings 2022-07-30 12:43:14 -04:00
GriffinR
34438e6bc4 Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
GriffinR
2efbd5f549 Merge pull request #1608 from GriffinRichards/fix-fieldmap
Fix some incorrect fieldmap names
2022-01-26 17:51:56 -05:00
GriffinR
3d0326106e Z coord / height -> elevation 2022-01-21 12:48:19 -05:00
GriffinR
a7e6045d71 Merge pull request #1597 from GriffinRichards/misc-cleanup
Miscellaneous fixes
2022-01-19 22:17:37 -05:00
GriffinR
429d53b95c Use runningState directly in CheckMovementInputNotOnBike 2022-01-09 11:12:35 -05:00
GriffinR
8f1a760937 Add missing array constants in field_player_avatar 2022-01-08 23:55:26 -05:00
GriffinR
ce55e58ad8 Misc cleanup 2022-01-04 10:09:42 -05:00
sphericalice
50522fdea4 Remove some magic numbers from TryPushBoulder 2021-12-30 12:21:47 +00:00
GriffinR
04cc923d6c Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05:00
GriffinR
1c82571fa0 Merge pull request #1542 from GriffinRichards/doc-menu
Document menu
2021-11-08 21:23:21 -05:00
cbt6
0fe3881961 Rename WalkInPlaceFastest to WalkInPlaceFaster 2021-11-05 01:54:34 +08:00
GriffinR
be7d0bd3b0 Merge branch 'master' into doc-menu 2021-11-04 12:11:31 -04:00
GriffinR
17b657d83a Finish menu documentation 2021-11-04 11:52:43 -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
afb9ff3a40 Document files with a few remaining symbols 2021-11-02 18:06:06 -04:00
cbt6
3f5f057ebe Rename GoSpeedX functions to WalkNormal, WalkFast, etc. 2021-11-03 01:50:53 +08:00
cbt6
4cedd2d551 Rename WalkFastest functions to WalkFaster 2021-11-03 01:50:53 +08:00
GriffinR
fdaf436960 Add font id constants 2021-10-30 19:54:15 -04:00
cbt6
9a1764f83e Label some animation index numbers 2021-10-30 01:37:49 +08:00
cbt6
bd9ea23925 Rename as StaticCollision instead 2021-10-27 02:21:51 +08:00
cbt6
b3d779fd0d Document field player functions 2021-10-27 01:39:00 +08:00
GriffinR
1f39c34ca4 Merge branch 'master' into minor-constants 2021-10-15 22:44:49 -04:00
GriffinR
862febe03a Add MAP_OFFSET 2021-10-09 13:19:27 -04:00
GriffinR
a2655ba9ab Merge branch 'master' into doc-union 2021-10-07 16:10:35 -04:00
GriffinR
6aaf50ee27 Rename GF Gname, Rfu, finish bulk of Union Room, more link doc 2021-10-07 10:43:03 -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
PikalaxALT
810ca5f8ff Flatten pos fields in struct Sprite 2021-07-07 09:11:52 -04:00
GriffinR
756fad0e61 Document some event object movement 2021-04-06 14:34:36 -04:00
GriffinR
553fe6239a Document more field effects 2021-04-05 18:21:17 -04:00
HornedCrusader
84cb04fa38 Fix bike flag 2021-02-20 11:52:41 -05:00
GriffinR
9e59581220 Document object lock and some trainer approach 2021-01-26 04:42:18 -05:00
GriffinR
c711a2f73b Document warp spin functions 2021-01-01 17:11:02 -05:00
Kurausukun
58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
Kaz
1404cf3330 field_player_avatar.c: Fix TryInterruptObjectEventSpecialAnim fakematch. 2020-09-17 18:24:11 -04:00
PokeCodec
28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00