Commit Graph

364 Commits

Author SHA1 Message Date
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 e0d6e9ca7a Fix NorthMapObjectIndexBuffer etc 2015-11-02 12:54:27 -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 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 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
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 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
PikalaxALT b68913a782 More radio labels 2015-10-09 23:09:03 -04: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 c76a3c6ecd changed more labels 2015-09-04 22:30:40 +02: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
JimB16 5faf138dc9 changed some labels and added comments 2015-08-28 22:18:41 +02:00
JimB16 4cd354ec32 fixed the BT_OTrainer Labels 2015-08-26 03:11:19 +02:00
JimB16 2f4a0179fe changed constants to SRAMLabels 2015-08-26 01:40:34 +02:00
JimB16 b9c1d1b61e named labels and commented WRAMVars in battle_tower.asm 2015-08-25 17:02:13 +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
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
PikalaxALT 5631bdc0d7 Added labels to different parts of the map script and event headers 2015-07-21 00:02:21 -04:00
PikalaxALT 06673cbee7 Named more specials, fixed a missing EOL 2015-07-20 18:59:26 -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 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
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 249bad9551 Replace EVENT_ALWAYS_THERE with -1 2015-07-13 00:18:01 -04:00
IIMarckus 63cc4daae2 prefix wram varables with w. 2015-07-10 14:04:00 -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 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 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 8bc89189cc Use NUM_MOVES more liberally in wram. 2015-02-11 14:17:45 -08:00
yenatch b22a334793 Section "Video" in wram.asm doesn't need to be locked to an address. 2015-02-10 18:25:48 -08:00
yenatch b097617f9f Blind wram in maps. 2015-02-10 15:43:34 -08:00
yenatch c07ed74a5d Blind wram labels part 4. 2015-02-10 15:14:41 -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 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 ca58bd215c Clean up wram sections so that all space is accounted for. 2014-09-30 11:17:52 -07:00
yenatch dea79bb86e Add real-time-clock and Daylight Savings Time wram labels. 2014-07-24 10:45:54 -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 2955e28a42 Add address labels used by Decompress. 2014-07-18 10:31:50 -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 541a9c7347 Name the UpdateEnemyHUD predef.
Also start using hp palette constants.
2014-06-16 22:53:56 -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 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 560b892b2d Reformat the channel_struct macro and use more constants in wram. 2014-06-12 19:32:58 -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 2cb3f8e1b9 Comment music functions in home.asm. 2014-05-21 16:21:46 -04:00
yenatch 2ead808353 More labels and incbins in slots, PC menus, intro. 2014-05-05 03:04:14 -04:00
yenatch d9c5c2c55b Boxes, trading, assorted incbins. 2014-04-12 15:45:19 -04:00
yenatch 6fddb8ba85 Use struct macros for audio channels in wram. 2014-03-04 21:41:30 -05:00
yenatch 60e19487a7 Wram labels for map triggers. 2014-03-03 22:46:04 -05:00
yenatch f39a3c4001 Introducing StringBuffer5 2014-02-24 21:35:29 -05:00
yenatch a01dad8e49 Partymon structs for opponent and player parties. 2014-02-23 00:37:09 -05:00
yenatch f3d614a235 Use a partymon struct macro in wram.asm. 2014-02-22 21:57:28 -05:00
yenatch cf2acc1001 Use :: to export labels between objects.
This fixes the build.
2014-02-01 20:26:39 -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 48db6daef9 overworld object struct constants 2013-12-22 21:28:41 -05:00
yenatch 48be8d206c some bg effect labels 2013-12-17 23:33:15 -05:00
yenatch 418878d932 more map attribute getters and some cleanup in home/map.asm 2013-12-11 21:42:56 -05:00
yenatch 46d96bc7fd more battle anim labels 2013-12-09 16:20:19 -05:00
yenatch 9eb2cf3d21 more battle animation labels 2013-12-08 16:22:35 -05:00
yenatch b18beef4d5 more landmark constants and rename FlypointPerms -> VisitedSpawns 2013-11-29 00:38:22 -05:00
yenatch 7d2b45cc3d wram: object structs
these are separate from MapObjects but not enough attributes are defined yet to know how
2013-11-28 00:53:09 -05:00
yenatch f6706ecb09 finally compile multiple objects
pokecrystal.asm doesnt really make sense now so its gone

add includes.asm so objects have a standard include set
2013-11-20 06:35:10 -05: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
yenatch 4aae680b69 move wram constants into constants.asm; make all labels use :s
any global constants will have to be separate from any one object

there might be a better way to fix this, like pulling constants in preprocessor.py
2013-09-11 19:28:18 -04:00
yenatch d07cd79443 consecutive protect/endure count in battle 2013-09-09 21:23:42 -04:00
yenatch 771ebcbf23 PokedexSeen and PokedexCaught were swapped 2013-09-09 02:40:27 -04:00
yenatch 03a6cfc2d3 OTName wram label 2013-09-07 22:47:58 -04:00
yenatch a6ad4ad37e Predef wram labels
these are obviously general-purpose temps, but how do you name that?
2013-09-04 04:04:11 -04:00
yenatch 5b38b377f2 wram labels for graphics requests 2013-09-01 15:24:07 -04:00
yenatch cc2906b68f consistent casing for Tileset labels
wram labels were using TileSet for some reason
2013-09-01 00:09:57 -04:00
yenatch 674229228f Coins wram label 2013-08-30 17:48:59 -04:00
yenatch 3aabca9baa remove a section def in the middle of the player struct 2013-08-30 14:20:01 -04:00
yenatch 320142fdda PCItems in wram 2013-08-30 00:07:51 -04:00
yenatch eff81fb080 fix Stack's address ($c100 -> $c0ff)
using negative ds
2013-08-29 02:10:32 -04:00
yenatch 64bb7d2253 add LYOverrides in wram bank 5 2013-08-27 20:56:24 -04:00
yenatch 517da9357b PlayerPalette and PlayerAction wram labels 2013-08-27 13:49:32 -04:00
yenatch 744d1d8599 first event flag constants 2013-08-23 21:19:58 -04:00
yenatch bc7b63b44a EventFlags label (bittable1) 2013-08-23 15:00:07 -04:00
yenatch 35a16b4860 Party/BoxMon nickname enders 2013-08-22 15:40:00 -04:00
yenatch 231adfe99c boxmon labels in sram 2013-08-22 14:01:46 -04:00
yenatch 802c3149c0 Merge commit 'd2d5c09'
Conflicts:
	main.asm
	wram.asm

Git couldn't figure out what this commit did, so it was redone to merge.
2013-08-21 13:54:35 -04:00
yenatch d2d5c09b1d update section names to comply with rgbds redefinitions
HOME -> ROM0
DATA, CODE -> ROMX
BSS -> WRAM0, WRAMX

new to rgbds are banked VRAM and SRAM
2013-08-04 05:04:13 -04:00
yenatch c01c2ad3c4 dump marts and related asm 2013-08-03 17:26:58 -04:00
yenatch 59cb57b954 more cleanup 2013-07-31 19:17:35 -04:00
yenatch caaab30e66 reorder a couple wram labels
latest label is used in wram label replace
2013-07-29 23:59:05 -04:00
yenatch 45f52b0f71 Remove erroneous TileX/Y labels 2013-07-25 21:20:19 -04:00
yenatch 65bd235e61 even more bank 1 asm 2013-07-22 03:08:03 -04:00
yenatch b3c5ca0d6e mom/rival/red/green names 2013-07-21 05:53:04 -04:00
yenatch f2888a2d75 more overworld wram labels 2013-07-20 01:25:20 -04:00
yenatch 1da2a7a5c4 Outdoor sprites and sprite constants 2013-07-12 14:50:37 -04:00
yenatch 0988d69d9d more scripting cleanup 2013-07-10 19:17:04 -04:00
yenatch 82ebad99de MapObjects and ScriptRunning 2013-07-10 19:17:04 -04:00
yenatch 24daef7afb SelectMenu 2013-07-10 19:17:03 -04:00
yenatch dca6fd37cd start using relevant constants in wram.asm 2013-07-10 19:17:03 -04:00
yenatch fbf9ae7877 clean up StartMenu 2013-07-10 19:17:02 -04:00
yenatch b9dfd607bb DoPlayerMovement and recomment ow surfing checks 2013-06-27 00:34:49 -04:00
yenatch 869de91bd5 LostBattle and HalveMoney 2013-06-17 18:19:45 -04:00
yenatch 8ae709be9f comment statdown move command 2013-06-13 16:10:39 -04:00
yenatch 3bb2a65eac wram: room decorations 2013-05-29 18:56:09 -04:00
IIMarckus 56d0175ad8 Add Prof. Oak's PC. 2013-05-21 17:03:31 -06:00
yenatch 0f3e9c6f7e mixed up connection y/x offset wram labels 2013-05-13 22:09:01 -04:00
yenatch db84ec18d9 connection wram labels for each direction 2013-05-13 18:47:31 -04:00
yenatch afa35111a4 Map connection wram labels 2013-05-13 15:37:14 -04:00
IIMarckus e7208f1964 Add some naming screen stuff. 2013-05-12 18:36:40 -06:00
Sanky d590a169c4 disasm some menu stuff 2013-05-08 01:43:29 +02:00
yenatch bf73fd43db residual status constants 2013-05-06 11:41:12 -04:00
yenatch 6b12741537 additional trainer class id in wram
this one seems more persistent than OtherTrainerID
2013-05-04 02:14:17 -04:00
yenatch 8b1afa2265 Fix a wram mislabel (EnemyDisabledMove) 2013-05-03 21:04:34 -04:00
yenatch c539a96f78 fruit trees 2013-05-03 19:34:19 -04:00
yenatch 9b68493758 arena trap substatus 2013-05-03 02:42:25 -04:00
yenatch 2b00d49065 move effect cleanup 2013-05-03 01:29:57 -04:00
yenatch 3f07cd95f7 GetItemAttr and related fns 2013-04-30 02:04:32 -04:00
yenatch 94cdb091c9 i have a clue what most of this does 2013-04-29 16:32:05 -04:00
yenatch 620d5c09c7 More labels in LoadEnemyMon 2013-04-29 15:49:58 -04:00
yenatch f2185cd0e4 BaseStats is now BaseData 2013-04-29 15:11:48 -04:00
yenatch 652d26bb05 base stat labels + GetCurNick 2013-04-29 14:46:32 -04:00
yenatch 6f6988e3d1 more effect constants 2013-04-27 17:35:14 -04:00
yenatch 984b47f3e7 Enemy screens 2013-04-20 02:57:11 -04:00
yenatch f125f14e98 various battle wram + fixes 2013-04-20 02:38:52 -04:00
yenatch be3687bb55 party flags for evolution checking 2013-04-19 03:49:37 -04:00
yenatch 474606ace7 TempMon struct 2013-04-12 17:21:22 -04:00
yenatch 5f4fcbfba2 minor wram fixes 2013-04-08 02:19:28 -04:00
yenatch 45164c70b2 BreedMon typo in wram 2013-04-07 00:26:32 -04:00
yenatch 1b96c1543a All local addresses in bank d have labels 2013-03-27 18:50:10 -04:00
yenatch d2f6b6febe Identify more move effect commands 2013-03-27 03:33:24 -04:00
yenatch 3e6c37fe52 Move effect commands dump 2013-03-26 20:39:56 -04:00
yenatch edfffec831 Various battle-related bank0 asm and wram/constants 2013-03-26 05:22:22 -04:00
yenatch f0346a9982 various minor additions
-battle variable constants
-step counters
-turn update fns
2013-03-22 04:15:35 -04:00
Bryan Bishop ef4b04f12c comments for GetScriptByte 2013-02-28 15:45:34 -06:00
yenatch 823b7e3b9d Credits script and parser
This is the first time two wram addresses overlap.
2013-02-26 00:47:46 -05:00
yenatch 8bbfa54059 PlayCryHeader and related wram 2013-02-23 16:57:25 -05:00
yenatch fd51a5a3b1 Split magikarp length calcs out 2013-02-18 20:14:25 -05:00
yenatch c811b20b65 Move BitTable2 to a file
Currently, rgbasm's maximum macro parameter length is sixteen chars.
A couple wram labels were changed to accomodate this for now.
2013-02-05 03:16:46 -05:00
yenatch 710b7ddd7f Fix box name addresses 2013-02-05 01:20:51 -05:00
yenatch b8f4fd6390 Add vram sections to wram, and minor fixes 2013-02-04 04:27:56 -05:00
Bryan Bishop 21429332ef Merge pull request #103 from yenatch/master
Fly / town map.
2013-02-03 21:46:09 -08:00
yenatch 54d4818d4f Fly / town map 2013-02-04 00:39:30 -05:00
Sanky 7df002c3e2 Merge https://github.com/kanzure/pokecrystal
Conflicts:
	constants.asm
	extras/crystal.py
	main.asm
2013-02-02 23:20:50 +01:00
yenatch 4ef85af828 fix OverworldMap definition 2013-01-25 03:25:48 -05:00
Sanky 7b3e7a8de0 disasm PrintPartyMenuText 2013-01-14 09:40:27 +01:00
yenatch ad46a9359b make some labels saner 2013-01-11 15:08:28 -05:00
yenatch 7d55a39096 comment LoadEnemyMon and related fns; add RNG fns 2013-01-11 02:18:34 -05:00
yenatch 91726b3a53 clean up wram (excess partymon structs) 2013-01-01 17:08:26 -05:00
yenatch 9a64bb1581 remove last incbin in bank 3a 2013-01-01 14:20:15 -05:00
padz eb4db4618f clean up bank 0; time-sensitive fns; add Predef fn
comment redone joypad functions + automated input
comment some uncommented functions
comment known hram addresses
try to clean up CalcMagikarpLength
label known addresses
add time-sensitive functions (rtc, palettes)
add Predef and PredefPointers
2012-12-23 03:21:19 -05:00
padz 8092f62cf4 expand on battle ram 2012-12-14 03:00:10 -05:00
padz c82557c934 more wram.asm typos 2012-11-24 02:00:26 -05:00
padz 147eb967e5 fix a typo in wram.asm 2012-11-23 23:03:01 -05:00
padz e4cfbdc886 flesh out wram, fix unallocated labels 2012-11-23 21:19:02 -05:00
padz 22ac1dfaf0 disasm bank3a, map audio ram, implement musscripts 2012-11-03 00:45:14 -04:00
padz 95ac2a8da6 prep for next commit 2012-11-02 18:43:05 -04:00
padz 2369bd7ed2 add missing instruction 2012-10-11 23:12:42 -04:00
padz 5635c2027a start sfx disasm 2012-10-11 20:35:22 -04:00
padz 3383c45c27 fixed problems with wram.asm, compiles now 2012-10-09 04:43:45 -04:00
padz 5ba5a025c4 add breeding section to wram 2012-10-09 02:40:36 -04:00
padz a7631774b4 start work on audio engine 2012-10-09 02:32:05 -04:00
padz 399a5ab171 emergency fix 2012-09-26 15:43:48 -04:00
padz ea897c2a37 fix last commit 2012-09-23 12:50:44 -04:00
padz 354685efd7 treemon and assorted minor changes 2012-09-22 19:27:57 -04:00
padz e8b7789127 comment last commit 2012-09-16 21:20:04 -04:00