Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,095 Commits 2 Branches 0 Tags 183 MiB
Commit Graph

304 Commits

Author SHA1 Message Date
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 46e66077a5 BattleCommand labels copied from macros 2015-11-06 14:45:10 -05:00
PikalaxALT f0830f084f BATTLEACTION constants 2015-11-06 09:04:27 -05:00
PikalaxALT 5eed48f05d Some battle labels 2015-11-05 19:13:09 -05:00
PikalaxALT adf2fe712d Various labels 2015-11-05 14:06:03 -05:00
PikalaxALT 7fd20e6322 home/copy.asm completely labeled 2015-11-04 16:14:27 -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 91ea4a2f9b Battle Tower trainer text 2015-11-03 22:35:36 -05:00
PikalaxALT c5527a02ae dbw BANK, addr replaced with dba 2015-11-03 19:43:47 -05:00
PikalaxALT b1dc88b728 Experience and level calculations 2015-11-03 12:36:33 -05:00
PikalaxALT 40eae001a1 Status strings 2015-11-03 09:45:25 -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 3b4805ee98 Sweepthrough of ClearBox arg conversion to lb 2015-11-01 09:38:48 -05: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 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 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 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
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 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 706f289c70 change more labelss 2015-08-25 01:56:30 +02:00
JimB16 3922ad2c3c changed labels and added comments 2015-08-23 15:09:56 +02:00
yenatch a0aadb33e7 More sScratch. 2015-08-20 23:00:59 -07:00
yenatch 9e3bd6cb9b Label scratch space and a bunch of box lists. 2015-08-19 21:51:04 -07:00
yenatch 183845bd73 Add labels for link battle scores. 2015-08-19 21:21:38 -07: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 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 d5ddd9e54e Move radio code to its own file 2015-07-21 01:52:46 -04: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 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 39524cdb76 More enumeration of constants, more annotations of scripts. 2015-07-15 15:48:44 -04:00
yenatch c00949dddf Labels for the heal machine; spriteface constants. 2015-06-26 23:24:55 -07:00
IIMarckus 4d532beee6 Remove trailing newlines. 2015-06-23 12:24:51 -06:00
IIMarckus 2bf3a322ba Labels for "sent some to mom" text. 2015-06-11 10:57:45 -06:00
Scott Norton 739bac75b7 Updated text pointer in line 5746. 2015-06-07 21:14:20 -04:00
yenatch ee98f7b489 Enumerate the move effect command macros. 2015-04-13 21:41:32 -07: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 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 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 c611a45486 Inconsequential bank ref in battle graphics code. 2015-02-02 16:39:42 -08:00
yenatch 3fe3cd1a46 hVBlank 2015-01-19 21:31:29 -08:00
yenatch 346844a613 Replace pointless $FF00+$xx with $ffxx. 2014-12-28 18:44:23 -08:00
yenatch e325210a61 Merge remote-tracking branch 'kanzure/master' 2014-12-11 23:25:30 -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
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 dd8653fe6f More AI commentary/labels 2014-10-22 23:08:51 +02:00
xCrystal bb9818e3c3 More AI commentary/labels 2014-10-22 17:36:42 +02:00
xCrystal bf60a6b690 evasionup, accdown, whirlwind, haze 2014-10-22 14:47:33 +02:00
xCrystal 7cbec0d52a More AI commentary/labels 2014-10-22 00:28:51 +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
xCrystal 28097be25c Add commentary to some AI layers 2014-10-21 14:17:55 +02:00
xCrystal df2d027501 Start commenting some AI layers 2014-10-21 13:54:04 +02:00
yenatch 78d16c1efa Better labels for item/switch AI. 2014-09-30 11:20:38 -07:00
yenatch da799c80d4 Better trainer AI comments and finish off trainer attributes. 2014-08-13 19:44:56 -07:00
yenatch 849044ce8a Remove generated "jump sources" comments. 2014-07-19 14:11:48 -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 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 32a5f21cc7 More PartyMon labels for relative addressing. 2014-06-23 12:45:30 -07:00
yenatch bc3a21193d Residual damage, battle text labels, pic predefs. 2014-06-18 00:55:44 -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 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 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 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 67b3a7fc57 Battle animation object sprite data. 2014-05-05 16:52:40 -04:00
yenatch 32d1a77341 Battle animation object attributes and data. 2014-05-05 16:36:29 -04:00
yenatch 50062957f9 Add an unused function in battle animation commands. 2014-05-05 16:27:48 -04:00
yenatch 2a2b5d7f23 Battle BG effect data. 
Pokemon appearing from a ball, screen fades, etc.
 2014-05-05 15:17:13 -04:00
yenatch c8055c17f2 Fix static farcalls in AI scoring. 2014-05-05 03:30:51 -04:00
yenatch 1fcc69e495 Fix up some labels in the battle animation object engine. 2014-05-05 03:30:21 -04:00
yenatch 850ade2f41 Image extensions in battle animation graphics. 2014-04-02 00:47:22 -04:00
yenatch 13d13263af Text macros in move and item descriptions. 2014-03-06 00:58:15 -05:00
yenatch 1fe2560a36 Growth rate data. 2014-03-05 06:11:52 -05:00
yenatch d952b5c3eb Label more graphics in bank 3e. 2014-03-05 02:43:08 -05:00
yenatch 1045c6a16f OTPartyMon1HP instead of PartyMon1HP - PartyMon1 + OtPartyMon1 2014-02-23 01:10:58 -05:00
yenatch a01dad8e49 Partymon structs for opponent and player parties. 2014-02-23 00:37:09 -05:00
yenatch cf2acc1001 Use :: to export labels between objects. 
This fixes the build.
 2014-02-01 20:26:39 -05:00
yenatch 08a0462c1e use constants for berserk gene, kings rock, scope lens effects 2014-01-20 00:07:51 -05:00
yenatch 04f5c51753 explicitly define type categories 2014-01-05 09:17:31 -05:00
yenatch 4e9102f249 recomment hidden power calculation 2014-01-05 08:13:43 -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
yenatch a18cab495d rename Function0x{} labels to Function{} for consistency 2013-12-31 04:10:49 -05:00
yenatch 1ab4b59d86 clean up some labels in battle asm 2013-12-31 04:09:00 -05:00
yenatch d1d186d1ee rename CallBankF -> CallBattleCore 2013-12-31 03:25:38 -05:00
yenatch a10ee4e9f1 comment move priority functions 2013-12-30 23:32:37 -05:00
yenatch bfaad924e7 label more pointers to Moves 2013-12-30 23:22:27 -05:00
yenatch 82214440e1 move the Moves label into battle/moves/moves.asm 2013-12-30 23:17:11 -05:00
yenatch f91be01df8 use a macro to define move structs for percentage values 2013-12-30 23:13:25 -05:00
yenatch e2b00ea117 shorten SP_ATTACK and SP_DEFENSE move effect constants 2013-12-30 23:12:06 -05:00
yenatch 2172461a60 fleemons are global 2013-12-24 17:19:50 -05:00
yenatch 5f0e279bfa Merge remote-tracking branch 'kanzure/master' into more-objects 
Conflicts:
	main.asm
 2013-12-23 05:21:12 -05:00
yenatch cad6f30f83 null pointers back in object gfx 2013-12-20 01:06:17 -05:00
yenatch 046d85f37a finish off object gfx pointers and dont use BANK() for null pointers 
fixes 2f5b9b96

definitely did this in the original commit...
 2013-12-20 00:59:00 -05:00
yenatch 0500947dd0 dump the battle animations 2013-12-19 04:49:40 -05:00
yenatch 4bb8c82d8a battle animation constants 2013-12-19 04:47:39 -05:00
yenatch 5613563d1d split out battle anim object gfx 2013-12-18 03:20:12 -05:00
yenatch 2f5b9b968a anim object graphics pointers 2013-12-18 03:18:16 -05:00
yenatch 6d7e674bd0 move some labels into included files 2013-12-18 01:14:48 -05:00
yenatch 7ccb6d91e6 split out the battle engine into battle/core.asm 2013-12-18 01:11:06 -05:00
yenatch fa2e0108b9 split out battle animation asm (bg effects, objects, commands) 2013-12-17 23:54:25 -05:00
yenatch 46d96bc7fd more battle anim labels 2013-12-09 16:20:19 -05:00
yenatch 099e17bbaf comment some battle animation asm 2013-12-04 02:33:46 -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 d7cdd0ac73 split out some more move effects 2013-12-01 14:19:57 -05:00
yenatch 193dbd53a6 Merge commit '0ead58cd' into merge-mrwint 
Conflicts:
	main.asm
 2013-10-25 17:57:27 -04:00
yenatch 0ead58cdaa fix labels for and rename GetBattleVarPair to GetBattleVar 2013-10-11 03:04:21 -04:00