Commit graph

6480 commits

Author SHA1 Message Date
GriffinR
2237d0748f Label unused layouts 2021-02-08 14:45:56 -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
ghoulslash
ac9828d016
Merge pull request #1385 from ultima-soul/item_expansion_sync
Item Expansion Upstream Sync
2021-02-02 09:23:11 -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
ultima-soul
5fdb578747 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-02-01 15:58:18 -08:00
GriffinR
90513a9d72
Merge pull request #1318 from GriffinRichards/bardmoves
Minor bard music clean up
2021-02-01 14:59:45 -05:00
GriffinR
45ee3a687d Add comments for some data in crt0.s 2021-01-29 18:36:39 -05:00
opakedragon
1e8edcbfcd Revert "Revert "Fix Spelling of BagMenu_RemoveBagItemMessageindow""
This reverts commit be50fab8f2.
2021-01-29 13:36:24 -05:00
opakedragon
be50fab8f2 Revert "Fix Spelling of BagMenu_RemoveBagItemMessageindow"
This reverts commit 3a6be5a34c.
2021-01-29 13:30:09 -05:00
GriffinR
12af03cd62 Label bard music pitch table 2021-01-28 16:36:56 -05:00
GriffinR
89b85a49ec Index gBardSounds_Moves and gBardSounds_Pokemon with constants 2021-01-28 15:55:33 -05:00
ExpoSeed
857fc9ce95
Merge pull request #1320 from amiosi/item_expansion
update item effects, prices, names & descriptions
2021-01-28 12:15:11 -06:00
opakedragon
3a6be5a34c Fix Spelling of BagMenu_RemoveBagItemMessageindow 2021-01-27 06:18:29 -05:00
luckytyphlosion
740c0a6bc1
Merge pull request #1294 from luckytyphlosion/aif2pcm-fix
Fix bug in pcm delta compression.
2021-01-26 15:23:11 -05:00
luckytyphlosion
b0de03356b
Merge pull request #1315 from PokeCodec/patch-3
Use INTR_FLAG_VBLANK instead of constant 0x1
2021-01-26 15:22:24 -05:00
luckytyphlosion
ff8952a3f0
Merge pull request #1308 from PokeCodec/pain
Get rid of Task_data_OP macro
2021-01-26 15:22:13 -05:00
GriffinR
92bd6400b7 Fix up berry sparkle 2021-01-26 05:40:34 -05:00
GriffinR
9e59581220 Document object lock and some trainer approach 2021-01-26 04:42:18 -05:00
GriffinR
0064333e4a Clean up scrcmd.c 2021-01-26 02:16:26 -05:00
N
b1a29e5017
Use INTR_FLAG_VBLANK instead of constant 0x1 2021-01-25 21:37:04 -05:00
GriffinR
3fd5e143a9 Misc battle anim documentation 2021-01-23 00:40:46 -05:00
GriffinR
a392cca928 Misc battle documentation 2021-01-23 00:40:31 -05:00
GriffinR
4228509e95 Sync link opponent controller doc to opponent 2021-01-22 21:47:00 -05:00
GriffinR
6f71569fbd Sync recorded opponent controller doc to opponent 2021-01-22 21:41:49 -05:00
GriffinR
c106f7f130 Document battle_controller_opponent.c 2021-01-22 21:35:16 -05:00
GriffinR
d1878f933b Sync link partner controller doc to player 2021-01-22 20:49:14 -05:00
GriffinR
74990a5a76 Sync player partner controller doc to player 2021-01-22 20:48:43 -05:00
GriffinR
1042426cc6 Sync recorded player controller doc to player 2021-01-22 20:47:59 -05:00
GriffinR
b9baf9437d Sync safari/wally controller doc to player 2021-01-22 20:13:34 -05:00
GriffinR
63a7828772 Document battle_controller_player.c 2021-01-22 20:03:27 -05:00
N
07d19ba526
Update main.c 2021-01-22 18:40:08 -05:00
N
3102d94e3c Undo change 2021-01-22 17:41:57 -05:00
N
c636b7c3ae Some more tweaks 2021-01-22 17:41:07 -05:00
amiosi
44a0983624 missed some 2021-01-22 07:43:48 -05:00
GriffinR
4eca05ccf5 Document remainder of battle_controllers.c 2021-01-22 02:48:22 -05:00
amiosi
9456382a32 yellow shmellow 2021-01-21 19:05:01 -05:00
amiosi
184dad1874 changes according to review 2021-01-21 19:04:26 -05:00
ghoulslash
fcc6444c2e
Merge pull request #1329 from ultima-soul/add_fairy_frlg_icon_ie
Add Fairy-type FRLG Icon to Fix Fairy TM Info Icon Being Blank
2021-01-21 12:20:15 -07:00
ghoulslash
c5491664bd
Merge pull request #1326 from ultima-soul/add_fairy_type_icon_ie
Add Fairy-type Icon to Fix Contest Move Viewing Crash
2021-01-21 12:19:10 -07:00
GriffinR
8fe4d004e3
Merge pull request #1305 from GriffinRichards/doc-battletv
Document battle tv data
2021-01-21 12:27:14 -05:00
GriffinR
3ceb43177d
Merge pull request #1312 from sphericalice/pokeemerald
Fix misnamed ground effect flags & document reflections
2021-01-20 18:50:31 -05:00