pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity
2,944 Commits 1 Branch 0 Tags 52 MiB
2dc6dd7584
Commit Graph

1296 Commits

Author SHA1 Message Date
yenatch
4592603114 No more unreferenced incbins in bank 40. 2015-02-02 16:38:38 -08:00
yenatch
46f2dbb367 Mobile trade incbins and coordinate macros. 2015-02-02 15:46:06 -08:00
yenatch
5aec11492d Add a "mobile" directive for dummied-out mobile adapter functions. 2015-01-27 15:03:14 -08:00
yenatch
8583cc4724 Stop using the preprocessor. 2015-01-20 00:01:23 -08:00
yenatch
d8cf44a87e wow 2015-01-19 21:31:56 -08:00
yenatch
3fe3cd1a46 hVBlank 2015-01-19 21:31:29 -08:00
yenatch
1aa28c7712 Some mobile pseudoconstant. 2015-01-01 21:44:01 -08:00
yenatch
e45e685bf3 Glossed over a couple predefs. 2015-01-01 21:32:26 -08:00
yenatch
355aeb0a2f Tripped over a mobile jumptable. 2015-01-01 21:29:23 -08:00
yenatch
7b87e67a89 More labels in code and some mobile datatracking. 2015-01-01 20:59:08 -08:00
yenatch
7b71a12ed1 Rename some graphics to avoid collisions later. 
chris.5x7.2bpp and chris.7x7.2bpp would probably both end up as chris.png.
 2014-12-29 22:10:20 -08:00
yenatch
4781d9a809 Fix more static banks (trainers, mobile graphics). 2014-12-29 10:23:22 -08:00
yenatch
133e2fb7a7 Use "- $ff00" instead of "& $ff" when dealing with hram. 2014-12-29 08:49:08 -08:00
yenatch
346844a613 Replace pointless $FF00+$xx with $ffxx. 2014-12-28 18:44:23 -08:00
yenatch
0c55e33b5f More mobile subfunctions. 2014-12-28 18:19:18 -08:00
yenatch
ea6954c492 Mystery Gift graphics labels. 2014-12-28 12:33:50 -08:00
yenatch
2cafe3522b Fix static banks for save text and bedroom poster scripts. 2014-12-26 20:04:09 -08:00
yenatch
a6597ba919 Pick off references in misc/crystal_misc.asm. 2014-12-26 14:52:03 -08:00
yenatch
48b1faf73c Reference name input character sets. 2014-12-26 13:01:53 -08:00
yenatch
43a961af42 More unknown mobile code and MIN_LEVEL. 2014-12-26 11:31:55 -08:00
yenatch
e325210a61 Merge remote-tracking branch 'kanzure/master' 2014-12-11 23:25:30 -08:00
yenatch
755c0ae079 Dump a big mobile text table. 2014-12-11 23:20:19 -08:00
yenatch
7391454a76 Get rid of incbins in bank $77. 
This includes the diploma and related assets.
 2014-12-04 00:11:16 -08:00
yenatch
5cbc7cc79c Fix padding in gfx/misc/pokegear.2bpp.lz. 2014-12-03 23:10:26 -08:00
yenatch
fec2f25cb3 Miscellaneous mobile incbins. 2014-12-03 21:25:23 -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
IIMarckus
b4df25a1e1 More comments and labels for ball catch rates. 2014-10-24 00:18:48 -06: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
d430cccdfb Add commentary and labels to AI stuff 
Name some labels and add lots of commentary to AI stuff, including most
AIScoring_Smart sublayers.
 2014-10-22 23:19:30 +02:00
xCrystal
8641358590 Revert "nothing" 
This reverts commit 201f56b3e9.
 2014-10-22 23:17:49 +02:00
xCrystal
201f56b3e9 nothing 2014-10-22 23:17:19 +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
yenatch
7996f5b1ab Miscellaneous formatting cleanup. 2014-09-30 11:19:33 -07:00
yenatch
d6ac5407e7 Add the initial mobile adapter save data. 
The contents of the save and the rest of the bank are unknown.
 2014-08-22 20:48:58 -07:00
yenatch
1d4158057e Close an open string in name selection. 
The python preprocessor doesn't care if a string is left open.
It probably should, so this string is fixed preemptively.
 2014-08-22 20:43:02 -07:00
yenatch
3be6ca012f Use AttrMap and TileMap labels for relative addressing. 2014-08-22 20:41:57 -07:00
yenatch
49b00673b0 Recomment Headbutt tree and Rock Smash encounters. 2014-08-18 08:20:37 -07:00
yenatch
5337d0159e Recomment the text engine. 2014-08-14 23:50:53 -07:00
yenatch
da799c80d4 Better trainer AI comments and finish off trainer attributes. 2014-08-13 19:44:56 -07:00
yenatch
88a15c5038 More constants and bug comments in item effects. 
Apparently a bunch of constants from red were never removed for some reason.
 2014-08-13 19:42:58 -07:00
yenatch
b922fe72a1 Label CheckPhoneCall. 2014-07-24 20:19:56 -07:00
yenatch
07693817ce Use phone script labels in the phone contact table. 2014-07-24 19:40:25 -07:00
yenatch
3fb29975ca Relabel GetItemDescription -> PrintItemDescription. 2014-07-24 19:27:21 -07:00
yenatch
dea79bb86e Add real-time-clock and Daylight Savings Time wram labels. 2014-07-24 10:45:54 -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
b211cac35a Separate phone scripts from std scripts. 2014-07-22 22:09:55 -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
3110fd28e2 Badge and move constants in Strength and Surf field effects. 2014-07-18 10:31:53 -07:00
yenatch
2b1cc7f270 Use WOOPER in Oak speech. 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
2f99608526 Use macros for spawns and flypoints. 
This firmly ties spawn constant definition to data allocation,
preventing usage earlier in main.asm or in other objects.

A potential solution is to abuse ifdefs and include it in
both main.asm and constants.asm.
 2014-07-18 10:31:51 -07:00
yenatch
32a5f21cc7 More PartyMon labels for relative addressing. 2014-06-23 12:45:30 -07:00
yenatch
6fee80528a More object struct labels and constants. 2014-06-19 17:23:53 -07:00
yenatch
044d0f7f04 Merge remote-tracking branch 'kanzure/master' 2014-06-18 01:05:52 -07:00
yenatch
bc3a21193d Residual damage, battle text labels, pic predefs. 2014-06-18 00:55:44 -07:00
yenatch
c2dba43188 Contest battle type and comment the battle menu. 2014-06-17 11:58:11 -07:00
IIMarckus
1fbe471b74 Use better constants/comments in DST near-midnight checks. 2014-06-17 04:53:58 -06: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
0b7dfeb9b2 Name and comment some move learning functions. 2014-06-16 10:32:39 -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
c7f11f7591 Item constants in trainer ai. 2014-06-14 15:00:03 -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
61521f4458 Comment PrintNum. 2014-06-06 21:30:11 -07:00
yenatch
fc16533207 Clean up the growth_rate macro. 2014-06-04 01:34:07 -07:00
yenatch
8d2b9f3fcb Remove the FuncCoord macro. 
Variables can't use labels, so a macro that doesn't use variables is better suited.
 2014-06-04 01:18:54 -07:00
yenatch
fd8804472d Use {hl,de,bc}coord macros wherever possible. 2014-06-04 01:10:56 -07:00
yenatch
b17553218b Add a dereferenced stats screen function. 
This was probably used in the stats screen in JP versions.
It fell out of use when the stats screen layout was redon in localization.
 2014-06-04 00:34:01 -07:00
yenatch
6718981fb1 Truncate MAX_LEVEL + 1 if it exceeds 8 bits. 
If MAX_LEVEL was set to 255, the value could not fit into a byte.
 2014-06-03 16:34:21 -07:00
yenatch
20444d2f63 More MAX_LEVEL use. 2014-06-03 14:07:10 -07:00
yenatch
99fbe3147b Rename directory stats -> data. 2014-05-31 22:57:00 -07:00
yenatch
2cb3f8e1b9 Comment music functions in home.asm. 2014-05-21 16:21:46 -04:00
yenatch
93f406e8b4 Revert some misused labels to static values in main.asm. 2014-05-06 16:57:21 -04:00
yenatch
ddc88bed4b Use a macro for sine waves. 
So far they're identical, but amplitude could change.
 2014-05-05 15:58:43 -04:00
yenatch
2ead808353 More labels and incbins in slots, PC menus, intro. 2014-05-05 03:04:14 -04:00
yenatch
92c40ba266 Labels for mail graphics. 2014-05-04 18:02:45 -04:00
yenatch
066d569e7e Radio text/music and mail jumptables. 2014-05-04 03:28:57 -04:00
yenatch
dbb7431cde Give a name to RandomRange. 2014-05-03 21:44:18 -04:00
yenatch
a7a95e59f7 Headbutt tree encounter maps. 2014-05-03 21:43:54 -04:00
yenatch
3fcaea4780 Misc incbins in fly menu, slots, phone. 2014-05-03 20:57:09 -04:00
yenatch
772c2c48e4 Sprite predef engine data. 
Appears to display predefined sprites at given coordinates.
This lets multiple sprites be drawn in any order without interacting with OAM directly.
 2014-05-03 17:33:00 -04:00
yenatch
467b73a065 Phone contacts and more misc pokegear. 2014-05-03 01:10:08 -04:00
yenatch
6fff25a9bd Fix padding in the compressed pokegear sprite graphics. 2014-05-02 03:37:27 -04:00
yenatch
ae6930fc66 Radio stations and the cell phone menu. 2014-05-02 03:32:51 -04:00
yenatch
7e4744fdaf Fix some lines that were indented with spaces instead of tabs. 
It's mostly menudata. Whoops.
 2014-05-01 22:21:29 -04:00
yenatch
af77c4eddd Misc incbins in bank 23. 2014-05-01 03:37:22 -04:00
yenatch
b7e3762187 A couple Buena's Password specials. 2014-05-01 02:23:51 -04:00
yenatch
2f218f5283 Some GB Printer strings. 2014-05-01 00:09:32 -04:00
yenatch
95af7dd873 Move RegionCheck into engine/landmarks.asm. 2014-04-30 23:44:44 -04:00
yenatch
c58a5b8b7a Use constants for the skipped dummy TMs. 2014-04-30 23:37:50 -04:00
yenatch
c7938cc7d3 Split the mobile adapter library into another object file. 2014-04-30 03:03:20 -04:00
yenatch
6bba0e7fd1 Add constants for unused items, including Town Map and Poke Flute. 2014-04-28 16:43:11 -04:00
yenatch
0e63b0433f String and OAM incbins in Town Map code. 2014-04-28 16:41:16 -04:00
yenatch
7d03634d68 Kanto mon Special stats for the Time Machine. 2014-04-28 15:14:48 -04:00
yenatch
1dc2a1776c More incbins in bank 22. 2014-04-19 23:15:59 -04:00
yenatch
0ad21e6c18 The unused name array is move descriptions. 
Still not sure where the bank comes from.
 2014-04-19 23:15:01 -04:00
yenatch
fe3bcd62ee Trainer card graphics and misc incbins in banks 21 and 22. 2014-04-19 03:08:26 -04:00
yenatch
74a0d46cce Tileset color test debug menu. 2014-04-18 02:31:37 -04:00
yenatch
63dcee0772 Script vars and the color test debug menu. 2014-04-18 02:21:02 -04:00
yenatch
762008952d Shrink pics, an extra egg pic and their labels. 2014-04-17 23:11:47 -04:00
yenatch
5d269b4275 Pick off more bank 12 incbins and labels. 2014-04-17 22:07:08 -04:00
yenatch
12412713fd Fix static banks for monster icons. 2014-04-17 22:06:02 -04:00
yenatch
992a9e506c Rough intro comments and palettes. 2014-04-14 03:37:50 -04:00
yenatch
b8cd97f943 Incbins and jumptables in bank 38 (slots, cards, PC). 2014-04-13 18:30:39 -04:00
yenatch
1fd39f7fb9 Item usage strings and misc labels. 2014-04-13 02:06:22 -04:00
yenatch
266087909b Assorted labels, incbins, text, graphics, etc. 2014-04-13 00:02:26 -04:00
yenatch
d9c5c2c55b Boxes, trading, assorted incbins. 2014-04-12 15:45:19 -04:00
yenatch
5097747404 Anonymous jumptables and sfx in bank 23. 2014-04-10 21:31:56 -04:00
yenatch
6045c560ad Magnet Train data. 2014-04-10 21:31:56 -04:00
yenatch
4b9563d026 Field effect data and sound effects. 2014-04-10 21:31:56 -04:00
yenatch
93cbbaf49d Unused title screen code, graphics, tilemaps, palettes. 
At 43:4000 (UnusedTitleScreen) is a semi-functional title screen.
It's never used, and appears in the Japanese version at the same offset.

Notably, a portion of the logo is cut out and used as OAM.
The final title screen instead uses BG priority to avoid this.
 2014-04-10 15:53:09 -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
49987a7527 A couple more EvosAttacks references. 2014-04-01 17:37:42 -04:00
yenatch
bdbf38b072 Text macros in main.asm. 
So far so good.
 2014-03-06 00:29:22 -05:00
yenatch
1fe2560a36 Growth rate data. 2014-03-05 06:11:52 -05:00
yenatch
c0e07f5e5d Items and dolls bought by Mom. 2014-03-05 04:32:35 -05:00
yenatch
6856667b36 Magnemite and Magneton handling in the Time Machine. 2014-03-05 02:45:33 -05:00
yenatch
d952b5c3eb Label more graphics in bank 3e. 2014-03-05 02:43:08 -05:00
yenatch
3453e7ce9c Label a stats screen jumptable. 2014-03-04 06:21:22 -05:00
yenatch
47bb5ff1ab Strings in bank 12. 
This was a mistake.
 2014-03-04 06:18:36 -05:00
yenatch
e4f142191b Some animation and sprite data in bank 11. 2014-03-04 05:32:18 -05:00
yenatch
3db5d61c7f Minor cleanup at the end of bank 10. 2014-03-04 05:19:59 -05:00
yenatch
2d5661d19d Pokedex code and strings. 2014-03-04 05:04:29 -05:00
yenatch
e149fa6715 Clock text and bank 8 code. 2014-03-04 02:09:58 -05:00
yenatch
7ab8f76117 Label map trigger functions in home.asm. 2014-03-03 22:53:43 -05:00
yenatch
60e19487a7 Wram labels for map triggers. 2014-03-03 22:46:04 -05:00
yenatch
c3bd5dfd41 Merge remote-tracking branch 'kanzure/master' into incbins 2014-03-03 22:32:12 -05:00
yenatch
62600d525d Egg hatching and more daycare text. 2014-03-03 21:53:36 -05:00
yenatch
d1a54e3265 Map triggers and label some addresses in bank 0. 2014-03-03 20:48:57 -05:00
tkatzenbaer
2e1a05b1c9 Bills PC Deposit and Withdraw jumptable & function 2014-03-03 10:19:04 -06:00
yenatch
ea2ec66d11 Unown words and Magikarp measurement graphics 2014-03-03 00:23:54 -05:00
yenatch
dc494c3f29 Red/Blue Pokemon constant order. 2014-03-02 23:38:33 -05:00
yenatch
c3efc17bf8 Mom (DST, money) and daycare text. 2014-03-02 23:26:30 -05:00
yenatch
d6597fab7b Money is capped at ¥999999. 
Coins are capped at 9999.
 2014-03-02 21:23:57 -05:00
yenatch
c4c278fbe3 PC/shop text and menu data. 2014-03-02 21:10:20 -05:00
yenatch
83537048fb Smoke out bank 4. 
Highlights: contest trainers and mons
 2014-03-01 10:31:13 -05:00
yenatch
7da86ec0e8 Split up pack graphics and point to them. 2014-02-28 22:12:29 -05:00
yenatch
8a37a2d914 A bunch of menu data in bank 4. 2014-02-28 19:06:46 -05:00
yenatch
a55c6ac26e Split up emote images and dump emote pointers. 2014-02-28 01:31:52 -05:00
yenatch
36351fcc17 A couple bank 5 incbins incl emote pointers 2014-02-27 14:37:34 -05:00
yenatch
7e3394bb53 Trainer init jumptable. 
Bank E done.
 2014-02-27 13:29:12 -05:00
yenatch
15122d6181 Trainer item AI. 2014-02-27 13:22:16 -05:00
yenatch
f3f37d0472 Trainer class attributes. 2014-02-27 10:37:27 -05:00
yenatch
dd51aa0b66 Unknown item lists and TM/HM text. 
Bank B is all done.
 2014-02-26 03:46:10 -05:00
yenatch
85fa79cfda Move deleter text. 2014-02-25 12:33:41 -05:00
yenatch
6ad2d79cc9 Battle hud party status graphics. 2014-02-25 12:28:50 -05:00
yenatch
2d2cb00ae2 Legacy move AI. 
This is distinct from the "Smart" AI's giant move handling table in battle/ai/scoring.asm.
 2014-02-25 12:13:29 -05:00
yenatch
9c00912f89 Doll text. 
That's it for bank 9 incbins.
 2014-02-25 11:11:26 -05:00
yenatch
47e11948ea Poster scripts. 2014-02-25 09:29:38 -05:00
yenatch
4756027ee0 Decoration attributes and menus. 2014-02-25 09:12:17 -05:00
yenatch
2df85caa28 Decoration menus and a couple broken function calls. 2014-02-24 22:54:51 -05:00
yenatch
f367db0180 Misc bank 9 and text command $14 data. 2014-02-24 21:52:34 -05:00
yenatch
7601ac4cfa Assorted strings, tilemaps and menudata in bank 9. 2014-02-24 20:01:22 -05:00
yenatch
41383145f1 Consumable items and trainer card badge oam data. 2014-02-24 06:18:03 -05:00
yenatch
71cc880636 Restore byte padding to trainer backpics. 2014-02-24 04:57:28 -05:00
yenatch
602b91944f Get rid of the last bank A incbin. 2014-02-24 04:56:32 -05:00
yenatch
54a6118e0d Unused item mappings and roaming maps. 2014-02-24 04:48:17 -05:00
yenatch
3e830ab884 Fix a party menu action comment. 2014-02-24 01:00:36 -05:00
yenatch
d89ca4aead Trade tilemaps and an unreferenced function. 2014-02-24 00:58:31 -05:00
yenatch
2b882b1ef9 Trade graphics in gfx/trade. 2014-02-23 22:25:11 -05:00
yenatch
094e67f0a0 More trade text functions. 2014-02-23 21:41:36 -05:00
yenatch
876e14ece8 Disassemble a jump table related to trading. 2014-02-23 21:21:09 -05:00
yenatch
bac031156b Misc trainer card graphics. 2014-02-23 20:58:38 -05:00
yenatch
85698ddbdb Trainer card gym leader and badge graphics. 2014-02-23 20:40:47 -05:00
yenatch
229da90963 Dummy player object and incbinned data. 2014-02-23 18:26:44 -05:00
yenatch
f0580df37c Remove an incbin for Data4273 2014-02-23 17:22:47 -05:00
yenatch
a01dad8e49 Partymon structs for opponent and player parties. 2014-02-23 00:37:09 -05:00
yenatch
0ea86cecba wContestMon in Bug Catching Contest rankings. 2014-02-22 23:52:20 -05:00
yenatch
d11a23c7d1 Address comments for footprints. 2014-02-22 06:50:20 -05:00
yenatch
e9626c7710 gfx/misc/town_map.lz is actually padded 2014-02-22 06:44:47 -05:00
yenatch
43c10efb29 footprints 
how did we forget that?
 2014-02-22 06:25:19 -05:00
yenatch
11f8168995 Some item menu headers. 2014-02-22 06:10:54 -05:00
yenatch
44a11e6588 More Bill's PC functions. 2014-02-22 03:50:46 -05:00
yenatch
c6dd950f32 Finish off Bill's PC menudata. 2014-02-22 03:36:08 -05:00
yenatch
874736db40 Some incbinned data related to Cut. 2014-02-22 03:25:24 -05:00
yenatch
654779d2c1 Bicycle scripts and text. 
Also an egg string.
 2014-02-17 19:07:57 -05:00
yenatch
eeac223253 Whirlpool and fishing scripts and text. 2014-02-17 18:51:00 -05:00
yenatch
d72c1c8ee0 More field move scripts and text. 2014-02-16 23:56:51 -05:00
yenatch
30218eb3d6 Use globals to implicitly define labels before passing them into BANK(). 2014-02-04 21:30:27 -05:00
yenatch
cf2acc1001 Use :: to export labels between objects. 
This fixes the build.
 2014-02-01 20:26:39 -05:00
yenatch
adb3b29b4d pokedex entry banks 2014-02-01 17:06:18 -05:00
yenatch
821f2c2ea0 Merge remote-tracking branch 'kanzure/master' 2014-02-01 02:45:07 -05:00
yenatch
a643ba8996 MBC3 constants in some RTC-related functions 2014-02-01 01:51:57 -05:00
yenatch
ee098254a8 Assorted text and labels in banks 5 and A 2014-02-01 01:47:03 -05:00
U-Myles-PC\Myles
1d2da4de84 fixed bank 39 pointers, options menu commentary 2014-01-29 10:28:08 -05:00
yenatch
1ba5b0f4bc Map setup scripts and commands 2014-01-26 22:07:19 -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
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
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
ace57ec827 npc trade text/comments 2013-12-27 05:55:40 -05:00
yenatch
d8eed222b7 split out tileset animations 2013-12-26 02:09:58 -05:00
yenatch
c1096d08f6 null pointers in tileset animations 2013-12-26 02:04:03 -05:00
yenatch
f2025afdb6 label and move related asm into items/item_effects.asm 
oops
 2013-12-25 01:42:41 -05:00
yenatch
f99e448a73 fix a mislabeled function in bank 3 2013-12-24 22:13:17 -05:00
yenatch
fa1e93a870 evolution prerequisites and no more incbins in item effects 2013-12-24 20:49:14 -05:00
yenatch
0cd1d2071f item effect incbins 2013-12-24 17:11:52 -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
7b20626c7b more object struct constants 2013-12-23 04:39:26 -05:00
yenatch
48db6daef9 overworld object struct constants 2013-12-22 21:28:41 -05:00
yenatch
496502b3dc no more Public in joypad interface labels 2013-12-22 17:30:35 -05:00
yenatch
18124d0a5d split out poke seer special into event/poke_seer.asm 2013-12-22 17:19:54 -05:00
yenatch
4d1091f8d9 poke seer special 2013-12-22 17:17:33 -05:00
yenatch
a15bd15e2a split gbc-only screen into misc/gbc_only.asm 2013-12-22 06:00:34 -05:00
yenatch
799f945cf5 gbc-only screen 2013-12-22 05:53:48 -05:00
yenatch
6225fca386 more title screen comments 2013-12-22 04:36:03 -05:00
yenatch
c140af9e59 some mobile stat screen icons 2013-12-21 03:02:59 -05:00
yenatch
d9ad10771c move a palette map incbin into tilesets/palette_maps.asm 2013-12-21 00:56:04 -05:00
yenatch
1ef4b0e848 move blockdata into maps.asm 2013-12-20 21:21:43 -05:00
yenatch
d4074dd385 clean up some tileset sections 
also found unused metatile/collision data for a 128-block tileset
 2013-12-20 21:16:57 -05:00
yenatch
a422e1b761 label the pokedex entry point 2013-12-18 21:05:50 -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
6909a00e8b button constants for some function 
probably to do with mobile link
 2013-12-18 02:11:24 -05:00
yenatch
12a18c8fd9 dude auto input bank 2013-12-18 02:01:29 -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
ef20124213 split out pic animation asm and clean up some more includes 2013-12-18 00:23:50 -05:00
yenatch
6690f3901a clean up pic animation sections 2013-12-18 00:11:02 -05:00
yenatch
fa2e0108b9 split out battle animation asm (bg effects, objects, commands) 2013-12-17 23:54:25 -05:00
yenatch
48be8d206c some bg effect labels 2013-12-17 23:33:15 -05:00
yenatch
b616180c10 battle animation asm cleanup 2013-12-15 02:34:26 -05:00
yenatch
b113931b83 some mobile link menu graphics 2013-12-13 20:50:08 -05:00
yenatch
ef6b8b5490 pokegear asm cleanup 2013-12-13 05:08:48 -05:00
yenatch
5708d855e5 pokeball wobbling 2013-12-13 01:07:16 -05:00
yenatch
1b7e44c729 split out sprite facing defs into engine/facings.asm 2013-12-11 22:00:56 -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
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
Bryan Bishop
0fdbdb43a7 Merge pull request #217 from yenatch/more-objects 
compile and link multiple objects
 2013-12-07 00:50:26 -08:00
yenatch
37dd85797a Function3af0 -> GetBattleAnimByte 2013-12-05 15:01:32 -05:00
yenatch
b85244eade labels for battle animation commands 2013-12-05 14:57:56 -05:00
yenatch
be0c7962b0 YesNoBox 2013-12-04 03:07:58 -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
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
c0e2170f01 some oam constants 2013-12-01 16:40:56 -05:00
yenatch
d7bf70f3c9 home.o 2013-11-29 02:30:08 -05:00
yenatch
2ec12a22af gfx/pics.o 2013-11-29 02:11:40 -05:00
yenatch
c2889215a8 audio.o and misc/crystal_misc.o 2013-11-29 01:51:27 -05:00
yenatch
b18beef4d5 more landmark constants and rename FlypointPerms -> VisitedSpawns 2013-11-29 00:38:22 -05:00
yenatch
5c76249488 flypoints and spawn points 2013-11-28 04:35:14 -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
ddfda26725 facing structs and other movement stuff 2013-11-28 00:54:43 -05:00
yenatch
e3e1298196 enumerate battle var constants 2013-11-27 14:45:43 -05:00
yenatch
57736ce19c recomment battle vars 2013-11-27 14:45:42 -05:00
yenatch
d2dc732600 split some more and recomment more home asm 2013-11-27 14:45:42 -05:00
yenatch
41f149c7f1 maps.o and stats/pokedex/entries.o 2013-11-27 14:45:42 -05:00
yenatch
04eb541f83 proper section names and bank constants 2013-11-26 04:29:47 -05:00
yenatch
3eb9851b84 text in slots asm 2013-11-25 19:10:04 -05:00
yenatch
15d7d65355 jumptable in slots asm 2013-11-25 19:10:00 -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
Bryan Bishop
112de1c172 Merge pull request #216 from yenatch/master 
1bpp handling
 2013-11-23 00:39:48 -08: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
8bb8546497 buena text 2013-11-22 05:38:52 -05:00
yenatch
0ccfccf4bf move map groups into maps/map_headers.asm 2013-11-22 05:05:25 -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
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
yenatch
a082f314b3 evolution animation 2013-11-18 20:48:00 -05:00
Bryan Bishop
74afd6d680 Merge pull request #215 from yenatch/master 
dump the music again
 2013-11-14 12:02:49 -08:00
Bryan Bishop
40ed4545b2 local labels for some mobile link battles 2013-11-12 01:39:41 -06:00
Bryan Bishop
2ee4938987 fix typo in PartyMenuSelect comment 2013-11-12 01:05:54 -06:00
Bryan Bishop
02d001a1f4 label CheckInMobileLinkBattle 2013-11-12 01:05:21 -06:00
Bryan Bishop
a99a205b28 labels for some battle menus 2013-11-12 00:29:26 -06:00
yenatch
42a0396b6a get rid of external song labels 2013-11-07 01:18:58 -05:00
yenatch
86cdb9e013 Merge commit 'cf966bb8' into merge-mrwint 
Conflicts:
	main.asm
 2013-10-25 18:02:17 -04:00
yenatch
193dbd53a6 Merge commit '0ead58cd' into merge-mrwint 
Conflicts:
	main.asm
 2013-10-25 17:57:27 -04: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
933634d913 Merge commit 'da689fa7' into merge-mrwint 2013-10-25 17:45:25 -04:00
yenatch
9d02e1063f Merge commit '8b8de40' into merge-mrwint 
Conflicts:
	main.asm
 2013-10-25 17:44:50 -04:00
yenatch
6ea15c444e Merge commit '650dc98b' into merge-mrwint 
Conflicts:
	main.asm
 2013-10-25 17:34:45 -04:00
yenatch
a41b870dfa Merge commit '754325b2' into merge-mrwint 
Conflicts:
	main.asm
 2013-10-25 17:21:20 -04:00
yenatch
15a6bd55f4 Merge commit 'e1cce1c' into merge-mrwint 
Conflicts:
	main.asm
 2013-10-25 17:06:19 -04:00
yenatch
32ede188d7 Merge commit 'a0ba53e' into merge-mrwint 2013-10-25 16:55:58 -04:00
yenatch
2ca81c9d73 Merge commit 'aae33da9' into merge-mrwint 2013-10-25 16:55:41 -04:00
yenatch
4fcabdc07b Merge commit '91b822c' into merge-mrwint 2013-10-25 16:51:24 -04:00
yenatch
bd49428c4a Merge commit '789469c' into merge-mrwint 
Conflicts:
	main.asm
 2013-10-25 16:48:29 -04:00
yenatch
2a08b8b7ce Merge commit '963fe48' into merge-mrwint 2013-10-25 16:41:19 -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
7a13251d03 Merge commit '4ac6783' into merge-mrwint 2013-10-25 16:17:52 -04:00
yenatch
b8603ecb92 Merge commit 'ec77075a' into merge-mrwint 
Conflicts:
	main.asm
 2013-10-25 16:04:31 -04:00
yenatch
cf966bb824 rename tilemap coordinate functions 2013-10-13 02:26:42 -04:00
yenatch
0ead58cdaa fix labels for and rename GetBattleVarPair to GetBattleVar 2013-10-11 03:04:21 -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
da689fa7d6 roof graphics 2013-10-11 01:43:15 -04:00
yenatch
8b8de40525 roofs for each map group 2013-10-11 01:36:11 -04:00
yenatch
650dc98be4 game freak logo 2013-10-10 03:12:02 -04:00
yenatch
754325b270 use the IntroLogoGFX label in existing asm 2013-10-10 03:02:14 -04:00
yenatch
e1cce1cfb9 fix padding in compressed intro graphics 2013-10-08 22:28:51 -04:00
yenatch
a0ba53e09d stop hardcoding the return bank for _LoadMusicByte 2013-10-08 13:37:11 -04:00
yenatch
aae33da95b fix LoadMusicByte naming scheme 2013-10-08 13:34:32 -04:00
yenatch
91b822ceb8 rename 'LoadMusic' to '_PlayMusic' 2013-10-08 13:26:05 -04:00
yenatch
789469c465 rename 'StartMusic' to 'PlayMusic' 2013-10-08 13:21:15 -04:00
yenatch
963fe4808b rename 'LoadSFX' to '_PlaySFX' 2013-10-08 13:13:35 -04:00
yenatch
546c17ad37 rename 'StartSFX' to 'PlaySFX' 2013-10-08 13:10:36 -04:00
yenatch
ec77075a47 ContestMons 2013-10-08 12:44:45 -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
6ddd1d8b46 * fixed call and jump labels in home bank 
* added some more assembly
 2013-10-02 07:11:54 +02:00
Mr Wint
c666d1014a * make jumps and calls use labels 2013-10-02 06:53:35 +02:00
Mr Wint
c5ff1606f0 * last callab/callba macros 2013-10-02 03:55:40 +02:00
Mr Wint
181840cf43 * even more callab/callba macros 2013-10-02 03:20:48 +02:00
Mr Wint
eb5a7afe2b * more callab/callba macros 2013-10-02 02:47:54 +02:00
Mr Wint
fa673df4fa * applied callab/callba macros where possible 
* corrected some mislabeled jump addresses
 2013-10-02 01:59:16 +02:00
Mr Wint
255135d187 * extracted and added a bunch of assembly 2013-10-01 23:23:21 +02:00
yenatch
eebf069839 missed some bit2 script commands 2013-10-01 01:01:43 -04:00
yenatch
f6a5d7b2f2 split pokedex flag handling into home/pokedex_flags.asm 2013-09-18 21:54:31 -04:00
yenatch
f958ba0e6d recomment IsInArray 2013-09-18 21:48:04 -04:00
yenatch
c074231a07 move window asm into home/window.asm 2013-09-18 21:40:48 -04:00
yenatch
5a4e4bdb41 fix some farcalls in window asm 2013-09-18 21:39:14 -04:00
yenatch
5249fd9773 fix padding in .lz files for attack graphics 2013-09-18 21:31:40 -04:00
yenatch
663c523ac4 fix formatting in player pic asm 2013-09-18 21:10:25 -04:00
yenatch
48bab16ea4 move dratini special into event/dratini.asm 2013-09-18 21:04:16 -04:00
yenatch
7cef3b76de move mon icons into menu/mon_icons.asm 2013-09-18 20:58:32 -04:00
yenatch
1e56e3e9af more encounter functions 2013-09-18 20:50:42 -04:00
yenatch
ee47d6ed17 more mobile functions 2013-09-16 17:52:23 -04:00
yenatch
e770ae20b2 clean up a couple mobile function comments 
nothing here is actually commented out
 2013-09-16 17:42:19 -04:00
yenatch
237861b553 rename hall of fame labels 2013-09-16 17:42:11 -04:00
yenatch
9ae1cd6a1c split title screen functions into engine/title.asm 2013-09-15 18:59:53 -04:00
yenatch
0ce5c4fe93 split the mobile adapter library into lib/mobile/ 2013-09-15 18:58:37 -04:00
yenatch
013c6fc368 some time-dependent function 2013-09-15 18:17:02 -04:00
yenatch
3370a04d9e split color asm and data into engine/color.asm 2013-09-15 18:02:02 -04:00
yenatch
c3cab23cda dump a palette set at the end of bank 2 2013-09-15 17:29:53 -04:00
yenatch
dd473e565b incbin some 0s back 2013-09-15 17:24:56 -04:00
yenatch
c738318dc0 move part of an incbin into predef/cgb.asm 2013-09-15 17:08:10 -04:00
yenatch
ab91f49e3b remove some incbins in bank 2 2013-09-15 17:01:17 -04:00
yenatch
44fac4fd70 finish an old script pointer table 2013-09-12 05:37:53 -04:00