Commit Graph

1589 Commits

Author SHA1 Message Date
PikalaxALT
d5ddd9e54e Move radio code to its own file 2015-07-21 01:52:46 -04:00
PikalaxALT
5631bdc0d7 Added labels to different parts of the map script and event headers 2015-07-21 00:02:21 -04:00
PikalaxALT
471492b775 Reverted ld_hl_pointer macro 2015-07-20 22:18:18 -04:00
PikalaxALT
06673cbee7 Named more specials, fixed a missing EOL 2015-07-20 18:59:26 -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
94129b6b45 Finished the decoration attributes table
Interpretation of the Decoration Attributes table is complete.

Other changes include some more event flag and function naming, as well as a minor tweak to the person_events of every map.
2015-07-19 04:58:31 -04:00
yenatch
a3c6931fa8 Use pngs for some misc graphics. 2015-07-18 22:01:59 -07: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
yenatch
8186190ef1 Fix filenames and use pngs for credits graphics. 2015-07-18 00:05:14 -07:00
PikalaxALT
0fcef5fc08 More annotations and interpretations of functions and scripts 2015-07-17 17:17:10 -04:00
PikalaxALT
894955f9d9 Special script annotation, trainer constant enumeration, person-event structure update 2015-07-16 18:10:10 -04:00
PikalaxALT
39524cdb76 More enumeration of constants, more annotations of scripts. 2015-07-15 15:48:44 -04:00
PikalaxALT
8fa8e29170 - Update variable sprites to use constants rather than fixed values 2015-07-13 02:29:10 -04:00
PikalaxALT
249bad9551 Replace EVENT_ALWAYS_THERE with -1 2015-07-13 00:18:01 -04:00
PikalaxALT
d282fe4799 Event and engine constant enumeration; replace static flag numbers with their constant names 2015-07-12 02:00:17 -04:00
IIMarckus
388336353d Fix mislabeled engine flags. 2015-07-10 06:12:28 -06:00
IIMarckus
07a12b37b6 Add more event flags. 2015-07-10 06:08:03 -06:00
IIMarckus
a711b45404 checkcode $1a is Kenji's break schedule. 2015-07-10 03:03:08 -06:00
IIMarckus
6f3b2d6de8 Add constants for checkcodes.
From PikalaxALT.
2015-07-09 20:23:23 -06:00
yenatch
e2c2e20f93 Use charmaps for special string codepoints.
Also fix all the text.
Also fix some unreferenced scripts that were interpreted as text.
2015-06-27 22:53:38 -07:00
yenatch
c00949dddf Labels for the heal machine; spriteface constants. 2015-06-26 23:24:55 -07:00
yenatch
d6f7dc3206 Fix the Nurse std comments. 2015-06-26 23:17:10 -07:00
yenatch
0f57aefdf2 Merge branch 'tilesets' into master
Conflicts:
	tilesets/tileset_headers.asm
2015-06-26 11:00:39 -07:00
IIMarckus
e57e1ba63b Improve some signpost labels. 2015-06-25 22:01:08 -06:00
IIMarckus
f16d60e3f9 Update some event flags. 2015-06-24 21:20:04 -06:00
IIMarckus
fdfbeb7e5f More std enums. 2015-06-24 19:26:24 -06:00
IIMarckus
5d48bc96fd More std_scripts enums. 2015-06-23 15:02:58 -06:00
IIMarckus
1027a3a157 Clean up labels. 2015-06-23 14:29:06 -06:00
IIMarckus
7ac6aa2d22 Begin enumerating std_scripts constants. 2015-06-23 14:21:54 -06:00
IIMarckus
0ba261a3fd Introduce checkmorn/checkday/checknite to replace checktime. 2015-06-23 12:28:48 -06:00
IIMarckus
4d532beee6 Remove trailing newlines. 2015-06-23 12:24:51 -06:00
yenatch
5ae298f533 Organized the primary tileset palettes.
Crystal's tileset-specific palettes are disconnected from these.
2015-06-23 10:46:51 -07:00
IIMarckus
47938939fe Give Buena's phone scripts more appropriate filenames. 2015-06-23 11:43:32 -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
7563a990aa w-prefix the new PokegearFlags variable. 2015-05-18 03:15:45 -06:00
IIMarckus
bd894f6fb0 Fix a static address. 2015-05-18 02:07:28 -06:00
IIMarckus
32864d2db6 Give wd957 a more descriptive name. 2015-05-14 22:42:29 -06:00
yenatch
adc41566aa Fix a static reference to a string in Pokedex code. 2015-03-03 18:31:46 -08:00
IIMarckus
828d6b92f0 Add the ability to build Crystal 1.1. 2015-02-14 01:51:34 -07:00
IIMarckus
b028e13834 Give an internal Pokédex status variable its own label.
This new label is used in revision 1.1 of Pokémon Crystal.
2015-02-14 01:40:38 -07:00
yenatch
92e2ed3e61 Split out event scripting specials. 2015-02-11 15:09:35 -08:00
yenatch
b048ea0faf Use labels for script specials instead of constants/static values. 2015-02-11 15:03:42 -08:00
yenatch
9aef93701a Split out map object code. 2015-02-11 14:13:22 -08:00
yenatch
a31b4586df Split out the diploma code. 2015-02-11 14:08:07 -08:00
yenatch
f4e0e61114 Split out the map setup scripts. 2015-02-11 14:01:04 -08:00
yenatch
c6c220f1ad Split out spawn points. 2015-02-11 13:59:59 -08:00
yenatch
3977bd6208 Split out map triggers. 2015-02-11 13:45:33 -08:00
yenatch
25f5306a4d Split out the Pokedex code. 2015-02-11 13:36:02 -08:00
yenatch
e13565f933 Split out the pack code. 2015-02-11 13:27:15 -08:00
yenatch
956b990cd2 Fix a bunch of palette copying errors and wram bank conflicts.
There are probably a bunch more labels with wrong banks. This takes care of the most noticeable ones.
2015-02-10 18:21:38 -08:00
yenatch
62b473d6c6 Blind wram labels part 3. 2015-02-10 15:14:21 -08:00
yenatch
849595e537 Blindly use wram labels for everything except mobile, part 2. 2015-02-10 14:18:23 -08:00
yenatch
d3054dc4cb More graphics and straggling static refs. 2015-02-06 21:17:32 -08:00
yenatch
ed88e4947c Get rid of more static refs in banks 47, 5c, 5f. 2015-02-05 23:59:50 -08:00
yenatch
8583cc4724 Stop using the preprocessor. 2015-01-20 00:01:23 -08:00
yenatch
3fe3cd1a46 hVBlank 2015-01-19 21:31:29 -08:00
yenatch
7b87e67a89 More labels in code and some mobile datatracking. 2015-01-01 20:59:08 -08:00
yenatch
133e2fb7a7 Use "- $ff00" instead of "& $ff" when dealing with hram. 2014-12-29 08:49:08 -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
6604afce62 Use the "next" directive in the credits. 2014-12-03 21:26:14 -08:00
yenatch
7996f5b1ab Miscellaneous formatting cleanup. 2014-09-30 11:19:33 -07:00
yenatch
ed15916f05 Use landmark constants in displaylocation commands (phone scripts). 2014-08-22 20:36:10 -07:00
yenatch
49b00673b0 Recomment Headbutt tree and Rock Smash encounters. 2014-08-18 08:20:37 -07:00
yenatch
b922fe72a1 Label CheckPhoneCall. 2014-07-24 20:19:56 -07:00
yenatch
f7e53b0f50 Dump the phone scripts.
This is one of the last major incbins. The rest is mostly mobile code.
2014-07-23 20:20:21 -07:00
yenatch
cda504fbce Fix "name" event command parameter comments. 2014-07-22 22:39:41 -07:00
yenatch
b211cac35a Separate phone scripts from std scripts. 2014-07-22 22:09:55 -07:00
yenatch
29d92fe79c Fix some static addresses in std scripts. 2014-07-22 22:05:41 -07:00
yenatch
e75e735f7f Reflect the extra loadwilddata argument in its function comment. 2014-07-22 22:05:06 -07:00
yenatch
849044ce8a Remove generated "jump sources" comments. 2014-07-19 14:11:48 -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
fd8804472d Use {hl,de,bc}coord macros wherever possible. 2014-06-04 01:10:56 -07:00
yenatch
2cb3f8e1b9 Comment music functions in home.asm. 2014-05-21 16:21:46 -04:00
yenatch
95af7dd873 Move RegionCheck into engine/landmarks.asm. 2014-04-30 23:44:44 -04:00
yenatch
113dd395d2 Include palette 0 in PokemonPalettes.
Now PokemonPalettes is referenced.
2014-04-13 00:03:21 -04:00
yenatch
f66f4d51c7 Replace static bank 0 calls in the event scripting engine. 2014-04-12 15:45:40 -04:00
yenatch
0eb49d5941 Fix a title screen label that accidentally made its way into bank 1.
Somehow, a title screen (bank 0x43) function had its label put in bank 1.
This caused changes to either bank to break the compiled rom.

fixes 61a3d145
2014-04-09 18:27:29 -04:00
yenatch
73ffc4677a Image extensions in gfx/{intro,title}. 2014-04-02 00:41:56 -04:00
yenatch
6a66f28bf5 Fix image extensions in gfx/{credits,misc}. 2014-04-02 00:16:03 -04:00
yenatch
2564836df1 Compressed title screen graphics are padded too. 2014-03-04 01:29:43 -05:00
yenatch
7ab8f76117 Label map trigger functions in home.asm. 2014-03-03 22:53:43 -05:00
yenatch
2b144fcfd4 Finish off SGB and CGB code and data.
That should be it for bank 2.
2014-03-02 16:02:55 -05:00
yenatch
78c70bffe4 More SGB and CGB palettes. 2014-03-02 01:22:33 -05:00
yenatch
38850df63d Lots of SGB incbins in bank 2.
Palette/block packets, border tilemap, more palettes etc.
2014-03-01 21:43:16 -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
1ba5b0f4bc Map setup scripts and commands 2014-01-26 22:07:19 -05:00
yenatch
4612670768 more npc trade cleanup 2013-12-27 22:20:24 -05:00
yenatch
58af27eaeb label overworld loop functions 2013-12-27 05:56:23 -05:00
yenatch
0cd1d2071f item effect incbins 2013-12-24 17:11:52 -05:00
yenatch
7b20626c7b more object struct constants 2013-12-23 04:39:26 -05:00
yenatch
496502b3dc no more Public in joypad interface labels 2013-12-22 17:30:35 -05:00
yenatch
0d3308f68c use RGB macros for palettes instead of binary chunks 2013-12-20 00:29:31 -05:00
yenatch
c7b19392a9 use the sgb border label in asm 2013-12-13 20:49:01 -05:00
yenatch
1b7e44c729 split out sprite facing defs into engine/facings.asm 2013-12-11 22:00:56 -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
ce37f0f970 labels for every 3callasm 2013-12-01 18:26:05 -05:00
yenatch
9aaa5f24bb shorten redundant text_jump macros 2013-12-01 17:54:09 -05:00
yenatch
0b905cb8ac rename a credit constant to avoid conflicts 2013-11-29 01:49:48 -05:00
yenatch
b18beef4d5 more landmark constants and rename FlypointPerms -> VisitedSpawns 2013-11-29 00:38:22 -05:00
yenatch
fd73d41e6b redone landmarks, now with constants 2013-11-28 03:54:21 -05:00
yenatch
ac65a8b821 engine/credits_crystal.o 2013-11-28 01:38:49 -05:00
yenatch
72b1dda303 more credits cleanup 2013-11-28 00:55:32 -05:00
yenatch
04eb541f83 proper section names and bank constants 2013-11-26 04:29:47 -05:00
yenatch
f16193dc91 move more credits asm into engine/credits.asm 2013-11-24 04:26:10 -05:00
yenatch
25325139e6 more credits labels and theend graphic 2013-11-24 04:09:17 -05:00
yenatch
cf6295cb9f objects for event handling and scripting 2013-11-23 02:51:48 -05:00
yenatch
29afa24f0b split more event handling out of main 2013-11-23 02:33:53 -05:00
yenatch
bd392da29e split event handling into engine/events.asm 2013-11-22 05:04:32 -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
dfa9adcaeb * added index comments to pointer lists
* added map header wram addresses
* analyzed some assembly
2013-10-05 04:03:34 +02:00
Mr Wint
c666d1014a * make jumps and calls use labels 2013-10-02 06:53:35 +02: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
Mr Wint
eb5a7afe2b * more callab/callba macros 2013-10-02 02:47:54 +02:00
Mr Wint
255135d187 * extracted and added a bunch of assembly 2013-10-01 23:23:21 +02:00
yenatch
cf359b09fc fix parsing errors for displaylocation 2013-10-01 01:13:21 -04: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
9ae1cd6a1c split title screen functions into engine/title.asm 2013-09-15 18:59:53 -04:00
yenatch
3370a04d9e split color asm and data into engine/color.asm 2013-09-15 18:02:02 -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
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
6e5876377f split out std scripts from main.asm 2013-09-07 15:30:07 -04:00
yenatch
45e791bb42 StdScripts label in engine/scripting.asm 2013-09-07 05:08:34 -04:00
yenatch
4a429aded4 add a label in the text engine 2013-09-06 03:47:07 -04:00
yenatch
60dde1d03e forgot to commit engine/farcall.asm
fixes 715a19fd59
2013-09-05 14:25:20 -04:00
yenatch
d93d17b43b split out game time functions into engine/game_time.asm 2013-09-03 18:58:16 -04:00
yenatch
340e31d839 split menu functions into engine/menu.asm 2013-09-03 18:43:15 -04:00
yenatch
23bb05851b split Sine/Cosine into engine/sine.asm 2013-09-03 18:40:12 -04:00
yenatch
12e6ff3fc6 split map object functions into engine/map_objects.asm 2013-09-03 18:39:19 -04:00
yenatch
71bbd77261 split some RTC interfaces into engine/rtc.asm 2013-09-03 18:35:37 -04:00
yenatch
004956798c split vram functions out into engine/video.asm 2013-09-03 18:32:55 -04:00
yenatch
b74e63a20d split out delay functions 2013-09-03 17:36:55 -04:00
yenatch
5b38b377f2 wram labels for graphics requests 2013-09-01 15:24:07 -04:00
yenatch
8190c3e5e7 rename DoTileAnimation to AnimateTileset 2013-09-01 00:07:10 -04:00
yenatch
fc6bc8e311 rename graphics request handlers to Serve1bppRequest and Serve2bppRequest
these had some really dumb names
2013-09-01 00:02:35 -04:00
yenatch
abce472354 fix PushOAM references in VBlank 2013-08-31 21:47:28 -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
cc98fab33e move VBlank interrupt label from main.asm to engine/vblank.asm 2013-08-29 19:40:33 -04:00
yenatch
2c16bc7ab9 move copy asm from main.asm to engine/copy.asm 2013-08-29 19:39:21 -04:00
yenatch
04da88a285 move palette asm from main.asm to engine/palettes.asm 2013-08-29 19:37:35 -04:00
yenatch
6d29673a5f move time-related asm from main.asm into engine/time.asm 2013-08-29 19:32:03 -04:00
yenatch
6467755568 move serial asm from main.asm into engine/serial.asm 2013-08-29 19:11:39 -04:00
yenatch
2341bb148a move more joypad code from main.asm into engine/joypad.asm 2013-08-29 19:10:06 -04:00
yenatch
906496e107 split lcd functions out of main.asm 2013-08-29 18:52:26 -04:00
yenatch
2b5b6f3e3a split fading functions out of main.asm 2013-08-29 18:50:59 -04:00
yenatch
eff81fb080 fix Stack's address ($c100 -> $c0ff)
using negative ds
2013-08-29 02:10:32 -04:00
yenatch
12ab33b37e rename FarCall family labels
FarJump labels renamed to FarCall
register aliases JpHl and JpDe renamed to _hl_ and _de_
2013-08-27 18:16:42 -04:00
yenatch
17725d7af1 battle init and some overworld actions 2013-08-24 04:10:38 -04:00
yenatch
af205a7217 BitTable2 -> EngineFlags 2013-08-23 16:08:31 -04:00
yenatch
3a24cff5eb BitTableFunc -> FlagAction 2013-08-23 15:49:24 -04:00
yenatch
636a960909 split out text engine 2013-08-21 14:01:49 -04:00
yenatch
35de889dd7 split out decompression 2013-08-21 14:01:46 -04:00
yenatch
99d2ee2bdc split out program init 2013-08-20 03:26:37 -04:00
yenatch
3460b82d22 update hram addresses in engine/vblank.asm 2013-08-19 20:49:41 -04:00
yenatch
df21dbccb7 $ffcf $ffd0 -> hSCX hSCY 2013-08-19 18:46:56 -04:00
yenatch
449bda272a $ffd1 $ffd2 -> hWX hWY 2013-08-19 18:44:12 -04:00
yenatch
6343e2ddaf Reset 2013-07-26 23:49:33 -04:00
yenatch
8e27cfbc1a movement command asm 2013-07-20 22:34:40 -04:00
yenatch
173f38346c get rid of bank 25 hard addresses in scripting.asm 2013-07-20 02:27:48 -04:00
yenatch
f2888a2d75 more overworld wram labels 2013-07-20 01:25:20 -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