Commit Graph

5395 Commits

Author SHA1 Message Date
PokeCodec
9bdb15c54c
Merge branch 'master' into Explcit-Casting 2020-07-27 13:18:28 -04:00
DizzyEggg
11178a49db Fix undefined behaviour in protect animation
gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1]

The above does NOT make it certain that i gets incremented before reading from the right side. Changed it, so the function always increments i first, then reads from pal buffer.
2020-07-27 13:17:18 -04:00
GriffinR
ad3de420af Sync flags with pokeruby 2020-07-27 13:14:48 -04:00
GriffinR
1c55734e44 Document faraway island 2020-07-27 13:14:48 -04:00
PokeCodec
ddd012f3ed holding back on casts 2020-07-27 12:47:08 -04:00
PikalaxALT
79cc659d7e
Merge pull request #1113 from DizzyEggg/patch-4
Fix undefined behaviour in protect animation
2020-07-27 06:37:37 -04:00
DizzyEggg
f007165c53
Fix undefined behaviour in protect animation
gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1] 

The above does NOT make it certain that i gets incremented before reading from the right side. Changed it, so the function always increments i first, then reads from pal buffer.
2020-07-27 12:27:35 +02:00
PokeCodec
c5aa91741b Change signedness and add casts to avoid implicit conversion warnings 2020-07-24 22:18:57 -04:00
PikalaxALT
2e077f09e4
Merge pull request #1111 from GriffinRichards/sync-flags
Sync unused flags with pokeruby
2020-07-23 09:12:33 -04:00
PikalaxALT
5348674bc4
Merge pull request #1102 from GriffinRichards/doc-faraway
Document faraway island
2020-07-23 09:12:19 -04:00
GriffinR
813f0c724f Sync flags with pokeruby 2020-07-22 18:00:41 -04:00
GriffinR
69a04f88f4
Merge pull request #1109 from DizzyEggg/patch-3
Update agb_flash.c
2020-07-22 15:47:06 -04:00
DizzyEggg
af5090c892
Update agb_flash.c 2020-07-22 19:25:09 +02:00
GriffinR
bfa7dfcd58
Merge pull request #1105 from AsparagusEduardo/Coordinates
Changed mon front and back coordinates from hex to decimal so they're easier to edit.
2020-07-21 19:43:14 -04:00
Eduardo Quezada
6eccf019db Fixed missing changes. 2020-07-21 19:32:33 -04:00
GriffinR
07cd31caac
Merge pull request #1108 from PokeCodec/FixPort
Match RotateAuroraRingColors_Step
2020-07-21 17:18:03 -04:00
PokeCodec
97ceca6527 Match AnimTask_RotateAuroraRingColors_Step 2020-07-21 16:11:11 -04:00
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
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
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