Commit Graph

556 Commits

Author SHA1 Message Date
PikalaxALT
f31da089bb Merge branch 'master' of https://github.com/pret/pokecrystal 2016-03-01 22:31:28 -05:00
PikalaxALT
599e6e8d16 Battle animation annotations 2016-03-01 22:31:21 -05:00
yenatch
08ac6dfd80 *_crystal.asm files are no longer needed to build crystal *.o. 2016-01-29 16:24:38 -05:00
PikalaxALT
5322b56a83 Add more missing files 2016-01-29 00:57:06 -05:00
PikalaxALT
b272c0c375 Fix marts using hard-coded bank number 2016-01-27 12:25:12 -05:00
PikalaxALT
be8d1c80f4 Merge branch 'master' of https://github.com/pret/pokecrystal 2016-01-19 23:28:37 -05:00
YamaArashi
49a7eeb76d Update pokedex.asm 2016-01-19 16:51:05 -08:00
PikalaxALT
8a45169a9d Merge branch 'master' of https://github.com/pret/pokecrystal 2016-01-18 00:56:33 -05:00
PikalaxALT
8bf255b9f8 Prepare to merge 2016-01-18 00:39:01 -05:00
PikalaxALT
2ed6c357af More WRAM tidying 2016-01-12 12:46:18 -05:00
PikalaxALT
35f687b536 Fully label home/map_objects.asm 2016-01-11 02:36:39 -05:00
PikalaxALT
1637d915d4 Restored StandingTile and introduced LastTile 2016-01-11 02:28:09 -05:00
PikalaxALT
3dcbe0ff55 Pokegear 2016-01-10 17:44:09 -05:00
YamaArashi
20e7bc3b09 pokedex jumptable constants 2016-01-09 23:05:34 -08:00
PikalaxALT
8360a1a2e8 Pokegear functions and RAM labels 2016-01-09 23:41:03 -05:00
YamaArashi
0dd5f7ab7a pokedex palette numbers 2016-01-09 19:56:37 -08:00
YamaArashi
b609a1690d pokedex unown mode 2016-01-09 19:46:41 -08:00
YamaArashi
418c84dc0c pokedex 2 2016-01-09 19:03:38 -08:00
YamaArashi
e033ea3a37 commented pokedex more 2016-01-09 17:51:14 -08:00
PikalaxALT
f7ee74c3b8 Finish labels in engine/namingscreen.asm 2016-01-09 19:34:14 -05:00
PikalaxALT
6d1b7f28c8 Split base stats 2016-01-09 16:52:34 -05:00
PikalaxALT
f14562da4b Merge branch 'master' of https://github.com/pret/pokecrystal 2016-01-07 18:45:34 -05:00
IIMarckus
f81fb0ba13 Improve text labels, trim address comments. 2016-01-07 15:41:51 -07:00
PikalaxALT
69af99da5e Mr Pokemons House 2016-01-06 16:59:56 -05:00
IIMarckus
e699992e6b Text labels for Places and People. 2016-01-06 11:01:20 -07:00
PikalaxALT
ce019e6347 Map callback constants 2016-01-06 07:44:50 -05:00
PikalaxALT
80aba7fc13 maptrigger macro 2016-01-05 08:46:37 -05:00
PikalaxALT
c087d44c42 more gfx-related labels 2016-01-04 08:43:55 -05:00
PikalaxALT
2a263629a4 Item effects, post-battle, and decoration flags 2015-12-29 16:44:37 -05:00
PikalaxALT
9bbb65166e More movement stuff 2015-12-29 13:15:58 -05:00
PikalaxALT
a2a2668233 Dummy Game 2015-12-28 17:09:53 -05:00
PikalaxALT
57d4cb0edf trainer card 2015-12-28 10:57:04 -05:00
PikalaxALT
f030315b1f jumptable macro repurposed 2015-12-26 21:59:03 -05:00
PikalaxALT
2bd45ca574 Move effects; no more reloadmapmusic, returnafterbattle 2015-12-26 19:22:27 -05:00
PikalaxALT
f485a45cda More mobile-related labels; remove unneeded map object constants 2015-12-26 12:01:21 -05:00
PikalaxALT
7683b78fb4 Labels relating to odd egg 2015-12-25 23:34:33 -05:00
PikalaxALT
a5e928eb98 writebackup --> closewindow; game corner prize vendors; others 2015-12-24 22:58:42 -05:00
PikalaxALT
2a2222476a Split up anim objects into several files 2015-12-24 14:07:33 -05:00
PikalaxALT
41618f9e98 More battle anim object constants 2015-12-24 13:33:54 -05:00
PikalaxALT
8152ab612c Battle anims 2015-12-23 17:10:50 -05:00
PikalaxALT
3893feb835 Battle Anim Object struct constants 2015-12-23 14:00:29 -05:00
PikalaxALT
ddc05ec8dd Finish stats screen function labels 2015-12-23 09:12:29 -05:00
PikalaxALT
30b37da387 More stats screen shenanigans 2015-12-22 22:19:33 -05:00
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