Commit Graph

5967 Commits

Author SHA1 Message Date
GriffinR
462e3bc0cb Sync flags with pokeruby 2020-07-28 15:22:40 -04:00
PokeCodec
c722b77558 holding back on casts 2020-07-28 15:22:15 -04:00
PokeCodec
ebcb982e16 Change signedness and add casts to avoid implicit conversion warnings 2020-07-28 15:22:15 -04:00
GriffinR
b22709ee3d More slot machine data documentation 2020-07-28 14:29:44 -04:00
PikalaxALT
70617d56e4
Merge pull request #1104 from PokeCodec/Explcit-Casting
Reduce "Implicit conversion" warnings
2020-07-28 11:10:00 -04:00
PokeCodec
1e8ffcb898 Merge branch 'Explcit-Casting' of https://github.com/PokeCodec/pokeemerald into Explcit-Casting 2020-07-28 10:25:33 -04:00
GriffinR
e8568b79ef
Merge pull request #1114 from ExpoSeed/doc
Document some battle_util.c
2020-07-28 00:56:02 -04:00
ExpoSeed
b401e2eb86 Fix naming style of function 2020-07-27 21:22:16 -05:00
PokeCodec
fb6f859edd semicolon 2020-07-27 19:17:34 -04:00
ExpoSeed
71dc5edf2e Document some battle_util.c 2020-07-27 17:10:42 -05:00
PokeCodec
5f6e7e2279
Update secret_base.c 2020-07-27 14:59:37 -04:00
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
DizzyEggg
11c2207839 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-27 14:54:32 +02: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
GriffinR
36a4764a78 Document some slot machine data 2020-07-26 02:15:59 -04:00
PokeCodec
c5aa91741b Change signedness and add casts to avoid implicit conversion warnings 2020-07-24 22:18:57 -04:00
GriffinR
2439f42de4 Add warnings to generated files 2020-07-24 03:43:37 -04:00
GriffinR
aca50c87be Continue new contest documentation 2020-07-24 00:14:53 -04:00
GriffinR
52a4428ba6 Begin new contest documentation 2020-07-23 17:55:40 -04:00
GriffinR
4a42e2a710
Merge branch 'master' into doc-overworld 2020-07-23 10:31:52 -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
60ca1aa3fd Restore tabs in field_effect_scripts.s 2020-07-23 05:07:20 -04:00
GriffinR
a4e47f1201 Clean some battle_message.c data 2020-07-23 05:01:42 -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
af09e73d67
Merge branch 'master' into doc-overworld 2020-07-18 20:24:09 -04:00