Commit Graph

5961 Commits

Author SHA1 Message Date
PokeCodec
3ae3bea28f fix bad asm 2020-08-24 21:57:34 -04:00
PokeCodec
e71c18feb6 use # 2020-08-24 18:29:14 -04:00
PokeCodec
09e97fff53 UB 2020-08-24 17:34:26 -04:00
GriffinR
65d5fd8eff
Merge pull request #1150 from PokeCodec/tower
Match trainer hill
2020-08-24 17:29:57 -04:00
PokeCodec
96d2066abe Changed assignment from 136 to -120 2020-08-24 17:28:55 -04:00
PokeCodec
3ddf7175bf Match sub_81D5F58 2020-08-24 17:20:18 -04:00
GriffinR
22c1bf965a Finish documenting berry blender 2020-08-24 17:06:55 -04:00
PokeCodec
75fea51712 refactor 2020-08-24 15:32:57 -04:00
PokeCodec
b52c0d1a2e Cleaned up variables 2020-08-24 15:20:50 -04:00
PokeCodec
95009c1c03 confetti 2020-08-24 14:51:43 -04:00
PokeCodec
86a1e89879 Documentation of unk field 2020-08-23 21:34:31 -04:00
PokeCodec
6aee7d38f3 sizeOf data type, not pointer value 2020-08-23 21:34:31 -04:00
PikalaxALT
d7e31f5a85
Merge pull request #1148 from PokeCodec/savedIme
Remove unused var from ruby and other minor refactors.
2020-08-23 19:47:08 -04:00
PokeCodec
cc018fe6c9 Remove const 2020-08-23 17:22:15 -04:00
PokeCodec
a20745422b Remove unused variable remaining from ruby 2020-08-23 16:37:46 -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
PikalaxALT
d2c7a862c7
Merge pull request #1147 from GriffinRichards/doc-contestai
Document contest AI
2020-08-21 15:16:37 -04:00
GriffinR
fbb70b3727 Document contest AI scripts 2020-08-21 14:57:17 -04:00
PikalaxALT
cd895e497d
Merge pull request #1141 from GriffinRichards/add-nonmatch
Wrap asm statements in NONMATCHING
2020-08-21 12:44:07 -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
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
0e7f634b00 Wrap asm statements in NONMATCHING 2020-08-18 08:16:09 -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