Commit Graph

320 Commits

Author SHA1 Message Date
yenatch 5f0e279bfa Merge remote-tracking branch 'kanzure/master' into more-objects
Conflicts:
	main.asm
2013-12-23 05:21:12 -05:00
yenatch cad6f30f83 null pointers back in object gfx 2013-12-20 01:06:17 -05:00
yenatch 046d85f37a finish off object gfx pointers and dont use BANK() for null pointers
fixes 2f5b9b96

definitely did this in the original commit...
2013-12-20 00:59:00 -05:00
yenatch 0500947dd0 dump the battle animations 2013-12-19 04:49:40 -05:00
yenatch 4bb8c82d8a battle animation constants 2013-12-19 04:47:39 -05:00
yenatch 5613563d1d split out battle anim object gfx 2013-12-18 03:20:12 -05:00
yenatch 2f5b9b968a anim object graphics pointers 2013-12-18 03:18:16 -05:00
yenatch 6d7e674bd0 move some labels into included files 2013-12-18 01:14:48 -05:00
yenatch 7ccb6d91e6 split out the battle engine into battle/core.asm 2013-12-18 01:11:06 -05:00
yenatch fa2e0108b9 split out battle animation asm (bg effects, objects, commands) 2013-12-17 23:54:25 -05:00
yenatch 46d96bc7fd more battle anim labels 2013-12-09 16:20:19 -05:00
yenatch 099e17bbaf comment some battle animation asm 2013-12-04 02:33:46 -05:00
yenatch 3de254f7a2 more 3pt macro labels; shorten 3pt macros to take just a label
static addresses should be avoided anyway
2013-12-02 14:18:03 -05:00
yenatch d7cdd0ac73 split out some more move effects 2013-12-01 14:19:57 -05:00
yenatch 193dbd53a6 Merge commit '0ead58cd' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 17:57:27 -04:00
yenatch 0ead58cdaa fix labels for and rename GetBattleVarPair to GetBattleVar 2013-10-11 03:04:21 -04:00
Mr Wint 181840cf43 * even more callab/callba macros 2013-10-02 03:20:48 +02:00
Mr Wint eb5a7afe2b * more callab/callba macros 2013-10-02 02:47:54 +02:00
yenatch 0f8c8e2d52 move effect command 'wait' is now 'movedelay' 2013-10-01 01:02:33 -04:00
yenatch 6439706943 split spikes effect into effects/spikes.asm 2013-09-09 22:02:26 -04:00
yenatch 91e89a29a2 comment spikes move effect 2013-09-09 22:01:24 -04:00
yenatch b437aaf329 add a note to endure.asm
this is easier than combining protect and endure
2013-09-09 21:53:21 -04:00
yenatch 40010e2514 split protect and endure effects into battle/effects/ 2013-09-09 21:51:41 -04:00
yenatch aaf77957bf comment protect and endure move effects 2013-09-09 21:50:34 -04:00
yenatch 110477cd9e split curse effect into battle/effects/curse.asm 2013-09-09 18:43:22 -04:00
yenatch 9f7adeafcf ItemIsMail and comment thief move effect 2013-09-08 23:18:30 -04:00
yenatch bd7563e0b6 comment arena trap move effect asm 2013-09-08 22:44:20 -04:00
yenatch 05db4b4cb6 comment nightmare move effect asm 2013-09-08 22:42:07 -04:00
yenatch b4d37c675f comment defrost move effect asm 2013-09-08 22:30:10 -04:00
yenatch 7a1951528d comment curse move effect asm 2013-09-08 22:23:55 -04:00
yenatch 2acccc3ea5 rename FarBattleTextBox to StdBattleTextBox
that's it for bad Far usage
2013-08-31 03:54:02 -04:00
yenatch c9d3881a2f rename RNG to Random
also fix 'Far' naming scheme for BattleRandom

this was a long time coming
2013-08-30 22:59:40 -04:00
yenatch 14160a180f hidden power type/power calculation 2013-08-09 17:50:34 -04:00
yenatch ed200a5a16 fill out bank f more 2013-07-29 13:58:20 -04:00
yenatch 5b07ea19d0 move descriptions 2013-07-27 16:31:29 -04:00
yenatch 90c18c5cf3 rst $28 -> JumpTable 2013-07-10 19:17:04 -04:00
yenatch dca6fd37cd start using relevant constants in wram.asm 2013-07-10 19:17:03 -04:00
yenatch c9ff12cc5d use stat constants in statdown commands 2013-06-13 16:31:50 -04:00
yenatch 8ae709be9f comment statdown move command 2013-06-13 16:10:39 -04:00
yenatch 3a7edf8b1a even more ai cleanup 2013-05-07 01:11:08 -04:00
yenatch 573db5b1b4 more ai cleanup 2013-05-06 20:51:07 -04:00
yenatch 5859040555 more thorough ai commenting 2013-05-06 14:36:32 -04:00
yenatch 9f5396eff6 clean up ai scoring 2013-05-06 02:39:01 -04:00
yenatch 3beab7dd92 move ai scoring out of main.asm 2013-05-05 19:56:17 -04:00
yenatch 8b1afa2265 Fix a wram mislabel (EnemyDisabledMove) 2013-05-03 21:04:34 -04:00
yenatch d077fae081 more move effect cleanup 2013-05-03 02:43:44 -04:00
yenatch 2b00d49065 move effect cleanup 2013-05-03 01:29:57 -04:00
yenatch 0cbea9b553 bank 0 battle functions 2013-05-03 00:22:28 -04:00
yenatch 45343b07c7 dump item attributes 2013-04-30 02:04:36 -04:00
yenatch f2185cd0e4 BaseStats is now BaseData 2013-04-29 15:11:48 -04:00
yenatch 6f6988e3d1 more effect constants 2013-04-27 17:35:14 -04:00
yenatch c0918f94fd there is no Move0 2013-04-25 13:21:49 -04:00
yenatch 0844e3ee59 implement move effect constants 2013-04-25 04:26:37 -04:00
yenatch 984b47f3e7 Enemy screens 2013-04-20 02:57:11 -04:00
yenatch 494f4c13fe damagecalc is actually damagestats; itemmultiplier is actually damagecalc 2013-04-20 02:55:50 -04:00
yenatch 8f55647441 Clarify species-item boost functions 2013-04-20 02:38:56 -04:00
yenatch 7503f9074c effect command cleanup
-weather and badge type boosts
2013-04-20 02:38:56 -04:00
yenatch 5f4fcbfba2 minor wram fixes 2013-04-08 02:19:28 -04:00
yenatch f36dfc3689 Move-specific effect pointers 2013-04-01 00:53:18 -04:00
yenatch b998f4594c Move effect pointers 2013-03-31 21:39:12 -04:00
yenatch dc81d0cfcf dump move effects 2013-03-29 18:54:42 -04:00
yenatch 1b96c1543a All local addresses in bank d have labels 2013-03-27 18:50:10 -04:00
yenatch 4f8f811fe4 Moves that don't make sense are actually effect ids 2013-03-27 17:33:29 -04:00
yenatch b6ab385d3c More battletexts 2013-03-27 17:30:20 -04:00
yenatch 62c621d5ad no more incbins in bank d 2013-03-27 16:19:51 -04:00
yenatch d2f6b6febe Identify more move effect commands 2013-03-27 03:33:24 -04:00
yenatch 3e6c37fe52 Move effect commands dump 2013-03-26 20:39:56 -04:00
yenatch fd51a5a3b1 Split magikarp length calcs out 2013-02-18 20:14:25 -05:00
yenatch 23bdfa2b4c Split move names out 2013-02-17 02:45:38 -05:00
yenatch 75ab33b311 Saner file distribution
Moved files from data/ into new folders:
-battle/
-stats/
-trainers/
2013-02-05 03:56:27 -05:00