Commit Graph

5539 Commits

Author SHA1 Message Date
PokeCodec
27ac010922
Merge pull request #1 from pret/master
Upstream
2020-07-20 17:09:02 -04:00
GriffinR
28759f8569
Merge pull request #1106 from GriffinRichards/add-aiscriptcomm
Comment gBattleAI_ScriptsTable with constants
2020-07-20 14:29:28 -04:00
GriffinR
33523d1b06 Comment gBattleAI_ScriptsTable with constants 2020-07-20 14:20:25 -04:00
Eduardo Quezada
f825ba875e Reverted size. 2020-07-19 21:17:32 -04:00
Eduardo Quezada
49ee0fd953 Front pic coordinates. 2020-07-19 20:54:12 -04:00
Eduardo Quezada
10c4debe31 Back pic coordinates 2020-07-19 20:37:11 -04:00
GriffinR
d91f02d984
Merge pull request #1103 from GriffinRichards/doc-optionpal
Label option menu pal
2020-07-19 15:53:17 -04:00
GriffinR
2273458d50 Label option menu pal 2020-07-19 15:44:58 -04:00
GriffinR
a1cc7d2bd6 Document faraway island 2020-07-19 14:12:38 -04:00
GriffinR
5e1fb23aad
Merge pull request #1101 from AsparagusEduardo/doc-pss
Some PSS documentation.
2020-07-19 10:11:00 -04:00
Eduardo Quezada
551334b20b Fixed missing lowercase field name. 2020-07-18 23:10:37 -04:00
Eduardo Quezada
3bec840419 Fixed field names lowercase. 2020-07-18 23:08:44 -04:00
Eduardo Quezada
9b32cafd57 Some PSS documentation. 2020-07-18 21:58:01 -04:00
GriffinR
af09e73d67
Merge branch 'master' into doc-overworld 2020-07-18 20:24:09 -04:00
GriffinR
8e6dd3bafe
Merge pull request #1086 from GriffinRichards/doc-unktrans
Document unk_transition
2020-07-18 20:22:58 -04:00
GriffinR
1a27af8855
Merge pull request #1100 from GriffinRichards/clean-battlescrdata
Misc battle and battle palace documentation
2020-07-18 20:22:44 -04:00
GriffinR
fb402725c6 Convert more battle constants to bit shifts 2020-07-18 18:39:38 -04:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
GriffinR
1cf2470aac
Merge pull request #1097 from PokeCodec/asm
Allow assembly on Clang
2020-07-17 18:19:06 -04:00
GriffinR
96fd719a19
Merge pull request #1081 from GriffinRichards/add-localids
Add local object event ids for referenced objects
2020-07-17 18:18:47 -04:00
GriffinR
50e48898d2
Merge pull request #1088 from GriffinRichards/doc-starterchoose
Document starter_choose.c
2020-07-17 16:02:10 -04:00
GriffinR
300f36654d
Merge pull request #1099 from PokeCodec/quickie
ifndef GUARD typo fix
2020-07-17 15:56:52 -04:00
PokeCodec
597a238229 Typo Fix 2020-07-17 15:49:46 -04:00
PokeCodec
98441b1199 Sort out asm 2020-07-16 18:28:38 -04:00
GriffinR
d888fe1013
Merge pull request #1096 from DizzyEggg/patch-2
Use stat constants in MonGainEVs
2020-07-16 09:29:23 -04:00
DizzyEggg
c8e1079736
Use stat constants in MonGainEVs 2020-07-16 09:58:16 +02:00
GriffinR
7bea28cb84
Merge pull request #1093 from GriffinRichards/fix-frontiermonconst
Clean up some frontier mon use in battle factory
2020-07-15 13:37:07 -04:00
GriffinR
0c4f3b269e
Merge pull request #1083 from GriffinRichards/playse-constants
Use charmap constants for PLAY_SE
2020-07-15 02:53:53 -04:00
GriffinR
e129d04b93
Merge branch 'master' into doc-overworld 2020-07-15 00:40:47 -04:00
GriffinR
3c356a1d7a
Merge pull request #1082 from GriffinRichards/add-flagvarsave
Allow flag/var counts to be updated alongside values
2020-07-14 19:58:38 -04:00
GriffinR
6f3c792577
Merge pull request #1084 from GriffinRichards/fix-gbagfxsegfault
Fix segfault in gbagfx
2020-07-14 19:57:27 -04:00
GriffinR
a583dfcc42
Merge pull request #1094 from DizzyEggg/rename
Give proper names to some functions
2020-07-14 19:56:46 -04:00
GriffinR
c177872c9c
Merge pull request #1080 from AsparagusEduardo/EndBalls
Created constant for easier Ball Expansion.
2020-07-14 19:56:20 -04:00
DizzyEggg
0425cb66ef Give proper names to some functions 2020-07-14 11:13:03 +02:00
GriffinR
1c75396276 Clean up some frontier mon use in battle factory 2020-07-13 00:47:30 -04:00
Eduardo Quezada
b31efcd6e3 Renamed constant, 2020-07-12 01:49:32 -04:00
PikalaxALT
617e411aca
Merge pull request #1092 from PikalaxALT/ubfix
Fix some UB exposed with GCC 10.1.0
2020-07-11 10:32:30 -04:00
PikalaxALT
535189bf14 Fix some UB exposed with GCC 10.1.0 2020-07-11 10:22:34 -04:00
PikalaxALT
038d247e14
Merge pull request #1091 from Flametix/target
Replace magic number with MOVE_TARGET_BOTH
2020-07-09 15:45:36 -04:00
PikalaxALT
5a326a11f4
Merge pull request #1090 from Ryuhouji/patch-3
Made documentation more readable
2020-07-09 15:45:11 -04:00
Ryuhouji
8e2128f22c
Fix indentation 2020-07-09 15:36:22 -04:00
Ryuhouji
d261374044
Made documentation more readable
This change will make the script command documentation more user-friendly to read.
Additionally, provided the information on the 'delay' macro. I have confirmed that this
is indeed Frames and not Milliseconds. Updated the macro respectively.
2020-07-09 15:16:37 -04:00
Flametix
4ba2799849 Update pokemon.c 2020-07-09 14:52:19 -04:00
GriffinR
beeb673ba1 Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave 2020-07-08 16:03:32 -04:00
PikalaxALT
ebade7affb
Merge pull request #1079 from GriffinRichards/doc-confetti
Document Contest Util and confetti effects
2020-07-08 16:01:27 -04:00
GriffinR
ebb6c4ee66
Merge branch 'master' into doc-overworld 2020-07-08 15:51:58 -04:00
GriffinR
89bcf3cbd9
Merge branch 'master' into add-localids 2020-07-08 15:47:45 -04:00
PikalaxALT
9ff261ac2a
Merge pull request #1078 from GriffinRichards/move-cries
Move Pokemon cries to own directory
2020-07-08 15:45:32 -04:00
GriffinR
431c60c92c Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti 2020-07-08 15:45:31 -04:00
PikalaxALT
8b80b417e2
Merge pull request #1069 from GriffinRichards/doc-link
Document linking
2020-07-08 15:43:45 -04:00