Commit Graph

128 Commits

Author SHA1 Message Date
PikalaxALT
72af3337fd No more NONE 2015-11-02 14:37:02 -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
JimB16
9a9cb38e39 merge with newest update 2015-10-26 03:26:53 +01:00
PikalaxALT
79ceca591b ITEMMENU_CLOSE is now ITEMMENU_FIELD 2015-10-25 20:43:39 -04:00
PikalaxALT
247a31c298 RIP ITEMCONTEXT constants 2015-10-25 18:47:27 -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
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
da7849d800 Restructured functions in main.asm to resemble the home functions they clone 2015-10-17 13:00:34 -04:00
PikalaxALT
0c39f6e273 Happiness and Mystery Gift constants 2015-10-12 12:33:24 -04:00
JimB16
3ef626d378 added comments to the PPUP-function 2015-10-11 18:39:00 +02:00
JimB16
4b722eb530 changed name of some labels 2015-10-10 13:45:39 +02: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
JimB16
a7cb2a5e9b changed more labels 2015-09-10 01:27:07 +02:00
JimB16
0d4c2776d9 changed varlabels for multiply- and divide-func, renamed battletext-labels 2015-09-06 23:38:01 +02:00
JimB16
172a1488de renamed labels and added comments 2015-08-30 13:17:14 +02:00
yenatch
a129ba7b43 Nail down the rest of SRAM banks 0 and 1. 2015-08-20 23:03:05 -07: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
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
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
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
0fcef5fc08 More annotations and interpretations of functions and scripts 2015-07-17 17:17:10 -04: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
IIMarckus
4d532beee6 Remove trailing newlines. 2015-06-23 12:24:51 -06: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
7c862ca7e2 Blind wram part 5.
starting to go smoothly
2015-02-10 15:43:27 -08:00
yenatch
346844a613 Replace pointless $FF00+$xx with $ffxx. 2014-12-28 18:44:23 -08:00
IIMarckus
4aa3d3e31a Fix bad merge. 2014-10-24 00:43:50 -06:00
IIMarckus
b4df25a1e1 More comments and labels for ball catch rates. 2014-10-24 00:18:48 -06: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
3fb29975ca Relabel GetItemDescription -> PrintItemDescription. 2014-07-24 19:27:21 -07:00
yenatch
849044ce8a Remove generated "jump sources" comments. 2014-07-19 14:11:48 -07:00
yenatch
32a5f21cc7 More PartyMon labels for relative addressing. 2014-06-23 12:45:30 -07: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
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
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
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
fd8804472d Use {hl,de,bc}coord macros wherever possible. 2014-06-04 01:10:56 -07:00
yenatch
20444d2f63 More MAX_LEVEL use. 2014-06-03 14:07:10 -07:00
yenatch
da88588636 Use BCD for Teru-sama prices. 2014-04-28 16:43:50 -04:00
yenatch
6bba0e7fd1 Add constants for unused items, including Town Map and Poke Flute. 2014-04-28 16:43:11 -04:00
yenatch
13d13263af Text macros in move and item descriptions. 2014-03-06 00:58:15 -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
a18cab495d rename Function0x{} labels to Function{} for consistency 2013-12-31 04:10:49 -05:00
yenatch
f2025afdb6 label and move related asm into items/item_effects.asm
oops
2013-12-25 01:42:41 -05:00
yenatch
79917a7557 moon ball uses red's moon stone id 2013-12-24 21:09:41 -05:00
yenatch
fa1e93a870 evolution prerequisites and no more incbins in item effects 2013-12-24 20:49:14 -05:00
yenatch
2172461a60 fleemons are global 2013-12-24 17:19:50 -05:00
yenatch
0cd1d2071f item effect incbins 2013-12-24 17:11:52 -05:00
yenatch
be0c7962b0 YesNoBox 2013-12-04 03:07:58 -05:00
yenatch
9aaa5f24bb shorten redundant text_jump macros 2013-12-01 17:54:09 -05: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
eb5a7afe2b * more callab/callba macros 2013-10-02 02:47:54 +02:00
Mr Wint
fa673df4fa * applied callab/callba macros where possible
* corrected some mislabeled jump addresses
2013-10-02 01:59:16 +02:00
yenatch
d2eeab62ea split out marts 2013-09-03 17:35:17 -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
0ee006a145 more item effects 2013-08-03 16:25:38 -04:00
yenatch
50f1d7b788 no more incbins in bank 0 2013-07-29 23:58:02 -04:00
yenatch
dca6fd37cd start using relevant constants in wram.asm 2013-07-10 19:17:03 -04:00
yenatch
eb75c58023 heavy ball 2013-05-27 23:28:21 -04:00
IIMarckus
e7208f1964 Add some naming screen stuff. 2013-05-12 18:36:40 -06:00
yenatch
769005d270 remove a couple item effect incbins 2013-05-08 03:33:28 -04:00
yenatch
d0ef05a6fd dump item effects 2013-05-08 02:02:15 -04:00
yenatch
45343b07c7 dump item attributes 2013-04-30 02:04:36 -04:00
yenatch
a2de02b504 Split item names and descriptions from main.asm 2013-02-17 02:42:29 -05:00