Commit Graph

2057 Commits

Author SHA1 Message Date
Bryan Bishop 709f495cdf Merge pull request #230 from yenatch/master
the calm before the storm
2014-02-06 20:02:27 -06:00
yenatch ddc665a31a Move includes into object bases instead of their version wrappers. 2014-02-05 19:07:24 -05:00
yenatch 370d5f71f2 compare.sh: diff -u 2014-02-05 18:41:04 -05:00
yenatch ca6ef0773f Merge remote-tracking branch 'kanzure/master' into nuke-globals 2014-02-05 18:40:59 -05:00
Bryan Bishop ff6306400b Merge pull request #229 from yenatch/nuke-globals
Use globals to implicitly define labels before passing them into BANK().
2014-02-05 00:16:48 -08:00
yenatch 0105f6eeb0 Merge remote-tracking branch 'kanzure/master' into nuke-globals 2014-02-04 21:34:04 -05:00
yenatch 30218eb3d6 Use globals to implicitly define labels before passing them into BANK(). 2014-02-04 21:30:27 -05:00
Bryan Bishop 1202e68d2f Merge pull request #228 from yenatch/nuke-globals
Nuke globals.asm
2014-02-04 07:25:51 -08:00
yenatch 7c02c2bb31 Move remaining constants into constants/{misc,pokemon_data}_constants.asm
Now constant groups can be included separately if needed.
2014-02-03 18:00:51 -05:00
yenatch 4f5ae6510c Move rst constants into macros.asm 2014-02-02 16:13:23 -05:00
Bryan Bishop 80465fc6e6 Merge pull request #227 from yenatch/master
Map setup scripts
2014-02-01 17:59:39 -08:00
yenatch 7bae65b664 .gitignore: no more globals.asm 2014-02-01 20:42:43 -05:00
yenatch 8e24af1f22 Clean up variable usage in the makefile. 2014-02-01 20:36:44 -05:00
yenatch cf2acc1001 Use :: to export labels between objects.
This fixes the build.
2014-02-01 20:26:39 -05:00
yenatch adb3b29b4d pokedex entry banks 2014-02-01 17:06:18 -05:00
yenatch 7f0f21b1fc Get rid of globals.asm
This breaks the build until labels are exported again!
2014-02-01 13:55:48 -05:00
yenatch 65efbe55e7 preprocessor: actually call update_globals()
This is about to be removed, but it may as well work first.
2014-02-01 02:47:25 -05:00
yenatch 821f2c2ea0 Merge remote-tracking branch 'kanzure/master' 2014-02-01 02:45:07 -05:00
yenatch a643ba8996 MBC3 constants in some RTC-related functions 2014-02-01 01:51:57 -05:00
yenatch ee098254a8 Assorted text and labels in banks 5 and A 2014-02-01 01:47:03 -05:00
Bryan Bishop 0a16a7aef0 Merge pull request #225 from froggestspirit/master
fixed bank 39 pointers, options menu commentary
2014-01-29 07:34:43 -08:00
U-Myles-PC\Myles 1d2da4de84 fixed bank 39 pointers, options menu commentary 2014-01-29 10:28:08 -05:00
Bryan Bishop 94c9f59f45 Merge pull request #224 from yenatch/moves
Clean up the battle core and specify type categories
2014-01-27 06:51:01 -08:00
yenatch 1ba5b0f4bc Map setup scripts and commands 2014-01-26 22:07:19 -05:00
yenatch 08a0462c1e use constants for berserk gene, kings rock, scope lens effects 2014-01-20 00:07:51 -05:00
yenatch 04f5c51753 explicitly define type categories 2014-01-05 09:17:31 -05:00
yenatch 883a8b7a90 enumerate type constants 2014-01-05 08:24:19 -05:00
yenatch 4e9102f249 recomment hidden power calculation 2014-01-05 08:13:43 -05:00
yenatch ea01721284 move type constants into constants/type_constants.asm 2014-01-05 08:13:43 -05:00
yenatch 0a11c9f500 clean up type constants 2014-01-05 08:13:43 -05:00
yenatch 0a5f14dc9c bring back move constant values 2014-01-05 07:29:24 -05:00
yenatch 92aab1e185 even more battle labels 2014-01-05 07:28:55 -05:00
Bryan Bishop 056c240366 Merge pull request #222 from yenatch/moves
clean up some move data
2014-01-03 11:00:44 -08:00
yenatch 4dbf0d44e0 comment and relabel more battle functions 2014-01-01 08:09:15 -05:00
yenatch a18cab495d rename Function0x{} labels to Function{} for consistency 2013-12-31 04:10:49 -05:00
yenatch 1ab4b59d86 clean up some labels in battle asm 2013-12-31 04:09:00 -05:00
yenatch d1d186d1ee rename CallBankF -> CallBattleCore 2013-12-31 03:25:38 -05:00
yenatch a10ee4e9f1 comment move priority functions 2013-12-30 23:32:37 -05:00
yenatch bfaad924e7 label more pointers to Moves 2013-12-30 23:22:27 -05:00
yenatch 82214440e1 move the Moves label into battle/moves/moves.asm 2013-12-30 23:17:11 -05:00
yenatch f91be01df8 use a macro to define move structs for percentage values 2013-12-30 23:13:25 -05:00
yenatch e2b00ea117 shorten SP_ATTACK and SP_DEFENSE move effect constants 2013-12-30 23:12:06 -05:00
Bryan Bishop 983ef29fd0 Merge pull request #221 from yenatch/more-objects
analyze the bytes
2013-12-28 23:56:34 -08:00
yenatch a8cb73b654 bump pokemontools for sound macro changes 2013-12-28 20:33:46 -05:00
yenatch e937d6f25c audio: note duration from 0-15 to 1-16 to match pokered 2013-12-28 20:32:05 -05:00
yenatch 36b8a0061e bump pokemontools again 2013-12-27 22:26:25 -05:00
yenatch 0f7a101dd9 reorganize .gitignore 2013-12-27 22:26:10 -05:00
yenatch eb8a2b2cfb .gitignore: extras is a submodule 2013-12-27 22:23:35 -05:00
yenatch e2b900a40a .gitignore: don't track compare.sh output 2013-12-27 22:22:38 -05:00
yenatch 4612670768 more npc trade cleanup 2013-12-27 22:20:24 -05:00