Commit Graph

5069 Commits

Author SHA1 Message Date
Marcus Huderle 49421a41b2 Move field effects data and graphics into own directory, and cleanup naming for object events 2020-02-12 17:32:51 -06:00
GriffinR 956090b05f Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-02-12 13:05:57 -05:00
Diegoisawesome 66c6b7a38b Merge pull request #976 from GriffinRichards/fix-parens
Resolve missing parens errors
2020-02-11 21:54:23 -08:00
GriffinR eaf508ba5e Resolve missing parens errors 2020-02-12 00:44:09 -05:00
GriffinR 689acd3613 Move slot machine data to src 2020-02-09 14:11:50 -06:00
GriffinR 084bd66924 Document Trainer Card 2020-02-08 14:31:17 -06:00
GriffinR faeb974c46 Minor berry fix data clean up 2020-02-08 14:23:41 -06:00
GriffinR 6640c509c0 Remove unnecessary declaration 2020-02-08 14:22:53 -06:00
GriffinR 43ec11b92a Move berry powder data to src 2020-02-08 14:22:53 -06:00
GriffinR d1035f027e Move contest_link_80F57C4 data to src 2020-02-08 14:22:53 -06:00
GriffinR 85dc8a528c Move rotating tile puzzle data to src 2020-02-08 14:22:53 -06:00
Pokestia f92b03f266 Fix wrong variable name 2020-02-08 14:19:53 -06:00
GriffinR 27c4329e45 Use friendship event constants 2020-02-04 12:16:15 -06:00
GriffinR c859fe3606 Fix typo 2020-02-04 08:02:28 -06:00
GriffinR 8a96aa9e97 Name pokenav files 2020-02-04 08:02:28 -06:00
GriffinR be5d417236 Document some pokenav menu handlers 2020-02-04 08:02:28 -06:00
Sebastian Gabl 0cf84d13ef Use correct prefix 2020-02-04 07:42:04 -06:00
Sebastian Gabl 0bd9639478 Name Wally struct and use bag macros 2020-02-04 07:42:04 -06:00
PikalaxALT 39d70e364a Merge pull request #964 from PikalaxALT/combined_moves
sCombinedMoves
2020-02-01 13:10:03 -05:00
PikalaxALT 462acaa7dc sCombinedMoves 2020-02-01 12:07:40 -05:00
GriffinR 9c934c9664 Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers 2020-01-26 12:23:08 -05:00
GriffinR 9a6c2c25d0 Add some capacity constants 2020-01-26 09:42:55 -06:00
GriffinR 7232bfecc2 Name null palettes 2020-01-26 09:40:35 -06:00
GriffinR a152900211 Combine animated door frames 2020-01-26 09:40:35 -06:00
GriffinR 25d7577d9d Label animated doors 2020-01-26 09:40:35 -06:00
Diegoisawesome 53eb1ecf2b Merge pull request #962 from GriffinRichards/bug-aiweather
Note AI weather bug
2020-01-22 20:42:18 -08:00
GriffinR 6f392632c2 Note AI weather bug 2020-01-22 18:05:42 -05:00
Sahith Nallapareddy 25df146054 using item constant 2020-01-20 07:51:18 -06:00
GriffinR 4c12ad00d2 Merge branch 'master' into fix-eventobj 2020-01-19 21:57:29 -05:00
GriffinR a40f054900 Move/rename gfx start/end vars 2020-01-18 08:49:34 -06:00
jiangzhengwenjz aa631825fc resolve data sections 2020-01-16 08:14:27 -06:00
jiangzhengwenjz 46b00b11d4 match all the functions 2020-01-16 08:14:27 -06:00
jiangzhengwenjz c2be2e8c69 sync documentation from firered 2020-01-16 08:14:27 -06:00
jiangzhengwenjz 8a5f292618 document symbols 2020-01-16 08:14:27 -06:00
GriffinR ea8b1011d3 Merge master into fix-eventobj 2020-01-15 16:11:20 -05:00
Sebastian Gabl 5fff2f2234 Use SHINY_ODDS macro where intended
The 3 locations where SHINY_ODDS was added generate mon sprites for
display in the dex, at game start and on starter choice.
The arguments are intended for otId but in this case they are set to the
same value as SHINY_ODDS to prevent the pictures created from using the
shiny palette.
2020-01-15 08:10:20 -06:00
huderlem 69833181d9 Merge pull request #803 from tustin2121/tustin2121-patch-5
Document cave transition code.
2020-01-13 20:43:49 -06:00
Marcus Huderle 755ae0facc Use empty braces for last null entry in sTransitionTypes array 2020-01-13 20:31:40 -06:00
Marcus Huderle 5a2d676e71 Merge remote-tracking branch 'upstream' into tustin2121-patch-5 2020-01-13 20:26:20 -06:00
GriffinR 22931846d6 Fix Colosseum name porymap issue 2020-01-13 20:20:48 -06:00
GriffinR e92cc7752b Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-01-13 20:41:57 -05:00
GriffinR 736f3bbbe0 Remove false positives from partial doc calcrom 2020-01-13 19:34:27 -06:00
huderlem 6d6c57f383 Merge pull request #953 from GriffinRichards/sync-script
Port some macro/script fixes from pokefirered
2020-01-13 19:33:47 -06:00
GriffinR 96720db083 Remove unnecessary removeitem arguments 2020-01-12 23:29:19 -05:00
GriffinR c19289596d Give/Take to Add/Remove for silent script macros 2020-01-12 23:24:52 -05:00
GriffinR 655910a16f Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05:00
huderlem fa5816915d Merge pull request #949 from GriffinRichards/doc-dome
Document Battle Dome and add facility party constants
2020-01-12 20:10:03 -06:00
GriffinR 43962fe141 Fix BuffeInGameTradeMonName typo 2020-01-12 19:45:04 -06:00
GriffinR 10220d3b76 Label TryRecordMixLinkup 2020-01-12 19:39:30 -06:00
GriffinR e736c2d2fd Document some easy chat specials 2020-01-12 19:39:30 -06:00