Commit Graph

613 Commits

Author SHA1 Message Date
PikalaxALT d08199c79d Color fns, some more address decoding in link/mobile 2015-12-22 18:03:00 -05:00
PikalaxALT 630d789c70 More link trade shenanigans 2015-12-21 14:10:16 -05:00
PikalaxALT 047effba94 Menu joy flags; started with link address space 2015-12-20 12:54:08 -05:00
PikalaxALT 987ed1fafb More work on slots; WRAM cleanup, Move Deleter 2015-12-19 14:48:30 -05:00
PikalaxALT 3d36f1a837 Events and some WRAM cleanup 2015-12-18 20:07:09 -05:00
PikalaxALT d644406f61 More menu stuff 2015-12-17 22:31:16 -05:00
PikalaxALT fe4ef4e595 Elevator 2015-12-17 17:51:32 -05:00
PikalaxALT 42dd25b3e5 Merge branch 'master' of https://github.com/pret/pokecrystal into scriptmacrorenaming 2015-12-17 15:17:41 -05:00
PikalaxALT caa83c08a7 Movement etc. 2015-12-17 15:14:51 -05:00
IIMarckus 67d38da5b0 text/common.asm is only for std scripts. 2015-12-17 13:03:36 -07:00
PikalaxALT efee40447e Mobile trade animations, pokepic animations 2015-12-17 13:49:26 -05:00
PikalaxALT 7203e9d2cc Map script and color shenanigans 2015-12-16 21:57:42 -05:00
PikalaxALT 879b430fce Bill's PC 2015-12-16 12:36:58 -05:00
PikalaxALT 77ef8404a1 Menu 2015-12-15 18:59:49 -05:00
PikalaxALT efe3462f9a Replaced SignpostItem with Hidden(ItemName) 2015-12-15 11:21:58 -05:00
PikalaxALT bb2aba7da1 No more ItemFragment 2015-12-15 10:55:56 -05:00
PikalaxALT 6e257bc7cd mystery gift, credits 2015-12-14 20:06:41 -05:00
PikalaxALT c635e30777 map setup and warps 2015-12-14 11:12:18 -05:00
PikalaxALT 8a439dbd05 Miscellaneous labels 2015-12-13 20:33:56 -05:00
PikalaxALT 259c155187 Pack; buy, sell, toss 2015-12-13 17:11:58 -05:00
PikalaxALT acd92eee94 Pack 2015-12-13 14:15:16 -05:00
PikalaxALT ecd277204a Card Flip 2015-12-11 16:59:40 -05:00
PikalaxALT b65fe57db6 Simplify EnlargedTiles 2015-12-11 11:53:01 -05:00
PikalaxALT 15a03a2577 Unown Puzzles 2015-12-11 11:33:14 -05:00
PikalaxALT f198dfd862 card flip (checkpoint commit) 2015-12-11 08:17:38 -05:00
PikalaxALT b9870541d4 slot machines 2015-12-10 22:26:31 -05:00
PikalaxALT a5a8364c35 opentext and breeding 2015-12-09 18:25:44 -05:00
PikalaxALT 7f68db68ad underground switches, town map 2015-12-09 11:39:35 -05:00
PikalaxALT 5b7fc7b0fa More battle tower shenanigans 2015-12-08 16:06:13 -05:00
PikalaxALT 02d05255fe A stab at audio engine. 2015-12-06 22:36:09 -05:00
PikalaxALT 6eac26732a Celebi Event 2015-12-05 15:38:25 -05:00
PikalaxALT 81ea723b04 Getting started with battle anims; sine and cosine 2015-12-04 14:33:29 -05:00
PikalaxALT 5b94d54a6c More work on animations 2015-12-04 08:46:11 -05:00
PikalaxALT 2f14f3a669 No more autogen functions in engine/crystal_intro.asm 2015-12-02 20:37:00 -05:00
PikalaxALT 2cdca75441 Crystal Intro 2015-12-02 17:59:05 -05:00
PikalaxALT be082943ed More work interpreting the sprite engine 2015-12-02 13:24:18 -05:00
PikalaxALT 92a8c491c3 Break up engine/sprites.asm; address yenatch's comments 2015-12-01 21:54:11 -05:00
PikalaxALT ffbf2c0f5d More animations including cutting grass 2015-12-01 15:35:28 -05:00
PikalaxALT 6b33a8d155 More breakup of main.asm 2015-11-30 11:04:14 -05:00
PikalaxALT 0eb0c40ba7 buttonsound 2015-11-29 22:29:45 -05:00
PikalaxALT d314bdb4fa Pokedex labels 2015-11-29 21:34:59 -05:00
PikalaxALT 8612a4a531 Renaming sections, further dissolving main.asm 2015-11-28 15:13:40 -05:00
PikalaxALT 4bcd71e322 Fix some labels in engine/timeofdaypals.asm 2015-11-26 21:06:32 -05:00
PikalaxALT c7985e1f3c Battle Tower scripts and text labels 2015-11-26 21:05:32 -05:00
PikalaxALT 0c6f94effd Final relabeling before merge 2015-11-25 10:26:30 -05:00
PikalaxALT 01792e00d2 Rename several script commands 2015-11-25 10:16:29 -05:00
PikalaxALT f599e477fc Partial interpretation of battle tower trainer data 2015-11-24 15:18:44 -05:00
PikalaxALT 6c248953b7 Mobile functions for fixed-phrase selection 2015-11-24 10:35:13 -05:00
PikalaxALT f3c8f75209 bug contest judgint labels 2015-11-23 21:19:53 -05:00
PikalaxALT d972564175 link and seer labels 2015-11-23 16:04:53 -05:00
PikalaxALT 0dc5ae04b8 more trade animation labels 2015-11-23 02:08:08 -05:00
PikalaxALT 58020fb5f6 trade animation 2015-11-23 00:21:21 -05:00
PikalaxALT 24b7b2c1cf Foreign language font handling in mail 2015-11-22 12:01:58 -05:00
PikalaxALT 7b3090e22a Annotate battle tower text bug 2015-11-20 15:15:32 -05:00
PikalaxALT 812976cee6 bgcoord 2015-11-20 11:47:52 -05:00
PikalaxALT b023056259 engine/stats_screen.asm 2015-11-19 23:38:16 -05:00
PikalaxALT 93a129eb6d main.asm is now under 30k lines 2015-11-19 18:09:11 -05:00
PikalaxALT 8a6a1a7d77 CmdQueues 2015-11-18 23:16:25 -05:00
PikalaxALT 91f7491017 items/item_effects.asm; engine/evolution.asm 2015-11-18 18:35:44 -05:00
PikalaxALT 1ff37608b6 Update mail struct labels 2015-11-18 13:29:30 -05:00
PikalaxALT 3f4044cd46 engine/compose_mail.asm; ldpixel 2015-11-18 13:01:55 -05:00
PikalaxALT 6d47be8d8c Fruit tree constants, more mail engine 2015-11-18 10:42:42 -05:00
PikalaxALT bc1870e3f4 Save, Bill's PC 2015-11-17 23:29:14 -05:00
PikalaxALT 27ef600ace Here's the mail it never fails 2015-11-17 17:56:49 -05:00
PikalaxALT e88c88ff20 engine/decorations.asm 2015-11-17 16:12:27 -05:00
PikalaxALT 4bfe086ef6 Phone scripts and specials 2015-11-17 12:29:37 -05:00
PikalaxALT 0b8fe4bac3 More specials; bank 12 mobile 2015-11-16 22:29:54 -05:00
PikalaxALT 042fc4bfe5 Split up some more banks in main.asm 2015-11-16 21:46:36 -05:00
PikalaxALT ba871547ed engine/pokegear.asm 2015-11-16 21:07:26 -05:00
PikalaxALT 435b0cf686 Options menu, some mobile fns 2015-11-16 16:46:32 -05:00
PikalaxALT 4b5424368f Little cleanup on engine/scripting.asm 2015-11-16 12:49:42 -05:00
PikalaxALT fb88b2ccf8 Movement constants, script stack 2015-11-16 11:53:26 -05:00
PikalaxALT 8290f851fd Further decoding of SpriteMovementData 2015-11-16 00:52:53 -05:00
PikalaxALT aba038a4a4 Fix some movement macro/function names 2015-11-15 21:28:15 -05:00
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 21276b79f1 SpriteAnim 2015-11-13 10:48: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 8fb01de917 No more DefaultFlypoint 2015-11-10 19:51:13 -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 d8cd991b35 engine/link.asm 2015-11-09 23:55:39 -05:00
PikalaxALT f1b2466cc3 Cleaning up static HRAM labels; movement stuff, route 38 trainers 2015-11-09 23:01:45 -05:00
PikalaxALT 77d0a8a396 Add missing files in engine/ and battle/ 2015-11-09 17:02:47 -05:00
PikalaxALT 93ab6985d2 Some work on battle animations 2015-11-09 16:41:09 -05:00
PikalaxALT ac824f62fc More battle core labels 2015-11-08 13:27:26 -05:00
PikalaxALT c34264ddd8 AI and player items, withdraw/deposit 2015-11-08 10:59:28 -05:00
PikalaxALT 6a570ebb8e more battle core labels 2015-11-07 21:04:54 -05:00
PikalaxALT 09603bf031 More Battle Tower shenanigans 2015-11-07 14:38:52 -05:00
PikalaxALT 2cbb1acc6e Pokemon animations 2015-11-07 09:48:32 -05:00
PikalaxALT e044580669 battle/ai/switch.asm and more battle/effect_commands.asm 2015-11-07 08:05:57 -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 46e66077a5 BattleCommand labels copied from macros 2015-11-06 14:45:10 -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 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 10beeb3c06 Battle Tower 2015-11-03 15:22:04 -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 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 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 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
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 1e2ff967aa Replaced "ldtile" and "dwtile" with the "tile" equs macro 2015-10-14 09:29:15 -04:00
PikalaxALT d338a092c5 Revert sPlayerID 2015-10-13 17:40:18 -04:00
PikalaxALT 12f9dca7a5 Final descriptive label in tilesets/animations.asm 2015-10-13 14:29:34 -04:00
PikalaxALT 88bc86b0bb Replace Functionfb8 with FillBoxWithByte 2015-10-13 12:46:40 -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
PikalaxALT b68913a782 More radio labels 2015-10-09 23:09:03 -04: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
PikalaxALT 726c4bc1d6 Moved time-related functions in bank 4 to engine/time.asm 2015-10-02 22:49:26 -04:00
PikalaxALT c50b49bd62 Renamed some unused specials 2015-10-01 16:55:24 -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
JimB16 bcc11712a5 added 'wBT_OTTempCopy'-label and the data structure that comes after 2015-08-31 14:31:13 +02:00
JimB16 172a1488de renamed labels and added comments 2015-08-30 13:17:14 +02:00
JimB16 706f289c70 change more labelss 2015-08-25 01:56:30 +02:00
JimB16 157e5fd4b8 changed labels 2015-08-24 17:04:13 +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 038166f97c Fix some dubious comments about abandoned sram addresses. 2015-08-19 21:29:58 -07:00
yenatch 860296f468 Comment and label the save file. 2015-08-19 21:14:15 -07:00
yenatch 9c84a3dd22 Split out the save file code. 2015-08-19 10:17:58 -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 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
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
yenatch ec10d9dd6f Add constants for common map object ids. 2015-07-21 23:49:18 -07:00
yenatch 973721491c Merge remote-tracking branch 'kanzure/master' into gfx-script 2015-07-20 23:05:28 -07: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
yenatch a3c6931fa8 Use pngs for some misc graphics. 2015-07-18 22:01:59 -07: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
yenatch 8186190ef1 Fix filenames and use pngs for credits graphics. 2015-07-18 00:05:14 -07: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 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 a711b45404 checkcode $1a is Kenji's break schedule. 2015-07-10 03:03:08 -06:00
IIMarckus 6f3b2d6de8 Add constants for checkcodes.
From PikalaxALT.
2015-07-09 20:23:23 -06:00
yenatch e2c2e20f93 Use charmaps for special string codepoints.
Also fix all the text.
Also fix some unreferenced scripts that were interpreted as text.
2015-06-27 22:53:38 -07:00
yenatch c00949dddf Labels for the heal machine; spriteface constants. 2015-06-26 23:24:55 -07:00
yenatch d6f7dc3206 Fix the Nurse std comments. 2015-06-26 23:17:10 -07:00
yenatch 0f57aefdf2 Merge branch 'tilesets' into master
Conflicts:
	tilesets/tileset_headers.asm
2015-06-26 11:00:39 -07:00
IIMarckus e57e1ba63b Improve some signpost labels. 2015-06-25 22:01:08 -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 1027a3a157 Clean up labels. 2015-06-23 14:29:06 -06:00
IIMarckus 7ac6aa2d22 Begin enumerating std_scripts constants. 2015-06-23 14:21:54 -06:00
IIMarckus 0ba261a3fd Introduce checkmorn/checkday/checknite to replace checktime. 2015-06-23 12:28:48 -06:00
IIMarckus 4d532beee6 Remove trailing newlines. 2015-06-23 12:24:51 -06:00
yenatch 5ae298f533 Organized the primary tileset palettes.
Crystal's tileset-specific palettes are disconnected from these.
2015-06-23 10:46:51 -07:00
IIMarckus 47938939fe Give Buena's phone scripts more appropriate filenames. 2015-06-23 11:43:32 -06:00
yenatch 93a589795f Merge remote-tracking branch 'kanzure/master' 2015-05-18 02:21:14 -07:00
yenatch b47c4bc6fd Use more constants in the event scripting engine. 2015-05-18 02:16:11 -07:00
IIMarckus 7563a990aa w-prefix the new PokegearFlags variable. 2015-05-18 03:15:45 -06:00
IIMarckus bd894f6fb0 Fix a static address. 2015-05-18 02:07:28 -06:00
IIMarckus 32864d2db6 Give wd957 a more descriptive name. 2015-05-14 22:42:29 -06:00
yenatch adc41566aa Fix a static reference to a string in Pokedex code. 2015-03-03 18:31:46 -08: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 92e2ed3e61 Split out event scripting specials. 2015-02-11 15:09:35 -08:00
yenatch b048ea0faf Use labels for script specials instead of constants/static values. 2015-02-11 15:03:42 -08:00
yenatch 9aef93701a Split out map object code. 2015-02-11 14:13:22 -08:00
yenatch a31b4586df Split out the diploma code. 2015-02-11 14:08:07 -08:00
yenatch f4e0e61114 Split out the map setup scripts. 2015-02-11 14:01:04 -08:00
yenatch c6c220f1ad Split out spawn points. 2015-02-11 13:59:59 -08:00
yenatch 3977bd6208 Split out map triggers. 2015-02-11 13:45:33 -08:00
yenatch 25f5306a4d Split out the Pokedex code. 2015-02-11 13:36:02 -08:00
yenatch e13565f933 Split out the pack code. 2015-02-11 13:27:15 -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 849595e537 Blindly use wram labels for everything except mobile, part 2. 2015-02-10 14:18:23 -08:00
yenatch d3054dc4cb More graphics and straggling static refs. 2015-02-06 21:17:32 -08:00
yenatch ed88e4947c Get rid of more static refs in banks 47, 5c, 5f. 2015-02-05 23:59:50 -08:00
yenatch 8583cc4724 Stop using the preprocessor. 2015-01-20 00:01:23 -08:00
yenatch 3fe3cd1a46 hVBlank 2015-01-19 21:31:29 -08:00
yenatch 7b87e67a89 More labels in code and some mobile datatracking. 2015-01-01 20:59:08 -08:00
yenatch 133e2fb7a7 Use "- $ff00" instead of "& $ff" when dealing with hram. 2014-12-29 08:49:08 -08:00
yenatch 1a2784d414 Recombine the event engine objects.
They must be in the same bank to work, and defining sections with static banks should only be used to produce an identical rom.

They were only split in the first place to minimize the amount of code tahat needed to be rebuilt based on a single constant, which in retrospect was meaningless.
2014-12-29 08:08:03 -08:00
yenatch 6604afce62 Use the "next" directive in the credits. 2014-12-03 21:26:14 -08:00
yenatch 7996f5b1ab Miscellaneous formatting cleanup. 2014-09-30 11:19:33 -07:00
yenatch ed15916f05 Use landmark constants in displaylocation commands (phone scripts). 2014-08-22 20:36:10 -07:00
yenatch 49b00673b0 Recomment Headbutt tree and Rock Smash encounters. 2014-08-18 08:20:37 -07:00
yenatch b922fe72a1 Label CheckPhoneCall. 2014-07-24 20:19:56 -07:00
yenatch f7e53b0f50 Dump the phone scripts.
This is one of the last major incbins. The rest is mostly mobile code.
2014-07-23 20:20:21 -07:00
yenatch cda504fbce Fix "name" event command parameter comments. 2014-07-22 22:39:41 -07:00
yenatch b211cac35a Separate phone scripts from std scripts. 2014-07-22 22:09:55 -07:00
yenatch 29d92fe79c Fix some static addresses in std scripts. 2014-07-22 22:05:41 -07:00
yenatch e75e735f7f Reflect the extra loadwilddata argument in its function comment. 2014-07-22 22:05:06 -07:00
yenatch 849044ce8a Remove generated "jump sources" comments. 2014-07-19 14:11:48 -07:00
yenatch be08d93b61 Name the script special function and clean up a couple specials. 2014-07-19 14:02:58 -07:00
yenatch 928cdcfc23 Name cry functions in home.asm. 2014-07-18 10:31:52 -07:00
yenatch c2dba43188 Contest battle type and comment the battle menu. 2014-06-17 11:58:11 -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 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 2cb3f8e1b9 Comment music functions in home.asm. 2014-05-21 16:21:46 -04:00
yenatch 95af7dd873 Move RegionCheck into engine/landmarks.asm. 2014-04-30 23:44:44 -04:00
yenatch 113dd395d2 Include palette 0 in PokemonPalettes.
Now PokemonPalettes is referenced.
2014-04-13 00:03:21 -04:00
yenatch f66f4d51c7 Replace static bank 0 calls in the event scripting engine. 2014-04-12 15:45:40 -04:00
yenatch 0eb49d5941 Fix a title screen label that accidentally made its way into bank 1.
Somehow, a title screen (bank 0x43) function had its label put in bank 1.
This caused changes to either bank to break the compiled rom.

fixes 61a3d145
2014-04-09 18:27:29 -04:00
yenatch 73ffc4677a Image extensions in gfx/{intro,title}. 2014-04-02 00:41:56 -04:00
yenatch 6a66f28bf5 Fix image extensions in gfx/{credits,misc}. 2014-04-02 00:16:03 -04:00
yenatch 2564836df1 Compressed title screen graphics are padded too. 2014-03-04 01:29:43 -05:00
yenatch 7ab8f76117 Label map trigger functions in home.asm. 2014-03-03 22:53:43 -05:00
yenatch 2b144fcfd4 Finish off SGB and CGB code and data.
That should be it for bank 2.
2014-03-02 16:02:55 -05:00
yenatch 78c70bffe4 More SGB and CGB palettes. 2014-03-02 01:22:33 -05:00
yenatch 38850df63d Lots of SGB incbins in bank 2.
Palette/block packets, border tilemap, more palettes etc.
2014-03-01 21:43:16 -05:00
yenatch 83537048fb Smoke out bank 4.
Highlights: contest trainers and mons
2014-03-01 10:31:13 -05:00
yenatch ddc665a31a Move includes into object bases instead of their version wrappers. 2014-02-05 19:07:24 -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 4612670768 more npc trade cleanup 2013-12-27 22:20:24 -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 7b20626c7b more object struct constants 2013-12-23 04:39:26 -05:00
yenatch 496502b3dc no more Public in joypad interface labels 2013-12-22 17:30:35 -05:00
yenatch 0d3308f68c use RGB macros for palettes instead of binary chunks 2013-12-20 00:29:31 -05:00
yenatch c7b19392a9 use the sgb border label in asm 2013-12-13 20:49:01 -05:00
yenatch 1b7e44c729 split out sprite facing defs into engine/facings.asm 2013-12-11 22:00:56 -05:00
yenatch be0c7962b0 YesNoBox 2013-12-04 03:07:58 -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 ce37f0f970 labels for every 3callasm 2013-12-01 18:26:05 -05:00
yenatch 9aaa5f24bb shorten redundant text_jump macros 2013-12-01 17:54:09 -05:00
yenatch 0b905cb8ac rename a credit constant to avoid conflicts 2013-11-29 01:49:48 -05:00
yenatch b18beef4d5 more landmark constants and rename FlypointPerms -> VisitedSpawns 2013-11-29 00:38:22 -05:00
yenatch fd73d41e6b redone landmarks, now with constants 2013-11-28 03:54:21 -05:00
yenatch ac65a8b821 engine/credits_crystal.o 2013-11-28 01:38:49 -05:00
yenatch 72b1dda303 more credits cleanup 2013-11-28 00:55:32 -05:00
yenatch 04eb541f83 proper section names and bank constants 2013-11-26 04:29:47 -05:00
yenatch f16193dc91 move more credits asm into engine/credits.asm 2013-11-24 04:26:10 -05:00
yenatch 25325139e6 more credits labels and theend graphic 2013-11-24 04:09:17 -05:00
yenatch cf6295cb9f objects for event handling and scripting 2013-11-23 02:51:48 -05:00
yenatch 29afa24f0b split more event handling out of main 2013-11-23 02:33:53 -05:00
yenatch bd392da29e split event handling into engine/events.asm 2013-11-22 05:04:32 -05:00
yenatch bcd833e758 version checks for event script commands and move in related asm 2013-11-22 04:51:47 -05:00
yenatch 94188ee0f7 version-sensitive objects for egg moves and evos/attacks
this way main.o and wram.o are version-neutral
2013-11-22 00:14:55 -05:00
yenatch bd49428c4a Merge commit '789469c' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 16:48:29 -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 789469c465 rename 'StartMusic' to 'PlayMusic' 2013-10-08 13:21:15 -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