Commit Graph
34 Commits
Author SHA1 Message Date
GriffinR ea8b1011d3 Merge master into fix-eventobj 2020-01-15 16:11:20 -05: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
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
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
GriffinR c27a4778ee Standardize prebattle -> intro 2020-01-12 19:39:30 -06:00
GriffinR 6a470ddfda Some script clean up, document secret base secrets show 2020-01-12 19:39:30 -06:00
GriffinR e497fc64e3 if_undefeated macro to if_not_defeated 2020-01-12 20:20:02 -05:00
GriffinR 0284014e0e Add missing save status use 2020-01-12 18:42:41 -06:00
GriffinR 58e64b9524 Clean up some of save.c 2020-01-12 18:42:41 -06:00
GriffinR f2e7b1507e Port some macro/script fixes from pokefirered 2020-01-11 14:12:31 -05:00
GriffinR 635267ce32 Merge branch 'master' into fix-eventobj 2020-01-08 05:51:49 -05:00
GriffinR ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00
GriffinR e5df61e362 Merge branch 'master' into doc-dome 2020-01-08 01:15:36 -05:00
GriffinR 017fa294b5 Add battle tent mon/trainer constants 2020-01-08 01:07:53 -05:00
GriffinR f4c593cb4d Update .gitignore 2019-10-02 13:37:06 -04:00
GriffinR 945d3d3a27 Merge branch 'master' into document-eventscripts 2019-09-17 00:10:23 -04:00
GriffinR 2884f4ee4a Fix extraneous parentheses warning 2019-09-16 19:22:07 -05:00
GriffinR eb0b73c14e Use CountAliveMonsInBattle constants 2019-09-04 17:47:29 -04:00
GriffinR c647a8329f Use gBattlerPositions constants 2019-09-04 17:45:04 -04:00
GriffinR 4a0cad80b0 Use B_SIDE constants
Also includes a CHAR_X constant use for X items
2019-09-04 17:06:59 -04:00
GriffinR 6b04ea0727 Merge branch 'master' into document-eventscripts 2019-09-03 22:22:14 -04:00
GriffinR 5f457dd459 Use B_ACTION constants 2019-09-03 15:08:25 -04:00
GriffinR 5d30304f4e Use OTID constants for CreateMon 2019-08-30 22:13:14 -05:00
GriffinR 869d0eebc0 Rename atk## constants and states 2019-08-23 08:46:21 -04:00
GriffinR 2cb174b4ea rename BattleAICmd prefix 2019-08-23 08:10:37 -04:00
GriffinR 68905e3961 rename atk## prefixes 2019-08-23 07:55:36 -04:00
GriffinR f08615881e Changes from review 2019-08-21 17:06:55 -05:00
GriffinR 3c2576d3a3 trainer rematch macro 2019-08-16 13:48:45 -04:00