Commit Graph

537 Commits

Author SHA1 Message Date
PikalaxALT
eb39f6a339 Move MON_* parentheses to the EQUS declaration 2015-11-07 13:05:58 -05:00
PikalaxALT
2cbb1acc6e Pokemon animations 2015-11-07 09:48:32 -05:00
PikalaxALT
d8aa438644 More battle command labels 2015-11-06 20:55:16 -05:00
PikalaxALT
ae2970d73b Sprite movement function labels 2015-11-06 16:42:38 -05:00
PikalaxALT
f0830f084f BATTLEACTION constants 2015-11-06 09:04:27 -05:00
PikalaxALT
1205fe5100 PLAYEREVENT_ 2015-11-05 15:08:00 -05:00
PikalaxALT
3cadc7b012 give/takeitem *, 1: the 1 is optional 2015-11-04 20:20:14 -05:00
PikalaxALT
95cb4636af Corrected some mislabeled 1bpps 2015-11-04 15:35:29 -05:00
PikalaxALT
cf5d726b7f Mon submenu, engine/menu.asm 2015-11-04 14:02:11 -05:00
PikalaxALT
739bb3c136 Replace party struct relative values with EQUS constants 2015-11-04 11:31:00 -05:00
PikalaxALT
faa2d8f26e Reorganize BTTrainerClassGenders 2015-11-04 07:26:27 -05:00
PikalaxALT
c5527a02ae dbw BANK, addr replaced with dba 2015-11-03 19:43:47 -05:00
PikalaxALT
10beeb3c06 Battle Tower 2015-11-03 15:22:04 -05:00
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
0f37a42ad4 Mart constants 2015-11-02 17:38:08 -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
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
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
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
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
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
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
PikalaxALT
b68913a782 More radio labels 2015-10-09 23:09:03 -04: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
d6a4dada40 added/renamed constants and labels 2015-09-01 06:26:31 +02:00
JimB16
bcc11712a5 added 'wBT_OTTempCopy'-label and the data structure that comes after 2015-08-31 14:31:13 +02:00
yenatch
860296f468 Comment and label the save file. 2015-08-19 21:14:15 -07:00
PikalaxALT
4831b4429e Add radio_constants.asm, update "map" macro 2015-08-17 11:51:09 -04:00
PikalaxALT
895e14cd05 Reworked person_event arguments 2015-07-29 18:22:23 -04: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
432df825d4 Replaced GROUP_, MAP_ references with the map macro
Updated macros that rely on the GROUP_, MAP_ constants to use the map macro

Added GROUP_NONE and MAP_NONE for the sake of compatibility with this new scheme

Added new macro elevfloor to simplify the definition of elevators under this new scheme
2015-07-23 12:59:19 -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
yenatch
ec10d9dd6f Add constants for common map object ids. 2015-07-21 23:49:18 -07:00
PikalaxALT
d1e11f77e5 Replaced MON_ constants with aliases 2015-07-20 20:21:46 -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
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
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
3a9f537f8a Enumerate various constants 2015-07-13 01:44:27 -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
86c13acf84 Add more event flags and fight counters for phone scripts. 2015-07-10 04:31:08 -06:00
IIMarckus
d1fbc077a7 Label fight counters for phone call rematches. 2015-07-10 03:37:34 -06:00
IIMarckus
e118dfe727 checkcode $11 is how much time is left in the Bug Catching Contest. 2015-07-10 03:04:41 -06:00
IIMarckus
a711b45404 checkcode $1a is Kenji's break schedule. 2015-07-10 03:03:08 -06:00
IIMarckus
718c2260e9 Use constants for overworld phone script flags. 2015-07-10 02:36:57 -06:00
IIMarckus
2c98c694e3 Fill out trainer event flags. 2015-07-10 02:20:21 -06:00
IIMarckus
ac88c43b14 Clean up gym leader scripts. 2015-07-10 01:00:27 -06:00
IIMarckus
6f3b2d6de8 Add constants for checkcodes.
From PikalaxALT.
2015-07-09 20:23:23 -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
d6f7dc3206 Fix the Nurse std comments. 2015-06-26 23:17:10 -07:00
IIMarckus
89073da581 Label flypoint callbacks. 2015-06-25 23:30:16 -06:00
IIMarckus
e57e1ba63b Improve some signpost labels. 2015-06-25 22:01:08 -06:00
IIMarckus
bd022e179e Clean up labels for gym statues. 2015-06-24 21:51:36 -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
17a47bf54b Forgot to add file containing std constants. 2015-06-23 14:42:00 -06:00
IIMarckus
4d532beee6 Remove trailing newlines. 2015-06-23 12:24:51 -06:00
yenatch
d4817060de Enumerate the item constants. 2015-05-18 02:20:42 -07:00
yenatch
58e5b396c1 Use more struct offsets and constants for monsters and moves. 2015-03-03 18:31:57 -08:00
yenatch
943ddf6db0 Get rid of the now-unused specials constants. 2015-02-11 15:07:19 -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
f036cdf13b Move around some more macros. 2015-01-20 14:26:16 -08:00
yenatch
43a961af42 More unknown mobile code and MIN_LEVEL. 2014-12-26 11:31:55 -08:00
yenatch
ca58bd215c Clean up wram sections so that all space is accounted for. 2014-09-30 11:17:52 -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
e2ec8a1d13 Recomment type names.
This is mostly just whitespace reduction.
2014-07-09 12:50:33 -07:00
yenatch
d6fbdfb8de More comments and constants in move effect command code.
Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:52 -07:00
yenatch
dbe4c7ab67 Fix some misnamed substatus constants.
SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE.
SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT.
Substatus 5 bit 4 was actually SUBSTATUS_ENCORED.

Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
yenatch
c2dba43188 Contest battle type and comment the battle menu. 2014-06-17 11:58:11 -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
0b7dfeb9b2 Name and comment some move learning functions. 2014-06-16 10:32:39 -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
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
2d1a1b9c17 Experience growth rate constants. 2014-06-04 01:41:43 -07:00
yenatch
20444d2f63 More MAX_LEVEL use. 2014-06-03 14:07:10 -07:00
yenatch
2cb3f8e1b9 Comment music functions in home.asm. 2014-05-21 16:21:46 -04:00
yenatch
467b73a065 Phone contacts and more misc pokegear. 2014-05-03 01:10:08 -04:00
yenatch
b7e3762187 A couple Buena's Password specials. 2014-05-01 02:23:51 -04:00
yenatch
6bba0e7fd1 Add constants for unused items, including Town Map and Poke Flute. 2014-04-28 16:43:11 -04:00
yenatch
1fd39f7fb9 Item usage strings and misc labels. 2014-04-13 02:06:22 -04:00
yenatch
d9c5c2c55b Boxes, trading, assorted incbins. 2014-04-12 15:45:19 -04:00
yenatch
7c02c2bb31 Move remaining constants into constants/{misc,pokemon_data}_constants.asm
Now constant groups can be included separately if needed.
2014-02-03 18:00:51 -05:00
yenatch
883a8b7a90 enumerate type constants 2014-01-05 08:24:19 -05:00
yenatch
ea01721284 move type constants into constants/type_constants.asm 2014-01-05 08:13:43 -05:00
yenatch
0a5f14dc9c bring back move constant values 2014-01-05 07:29:24 -05:00
yenatch
e2b00ea117 shorten SP_ATTACK and SP_DEFENSE move effect constants 2013-12-30 23:12:06 -05:00
yenatch
7b20626c7b more object struct constants 2013-12-23 04:39:26 -05:00
yenatch
48db6daef9 overworld object struct constants 2013-12-22 21:28:41 -05:00
yenatch
4d1091f8d9 poke seer special 2013-12-22 17:17:33 -05:00
yenatch
4bb8c82d8a battle animation constants 2013-12-19 04:47:39 -05:00
yenatch
0a53612f69 NO_TEXT_SCROLL flag in Options 2013-12-18 18:04:55 -05:00
yenatch
46d96bc7fd more battle anim labels 2013-12-09 16:20:19 -05:00
yenatch
e538027c82 enumerate move constants 2013-12-01 15:56:51 -05:00
yenatch
5c76249488 flypoints and spawn points 2013-11-28 04:35:14 -05:00
yenatch
fd73d41e6b redone landmarks, now with constants 2013-11-28 03:54:21 -05:00
yenatch
7b02d57a8c split wram constants out of constants.asm 2013-11-27 14:45:44 -05:00
yenatch
14dce4418a enumerate pokemon constants 2013-11-27 14:45:44 -05:00
yenatch
76d8ed2264 split sfx constants out of music constants 2013-11-07 01:10:43 -05:00
yenatch
6a641b438a get rid of unused sound constants 2013-11-07 01:06:37 -05: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
5342f8d630 NUM_POKEMON constant
before we were just using CELEBI, but there's no way that's gonna pan out
2013-08-30 22:07:56 -04:00
yenatch
7cba224d4a engine flag constants 2013-08-27 14:12:05 -04:00
yenatch
744d1d8599 first event flag constants 2013-08-23 21:19:58 -04:00
yenatch
b275df6974 correct misnamed sfx constants 2013-07-31 18:04:01 -04:00
yenatch
4071137870 more sprite constants 2013-07-14 13:49:37 -04:00
yenatch
5f6d69fdd3 extra sprite constant 2013-07-12 17:03:03 -04:00
yenatch
1da2a7a5c4 Outdoor sprites and sprite constants 2013-07-12 14:50:37 -04:00
yenatch
41dbd3b4a6 move constants files into constants/ 2013-06-17 21:30:25 -04:00