Commit Graph

121 Commits

Author SHA1 Message Date
GriffinR
0c7c81e02f Merge branch 'master' into _pret/pr/pyramidLocation 2025-06-30 11:51:45 -04:00
GriffinR
0c32d840fa Merge pull request #2141 from pret/porymap-6
Update for Porymap 6
2025-05-27 10:53:17 -04:00
Alex
b31a73f990 Rename ItemId_GetX to GetItemX (#2116) 2025-05-22 13:27:52 +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
2a656ff1a5 Applied review changes 2024-12-27 12:40:25 -03:00
Eduardo Quezada
29ef1cf9ad Stick to the new name 2024-12-05 21:00:55 -03:00
Eduardo Quezada
720b2daecc Improve Pyramid location documentaion 2024-12-05 18:25:27 -03:00
Eduardo Quezada
5483e05db6 Fixed brace style inconsistencies 2024-12-05 12:46:50 -03:00
GriffinR
f61c0099b9 OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA 2024-10-12 23:34:02 -04:00
GriffinR
a3d5f54b75 Fix type for offset in MapConnection 2024-08-13 19:10:24 +02:00
Eduardo Quezada
af210da972 Solved a bunch of -Wall errors on modern 2023-09-20 19:01:08 -03:00
Martin Griffin
912a80e27a Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
GriffinR
dbf757be88 Treat map data as const 2023-03-08 12:00:30 -05:00
GriffinR
03a98c72bc Sync fieldmap 2022-09-02 19:29:35 -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
GriffinR
e5c36cd745 MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes 2022-08-03 14:21:13 -04:00
Eduardo Quezada
7b3401ee27 Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
Eduardo Quezada
a37d8b1346 Documented boolean uses 2022-07-25 14:59:14 -04:00
GriffinR
34438e6bc4 Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
GriffinR
7ddb9cb84c Add missing direction constant usage 2022-02-14 17:34:01 -05:00
GriffinR
3d0326106e Z coord / height -> elevation 2022-01-21 12:48:19 -05:00
GriffinR
3e49ac804b Merge branch 'master' into doc-finalmisc 2021-11-03 13:56:22 -04:00
GriffinR
afb9ff3a40 Document files with a few remaining symbols 2021-11-02 18:06:06 -04:00
GriffinR
fdaf436960 Add font id constants 2021-10-30 19:54:15 -04: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
b31bddddca Clean up metatile_behavior 2021-10-18 12:54:29 -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
28a8fe191a Document item menu 2021-08-10 22:13:02 -04:00
ExpoSeed
b6b0062bd6 Change map header flags to use a bitfield 2021-06-13 17:02:06 -05:00
GriffinR
8c820878bf Document Battle Pyramid Bag 2021-04-23 15:07:36 -04:00
GriffinR
cf9f8d01c5 Add misc item data constants 2021-01-19 05:49:20 -05:00
GriffinR
88e951bfe3 Label some ReturnToField funcs 2021-01-01 17:11:06 -05:00
aaaaaa123456789
bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03: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
28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04: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
e129d04b93 Merge branch 'master' into doc-overworld 2020-07-15 00:40:47 -04:00
GriffinR
4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
GriffinR
06025e887f Allow flag/var counts to be updated alongside values 2020-06-24 17:00:19 -04:00
Sierraffinity
74edaed426 Begin item_menu.c cleanup 2020-06-10 13:07:42 -07:00
GriffinR
b1d26e10a8 Sync map header property names with pokefirered 2020-04-28 19:59:08 -05:00
GriffinR
487080b425 Minor player avatar doc 2020-04-01 02:54:26 -04:00
GriffinR
ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00
GriffinR
68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
Diegoisawesome
026e1108b2 Merge pull request #935 from GriffinRichards/doc-warp
Document some warp/field screen effect
2019-12-20 23:44:56 -08:00
GriffinR
949509aade Merge branch 'master' into fix-eventobj 2019-12-18 13:16:38 -05:00