Commit Graph

5505 Commits

Author SHA1 Message Date
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
GriffinR
fadb72696f
Merge pull request #1140 from PokeCodec/match_next
Match battle script commands
2020-08-20 15:38:05 -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
52bada97cd
Merge pull request #1143 from GriffinRichards/fix-wallyuncle
Fix Wally's parents names, typo
2020-08-18 18:21:48 -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
54fb8eb68e
Merge pull request #1142 from GriffinRichards/fix-typo
Fix Brenday typo
2020-08-18 16:03:11 -04:00
GriffinR
3ba8cabd80 Fix Brenday typo 2020-08-18 15:56:44 -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
9eb28e8b06
Merge pull request #1139 from PokeCodec/NAKEDMATCH
Match GetConnectedChildStrength
2020-08-16 14:34:40 -04:00
PokeCodec
337ab9c7a2 match 2020-08-16 12:33:58 -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
98e68a8112
Merge pull request #1137 from PokeCodec/glyphREMATCH
Create Enum for Colors
2020-08-14 23:59:44 -04:00
PokeCodec
d3e00cadcc Enum Time 2020-08-14 23:53:20 -04:00
GriffinR
50d6e9ea34
Merge pull request #1136 from PokeCodec/matchSURF
Match Surf functions
2020-08-13 23:11:27 -04:00
PokeCodec
35dca16a3d matching 2020-08-13 21:20:55 -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
5ede085539
Merge pull request #1135 from PokeCodec/flying2
removed stray line
2020-08-13 15:49:32 -04:00
GriffinR
c4012d4cb9
Merge pull request #1131 from GriffinRichards/doc-mapscr
Add MAP_SCRIPT descriptions
2020-08-13 15:49:14 -04:00
GriffinR
1c74977915
Merge pull request #1134 from GriffinRichards/fix-warn
Fix backslash+newline warning
2020-08-12 19:59:36 -04:00
PokeCodec
96ef73f881 removed stray line 2020-08-12 19:58:58 -04:00
GriffinR
fa4d31ba96 Fix newline warning 2020-08-12 19:53:08 -04:00
GriffinR
ade49de329
Merge branch 'master' into doc-pblock 2020-08-12 19:49:55 -04:00
GriffinR
b3c4cd8a32
Merge pull request #1127 from PokeCodec/glyphMatch
Glyph match
2020-08-12 18:43:40 -04:00
GriffinR
f6efbe38bf Clean up use_pokeblock doc, some menu_specialized 2020-08-12 18:39:15 -04:00
GriffinR
78892a1fbc
Merge pull request #1132 from PokeCodec/boolJapanese
Apply bool8 type to u8 that act as bools
2020-08-12 13:00:31 -04:00
PokeCodec
f33737ae97 bool8 2020-08-12 12:53:59 -04:00
PokeCodec
4e20e2a3ea Match CopyGlyphToWindow 2020-08-12 12:34:01 -04:00
GriffinR
67f87ce533
Merge pull request #1126 from PokeCodec/flying
Remove fakematches in Flying anim
2020-08-11 23:27:27 -04:00
GriffinR
5735609629
Merge pull request #1124 from PokeCodec/smaller-array
sp stack should be 2 elements deep, not 4
2020-08-11 23:26:09 -04:00
GriffinR
2b412ac7e3
Merge pull request #1130 from GriffinRichards/fix-extrchar
Add some charmap constant usage
2020-08-11 23:25:54 -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
cc4255d4c0 Add some charmap constant usage 2020-08-11 00:23:28 -04:00
PokeCodec
7e593d37bb 2 2020-08-10 19:26:00 -04:00
PokeCodec
35c6e85e20 cleanup 2020-08-10 19:25:37 -04:00
PokeCodec
ceac2d547c Remove fakematch 2020-08-10 19:25:37 -04:00
GriffinR
8b95e1964b
Merge pull request #1121 from GriffinRichards/doc-roulette
Document roulette
2020-08-10 17:18:09 -04:00
GriffinR
4bf43311f0 Remove redundant parens 2020-08-10 17:09:17 -04:00