Commit Graph

326 Commits

Author SHA1 Message Date
PikalaxALT ead04b3b75 Backup prior to global introduction of PERSONTYPE constants 2015-11-15 14:59:38 -05:00
PikalaxALT b921226aea More map object, swap StandingTile and NextTile 2015-11-14 23:02:38 -05:00
PikalaxALT ed44de4bb4 More map object work 2015-11-14 14:41:47 -05:00
PikalaxALT cc8c36ee14 Creation of constants for OBJECT_09 indices 2015-11-13 18:59:49 -05:00
PikalaxALT e0b4fc781a sprite engine; tileset constants 2015-11-13 00:49:27 -05:00
PikalaxALT 40802da3cf Map header labels, tileset constants 2015-11-12 11:10:19 -05:00
PikalaxALT 2ffcb4b490 More splits; map setup labels 2015-11-11 23:38:57 -05:00
PikalaxALT 91068077f0 Further split bank 4 2015-11-11 16:15:06 -05:00
PikalaxALT b522b0f165 engine/mart.asm 2015-11-11 14:12:46 -05:00
PikalaxALT 4b35fa0582 Added w3 and w5 labels for misc/mobile_40.asm 2015-11-10 23:23:28 -05:00
PikalaxALT d13fb46d40 enum macros/move_anim.asm, resolve battle/anims.asm function labels 2015-11-10 16:53:37 -05:00
PikalaxALT ba05bfeafe Move some gfx files around, also clock reset fn 2015-11-10 11:05:26 -05:00
PikalaxALT f1b2466cc3 Cleaning up static HRAM labels; movement stuff, route 38 trainers 2015-11-09 23:01:45 -05:00
PikalaxALT 93ab6985d2 Some work on battle animations 2015-11-09 16:41:09 -05:00
PikalaxALT 6a570ebb8e more battle core labels 2015-11-07 21:04:54 -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 1205fe5100 PLAYEREVENT_ 2015-11-05 15:08:00 -05:00
PikalaxALT adf2fe712d Various labels 2015-11-05 14:06:03 -05:00
PikalaxALT 3cadc7b012 give/takeitem *, 1: the 1 is optional 2015-11-04 20:20:14 -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 91ea4a2f9b Battle Tower trainer text 2015-11-03 22:35:36 -05:00
PikalaxALT 72af3337fd No more NONE 2015-11-02 14:37:02 -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 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 88bc86b0bb Replace Functionfb8 with FillBoxWithByte 2015-10-13 12:46:40 -04:00
PikalaxALT 327faac497 Magikarp functions moved to event/magikarp.asm 2015-10-11 12:26:39 -04:00
PikalaxALT b68913a782 More radio labels 2015-10-09 23:09:03 -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 a7cb2a5e9b changed more labels 2015-09-10 01:27:07 +02:00
yenatch a129ba7b43 Nail down the rest of SRAM banks 0 and 1. 2015-08-20 23:03:05 -07:00
yenatch 9e3bd6cb9b Label scratch space and a bunch of box lists. 2015-08-19 21:51:04 -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 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 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 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
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 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
IIMarckus 4d532beee6 Remove trailing newlines. 2015-06-23 12:24:51 -06:00
yenatch c07ed74a5d Blind wram labels part 4. 2015-02-10 15:14:41 -08:00
yenatch 3fe3cd1a46 hVBlank 2015-01-19 21:31:29 -08:00
yenatch 133e2fb7a7 Use "- $ff00" instead of "& $ff" when dealing with hram. 2014-12-29 08:49:08 -08:00
yenatch 37c65c59ca Some wram labels in map connection code. 2014-12-26 20:37:18 -08:00
yenatch f7e25beee6 Fix a static bank in map header code. 2014-12-26 15:31:48 -08:00
yenatch a5862306b7 Split mobile/timer code out of home.asm. 2014-08-22 10:57:06 -07:00
yenatch 5337d0159e Recomment the text engine. 2014-08-14 23:50:53 -07:00
yenatch 68ee99818a Move cry functions out of home.asm. 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 2955e28a42 Add address labels used by Decompress. 2014-07-18 10:31:50 -07:00
yenatch 43fb5732a2 Don't use Olivine maps to define the length of a map header.
The first and second map header labels have no semantic meaning with regard to length.
In fact, none of the labels are used at all.
2014-06-24 10:19:27 -07:00
yenatch 6fee80528a More object struct labels and constants. 2014-06-19 17:23:53 -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 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 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 fd8804472d Use {hl,de,bc}coord macros wherever possible. 2014-06-04 01:10:56 -07:00
yenatch 21708a2271 Recomment lz deecompression. 2014-06-03 14:08:23 -07:00
yenatch 9755ff375a Split bank 0 battle functions into home/battle.asm. 2014-05-21 16:37:18 -04:00
yenatch 3624794599 Split bank 0 audio functions into home/audio.asm. 2014-05-21 16:26:28 -04:00
yenatch 2cb3f8e1b9 Comment music functions in home.asm. 2014-05-21 16:21:46 -04:00
yenatch dbb7431cde Give a name to RandomRange. 2014-05-03 21:44:18 -04:00
yenatch 7ab8f76117 Label map trigger functions in home.asm. 2014-03-03 22:53:43 -05:00
yenatch d1a54e3265 Map triggers and label some addresses in bank 0. 2014-03-03 20:48:57 -05:00
yenatch 9fb9a286ba Get rid of static rom addresses in home/text.asm. 2014-03-03 01:28:54 -05:00
yenatch f367db0180 Misc bank 9 and text command $14 data. 2014-02-24 21:52:34 -05:00
yenatch cf2acc1001 Use :: to export labels between objects.
This fixes the build.
2014-02-01 20:26:39 -05:00
yenatch 1ba5b0f4bc Map setup scripts and commands 2014-01-26 22:07:19 -05:00
yenatch 0cd1d2071f item effect incbins 2013-12-24 17:11:52 -05:00
yenatch 496502b3dc no more Public in joypad interface labels 2013-12-22 17:30:35 -05:00
yenatch 418878d932 more map attribute getters and some cleanup in home/map.asm 2013-12-11 21:42:56 -05:00
yenatch d461689704 LoadTilesetHeader 2013-12-11 17:23:33 -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
yenatch 72ff6fd0b0 home/time.asm: fix a label def 2013-11-29 02:29:48 -05:00
yenatch d2dc732600 split some more and recomment more home asm 2013-11-27 14:45:42 -05:00
yenatch 52a6b7da8e Merge commit '946a213f' into merge-mrwint 2013-10-25 17:54:04 -04:00
yenatch 9e81c46cbf Merge commit '66ef1838' into merge-mrwint
Conflicts:
	home/map.asm
2013-10-25 17:53:16 -04:00
yenatch da22ada91c Merge commit '546c17ad' into merge-mrwint
Conflicts:
	engine/scripting.asm
	main.asm
2013-10-25 16:23:16 -04:00
yenatch 946a213f09 fix labels for SoundRestart and UpdateSound 2013-10-11 02:55:01 -04:00
yenatch 66ef183847 relabel LoadMapGroupRoof 2013-10-11 02:31:51 -04:00
yenatch 546c17ad37 rename 'StartSFX' to 'PlaySFX' 2013-10-08 13:10:36 -04: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
Mr Wint c666d1014a * make jumps and calls use labels 2013-10-02 06:53:35 +02:00
Mr Wint eb5a7afe2b * more callab/callba macros 2013-10-02 02:47:54 +02:00
Mr Wint 255135d187 * extracted and added a bunch of assembly 2013-10-01 23:23:21 +02:00
yenatch f6a5d7b2f2 split pokedex flag handling into home/pokedex_flags.asm 2013-09-18 21:54:31 -04:00
yenatch c074231a07 move window asm into home/window.asm 2013-09-18 21:40:48 -04:00
yenatch 84a9b3907b rename common/ to home/ 2013-09-09 22:44:48 -04:00