Commit Graph

1814 Commits

Author SHA1 Message Date
yenatch
7a1951528d comment curse move effect asm 2013-09-08 22:23:55 -04:00
Bryan Bishop
78a3951d47 Merge pull request #196 from yenatch/std-scripts
std scripts
2013-09-08 17:06:54 -07:00
Bryan Bishop
50232cc92b Merge pull request #195 from yenatch/predefs
predefs
2013-09-08 16:47:29 -07:00
Bryan Bishop
3652417dda Merge pull request #172 from kanzure/refactor-preprocessor
Move main preprocessor into pokemontools
2013-09-08 09:20:02 -07:00
Bryan Bishop
5c4dc08ee4 Merge branch 'master' into refactor-preprocessor 2013-09-08 11:18:39 -05:00
Bryan Bishop
740f91370d Merge pull request #190 from yenatch/master
specials
2013-09-08 09:15:46 -07:00
yenatch
e7318ed4bc move double speed functions into common/double_speed.asm 2013-09-08 03:14:24 -04:00
yenatch
4a04a09a6b labels for cgb double speed functions 2013-09-08 03:12:48 -04:00
yenatch
844546f849 split sram access asm into common/sram.asm 2013-09-08 02:50:06 -04:00
yenatch
edf939a07b split Random into common/random.asm 2013-09-08 02:47:52 -04:00
yenatch
3b70005fb0 split item interfaces into common/item.asm 2013-09-08 01:45:54 -04:00
yenatch
f0cf86777b fix item asm labels
CheckItem was called PickUpItem by mistake

Also label TossItem and ReceiveItem
2013-09-08 01:43:51 -04:00
yenatch
d05adc4f98 Function2f17 -> IsInJohto 2013-09-08 00:48:12 -04:00
yenatch
705e682468 split InitString asm into common/string.asm 2013-09-08 00:22:33 -04:00
yenatch
82c3bb464f split flag action asm into common/flag.asm 2013-09-08 00:20:28 -04:00
yenatch
f513cdd888 split map engine asm into common/map.asm 2013-09-08 00:14:26 -04:00
yenatch
847843d866 rename BUTTON_A and BUTTON_B constants to A_BUTTON and B_BUTTON 2013-09-07 23:49:20 -04:00
yenatch
9f53825ce2 move common asm from engine/ to common/
engine/ was getting really bloated and common asm wasnt what it was made for
2013-09-07 23:38:19 -04:00
yenatch
7a3a4f913b split fruit tree asm out into engine/fruit_trees.asm 2013-09-07 23:26:28 -04:00
yenatch
8018614585 split type strings and related asm out into text/types.asm 2013-09-07 23:24:22 -04:00
yenatch
e13f03ae44 comment PrintMonTypes 2013-09-07 23:22:17 -04:00
yenatch
3b119687f3 leftover trainer class names from red
you can find these in pokered at TrainerNamePointers (9:7e64)
2013-09-07 22:48:07 -04:00
yenatch
03a6cfc2d3 OTName wram label 2013-09-07 22:47:58 -04:00
Bryan Bishop
c9dba36d13 Merge pull request #194 from kanzure/fix-asm-whitespace
whitespace -> tabs in main.asm
2013-09-07 18:03:06 -07:00
Bryan Bishop
4f7824ff08 whitespace -> tabs in main.asm
How did these get in here?
2013-09-07 19:53:22 -05:00
yenatch
353b4ac6da fix up TreeMons/RockMons 2013-09-07 17:35:41 -04:00
yenatch
6e5876377f split out std scripts from main.asm 2013-09-07 15:30:07 -04:00
yenatch
ed2063276a add a menudata2 header in std scripts
thats it for std incbins
2013-09-07 15:26:52 -04:00
yenatch
eaaf719440 label some jumps in std scripts 2013-09-07 14:42:28 -04:00
yenatch
3301e5b77b shorten PrintMoveDescription -> PrintMoveDesc so rgbds doesnt choke
still need to fix this 15-char macro argument limit
2013-09-07 14:14:29 -04:00
yenatch
45e791bb42 StdScripts label in engine/scripting.asm 2013-09-07 05:08:34 -04:00
yenatch
5376a0c96b the bomb 3
std scripts
2013-09-07 05:08:12 -04:00
yenatch
6f541d5723 labels for each predef
also fix up any labels that got missed

finally found a reference to the weird nop function (Function2d43)
2013-09-06 22:50:58 -04:00
yenatch
266e401b7d the bomb 2
remaining predef asm
2013-09-06 18:31:40 -04:00
Bryan Bishop
11fea19455 Merge pull request #191 from Sanky/master
PYTHON in Makefile
2013-09-06 13:42:33 -07:00
Sanky
03af68dc41 define PYTHON in Makefile for simpler local changes 2013-09-06 22:25:42 +02:00
yenatch
67dd49967d labels for each special
also fix up labels from last commit
2013-09-06 04:04:27 -04:00
yenatch
1660b814e8 the bomb
specials asm dump
2013-09-06 03:50:55 -04:00
yenatch
4a429aded4 add a label in the text engine 2013-09-06 03:47:07 -04:00
yenatch
fb68f75d9f update some labels and special/predef pointers 2013-09-06 01:57:03 -04:00
yenatch
a4707eccaf couple more specials in bank 3 2013-09-05 17:40:21 -04:00
yenatch
2aff956ba4 some specials in bank 3 and unown dex asm 2013-09-05 17:05:30 -04:00
Bryan Bishop
a75940caa2 Merge pull request #189 from yenatch/haxwiki-event-flags
dump haxwiki event flag constants and use them in map events
2013-09-05 11:42:44 -07:00
Bryan Bishop
40b4c87db7 Merge pull request #188 from yenatch/split-common
recomment and split out a ton of common asm (bank 0)
2013-09-05 11:30:12 -07:00
yenatch
60dde1d03e forgot to commit engine/farcall.asm
fixes 715a19fd59
2013-09-05 14:25:20 -04:00
yenatch
1323008f6f first round of event flag constants in map events
this is a little over half.. 610 to go
2013-09-05 05:19:35 -04:00
yenatch
9b6b5a530c clean up event flag constants
could probably be shorter, but they should still fit in a single line
2013-09-05 04:37:47 -04:00
yenatch
cac33e5e95 dump event flag constants from haxwiki
most of these need to be renamed before doing anything with them
2013-09-05 00:27:35 -04:00
yenatch
90e63a8e06 makefile: files in constants/ dont all end in 'constants' anymore
any non-constants asm files shouldn't be in constants/ anyway
2013-09-04 21:57:44 -04:00
yenatch
b417d08f2e recomment CheckShininess and CheckContestMon 2013-09-04 04:33:38 -04:00