ExpoSeed
bcfa79f4fb
Remove POKEMON_SLOTS_NUMBER define
2020-10-12 21:15:50 -05:00
ExpoSeed
88b9847772
Merge branch 'master' of https://github.com/pret/pokeemerald into sync-battle-engine-v2
2020-10-12 12:42:37 -05:00
GriffinR
17a77c9018
Merge pull request #1229 from ghoulslash/document
...
start pokenav documentation
2020-10-11 11:59:40 -04:00
Evan
f4909b4d96
align pokenav task funcs and update some pokenav menu bg gfx files
2020-10-11 08:50:58 -06:00
kageru
52ebc4252e
Document gUnknown_03006298
2020-10-11 09:54:49 +02:00
ExpoSeed
9e2c8a95c1
Sync bev2 with pret
2020-10-11 01:01:47 -05:00
Evan
2b2be90a52
start pokenav documentation
2020-10-10 16:17:34 -06:00
Evan
5ab17cc713
Merge branch 'battle_engine_v2' of https://github.com/dizzyeggg/pokeemerald into battle_engine
2020-10-09 09:13:17 -06:00
GriffinR
65a4e06737
Add ITEM6_HEAL constants, change move flags to shifts
2020-10-05 18:48:51 -04:00
GriffinR
5259898325
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
GriffinR
66bd1e6d3f
Use constants for item digits
2020-09-25 11:18:52 -04:00
tustin2121
832be34898
More documenting trainer hill
...
- Renamed members and added comments in the TrHillDisplay struct.
- Formatted the trainer hill data to better match the metatile layout its representing.
- Documented the function which uses this data.
2020-09-20 01:50:54 -04:00
aaaaaa123456789
7dc95a0103
Undo PokeCodec's PRs
...
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.
Reverts #1104 , #1108 , #1115 , #1118 , #1119 , #1124 , #1126 , #1127 , #1132 , #1136 ,
#1137 , #1139 , #1140 , #1144 , #1148 , #1149 , #1150 , #1153 , #1155 , #1177 , #1179 ,
#1180 , #1181 , #1182 and #1183 .
2020-09-13 06:30:55 -03:00
PokeCodec
7f1827767c
Document size field of unknown struct
2020-09-09 16:09:31 -04:00
PokeCodec
d541002ab6
Type adjust
2020-09-09 15:54:24 -04:00
PokeCodec
e84da39d8a
Match BattleIntroOpponent1SendsOutMonAnimation
2020-09-08 18:54:51 -04:00
PokeCodec
3336eb341d
More adjustments
2020-09-08 14:26:37 -04:00
DizzyEggg
97d0643110
Merge with master
2020-09-08 12:48:28 +02:00
PokeCodec
0a13d718ea
Make 0xFF have a lowercase "x"
2020-09-06 20:03:53 -04:00
PokeCodec
b49c5d188f
Move buffer has and operation too
2020-09-06 17:59:42 -04:00
PokeCodec
5d2a4e02dd
Remove explicit padding
2020-09-06 13:06:09 -04:00
PokeCodec
2d624d66db
Fix
2020-09-05 16:49:33 -04:00
PokeCodec
53a4effd57
Tidy up headers
2020-09-05 16:41:44 -04:00
PikalaxALT
16ecbc6446
Merge pull request #1177 from PokeCodec/MatchEmerald
...
Match All but 2 remaining naked functions
2020-09-05 10:25:10 -04:00
Eduardo Quezada
b7fe94108c
Fixed Pacifidlog typo.
2020-09-05 01:11:07 -04:00
PokeCodec
da582d5258
Make JOY Macros match
2020-09-04 20:41:29 -04:00
PokeCodec
3d87a88067
Make battle pyramid defines into enums
2020-09-04 19:49:53 -04:00
PokeCodec
3a2a2b6ba9
Fix issues according to feedback
2020-09-04 19:49:53 -04:00
PokeCodec
1cdd0ac199
Make argument int
2020-09-04 19:49:53 -04:00
PokeCodec
d4158e490a
Match more functions
2020-09-04 19:49:53 -04:00
PikalaxALT
c3f6c56e19
Merge pull request #1161 from GriffinRichards/doc-wallclock
...
Document wall clock data
2020-09-04 19:48:04 -04:00
PikalaxALT
135ed6a162
Merge pull request #1163 from GriffinRichards/doc-animthrow
...
Minor battle_anim_throw cleanup
2020-09-04 19:44:33 -04:00
GriffinR
1264c4615a
Merge pull request #1158 from GriffinRichards/doc-cablecar
...
Document cable car
2020-09-03 16:24:27 -04:00
GriffinR
4ad147f75d
Merge pull request #1156 from GriffinRichards/doc-rayscene
...
Document Rayquaza cutscene
2020-09-01 14:46:14 -04:00
GriffinR
5fc49bfd9f
Merge pull request #1165 from GriffinRichards/fix-underwatermaps
...
Give proper names to underwater maps
2020-09-01 14:26:11 -04:00
GriffinR
7c8bc0fbe3
Merge pull request #1149 from PokeCodec/datatypes
...
gflib documenting
2020-09-01 14:25:21 -04:00
GriffinR
f5495d1220
Give proper names to underwater maps
2020-09-01 03:03:14 -04:00
GriffinR
5773bb8643
Merge pull request #1152 from GriffinRichards/doc-blender
...
Document berry blender
2020-08-30 15:33:17 -04:00
GriffinR
cdc19a0b07
Merge pull request #1144 from PokeCodec/libgbasyscall
...
Cleanup and fix mistakes in libraries
2020-08-30 15:27:08 -04:00
GriffinR
afb3472282
Minor battle_anim_throw cleanup
2020-08-30 15:11:44 -04:00
hondew
5c7fa11390
Rename to battle_anim_throw
2020-08-30 14:25:40 -04:00
hondew
e46b35455d
Merge branch 'master' into pokeball-doc
2020-08-30 14:14:38 -04:00
hondew
328aecc96e
Document throwing pokeball
...
continue
Document more
Doc more funcs
Remove workspace
Document shiny stars
Document PokeBlock
Clean up
Clean more
2020-08-30 14:08:06 -04:00
GriffinR
778bdb4d30
Document wallclock data
2020-08-29 15:55:28 -04:00
pi1024e
bdb976dc27
fixed mistakes
2020-08-29 13:18:35 -04:00
GriffinR
a9719c92bf
Merge pull request #1160 from kiliwily/master2
...
add MAX_LEVEL_UP_MOVES macro
2020-08-28 19:18:03 -04:00
kiliwily
c68c2b66e8
add more macros
2020-08-29 01:02:20 +02:00
GriffinR
08a8aad65a
Merge branch 'master' into doc-cablecar
2020-08-28 16:17:48 -04:00
GriffinR
0cfc279af5
Merge branch 'master' into doc-rayscene
2020-08-28 16:17:11 -04:00
GriffinR
c830731734
Merge branch 'master' into doc-blender
2020-08-28 16:16:00 -04:00
GriffinR
09cfed64b5
Merge pull request #1146 from GriffinRichards/rename-songs
...
Give songs meaningful english names
2020-08-28 16:14:21 -04:00
GriffinR
e9b734c1ef
Merge branch 'master' into doc-blender
2020-08-28 16:07:35 -04:00
kiliwily
5e7b6a089c
add MAX_LEVEL_UP_MOVES macro
2020-08-28 20:36:07 +02:00
Eduardo Quezada
a2fb98934e
Partially document item_menu.c
2020-08-28 13:32:23 -04:00
GriffinR
71a066f945
Document cable car
2020-08-28 03:54:04 -04:00
Thomas Winwood
58786a7ac0
Add MAX_PER_STAT_EVS macro
2020-08-28 02:25:02 +01:00
GriffinR
38d4fc9c17
Clean up rayquaza scene documentation
2020-08-27 16:04:11 -04:00
GriffinR
c7e685edff
Document third rayquaza scene
2020-08-27 15:43:28 -04:00
GriffinR
ba13e9ec95
Document first rayquaza scene
2020-08-27 15:43:18 -04:00
DizzyEggg
f70a9ce153
Merge with master
2020-08-27 12:01:28 +02:00
GriffinR
95ea0e92e7
Start documenting rayquaza_scene
2020-08-25 17:49:42 -04:00
GriffinR
22c1bf965a
Finish documenting berry blender
2020-08-24 17:06:55 -04:00
PokeCodec
86a1e89879
Documentation of unk field
2020-08-23 21:34:31 -04:00
GriffinR
0ff767a9b5
Start documenting berry blender
2020-08-22 19:39:39 -04:00
PokeCodec
cbb94035e3
Cleaned up the libraries.
2020-08-22 00:52:45 -04:00
GriffinR
fbb70b3727
Document contest AI scripts
2020-08-21 14:57:17 -04:00
GriffinR
469ec5f248
Document contest AI commands
2020-08-21 02:36:48 -04:00
GriffinR
ee72696b53
Sync encounter musics with encounter music types
2020-08-20 21:03:24 -04:00
GriffinR
d356e35b64
Fix incorrect pike curtain SE names
2020-08-20 20:23:08 -04:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
GriffinR
6c34effda9
Merge pull request #1138 from GriffinRichards/doc-contest
...
Document contest
2020-08-20 16:03:47 -04:00
PokeCodec
e27975afaa
Match battle script commands by correcting a function and the pokemon struct
2020-08-18 22:05:01 -04:00
GriffinR
7d3b68a27b
Fix Champinship typo
2020-08-18 17:51:51 -04:00
GriffinR
503dafd210
Fix wallys parents misnamed as uncle/aunt
2020-08-18 17:51:41 -04:00
GriffinR
fa29ff98a3
Add condition mod constants
2020-08-18 11:38:50 -04:00
GriffinR
19cf1b9770
Fix ContestPokemon offset-named field
2020-08-18 07:30:18 -04:00
PikalaxALT
3372993a63
Merge pull request #1133 from GriffinRichards/doc-pblock
...
Document use_pokeblock
2020-08-17 16:28:15 -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
2749948eeb
Clean up contest doc
2020-08-16 05:52:17 -04:00
GriffinR
e98e4652fd
Document contest live updates
2020-08-16 05:18:09 -04:00
GriffinR
9f4525666d
Document misc contest
2020-08-16 02:50:35 -04:00
GriffinR
c42c1ab8c1
Document contest appeal
2020-08-15 14:32:30 -04:00
GriffinR
25f45ffa84
Merge pull request #1125 from GriffinRichards/doc-namingscr
...
Document naming screen
2020-08-15 00:06:57 -04:00
GriffinR
3779422489
Split contest funcs from script_pokemon_util
2020-08-13 17:42:12 -04:00
GriffinR
4911849723
Document link contest connection
2020-08-13 16:27:40 -04:00
GriffinR
ade49de329
Merge branch 'master' into doc-pblock
2020-08-12 19:49:55 -04:00
GriffinR
f6efbe38bf
Clean up use_pokeblock doc, some menu_specialized
2020-08-12 18:39:15 -04:00
GriffinR
70851d9083
Add MAP_SCRIPT descriptions
2020-08-11 15:50:09 -04:00
GriffinR
4f615b65e6
Continue documenting use_pokeblock
2020-08-11 13:56:17 -04:00
GriffinR
8b95e1964b
Merge pull request #1121 from GriffinRichards/doc-roulette
...
Document roulette
2020-08-10 17:18:09 -04:00
GriffinR
078c341b2b
Merge pull request #1122 from GriffinRichards/clean-battlemsg
...
Add stat stage constants, clean up misc battle msg data
2020-08-10 14:29:27 -04:00
GriffinR
e947729d65
Start documenting use_pokeblock
2020-08-10 13:48:16 -04:00
GriffinR
82e322bb96
Finish documenting naming screen
2020-08-07 20:18:09 -04:00
GriffinR
463d79c7c1
Start documenting naming screen
2020-08-07 02:00:41 -04:00
GriffinR
5e8ffff62f
Add stat stage constants
2020-08-04 20:38:57 -04:00
GriffinR
f8f6575360
Rename roulette_util to palette_util
2020-08-04 19:24:36 -04:00
GriffinR
8e800e2061
Document roulette flash util
2020-08-04 19:20:55 -04:00
GriffinR
868f831167
More roulette doc
2020-08-04 14:25:13 -04:00
GriffinR
b40cee540e
Continue documenting roulette
2020-08-02 14:52:05 -04:00
PikalaxALT
03eba6a62c
Merge pull request #1116 from GriffinRichards/doc-slotmachine
...
Document slot machine
2020-08-01 09:56:44 -04:00
GriffinR
22b5b6b074
Start documenting roulette
2020-07-30 19:37:16 -04:00
GriffinR
7ada56f039
Merge pull request #1085 from GriffinRichards/doc-overworld
...
Document field effects / misc overworld
2020-07-28 17:54:25 -04:00
GriffinR
c6b27013cc
Merge pull request #1112 from GriffinRichards/add-genwarn
...
Add warnings to generated map/layout files
2020-07-28 17:47:55 -04:00
GriffinR
e06de33cbd
Merge branch 'master' into doc-overworld
2020-07-28 17:46:17 -04:00
GriffinR
5eecaf92ba
Merge branch 'master' into doc-slotmachine
2020-07-28 17:41:34 -04:00
GriffinR
1f4813bfd2
Document slot machine funcs
2020-07-28 17:38:05 -04:00
GriffinR
b22709ee3d
More slot machine data documentation
2020-07-28 14:29:44 -04:00
ExpoSeed
b401e2eb86
Fix naming style of function
2020-07-27 21:22:16 -05:00
ExpoSeed
71dc5edf2e
Document some battle_util.c
2020-07-27 17:10:42 -05:00
DizzyEggg
0066640a1e
Merge with master
2020-07-27 14:51:39 +02:00
GriffinR
36a4764a78
Document some slot machine data
2020-07-26 02:15:59 -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
GriffinR
813f0c724f
Sync flags with pokeruby
2020-07-22 18:00:41 -04:00
GriffinR
a1cc7d2bd6
Document faraway island
2020-07-19 14:12:38 -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
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
PokeCodec
597a238229
Typo Fix
2020-07-17 15:49:46 -04:00
DizzyEggg
14daa9f4a5
Inverse battles
2020-07-17 20:53:22 +02:00
DizzyEggg
42f48d1a61
Power Construct
2020-07-16 15:40:56 +02:00
DizzyEggg
759bde46bb
Cheek Pouch
2020-07-16 15:20:03 +02:00
Evan
b428b39fd1
hide hp boxes during anims
2020-07-15 16:23:44 -06:00
DizzyEggg
ec4c73711e
Rest Sleep Talk wake up awaraness
2020-07-15 21:30:24 +02:00
DizzyEggg
1a94d27fe6
Emergency Exit
2020-07-15 17:21:12 +02:00
DizzyEggg
62dc94e9c8
Merge with master
2020-07-15 10:13:19 +02: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
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
ghoulslash
8f669bb57d
Add critical capture ( #402 )
...
* add critical capture
* synax and format fixes
2020-07-14 17:47:15 +02:00
DizzyEggg
0425cb66ef
Give proper names to some functions
2020-07-14 11:13:03 +02:00
DizzyEggg
2c9b4f4b17
Show targets in double battles while hitting multiple pokemon at once
2020-07-14 10:39:54 +02:00
Eduardo Quezada
b31efcd6e3
Renamed constant,
2020-07-12 01:49:32 -04:00
PikalaxALT
535189bf14
Fix some UB exposed with GCC 10.1.0
2020-07-11 10:22:34 -04:00
DizzyEggg
4c3f40a361
Merge with master
2020-07-11 12:59:23 +02:00
GriffinR
beeb673ba1
Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave
2020-07-08 16:03:32 -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
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
GriffinR
43c48d95c2
Document starter_choose.c
2020-07-06 17:26:25 -04:00
GriffinR
c0bc7e8f7b
Fix elevator metatile typo
2020-07-06 16:02:49 -04:00