GriffinR
0c7c81e02f
Merge branch 'master' into _pret/pr/pyramidLocation
2025-06-30 11:51:45 -04:00
GriffinR
929bc8b990
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
2025-05-14 11:50:11 -04:00
GriffinR
709cfa1c9a
Merge pull request #2014 from Bassoonian/battleterrain
...
Rename battle terrain to environment
2025-04-13 19:32:06 -04:00
Eduardo Quezada
29ef1cf9ad
Stick to the new name
2024-12-05 21:00:55 -03:00
GriffinR
9f31b0fe90
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
GriffinR
e4e90eacd6
Merge pull request #2023 from Bassoonian/updatemapmacros
...
Fix defines in MAP_NUM and MAP_GROUP
2024-09-19 12:17:16 -04:00
Martin Griffin
56d3faa32f
Merge pull request #2025 from Bassoonian/cleandefinespaces
...
Clean up defines lacking spaces
2024-08-21 19:04:12 +01:00
GriffinR
3f49c5cbaf
Fix trainer match call flags
2024-08-15 23:00:20 +02:00
Bassoonian
c1ee43254e
Clean up defines lacking spaces
2024-08-15 19:34:56 +02:00
Bassoonian
5fefd743a2
Fix defines in MAP_NUM and MAP_GROUP
2024-08-14 13:02:40 +02:00
Bassoonian
367f6dc8fd
Address concerns
2024-07-13 18:01:54 +02:00
Bassoonian
003bd54600
Rename battle terrain to environment
2024-07-13 12:02:18 +02:00
Bassoonian
e5ac2fe0b1
Clean up pokemon/ball/dex mentions in comments
2023-12-12 19:02:36 +01:00
Eduardo Quezada
af210da972
Solved a bunch of -Wall errors on modern
2023-09-20 19:01:08 -03:00
GriffinR
866c32a735
Add temp var aliases
2023-08-04 14:17:28 -04:00
Eduardo Quezada
079ca8ab29
Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarification
2023-02-24 07:53:02 -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
13672680b0
void pointer standarized
2022-07-29 10:52:35 -04:00
Eduardo Quezada
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
Martin Griffin
c9958e3087
Simplify GetBattleTransitionTypeByMap
2022-07-05 14:17:46 +01:00
GriffinR
61aa9c3ba9
More updating event macro comments
2021-11-16 17:46:34 -05:00
GriffinR
04cc923d6c
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
GriffinR
c1130592fa
Drop some overworld prefixes
2021-11-15 10:58:05 -05:00
Eduardo Quezada D'Ottone
b282bbc270
Using WEATHER_SANDSTORM in battle_setup
2021-11-06 14:55:27 -03:00
GriffinR
0ba22ca112
Merge pull request #1534 from GriffinRichards/doc-btrans
...
Document battle transition
2021-11-03 11:26:20 -04:00
GriffinR
07bf225f94
Continue battle_transition documenting
2021-10-29 11:24:36 -04:00
cbt6
b3d779fd0d
Document field player functions
2021-10-27 01:39:00 +08:00
GriffinR
1056209d8e
Start battle_transition documenting
2021-10-26 01:39:28 -04:00
GriffinR
6dc3c9864c
Merge pull request #1520 from GriffinRichards/doc-random
...
Document random remaining symbols
2021-10-24 23:43:17 -04:00
GriffinR
b31bddddca
Clean up metatile_behavior
2021-10-18 12:54:29 -04:00
GriffinR
31b501e7eb
Start misc battle documentation
2021-10-08 16:39:46 -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
9e59581220
Document object lock and some trainer approach
2021-01-26 04:42:18 -05:00
GriffinR
88e951bfe3
Label some ReturnToField funcs
2021-01-01 17:11:06 -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
171154a097
Convert to -g; will be required for eliminating fakematches.
2020-09-16 19:36:30 -04:00
GriffinR
ee72696b53
Sync encounter musics with encounter music types
2020-08-20 21:03:24 -04:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
GriffinR
65bd2faf94
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
2020-08-16 05:59:10 -04:00
GriffinR
3779422489
Split contest funcs from script_pokemon_util
2020-08-13 17:42:12 -04:00
GriffinR
72edc46ab6
Document unk_transition
2020-07-02 15:45:37 -04:00
GriffinR
aaf5d91c18
Document field_message_box.c
2020-06-03 19:47:45 -05:00
GriffinR
b6c9ad505d
Minor fixes in trainer_battle.inc
2020-03-03 14:47:14 -05:00
GriffinR
956090b05f
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-02-12 13:05:57 -05:00
GriffinR
084bd66924
Document Trainer Card
2020-02-08 14:31:17 -06:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
GriffinR
635267ce32
Merge branch 'master' into fix-eventobj
2020-01-08 05:51:49 -05:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome
2020-01-08 01:15:36 -05:00
Fontbane
31b4656324
Labels better
2019-12-25 22:39:06 -05:00
