Commit Graph

1446 Commits

Author SHA1 Message Date
PikalaxALT
4a16bbe45a sprite_header and emote_header 2015-11-03 09:16:56 -05:00
PikalaxALT
2faa4a0f70 Fix errors in global substitution 2015-11-03 07:11:32 -05:00
PikalaxALT
72af3337fd No more NONE 2015-11-02 14:37:02 -05:00
PikalaxALT
d35cfad0de object_struct 2015-11-02 11:15:32 -05:00
PikalaxALT
76e2ea534f Object masks 2015-11-01 21:17:46 -05:00
PikalaxALT
6b2d0ae841 Fix merge conflicts 2015-11-01 18:19:52 -05:00
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
3b4805ee98 Sweepthrough of ClearBox arg conversion to lb 2015-11-01 09:38:48 -05:00
PikalaxALT
fda1f7c01a SPRITEMOVEDATA 2015-10-31 21:05:02 -04:00
PikalaxALT
8153737bae Enumerate text constants 2015-10-30 10:34:35 -04:00
PikalaxALT
ed29db5841 No more -bash000; engine/movement.asm, SPRITEMOVEFN 2015-10-29 23:32:11 -04:00
JimB16
9a9cb38e39 merge with newest update 2015-10-26 03:26:53 +01: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
97cc513f54 Plus 4 on person events; feeble attempt to annotate color functions 2015-10-21 10:43:42 -04:00
PikalaxALT
6c25592b8c So very jumb 2015-10-19 16:49:29 -04:00
JimB16
3b9a3cc3be merge conflicts resolved 2015-10-19 16:25:15 +02:00
PikalaxALT
0a244e043c Move battle start animation functions to its own file 2015-10-19 10:23:58 -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
da7849d800 Restructured functions in main.asm to resemble the home functions they clone 2015-10-17 13:00:34 -04:00
PikalaxALT
4fa6c6daa4 Split up bank 2; other relabelings 2015-10-16 13:35:43 -04:00
PikalaxALT
1e2ff967aa Replaced "ldtile" and "dwtile" with the "tile" equs macro 2015-10-14 09:29:15 -04:00
PikalaxALT
12f9dca7a5 Final descriptive label in tilesets/animations.asm 2015-10-13 14:29:34 -04:00
PikalaxALT
8c2766e1b9 ldtile and dwtile macros added and globally implemented 2015-10-13 12:11:06 -04:00
PikalaxALT
0c39f6e273 Happiness and Mystery Gift constants 2015-10-12 12:33:24 -04:00
PikalaxALT
327faac497 Magikarp functions moved to event/magikarp.asm 2015-10-11 12:26:39 -04:00
PikalaxALT
d42330ed8b Annotation of PrintNum arguments in bc, and radio functions 2015-10-10 18:00:12 -04:00
JimB16
4b722eb530 changed name of some labels 2015-10-10 13:45:39 +02:00
PikalaxALT
b68913a782 More radio labels 2015-10-09 23:09:03 -04:00
JimB16
6730600d9b found CalcPkmnStats-function 2015-10-08 20:53:39 +02:00
PikalaxALT
96b0e448c4 Labeling of AI item and wild encounter functions 2015-10-07 21:27:32 -04:00
JimB16
975efb28ae Merge remote-tracking branch 'upstream/master' 2015-10-07 20:38:24 +02:00
PikalaxALT
edf42a54d5 More labels, including fns responsible for partymon generation 2015-10-07 13:19:41 -04:00
PikalaxALT
2770cfc354 soft reset 2015-10-04 14:14:51 -04:00
PikalaxALT
726c4bc1d6 Moved time-related functions in bank 4 to engine/time.asm 2015-10-02 22:49:26 -04:00
PikalaxALT
c50b49bd62 Renamed some unused specials 2015-10-01 16:55:24 -04:00
PikalaxALT
ebfa8e2639 Restore point 2015-10-01 15:03:20 -04:00
JimB16
0001c688d3 found functions that determine next OTPkmn 2015-09-12 04:21:00 +02:00
JimB16
8ccdd4d6c0 Merge remote-tracking branch 'upstream/master' 2015-09-10 01:28:06 +02:00
JimB16
a7cb2a5e9b changed more labels 2015-09-10 01:27:07 +02:00
IIMarckus
2e74d969f7 Fix typos in comments. 2015-09-09 15:05:19 -06:00
JimB16
0d4c2776d9 changed varlabels for multiply- and divide-func, renamed battletext-labels 2015-09-06 23:38:01 +02:00
JimB16
c76a3c6ecd changed more labels 2015-09-04 22:30:40 +02:00
JimB16
172a1488de renamed labels and added comments 2015-08-30 13:17:14 +02:00
JimB16
91ccb09379 changed some SRAMBank constants to labels 2015-08-29 11:22:56 +02:00
JimB16
2f4a0179fe changed constants to SRAMLabels 2015-08-26 01:40:34 +02:00
JimB16
3eed7c4ab0 changed labels 2015-08-23 22:30:37 +02:00
JimB16
0e05c91239 change WasSentToBillsPC-Label 2015-08-23 16:08:01 +02:00
JimB16
3922ad2c3c changed labels and added comments 2015-08-23 15:09:56 +02:00
yenatch
a129ba7b43 Nail down the rest of SRAM banks 0 and 1. 2015-08-20 23:03:05 -07:00
yenatch
70f9c27aac Found a reference to an unknown blob. 2015-08-19 22:42:59 -07:00
yenatch
9e3bd6cb9b Label scratch space and a bunch of box lists. 2015-08-19 21:51:04 -07:00
yenatch
860296f468 Comment and label the save file. 2015-08-19 21:14:15 -07:00
yenatch
9c84a3dd22 Split out the save file code. 2015-08-19 10:17:58 -07:00
yenatch
3cd79c55a3 Merge pull request #309 from PikalaxALT/master
Wild data, save functions, fix missing include
2015-08-17 11:58:57 -04:00
PikalaxALT
aa27080e29 Split fourth-to-last byte of person_event into nybble arguments 2015-07-31 15:16:53 -04:00
PikalaxALT
895e14cd05 Reworked person_event arguments 2015-07-29 18:22:23 -04:00
yenatch
abf3fc2137 Name some map event reading functions. 2015-07-26 00:11:33 -07:00
PikalaxALT
594253eb30 Merge yenatch:map-objects 2015-07-25 20:18:59 -04:00
PikalaxALT
6c3000efd2 Macro update, roam mon annotations
Updated map and mapgroup macros to get around an rgbds bug.

Legendary beast locale handling annotated and relabeled.

Added a new constant NUM_ENGINE_FLAGS for use in the EngineFlagAction function.  This will make it easier for modders to add or remove engine flags.
2015-07-25 19:02:36 -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
4c480a23dc Fixed a few labeling bugs 2015-07-22 16:58:47 -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
yenatch
973721491c Merge remote-tracking branch 'kanzure/master' into gfx-script 2015-07-20 23:05:28 -07:00
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
7054bfe717 More annotations 2015-07-15 22:56:42 -04:00
PikalaxALT
39524cdb76 More enumeration of constants, more annotations of scripts. 2015-07-15 15:48:44 -04:00
PikalaxALT
3a9f537f8a Enumerate various constants 2015-07-13 01:44:27 -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
07a12b37b6 Add more event flags. 2015-07-10 06:08:03 -06:00
IIMarckus
6f3b2d6de8 Add constants for checkcodes.
From PikalaxALT.
2015-07-09 20:23:23 -06:00
IIMarckus
e79f04e32d Fix previous. 2015-07-08 20:29:23 -06:00
IIMarckus
b82b27c264 Represent the Poké Ball battle transition in binary, not hex. 2015-07-08 20:18:21 -06:00
Scott Norton
f74fd6903f - Renamed "Functiond283" to "GetPocketCapacity" and updated the pointers and constants to better reflect their hypothesized purposes.
- Using yenatch's version of the macro and constant handling, rewrote the tmhm bit array as a macro-defined environment.
2015-07-03 13:46:38 -04: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
0f57aefdf2 Merge branch 'tilesets' into master
Conflicts:
	tilesets/tileset_headers.asm
2015-06-26 11:00:39 -07:00
yenatch
f9805056bb Make files for most of the special tileset palettes. 2015-06-26 10:45:24 -07: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
7ac6aa2d22 Begin enumerating std_scripts constants. 2015-06-23 14:21:54 -06:00
IIMarckus
4d532beee6 Remove trailing newlines. 2015-06-23 12:24:51 -06: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
IIMarckus
7563a990aa w-prefix the new PokegearFlags variable. 2015-05-18 03:15:45 -06:00
IIMarckus
32864d2db6 Give wd957 a more descriptive name. 2015-05-14 22:42:29 -06:00
IIMarckus
21a7300f68 Label some radio stuff. 2015-05-14 22:39:52 -06:00
yenatch
d4863f3fa5 Enumerate the event script command macros.
This is ugly, but much better than static values.
2015-04-13 22:28:28 -07:00
IIMarckus
d54725c28e Comment alternate Time Capsule item mappings. 2015-03-29 21:29:48 -06:00
yenatch
788af45988 Get rid of baserom incbins in main.asm. 2015-03-11 18:33:20 -07:00
yenatch
58e5b396c1 Use more struct offsets and constants for monsters and moves. 2015-03-03 18:31:57 -08:00
yenatch
3619b13d6c Fix some halts that were dumped as "db $76". 2015-03-03 18:31:51 -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
ca48571c51 Add another reference to OTPartyMonOT in link cable code. 2015-02-11 15:11:32 -08: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
994f89b490 Split out the move deleter code. 2015-02-11 13:20:22 -08:00
yenatch
6c492cb86d Comment PrintTempMonStats. 2015-02-11 13:15:38 -08:00
yenatch
3735185ec2 Use PartyMon labels in GetPartyParamLocation arguments. 2015-02-11 13:14:56 -08:00
yenatch
11b5c4c485 Add placeholder constants for ObjectStructs offsets.
Note that OBJECT_LENGTH is not associated with ObjectStructs (it's isntead used as the length of a MapObjects struct).
2015-02-10 23:03:46 -08:00
yenatch
6ff7b7413c Split 40k lines of mobile noise out of main.asm. 2015-02-10 19:15: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
8e03321069 Blindly use wram labels for everything except mobile, part 1.
Wram banks and mobile make this tough, since any address can secretly be a ghost.

As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-10 00:53:03 -08:00
yenatch
0683bc8770 Fix up remaining coords. 2015-02-07 23:06:52 -08:00
yenatch
e927a4c9f7 More hlcoord macros for recently dumped code. 2015-02-07 22:53:17 -08:00
yenatch
37ff5ddfd1 Rip the Stadium 2 footer. 2015-02-06 23:28:49 -08:00
yenatch
307706e679 There were actually 3 mobile chunks!
In retrospect these aren't saves at all--the mobile adapter does something funky with sram bank 6.
2015-02-06 23:26:53 -08:00
yenatch
47d25da38a Intro palettes. 2015-02-06 22:19:20 -08:00
yenatch
f326faef4d Dump known tilemaps and attribute maps. 2015-02-06 22:11:03 -08:00
yenatch
d3054dc4cb More graphics and straggling static refs. 2015-02-06 21:17:32 -08:00
yenatch
78a0c398c2 The last chunk of code? 2015-02-06 20:54:09 -08:00
yenatch
a0a12efcb7 Dump some more incbinned graphics, mostly 1bpp.
- Some mail graphics were dumped as 2bpp but are really 1bpp
- Some fonts weren't caught by the last dump
2015-02-06 20:10:39 -08:00
yenatch
556435e0c7 A couple of the dumped graphics files were actually tilemaps. 2015-02-06 19:20:06 -08:00
yenatch
6086778c41 Dump a bunch of incbinned graphics. 2015-02-06 16:24:00 -08:00
yenatch
90891ec69f Use Pokemon constants in the kana order table. 2015-02-06 13:52:37 -08:00
yenatch
7cc1b301ab Fix static predefs generated by the disassembler. 2015-02-06 13:37:27 -08:00
yenatch
41402c39f1 No static refs in bank 42. 2015-02-06 13:25:50 -08:00
yenatch
6c388a70e5 No more static refs in bank 45. 2015-02-06 11:26:35 -08:00
yenatch
e246b53ba8 Odds and ends in bank 45 (and more ascii incbins). 2015-02-06 00:19:36 -08:00
yenatch
ed88e4947c Get rid of more static refs in banks 47, 5c, 5f. 2015-02-05 23:59:50 -08:00
yenatch
8ab56853a2 A bunch of bank 5c incbins. 2015-02-05 23:02:17 -08:00
yenatch
e6a8977234 No more static refs in bank 5b. 2015-02-05 12:15:00 -08:00
yenatch
19b75ac1d2 Tear up bank 47. 2015-02-05 00:39:37 -08:00
yenatch
84bb0b1eb8 Mobile main menu jumptables.
No more unreferenced incbins in bank 46.
2015-02-04 17:10:07 -08:00
yenatch
091d33e801 More mobile incbins and start incbinning .txt for ascii. 2015-02-04 16:07:38 -08:00
yenatch
a0e2b8270f Mobile phrases and tons of related data. 2015-02-04 01:10:59 -08:00
yenatch
36436bbf41 No more unreferenced incbins in bank 41. 2015-02-02 16:57:10 -08:00
yenatch
4592603114 No more unreferenced incbins in bank 40. 2015-02-02 16:38:38 -08:00
yenatch
46f2dbb367 Mobile trade incbins and coordinate macros. 2015-02-02 15:46:06 -08:00
yenatch
5aec11492d Add a "mobile" directive for dummied-out mobile adapter functions. 2015-01-27 15:03:14 -08:00
yenatch
8583cc4724 Stop using the preprocessor. 2015-01-20 00:01:23 -08:00
yenatch
d8cf44a87e wow 2015-01-19 21:31:56 -08:00
yenatch
3fe3cd1a46 hVBlank 2015-01-19 21:31:29 -08:00
yenatch
1aa28c7712 Some mobile pseudoconstant. 2015-01-01 21:44:01 -08:00
yenatch
e45e685bf3 Glossed over a couple predefs. 2015-01-01 21:32:26 -08:00
yenatch
355aeb0a2f Tripped over a mobile jumptable. 2015-01-01 21:29:23 -08:00
yenatch
7b87e67a89 More labels in code and some mobile datatracking. 2015-01-01 20:59:08 -08:00
yenatch
7b71a12ed1 Rename some graphics to avoid collisions later.
chris.5x7.2bpp and chris.7x7.2bpp would probably both end up as chris.png.
2014-12-29 22:10:20 -08:00
yenatch
4781d9a809 Fix more static banks (trainers, mobile graphics). 2014-12-29 10:23:22 -08:00
yenatch
133e2fb7a7 Use "- $ff00" instead of "& $ff" when dealing with hram. 2014-12-29 08:49:08 -08:00
yenatch
346844a613 Replace pointless $FF00+$xx with $ffxx. 2014-12-28 18:44:23 -08:00
yenatch
0c55e33b5f More mobile subfunctions. 2014-12-28 18:19:18 -08:00
yenatch
ea6954c492 Mystery Gift graphics labels. 2014-12-28 12:33:50 -08:00
yenatch
2cafe3522b Fix static banks for save text and bedroom poster scripts. 2014-12-26 20:04:09 -08:00
yenatch
a6597ba919 Pick off references in misc/crystal_misc.asm. 2014-12-26 14:52:03 -08:00
yenatch
48b1faf73c Reference name input character sets. 2014-12-26 13:01:53 -08:00
yenatch
43a961af42 More unknown mobile code and MIN_LEVEL. 2014-12-26 11:31:55 -08:00
yenatch
e325210a61 Merge remote-tracking branch 'kanzure/master' 2014-12-11 23:25:30 -08:00
yenatch
755c0ae079 Dump a big mobile text table. 2014-12-11 23:20:19 -08:00
yenatch
7391454a76 Get rid of incbins in bank $77.
This includes the diploma and related assets.
2014-12-04 00:11:16 -08:00
yenatch
5cbc7cc79c Fix padding in gfx/misc/pokegear.2bpp.lz. 2014-12-03 23:10:26 -08:00
yenatch
fec2f25cb3 Miscellaneous mobile incbins. 2014-12-03 21:25:23 -08:00
yenatch
2f509ab379 Fix some incbins near Magikarp length code.
Also clean up the comments a little.
2014-12-03 20:12:37 -08:00
IIMarckus
b4df25a1e1 More comments and labels for ball catch rates. 2014-10-24 00:18:48 -06:00
yenatch
81e2a3f0cf Merge remote-tracking branch 'xcrystal/master' into master
Conflicts:
	battle/ai/scoring.asm
	main.asm
2014-10-23 02:41:52 -04:00
xCrystal
d430cccdfb Add commentary and labels to AI stuff
Name some labels and add lots of commentary to AI stuff, including most
AIScoring_Smart sublayers.
2014-10-22 23:19:30 +02:00
xCrystal
8641358590 Revert "nothing"
This reverts commit 201f56b3e9.
2014-10-22 23:17:49 +02:00
xCrystal
201f56b3e9 nothing 2014-10-22 23:17:19 +02:00
xCrystal
96a89ffad7 More AI commentary 2014-10-21 20:44:42 +02:00
xCrystal
44377acb2a Rename labels and add more commentary to AI stuff 2014-10-21 19:21:13 +02:00
yenatch
7996f5b1ab Miscellaneous formatting cleanup. 2014-09-30 11:19:33 -07:00
yenatch
d6ac5407e7 Add the initial mobile adapter save data.
The contents of the save and the rest of the bank are unknown.
2014-08-22 20:48:58 -07:00
yenatch
1d4158057e Close an open string in name selection.
The python preprocessor doesn't care if a string is left open.
It probably should, so this string is fixed preemptively.
2014-08-22 20:43:02 -07:00
yenatch
3be6ca012f Use AttrMap and TileMap labels for relative addressing. 2014-08-22 20:41:57 -07:00
yenatch
49b00673b0 Recomment Headbutt tree and Rock Smash encounters. 2014-08-18 08:20:37 -07:00
yenatch
5337d0159e Recomment the text engine. 2014-08-14 23:50:53 -07:00
yenatch
da799c80d4 Better trainer AI comments and finish off trainer attributes. 2014-08-13 19:44:56 -07:00
yenatch
88a15c5038 More constants and bug comments in item effects.
Apparently a bunch of constants from red were never removed for some reason.
2014-08-13 19:42:58 -07:00
yenatch
b922fe72a1 Label CheckPhoneCall. 2014-07-24 20:19:56 -07:00
yenatch
07693817ce Use phone script labels in the phone contact table. 2014-07-24 19:40:25 -07:00
yenatch
3fb29975ca Relabel GetItemDescription -> PrintItemDescription. 2014-07-24 19:27:21 -07:00
yenatch
dea79bb86e Add real-time-clock and Daylight Savings Time wram labels. 2014-07-24 10:45:54 -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
b211cac35a Separate phone scripts from std scripts. 2014-07-22 22:09:55 -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
3110fd28e2 Badge and move constants in Strength and Surf field effects. 2014-07-18 10:31:53 -07:00
yenatch
2b1cc7f270 Use WOOPER in Oak speech. 2014-07-18 10:31:52 -07:00
yenatch
928cdcfc23 Name cry functions in home.asm. 2014-07-18 10:31:52 -07:00
yenatch
251517812f Rename the internal PlayCry function to _PlayCryHeader. 2014-07-18 10:31:52 -07:00
yenatch
ab018a5094 Cry "echo" is actually the upper byte of pitch (now a word). 2014-07-18 10:31:51 -07:00
yenatch
2f99608526 Use macros for spawns and flypoints.
This firmly ties spawn constant definition to data allocation,
preventing usage earlier in main.asm or in other objects.

A potential solution is to abuse ifdefs and include it in
both main.asm and constants.asm.
2014-07-18 10:31:51 -07:00
yenatch
32a5f21cc7 More PartyMon labels for relative addressing. 2014-06-23 12:45:30 -07:00
yenatch
6fee80528a More object struct labels and constants. 2014-06-19 17:23:53 -07:00
yenatch
044d0f7f04 Merge remote-tracking branch 'kanzure/master' 2014-06-18 01:05:52 -07:00
yenatch
bc3a21193d Residual damage, battle text labels, pic predefs. 2014-06-18 00:55:44 -07:00
yenatch
c2dba43188 Contest battle type and comment the battle menu. 2014-06-17 11:58:11 -07:00
IIMarckus
1fbe471b74 Use better constants/comments in DST near-midnight checks. 2014-06-17 04:53:58 -06:00
yenatch
541a9c7347 Name the UpdateEnemyHUD predef.
Also start using hp palette constants.
2014-06-16 22:53:56 -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
0b7dfeb9b2 Name and comment some move learning functions. 2014-06-16 10:32:39 -07:00
yenatch
db27602679 Name and comment the trainer party reader.
Reads the contents of trainers/trainers.asm.
2014-06-14 22:35:00 -07:00
yenatch
e6271ca450 Move trainer item AI into battle/ai/items.asm. 2014-06-14 15:03:23 -07:00
yenatch
c7f11f7591 Item constants in trainer ai. 2014-06-14 15:00:03 -07:00
yenatch
b83f237254 Rename _GetBattleVar -> GetBattleVarAddr.
Functions prefixed with _ imply they're private.
The real purpose of this function is to use an address,
rather than saving a few cycles on push/pop.
2014-06-14 00:41:34 -07:00
yenatch
e23f341258 Battle type constants in the wild.
Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
yenatch
eb9fc6676c More battle code cleanup.
- Use more substatus constants.
- Reformat some code to be more atomic.
- Add constants for unused status prevention held item effects.
- Remove pointless or redundant comments.
2014-06-13 21:18:14 -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
23f9b5d21e Use constants for move struct positioning.
This eliminates the need for arbitrary move labels like Move2 and Move1 that don't have anything to do with their respective moves.
2014-06-10 23:24:25 -07:00
yenatch
86c1e0feea Consolidate NUM_MOVES usage and monster struct labels.
There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
yenatch
61521f4458 Comment PrintNum. 2014-06-06 21:30:11 -07:00
yenatch
fc16533207 Clean up the growth_rate macro. 2014-06-04 01:34:07 -07:00
yenatch
8d2b9f3fcb Remove the FuncCoord macro.
Variables can't use labels, so a macro that doesn't use variables is better suited.
2014-06-04 01:18:54 -07:00
yenatch
fd8804472d Use {hl,de,bc}coord macros wherever possible. 2014-06-04 01:10:56 -07:00
yenatch
b17553218b Add a dereferenced stats screen function.
This was probably used in the stats screen in JP versions.
It fell out of use when the stats screen layout was redon in localization.
2014-06-04 00:34:01 -07:00
yenatch
6718981fb1 Truncate MAX_LEVEL + 1 if it exceeds 8 bits.
If MAX_LEVEL was set to 255, the value could not fit into a byte.
2014-06-03 16:34:21 -07:00
yenatch
20444d2f63 More MAX_LEVEL use. 2014-06-03 14:07:10 -07:00
yenatch
99fbe3147b Rename directory stats -> data. 2014-05-31 22:57:00 -07:00
yenatch
2cb3f8e1b9 Comment music functions in home.asm. 2014-05-21 16:21:46 -04:00
yenatch
93f406e8b4 Revert some misused labels to static values in main.asm. 2014-05-06 16:57:21 -04:00
yenatch
ddc88bed4b Use a macro for sine waves.
So far they're identical, but amplitude could change.
2014-05-05 15:58:43 -04:00
yenatch
2ead808353 More labels and incbins in slots, PC menus, intro. 2014-05-05 03:04:14 -04:00
yenatch
92c40ba266 Labels for mail graphics. 2014-05-04 18:02:45 -04:00
yenatch
066d569e7e Radio text/music and mail jumptables. 2014-05-04 03:28:57 -04:00
yenatch
dbb7431cde Give a name to RandomRange. 2014-05-03 21:44:18 -04:00
yenatch
a7a95e59f7 Headbutt tree encounter maps. 2014-05-03 21:43:54 -04:00
yenatch
3fcaea4780 Misc incbins in fly menu, slots, phone. 2014-05-03 20:57:09 -04:00
yenatch
772c2c48e4 Sprite predef engine data.
Appears to display predefined sprites at given coordinates.
This lets multiple sprites be drawn in any order without interacting with OAM directly.
2014-05-03 17:33:00 -04:00
yenatch
467b73a065 Phone contacts and more misc pokegear. 2014-05-03 01:10:08 -04:00
yenatch
6fff25a9bd Fix padding in the compressed pokegear sprite graphics. 2014-05-02 03:37:27 -04:00
yenatch
ae6930fc66 Radio stations and the cell phone menu. 2014-05-02 03:32:51 -04:00
yenatch
7e4744fdaf Fix some lines that were indented with spaces instead of tabs.
It's mostly menudata. Whoops.
2014-05-01 22:21:29 -04:00
yenatch
af77c4eddd Misc incbins in bank 23. 2014-05-01 03:37:22 -04:00
yenatch
b7e3762187 A couple Buena's Password specials. 2014-05-01 02:23:51 -04:00
yenatch
2f218f5283 Some GB Printer strings. 2014-05-01 00:09:32 -04:00
yenatch
95af7dd873 Move RegionCheck into engine/landmarks.asm. 2014-04-30 23:44:44 -04:00
yenatch
c58a5b8b7a Use constants for the skipped dummy TMs. 2014-04-30 23:37:50 -04:00
yenatch
c7938cc7d3 Split the mobile adapter library into another object file. 2014-04-30 03:03:20 -04:00
yenatch
6bba0e7fd1 Add constants for unused items, including Town Map and Poke Flute. 2014-04-28 16:43:11 -04:00
yenatch
0e63b0433f String and OAM incbins in Town Map code. 2014-04-28 16:41:16 -04:00
yenatch
7d03634d68 Kanto mon Special stats for the Time Machine. 2014-04-28 15:14:48 -04:00
yenatch
1dc2a1776c More incbins in bank 22. 2014-04-19 23:15:59 -04:00
yenatch
0ad21e6c18 The unused name array is move descriptions.
Still not sure where the bank comes from.
2014-04-19 23:15:01 -04:00
yenatch
fe3bcd62ee Trainer card graphics and misc incbins in banks 21 and 22. 2014-04-19 03:08:26 -04:00
yenatch
74a0d46cce Tileset color test debug menu. 2014-04-18 02:31:37 -04:00
yenatch
63dcee0772 Script vars and the color test debug menu. 2014-04-18 02:21:02 -04:00
yenatch
762008952d Shrink pics, an extra egg pic and their labels. 2014-04-17 23:11:47 -04:00
yenatch
5d269b4275 Pick off more bank 12 incbins and labels. 2014-04-17 22:07:08 -04:00
yenatch
12412713fd Fix static banks for monster icons. 2014-04-17 22:06:02 -04:00
yenatch
992a9e506c Rough intro comments and palettes. 2014-04-14 03:37:50 -04:00
yenatch
b8cd97f943 Incbins and jumptables in bank 38 (slots, cards, PC). 2014-04-13 18:30:39 -04:00
yenatch
1fd39f7fb9 Item usage strings and misc labels. 2014-04-13 02:06:22 -04:00
yenatch
266087909b Assorted labels, incbins, text, graphics, etc. 2014-04-13 00:02:26 -04:00
yenatch
d9c5c2c55b Boxes, trading, assorted incbins. 2014-04-12 15:45:19 -04:00
yenatch
5097747404 Anonymous jumptables and sfx in bank 23. 2014-04-10 21:31:56 -04:00
yenatch
6045c560ad Magnet Train data. 2014-04-10 21:31:56 -04:00
yenatch
4b9563d026 Field effect data and sound effects. 2014-04-10 21:31:56 -04:00
yenatch
93cbbaf49d Unused title screen code, graphics, tilemaps, palettes.
At 43:4000 (UnusedTitleScreen) is a semi-functional title screen.
It's never used, and appears in the Japanese version at the same offset.

Notably, a portion of the logo is cut out and used as OAM.
The final title screen instead uses BG priority to avoid this.
2014-04-10 15:53:09 -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
49987a7527 A couple more EvosAttacks references. 2014-04-01 17:37:42 -04:00
yenatch
bdbf38b072 Text macros in main.asm.
So far so good.
2014-03-06 00:29:22 -05:00
yenatch
1fe2560a36 Growth rate data. 2014-03-05 06:11:52 -05:00
yenatch
c0e07f5e5d Items and dolls bought by Mom. 2014-03-05 04:32:35 -05:00
yenatch
6856667b36 Magnemite and Magneton handling in the Time Machine. 2014-03-05 02:45:33 -05:00
yenatch
d952b5c3eb Label more graphics in bank 3e. 2014-03-05 02:43:08 -05:00
yenatch
3453e7ce9c Label a stats screen jumptable. 2014-03-04 06:21:22 -05:00
yenatch
47bb5ff1ab Strings in bank 12.
This was a mistake.
2014-03-04 06:18:36 -05:00
yenatch
e4f142191b Some animation and sprite data in bank 11. 2014-03-04 05:32:18 -05:00
yenatch
3db5d61c7f Minor cleanup at the end of bank 10. 2014-03-04 05:19:59 -05:00
yenatch
2d5661d19d Pokedex code and strings. 2014-03-04 05:04:29 -05:00
yenatch
e149fa6715 Clock text and bank 8 code. 2014-03-04 02:09:58 -05:00
yenatch
7ab8f76117 Label map trigger functions in home.asm. 2014-03-03 22:53:43 -05:00
yenatch
60e19487a7 Wram labels for map triggers. 2014-03-03 22:46:04 -05:00
yenatch
c3bd5dfd41 Merge remote-tracking branch 'kanzure/master' into incbins 2014-03-03 22:32:12 -05:00
yenatch
62600d525d Egg hatching and more daycare text. 2014-03-03 21:53:36 -05:00
yenatch
d1a54e3265 Map triggers and label some addresses in bank 0. 2014-03-03 20:48:57 -05:00
tkatzenbaer
2e1a05b1c9 Bills PC Deposit and Withdraw jumptable & function 2014-03-03 10:19:04 -06:00
yenatch
ea2ec66d11 Unown words and Magikarp measurement graphics 2014-03-03 00:23:54 -05:00
yenatch
dc494c3f29 Red/Blue Pokemon constant order. 2014-03-02 23:38:33 -05:00
yenatch
c3efc17bf8 Mom (DST, money) and daycare text. 2014-03-02 23:26:30 -05:00
yenatch
d6597fab7b Money is capped at ¥999999.
Coins are capped at 9999.
2014-03-02 21:23:57 -05:00
yenatch
c4c278fbe3 PC/shop text and menu data. 2014-03-02 21:10:20 -05:00
yenatch
83537048fb Smoke out bank 4.
Highlights: contest trainers and mons
2014-03-01 10:31:13 -05:00
yenatch
7da86ec0e8 Split up pack graphics and point to them. 2014-02-28 22:12:29 -05:00
yenatch
8a37a2d914 A bunch of menu data in bank 4. 2014-02-28 19:06:46 -05:00
yenatch
a55c6ac26e Split up emote images and dump emote pointers. 2014-02-28 01:31:52 -05:00
yenatch
36351fcc17 A couple bank 5 incbins incl emote pointers 2014-02-27 14:37:34 -05:00
yenatch
7e3394bb53 Trainer init jumptable.
Bank E done.
2014-02-27 13:29:12 -05:00
yenatch
15122d6181 Trainer item AI. 2014-02-27 13:22:16 -05:00
yenatch
f3f37d0472 Trainer class attributes. 2014-02-27 10:37:27 -05:00
yenatch
dd51aa0b66 Unknown item lists and TM/HM text.
Bank B is all done.
2014-02-26 03:46:10 -05:00
yenatch
85fa79cfda Move deleter text. 2014-02-25 12:33:41 -05:00
yenatch
6ad2d79cc9 Battle hud party status graphics. 2014-02-25 12:28:50 -05:00
yenatch
2d2cb00ae2 Legacy move AI.
This is distinct from the "Smart" AI's giant move handling table in battle/ai/scoring.asm.
2014-02-25 12:13:29 -05:00
yenatch
9c00912f89 Doll text.
That's it for bank 9 incbins.
2014-02-25 11:11:26 -05:00
yenatch
47e11948ea Poster scripts. 2014-02-25 09:29:38 -05:00
yenatch
4756027ee0 Decoration attributes and menus. 2014-02-25 09:12:17 -05:00
yenatch
2df85caa28 Decoration menus and a couple broken function calls. 2014-02-24 22:54:51 -05:00
yenatch
f367db0180 Misc bank 9 and text command $14 data. 2014-02-24 21:52:34 -05:00
yenatch
7601ac4cfa Assorted strings, tilemaps and menudata in bank 9. 2014-02-24 20:01:22 -05:00
yenatch
41383145f1 Consumable items and trainer card badge oam data. 2014-02-24 06:18:03 -05:00
yenatch
71cc880636 Restore byte padding to trainer backpics. 2014-02-24 04:57:28 -05:00
yenatch
602b91944f Get rid of the last bank A incbin. 2014-02-24 04:56:32 -05:00
yenatch
54a6118e0d Unused item mappings and roaming maps. 2014-02-24 04:48:17 -05:00
yenatch
3e830ab884 Fix a party menu action comment. 2014-02-24 01:00:36 -05:00
yenatch
d89ca4aead Trade tilemaps and an unreferenced function. 2014-02-24 00:58:31 -05:00
yenatch
2b882b1ef9 Trade graphics in gfx/trade. 2014-02-23 22:25:11 -05:00
yenatch
094e67f0a0 More trade text functions. 2014-02-23 21:41:36 -05:00
yenatch
876e14ece8 Disassemble a jump table related to trading. 2014-02-23 21:21:09 -05:00
yenatch
bac031156b Misc trainer card graphics. 2014-02-23 20:58:38 -05:00
yenatch
85698ddbdb Trainer card gym leader and badge graphics. 2014-02-23 20:40:47 -05:00
yenatch
229da90963 Dummy player object and incbinned data. 2014-02-23 18:26:44 -05:00
yenatch
f0580df37c Remove an incbin for Data4273 2014-02-23 17:22:47 -05:00
yenatch
a01dad8e49 Partymon structs for opponent and player parties. 2014-02-23 00:37:09 -05:00
yenatch
0ea86cecba wContestMon in Bug Catching Contest rankings. 2014-02-22 23:52:20 -05:00
yenatch
d11a23c7d1 Address comments for footprints. 2014-02-22 06:50:20 -05:00
yenatch
e9626c7710 gfx/misc/town_map.lz is actually padded 2014-02-22 06:44:47 -05:00
yenatch
43c10efb29 footprints
how did we forget that?
2014-02-22 06:25:19 -05:00
yenatch
11f8168995 Some item menu headers. 2014-02-22 06:10:54 -05:00
yenatch
44a11e6588 More Bill's PC functions. 2014-02-22 03:50:46 -05:00
yenatch
c6dd950f32 Finish off Bill's PC menudata. 2014-02-22 03:36:08 -05:00
yenatch
874736db40 Some incbinned data related to Cut. 2014-02-22 03:25:24 -05:00
yenatch
654779d2c1 Bicycle scripts and text.
Also an egg string.
2014-02-17 19:07:57 -05:00
yenatch
eeac223253 Whirlpool and fishing scripts and text. 2014-02-17 18:51:00 -05:00
yenatch
d72c1c8ee0 More field move scripts and text. 2014-02-16 23:56:51 -05:00
yenatch
30218eb3d6 Use globals to implicitly define labels before passing them into BANK(). 2014-02-04 21:30:27 -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
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
U-Myles-PC\Myles
1d2da4de84 fixed bank 39 pointers, options menu commentary 2014-01-29 10:28:08 -05:00
yenatch
1ba5b0f4bc Map setup scripts and commands 2014-01-26 22:07:19 -05:00
yenatch
92aab1e185 even more battle labels 2014-01-05 07:28:55 -05:00
yenatch
4dbf0d44e0 comment and relabel more battle functions 2014-01-01 08:09:15 -05:00