b39047226b
Match CreateWaterPulseRingBubbles
2020-07-29 22:44:19 -04:00
7ada56f039
Merge pull request #1085 from GriffinRichards/doc-overworld
...
Document field effects / misc overworld
2020-07-28 17:54:25 -04:00
c6b27013cc
Merge pull request #1112 from GriffinRichards/add-genwarn
...
Add warnings to generated map/layout files
2020-07-28 17:47:55 -04:00
e06de33cbd
Merge branch 'master' into doc-overworld
2020-07-28 17:46:17 -04:00
5eecaf92ba
Merge branch 'master' into doc-slotmachine
2020-07-28 17:41:34 -04:00
1f4813bfd2
Document slot machine funcs
2020-07-28 17:38:05 -04:00
96b904bf80
Merge pull request #1115 from PokeCodec/Matching
...
Match InitObjectEventStateFromTemplate
2020-07-28 15:56:58 -04:00
93be3a08ce
Match
2020-07-28 15:31:08 -04:00
e52ffacc25
Clean up slot machine data doc
2020-07-28 15:28:16 -04:00
3b43fc12fc
Merge https://github.com/pret/pokeemerald into Matching
2020-07-28 15:26:05 -04:00
044d968513
Match
2020-07-28 15:23:14 -04:00
7b6607d9e3
Update secret_base.c
2020-07-28 15:23:04 -04:00
37957b2d15
semicolon
2020-07-28 15:23:02 -04:00
462e3bc0cb
Sync flags with pokeruby
2020-07-28 15:22:40 -04:00
c722b77558
holding back on casts
2020-07-28 15:22:15 -04:00
ebcb982e16
Change signedness and add casts to avoid implicit conversion warnings
2020-07-28 15:22:15 -04:00
b22709ee3d
More slot machine data documentation
2020-07-28 14:29:44 -04:00
70617d56e4
Merge pull request #1104 from PokeCodec/Explcit-Casting
...
Reduce "Implicit conversion" warnings
2020-07-28 11:10:00 -04:00
1e8ffcb898
Merge branch 'Explcit-Casting' of https://github.com/PokeCodec/pokeemerald into Explcit-Casting
2020-07-28 10:25:33 -04:00
e8568b79ef
Merge pull request #1114 from ExpoSeed/doc
...
Document some battle_util.c
2020-07-28 00:56:02 -04:00
b401e2eb86
Fix naming style of function
2020-07-27 21:22:16 -05:00
fb6f859edd
semicolon
2020-07-27 19:17:34 -04:00
71dc5edf2e
Document some battle_util.c
2020-07-27 17:10:42 -05:00
5f6e7e2279
Update secret_base.c
2020-07-27 14:59:37 -04:00
9bdb15c54c
Merge branch 'master' into Explcit-Casting
2020-07-27 13:18:28 -04:00
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
ad3de420af
Sync flags with pokeruby
2020-07-27 13:14:48 -04:00
1c55734e44
Document faraway island
2020-07-27 13:14:48 -04:00
ddd012f3ed
holding back on casts
2020-07-27 12:47:08 -04:00
79cc659d7e
Merge pull request #1113 from DizzyEggg/patch-4
...
Fix undefined behaviour in protect animation
2020-07-27 06:37:37 -04:00
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
36a4764a78
Document some slot machine data
2020-07-26 02:15:59 -04:00
c5aa91741b
Change signedness and add casts to avoid implicit conversion warnings
2020-07-24 22:18:57 -04:00
2439f42de4
Add warnings to generated files
2020-07-24 03:43:37 -04:00
4a42e2a710
Merge branch 'master' into doc-overworld
2020-07-23 10:31:52 -04:00
2e077f09e4
Merge pull request #1111 from GriffinRichards/sync-flags
...
Sync unused flags with pokeruby
2020-07-23 09:12:33 -04:00
5348674bc4
Merge pull request #1102 from GriffinRichards/doc-faraway
...
Document faraway island
2020-07-23 09:12:19 -04:00
60ca1aa3fd
Restore tabs in field_effect_scripts.s
2020-07-23 05:07:20 -04:00
a4e47f1201
Clean some battle_message.c data
2020-07-23 05:01:42 -04:00
813f0c724f
Sync flags with pokeruby
2020-07-22 18:00:41 -04:00
69a04f88f4
Merge pull request #1109 from DizzyEggg/patch-3
...
Update agb_flash.c
2020-07-22 15:47:06 -04:00
af5090c892
Update agb_flash.c
2020-07-22 19:25:09 +02:00
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
6eccf019db
Fixed missing changes.
2020-07-21 19:32:33 -04:00
07cd31caac
Merge pull request #1108 from PokeCodec/FixPort
...
Match RotateAuroraRingColors_Step
2020-07-21 17:18:03 -04:00
97ceca6527
Match AnimTask_RotateAuroraRingColors_Step
2020-07-21 16:11:11 -04:00
27ac010922
Merge pull request #1 from pret/master
...
Upstream
2020-07-20 17:09:02 -04:00
28759f8569
Merge pull request #1106 from GriffinRichards/add-aiscriptcomm
...
Comment gBattleAI_ScriptsTable with constants
2020-07-20 14:29:28 -04:00
33523d1b06
Comment gBattleAI_ScriptsTable with constants
2020-07-20 14:20:25 -04:00
f825ba875e
Reverted size.
2020-07-19 21:17:32 -04:00
PokeCodec