7041 Commits

Author SHA1 Message Date
GriffinR
987fdf6fcd
Merge pull request #1321 from GriffinRichards/doc-evoscene
Document evolution scene
2021-02-08 18:21:30 -05:00
GriffinR
487e04d269
Merge pull request #1319 from GriffinRichards/crt0comm
Add comments for some data in crt0.s
2021-02-08 17:15:52 -05:00
GriffinR
2237d0748f Label unused layouts 2021-02-08 14:45:56 -05:00
luckytyphlosion
1760d68010
Fix up dkP related naming here as well. 2021-02-08 12:39:43 -05:00
luckytyphlosion
6a865be4c2
Fix up incorrect term. 2021-02-08 12:38:49 -05:00
luckytyphlosion
0f13e061e1
Fix up dkP related naming. 2021-02-08 12:35:21 -05:00
luckytyphlosion
4c3c61fa35
Add instructions for installing libpng on macOS 2021-02-08 11:55:36 -05:00
GriffinR
6899acfb6f
Merge pull request #1317 from opakedragon/master
Fix Spelling of BagMenu_RemoveBagItemMessageindow
2021-02-07 13:43:05 -05:00
GriffinR
0851c34bac Add berry tree id constants 2021-02-05 15:25:12 -05:00
GriffinR
2e57a00d17 Use GAME_LANGUAGE instead of LANGUAGE_ENGLISH 2021-02-05 12:08:49 -05:00
GriffinR
a240481d5f Document secret_base.c 2021-02-05 12:08:25 -05:00
GriffinR
2b5f7fe151
Merge pull request #1323 from LOuroboros/newCursorArea
newCurosrArea -> newCursorArea
2021-02-05 07:16:38 -05:00
GriffinR
3b33c950b2
Merge pull request #1322 from Deokishisu/patch-2
Fix "Compatibility" Misspelling
2021-02-05 07:15:51 -05:00
LOuroboros
2e51a69400 newCurosrArea -> newCursorArea 2021-02-05 04:59:26 -03:00
Deokishisu
ac43365d58 Fix "Compatibility" Misspelling
Someone misspelled "compatibility" as "compatability" in the daycare-related files. This commit spells them correctly.
2021-02-05 01:27:11 -05:00
GriffinR
15906ca143 Document evolution scene 2021-02-03 17:55:37 -05:00
MandL27
b2a541a33b
Merge pull request #1390 from amiosi/mime_jr
Edited Constants to match one another in regards to CamelCase and underscores
2021-02-03 17:16:26 -05:00
amiosi
11e6298a05 tmhm and tutor spacing 2021-02-03 15:08:53 -05:00
amiosi
7714650fef fix build error 2021-02-03 14:55:55 -05:00
amiosi
762dcb8a7c cry fixes, type null 2021-02-03 14:10:39 -05:00
amiosi
b84f952f32 mistaken MrRime change 2021-02-03 13:09:09 -05:00
amiosi
663cc5b15c oricorio... 2021-02-03 13:02:13 -05:00
amiosi
418da6158b last of the cries 2021-02-03 12:57:56 -05:00
amiosi
2cba017699 cry renames 2021-02-03 12:50:54 -05:00
amiosi
86da6d04ff Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr 2021-02-03 12:45:19 -05:00
ExpoSeed
4a8e18cea2
Merge pull request #1336 from LOuroboros/cries_PE_redux
Various tweaks related to Pokémon cries
2021-02-03 11:26:44 -06:00
amiosi
e62f53b13e fix spacing i missed on tutors and expand to all species
plus reorder kyurem forms to match the rest of the repo
2021-02-02 15:18:45 -05:00
amiosi
0798ba22a6 fix tmhm spacing i missed, extend to all species 2021-02-02 15:10:45 -05:00
amiosi
a021204389 oricorio pau constants 2021-02-02 14:49:01 -05:00
amiosi
032f8ac834 tapus pls 2021-02-02 14:43:12 -05:00
amiosi
f46f21bb38 tapus again 2021-02-02 14:40:04 -05:00
amiosi
248e0b50d7 Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr 2021-02-02 14:24:36 -05:00
amiosi
9c2c337e6f tapu case 2021-02-02 14:24:15 -05:00
amiosi
f700004188 proper CamelCase 2021-02-02 14:21:00 -05:00
ghoulslash
2f00169623
Merge pull request #1387 from amiosi/dex-decap
decap dex entries
2021-02-02 12:17:11 -07:00
LOuroboros
e5801d83bc Removed unnecessary copy of Crustle's cry 2021-02-02 15:38:49 -03:00
amiosi
dba1383d55 Merge remote-tracking branch 'upstream/pokemon_expansion' into dex-decap 2021-02-02 13:33:06 -05:00
amiosi
42ea6f482b more dex entry spacing 2021-02-02 13:32:55 -05:00
amiosi
2d6b80455d Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr 2021-02-02 13:25:53 -05:00
amiosi
47e1d6b790 MIMEJR -> MIME_JR 2021-02-02 12:36:05 -05:00
ExpoSeed
f93bd60c93
Merge pull request #1371 from LOuroboros/keldeo_resolute
Fixed Keldeo Resolute's animation
2021-02-02 11:18:23 -06:00
ExpoSeed
2d1384e88f
Merge pull request #1370 from LOuroboros/deoxys
Fixed Deoxys Attack Form's animation
2021-02-02 11:17:25 -06:00
ghoulslash
47f89de53b
Merge pull request #1384 from ultima-soul/pokemon_expansion_sync
Pokemon Expansion Upstream Sync
2021-02-02 09:48:21 -07:00
GriffinR
64460e01ae
Merge pull request #1314 from GriffinRichards/doc-controllers
Document battle controllers, misc other battle
2021-02-02 00:24:16 -05:00
GriffinR
7e26aa3d21
Merge pull request #1316 from GriffinRichards/doc-scrcmd
Label remaining script commands, document some scrcmd.c, event_object_lock, trainer_see, berry tree
2021-02-01 21:04:00 -05:00
amiosi
940ca8dc19 category decap and length 2021-02-01 15:25:53 -05:00
GriffinR
90513a9d72
Merge pull request #1318 from GriffinRichards/bardmoves
Minor bard music clean up
2021-02-01 14:59:45 -05:00
amiosi
102285d464 mons/moves 2021-02-01 14:37:48 -05:00
amiosi
35f3cdd2f2 decap POKeMON string 2021-02-01 14:19:24 -05:00
ultima-soul
76851eb672
Merge pull request #1380 from amiosi/kyurem
Kyurem form moveset swap
2021-01-31 13:32:31 -08:00