Commit Graph

126 Commits

Author SHA1 Message Date
PikalaxALT 010b450834 Prepare to merge 2015-11-01 18:13:31 -05:00
PikalaxALT 31c407bb3d Buena local labels 2015-11-01 12:44:30 -05:00
PikalaxALT fda1f7c01a SPRITEMOVEDATA 2015-10-31 21:05:02 -04:00
PikalaxALT ed29db5841 No more -bash000; engine/movement.asm, SPRITEMOVEFN 2015-10-29 23:32:11 -04:00
PikalaxALT 4d17f6e1f6 Address comments on PR 322 2015-10-24 19:49:19 -04:00
PikalaxALT 119d6b4119 About time I got to these functions 2015-10-24 10:39:52 -04:00
PikalaxALT 6c25592b8c So very jumb 2015-10-19 16:49:29 -04:00
PikalaxALT 52605b764a Add commented numbers to map/group constants 2015-10-17 21:26:38 -04:00
PikalaxALT f53d65c536 Battle intro animation function 2015-10-17 17:18:52 -04:00
PikalaxALT d42330ed8b Annotation of PrintNum arguments in bc, and radio functions 2015-10-10 18:00:12 -04:00
PikalaxALT 96b0e448c4 Labeling of AI item and wild encounter functions 2015-10-07 21:27:32 -04:00
PikalaxALT edf42a54d5 More labels, including fns responsible for partymon generation 2015-10-07 13:19:41 -04:00
PikalaxALT 594253eb30 Merge yenatch:map-objects 2015-07-25 20:18:59 -04:00
PikalaxALT 185b0a1c86 Wild Pokemon functions and data
Replaced encounter rates with percent values
Added new constants denoting the number of wild Pokemon in the grass and water wild constructs
Annotated and relabeled the encounter generating functions
Renamed a WRAM address associaed with the temporary storage of the wild Pokemon's species
Moved spawn constants to constants/map_constants.asm for use anywhere in the disassembly
2015-07-23 03:51:15 -04:00
PikalaxALT c8960dd2c8 Various annotations
Annotated the SGB functions in predef/sgb.asm, and some of the map scripts.  Renamed several functions in home.  Renamed six WRAM addresses corresponding to party icon animations, and renamed several others relative to these.
2015-07-22 15:57:02 -04:00
yenatch ec10d9dd6f Add constants for common map object ids. 2015-07-21 23:49:18 -07:00
PikalaxALT 471492b775 Reverted ld_hl_pointer macro 2015-07-20 22:18:18 -04:00
PikalaxALT d9300a9bec Fix unnecessary white space and retire add_n_times 2015-07-20 11:28:05 -04:00
PikalaxALT bef792f2d2 More label updates, moved predefs to new file
Also named most of the engine and event flag constants.
2015-07-20 03:51:52 -04:00
PikalaxALT 60cd04b023 Trainer data structure and field move functions
Trainer data in map scripts is now a macro-defined structure.

Field move functions in main.asm are now nearly completely annotated, with local references.

Trailing white space deleted.
2015-07-18 23:45:39 -04:00
PikalaxALT e674869018 Updated signpost items and person_event flags 2015-07-18 16:00:53 -04:00
PikalaxALT 0fcef5fc08 More annotations and interpretations of functions and scripts 2015-07-17 17:17:10 -04:00
PikalaxALT 39524cdb76 More enumeration of constants, more annotations of scripts. 2015-07-15 15:48:44 -04:00
IIMarckus 4d532beee6 Remove trailing newlines. 2015-06-23 12:24:51 -06:00
yenatch 93a589795f Merge remote-tracking branch 'kanzure/master' 2015-05-18 02:21:14 -07:00
yenatch b47c4bc6fd Use more constants in the event scripting engine. 2015-05-18 02:16:11 -07:00
IIMarckus bd894f6fb0 Fix a static address. 2015-05-18 02:07:28 -06:00
yenatch 62b473d6c6 Blind wram labels part 3. 2015-02-10 15:14:21 -08:00
yenatch 8583cc4724 Stop using the preprocessor. 2015-01-20 00:01:23 -08:00
yenatch 1a2784d414 Recombine the event engine objects.
They must be in the same bank to work, and defining sections with static banks should only be used to produce an identical rom.

They were only split in the first place to minimize the amount of code tahat needed to be rebuilt based on a single constant, which in retrospect was meaningless.
2014-12-29 08:08:03 -08:00
yenatch 7996f5b1ab Miscellaneous formatting cleanup. 2014-09-30 11:19:33 -07:00
yenatch cda504fbce Fix "name" event command parameter comments. 2014-07-22 22:39:41 -07:00
yenatch e75e735f7f Reflect the extra loadwilddata argument in its function comment. 2014-07-22 22:05:06 -07:00
yenatch be08d93b61 Name the script special function and clean up a couple specials. 2014-07-19 14:02:58 -07:00
yenatch 928cdcfc23 Name cry functions in home.asm. 2014-07-18 10:31:52 -07:00
yenatch c2dba43188 Contest battle type and comment the battle menu. 2014-06-17 11:58:11 -07:00
yenatch 8639fcd29b Use a predef macro that takes labels instead of juggling constants.
Besides making predefs convenient, naming a predef no longer requires
adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
yenatch 023cfdbb05 Consolidate monster structs in wram and sram.
The PartyMon struct is really the box struct with volatile variables like status added.

Some other labels have been reworked.
Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
yenatch 2cb3f8e1b9 Comment music functions in home.asm. 2014-05-21 16:21:46 -04:00
yenatch f66f4d51c7 Replace static bank 0 calls in the event scripting engine. 2014-04-12 15:45:40 -04:00
yenatch 7ab8f76117 Label map trigger functions in home.asm. 2014-03-03 22:53:43 -05:00
yenatch 83537048fb Smoke out bank 4.
Highlights: contest trainers and mons
2014-03-01 10:31:13 -05:00
yenatch ddc665a31a Move includes into object bases instead of their version wrappers. 2014-02-05 19:07:24 -05:00
yenatch cf2acc1001 Use :: to export labels between objects.
This fixes the build.
2014-02-01 20:26:39 -05:00
yenatch 4612670768 more npc trade cleanup 2013-12-27 22:20:24 -05:00
yenatch be0c7962b0 YesNoBox 2013-12-04 03:07:58 -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 9aaa5f24bb shorten redundant text_jump macros 2013-12-01 17:54:09 -05:00
yenatch bcd833e758 version checks for event script commands and move in related asm 2013-11-22 04:51:47 -05:00
yenatch 94188ee0f7 version-sensitive objects for egg moves and evos/attacks
this way main.o and wram.o are version-neutral
2013-11-22 00:14:55 -05:00
yenatch bd49428c4a Merge commit '789469c' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 16:48:29 -04:00
yenatch da22ada91c Merge commit '546c17ad' into merge-mrwint
Conflicts:
	engine/scripting.asm
	main.asm
2013-10-25 16:23:16 -04:00
yenatch 789469c465 rename 'StartMusic' to 'PlayMusic' 2013-10-08 13:21:15 -04:00
yenatch 546c17ad37 rename 'StartSFX' to 'PlaySFX' 2013-10-08 13:10:36 -04:00
Mr Wint c5ff1606f0 * last callab/callba macros 2013-10-02 03:55:40 +02:00
Mr Wint 181840cf43 * even more callab/callba macros 2013-10-02 03:20:48 +02:00
yenatch 4cdc51d159 fix parameter comments for updated script commands 2013-10-01 01:13:04 -04:00
yenatch e5b5e1238d script command unknown0xa8 is wait 2013-10-01 01:03:08 -04:00
yenatch ad3293595d script commands if_greater_than and if_less_than were swapped 2013-09-26 18:40:20 -04:00
yenatch 73bd376cfd rename bit2 script commands to flag 2013-09-24 03:51:42 -04:00
yenatch 3134b26f7b rename bit1 script commands to event 2013-09-24 03:48:58 -04:00
yenatch 8da8dff7cf use a label in wildon/wildoff script command asm 2013-09-24 03:31:00 -04:00
yenatch 2afb247caa script commands wildon and wildoff got mixed up
this was a mistake in the original pksv spec and tauwasser's notes
2013-09-24 03:29:37 -04:00
yenatch 237861b553 rename hall of fame labels 2013-09-16 17:42:11 -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 45e791bb42 StdScripts label in engine/scripting.asm 2013-09-07 05:08:34 -04:00
yenatch b333b18dbd Function2f79 is PickUpItem 2013-08-30 23:07:08 -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 7cc320e835 Coins in main.asm 2013-08-30 17:50:46 -04:00
yenatch c4a764ce10 use more bank 0 labels in engine/scripting.asm 2013-08-29 23:20:09 -04:00
yenatch 17725d7af1 battle init and some overworld actions 2013-08-24 04:10:38 -04:00
yenatch 3a24cff5eb BitTableFunc -> FlagAction 2013-08-23 15:49:24 -04:00
yenatch 173f38346c get rid of bank 25 hard addresses in scripting.asm 2013-07-20 02:27:48 -04:00
yenatch 0988d69d9d more scripting cleanup 2013-07-10 19:17:04 -04:00
yenatch a3870db643 Clean up and remove incbins from script commands 2013-07-10 19:17:04 -04:00
yenatch fb931fe616 move miscellaneous asm into engine/ 2013-06-17 21:30:36 -04:00