Commit Graph

1384 Commits

Author SHA1 Message Date
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
yenatch
e1c3fee926 change old .tx includes to .asm
these were forgotten about with the last preprocessor change.
this is required for object dependencies to be handled by make.
2013-09-11 01:16:33 -04:00
yenatch
84a9b3907b rename common/ to home/ 2013-09-09 22:44:48 -04:00
Bryan Bishop
33d7ef72fe Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds
https://github.com/kanzure/pokecrystal/pull/198
2013-09-09 16:00:05 -05:00
Bryan Bishop
3a2dbb5289 Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds
https://github.com/kanzure/pokecrystal/pull/198
2013-09-09 15:59:08 -05:00
Bryan Bishop
37e1aa4e8e Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds
https://github.com/kanzure/pokecrystal/pull/198
2013-09-09 15:56:49 -05:00
Bryan Bishop
35324ae43f Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds
https://github.com/kanzure/pokecrystal/pull/198
2013-09-09 15:55:43 -05:00
yenatch
608d0d86e4 move name rater asm into event/name_rater.asm 2013-09-09 16:09:34 -04:00
yenatch
0fc0c0bebc name rater special 2013-09-09 15:47:32 -04:00
yenatch
429417da74 name a couple specials 2013-09-09 15:39:43 -04:00
yenatch
cc41f68c34 split sgb-to-cgb asm into predef/cgb.asm 2013-09-09 15:34:09 -04:00
yenatch
dab74d719e cgb replacements for sgb layouts 2013-09-09 15:12:30 -04:00
yenatch
e33423374b split sgb stuff into predef/sgb.asm 2013-09-09 14:33:04 -04:00
yenatch
de8e7ca422 sgb layout predef 2013-09-09 14:17:03 -04:00
yenatch
a6c7200782 CheckCGB 2013-09-09 12:56:13 -04:00
yenatch
5bbcedb886 typo in CheckContestMon 2013-09-09 12:49:26 -04:00
yenatch
2b4a5bdd8d comment flag predef
this is like FlagAction but with index c instead of de
2013-09-09 12:47:02 -04:00
yenatch
771ebcbf23 PokedexSeen and PokedexCaught were swapped 2013-09-09 02:40:27 -04:00
yenatch
106b0e139f clean up more bank 0 2013-09-09 02:26:46 -04:00
yenatch
53b7926f5e move multiplication/division functions into common/math.asm 2013-09-09 01:21:36 -04:00
yenatch
ee04a2fcd9 split more copy functions into common/copy2.asm 2013-09-09 01:11:41 -04:00
yenatch
60c1061a67 clean up some common includes and give names to wram copy functions 2013-09-09 01:10:07 -04:00
yenatch
abb7f2fa20 split Predef into common/predef.asm 2013-09-08 23:54:37 -04:00
yenatch
4778276f33 split serial handshake into common/handshake.asm 2013-09-08 23:53:04 -04:00
Bryan Bishop
6d7043c0c6 Merge pull request #197 from yenatch/master
comment some move effects
2013-09-08 20:24:26 -07:00
yenatch
9f7adeafcf ItemIsMail and comment thief move effect 2013-09-08 23:18:30 -04:00
Bryan Bishop
78a3951d47 Merge pull request #196 from yenatch/std-scripts
std scripts
2013-09-08 17:06:54 -07:00
Bryan Bishop
50232cc92b Merge pull request #195 from yenatch/predefs
predefs
2013-09-08 16:47:29 -07:00
Bryan Bishop
740f91370d Merge pull request #190 from yenatch/master
specials
2013-09-08 09:15:46 -07:00
yenatch
e7318ed4bc move double speed functions into common/double_speed.asm 2013-09-08 03:14:24 -04:00
yenatch
4a04a09a6b labels for cgb double speed functions 2013-09-08 03:12:48 -04:00
yenatch
844546f849 split sram access asm into common/sram.asm 2013-09-08 02:50:06 -04:00
yenatch
edf939a07b split Random into common/random.asm 2013-09-08 02:47:52 -04:00
yenatch
3b70005fb0 split item interfaces into common/item.asm 2013-09-08 01:45:54 -04:00
yenatch
f0cf86777b fix item asm labels
CheckItem was called PickUpItem by mistake

Also label TossItem and ReceiveItem
2013-09-08 01:43:51 -04:00
yenatch
d05adc4f98 Function2f17 -> IsInJohto 2013-09-08 00:48:12 -04:00
yenatch
705e682468 split InitString asm into common/string.asm 2013-09-08 00:22:33 -04:00
yenatch
82c3bb464f split flag action asm into common/flag.asm 2013-09-08 00:20:28 -04:00
yenatch
f513cdd888 split map engine asm into common/map.asm 2013-09-08 00:14:26 -04:00
yenatch
847843d866 rename BUTTON_A and BUTTON_B constants to A_BUTTON and B_BUTTON 2013-09-07 23:49:20 -04:00
yenatch
9f53825ce2 move common asm from engine/ to common/
engine/ was getting really bloated and common asm wasnt what it was made for
2013-09-07 23:38:19 -04:00
yenatch
7a3a4f913b split fruit tree asm out into engine/fruit_trees.asm 2013-09-07 23:26:28 -04:00
yenatch
8018614585 split type strings and related asm out into text/types.asm 2013-09-07 23:24:22 -04:00
yenatch
e13f03ae44 comment PrintMonTypes 2013-09-07 23:22:17 -04:00
yenatch
3b119687f3 leftover trainer class names from red
you can find these in pokered at TrainerNamePointers (9:7e64)
2013-09-07 22:48:07 -04:00
Bryan Bishop
4f7824ff08 whitespace -> tabs in main.asm
How did these get in here?
2013-09-07 19:53:22 -05:00
yenatch
353b4ac6da fix up TreeMons/RockMons 2013-09-07 17:35:41 -04:00
yenatch
6e5876377f split out std scripts from main.asm 2013-09-07 15:30:07 -04:00
yenatch
ed2063276a add a menudata2 header in std scripts
thats it for std incbins
2013-09-07 15:26:52 -04:00
yenatch
eaaf719440 label some jumps in std scripts 2013-09-07 14:42:28 -04:00
yenatch
3301e5b77b shorten PrintMoveDescription -> PrintMoveDesc so rgbds doesnt choke
still need to fix this 15-char macro argument limit
2013-09-07 14:14:29 -04:00
yenatch
5376a0c96b the bomb 3
std scripts
2013-09-07 05:08:12 -04:00
yenatch
6f541d5723 labels for each predef
also fix up any labels that got missed

finally found a reference to the weird nop function (Function2d43)
2013-09-06 22:50:58 -04:00
yenatch
266e401b7d the bomb 2
remaining predef asm
2013-09-06 18:31:40 -04:00
yenatch
67dd49967d labels for each special
also fix up labels from last commit
2013-09-06 04:04:27 -04:00
yenatch
1660b814e8 the bomb
specials asm dump
2013-09-06 03:50:55 -04:00
yenatch
fb68f75d9f update some labels and special/predef pointers 2013-09-06 01:57:03 -04:00
yenatch
a4707eccaf couple more specials in bank 3 2013-09-05 17:40:21 -04:00
yenatch
2aff956ba4 some specials in bank 3 and unown dex asm 2013-09-05 17:05:30 -04:00
yenatch
b417d08f2e recomment CheckShininess and CheckContestMon 2013-09-04 04:33:38 -04:00
yenatch
5888db3493 recomment Predef and GetPredefFn -> GetPredefPointer 2013-09-04 04:05:15 -04:00
yenatch
715a19fd59 split farcall functions into engine/farcall.asm 2013-09-03 21:15:03 -04:00
yenatch
1eab7959f4 formatting in the map engine 2013-09-03 20:49:05 -04:00
yenatch
d93d17b43b split out game time functions into engine/game_time.asm 2013-09-03 18:58:16 -04:00
yenatch
2c36afc6c3 recomment game time functions 2013-09-03 18:56:59 -04:00
yenatch
340e31d839 split menu functions into engine/menu.asm 2013-09-03 18:43:15 -04:00
yenatch
23bb05851b split Sine/Cosine into engine/sine.asm 2013-09-03 18:40:12 -04:00
yenatch
12e6ff3fc6 split map object functions into engine/map_objects.asm 2013-09-03 18:39:19 -04:00
yenatch
71bbd77261 split some RTC interfaces into engine/rtc.asm 2013-09-03 18:35:37 -04:00
yenatch
004956798c split vram functions out into engine/video.asm 2013-09-03 18:32:55 -04:00
yenatch
dad64b1d9d split out rst vectors 2013-09-03 18:17:33 -04:00
yenatch
0caac30f27 clean up rst vectors 2013-09-03 18:16:56 -04:00
yenatch
bd8be2b02e split out hardware interrupts 2013-09-03 17:57:47 -04:00
yenatch
affec2ac95 clean up interrupts 2013-09-03 17:48:18 -04:00
yenatch
20919e4d8a formatting at Start 2013-09-03 17:45:37 -04:00
yenatch
7bc23f0862 condense bank 0 includes 2013-09-03 17:44:24 -04:00
yenatch
04fc9c4748 fix interface label for UpdateTimePals 2013-09-03 17:38:45 -04:00
yenatch
b74e63a20d split out delay functions 2013-09-03 17:36:55 -04:00
yenatch
d2eeab62ea split out marts 2013-09-03 17:35:17 -04:00
yenatch
15076861f1 split out trainer dvs 2013-09-03 17:32:54 -04:00
yenatch
bbe8756302 recomment trainer dvs 2013-09-03 17:31:57 -04:00
yenatch
0ed9164ccc decoration names 2013-09-03 17:26:27 -04:00
yenatch
1cef08db06 some asm pointer tables in bank 5f 2013-09-03 17:24:35 -04:00
yenatch
171c21be69 dump move tutor asm in bank 40 2013-09-03 17:09:48 -04:00
yenatch
2b2018a83a more bank 4 asm
this stuff looks like it's related to phone call timing
2013-09-03 06:38:07 -04:00
yenatch
5dd127300c even more incbinned asm in bank 4 2013-09-03 06:07:45 -04:00
yenatch
5641ea009c disassemble more incbins in bank 4 2013-09-03 05:56:07 -04:00
yenatch
0eff98ecf1 the rest of TMHMMoves 2013-09-03 03:56:11 -04:00
yenatch
bf4bedc4bf more bank 4 functions and CanLearnTMHMMove 2013-09-03 03:54:13 -04:00
yenatch
0d3de2e30b GetTMHMMove and renamed TechnicalMachines -> TMHMMoves 2013-09-03 03:39:21 -04:00
yenatch
edc354152e formatting in MoveInfoBox and related functions 2013-09-02 06:40:30 -04:00
yenatch
9f7c4ef0b4 Sine and Cosine 2013-09-02 00:12:27 -04:00
yenatch
5b38b377f2 wram labels for graphics requests 2013-09-01 15:24:07 -04:00
yenatch
e3da601cee split out tileset headers from main into tilesets/tileset_headers.asm 2013-09-01 14:43:25 -04:00
yenatch
4a4dd20a6d split tileset palette maps out of main into tilesets/palette_maps.asm 2013-09-01 14:43:24 -04:00
yenatch
7cac61f3bd split tileset data out from main into tilesets/ 2013-09-01 14:43:23 -04:00
yenatch
5147e6c0a2 random 0s in tileset data was actually lz padding
i guess someone liked their filesizes nice and even?
2013-09-01 14:42:49 -04:00
yenatch
3010731347 split out blockdata includes from main into maps/ 2013-09-01 14:41:21 -04:00
yenatch
2a0089b92b shorten some overly long music filenames 2013-09-01 14:41:16 -04:00
yenatch
1a02ed6b37 get rid of the last static address in tileset animation arrays 2013-09-01 03:13:17 -04:00
yenatch
7d5e5b8182 recomment _AnimateTileset 2013-09-01 00:52:19 -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
8190c3e5e7 rename DoTileAnimation to AnimateTileset 2013-09-01 00:07:10 -04:00
yenatch
fc6bc8e311 rename graphics request handlers to Serve1bppRequest and Serve2bppRequest
these had some really dumb names
2013-09-01 00:02:35 -04:00
yenatch
abce472354 fix PushOAM references in VBlank 2013-08-31 21:47:28 -04:00
yenatch
28fd514bef recomment tileset animation interface 2013-08-31 21:47:22 -04:00
yenatch
0a821fe964 recomment bg map update functions 2013-08-31 21:47:05 -04:00
yenatch
2acccc3ea5 rename FarBattleTextBox to StdBattleTextBox
that's it for bad Far usage
2013-08-31 03:54:02 -04:00
yenatch
b333b18dbd Function2f79 is PickUpItem 2013-08-30 23:07:08 -04:00
yenatch
c402a16def undo overcommenting in BattleRandom
these comments made sense before hram and rst constants were established
2013-08-30 23:03:15 -04:00
yenatch
c9d3881a2f rename RNG to Random
also fix 'Far' naming scheme for BattleRandom

this was a long time coming
2013-08-30 22:59:40 -04:00
yenatch
70ecde3f78 StartTitleScreen -> TitleScreen
also undo "far" naming scheme
2013-08-30 22:47:20 -04:00
yenatch
523abc2d0e formatting in oak speech 2013-08-30 22:46:28 -04:00
yenatch
21248effe4 NUM_POKEMON in main.asm 2013-08-30 22:25:50 -04:00
yenatch
17f25691db Function378b is IsAPokemon 2013-08-30 20:53:42 -04:00
yenatch
f4572ecd4d use more egg constants in main 2013-08-30 19:14:04 -04:00
yenatch
4983c46a26 use callab/callba macros for known FarCalls 2013-08-30 18:57:31 -04:00
yenatch
7cc320e835 Coins in main.asm 2013-08-30 17:50:46 -04:00
yenatch
b86d0da040 less arbitrary wram clearing in game init 2013-08-30 14:21:26 -04:00
yenatch
79bcda11ad PCItems and game init formatting 2013-08-30 04:57:32 -04:00
yenatch
2f169fd2f9 clean up bank 7e includes 2013-08-29 23:27:57 -04:00
yenatch
fd74b4d379 move battle tower mon handling asm into battle_tower.asm 2013-08-29 23:27:17 -04:00
yenatch
7201ea8f0a move GiveOddEgg into odd_eggs.asm 2013-08-29 23:26:01 -04:00
yenatch
55cd892026 fix/add some missing function labels in bank 0 2013-08-29 23:19:21 -04:00
yenatch
fb28d24bd7 condense repeated asm with rept macros 2013-08-29 21:42:28 -04:00
yenatch
579ab13507 proper labeling of common function GetSpritePalette 2013-08-29 21:20:45 -04:00
yenatch
64a6af4052 condense some repetitive asm with rept macros 2013-08-29 21:20:37 -04:00
yenatch
cc98fab33e move VBlank interrupt label from main.asm to engine/vblank.asm 2013-08-29 19:40:33 -04:00
yenatch
2c16bc7ab9 move copy asm from main.asm to engine/copy.asm 2013-08-29 19:39:21 -04:00
yenatch
04da88a285 move palette asm from main.asm to engine/palettes.asm 2013-08-29 19:37:35 -04:00
yenatch
6d29673a5f move time-related asm from main.asm into engine/time.asm 2013-08-29 19:32:03 -04:00
yenatch
6467755568 move serial asm from main.asm into engine/serial.asm 2013-08-29 19:11:39 -04:00
yenatch
2341bb148a move more joypad code from main.asm into engine/joypad.asm 2013-08-29 19:10:06 -04:00
yenatch
dd11c22b31 more joypad function cleanup 2013-08-29 19:08:25 -04:00
yenatch
0a829301ae reformat some joypad functions 2013-08-29 18:59:05 -04:00
yenatch
906496e107 split lcd functions out of main.asm 2013-08-29 18:52:26 -04:00
yenatch
2b5b6f3e3a split fading functions out of main.asm 2013-08-29 18:50:59 -04:00
yenatch
37a841797e secret ruins of alph water stone room asm 2013-08-29 16:03:32 -04:00
yenatch
ae1d50c026 warp sound effects in field moves 2013-08-29 15:24:37 -04:00
yenatch
a167620109 more field move scripts and some map header references 2013-08-29 14:49:07 -04:00
yenatch
1a5f9426c8 get rid of a trailing incbin at the end of bank 21 2013-08-29 03:21:51 -04:00
yenatch
99760c2cc9 more hlcoords in bank 1 2013-08-29 03:04:23 -04:00
yenatch
9d1a6fe5bb more field move scripts 2013-08-29 02:53:04 -04:00
yenatch
a4b69a123f more text_jumps in known functions 2013-08-29 02:23:29 -04:00
yenatch
7fe1fa58e3 hram constants in serial interrupt 2013-08-28 04:29:20 -04:00
yenatch
faae0e1029 serial interrupt 2013-08-28 01:24:52 -04:00
yenatch
8898f63fc7 timer interrupt 2013-08-27 23:38:05 -04:00
yenatch
651e0a4245 LYOverrides in main.asm 2013-08-27 20:56:28 -04:00
yenatch
25dcc71c4c rename some LCD functions 2013-08-27 20:46:15 -04:00
yenatch
12ab33b37e rename FarCall family labels
FarJump labels renamed to FarCall
register aliases JpHl and JpDe renamed to _hl_ and _de_
2013-08-27 18:16:42 -04:00
yenatch
be9c504b24 rename PushScriptPointer -> CallScript 2013-08-27 18:00:41 -04:00
yenatch
886ab68884 add some field move asm and scripts 2013-08-27 17:11:24 -04:00
yenatch
94fc90a243 badge engine flags in main.asm 2013-08-27 16:23:53 -04:00
yenatch
2b10d184b0 recomment some common asm (rtc/lcd) 2013-08-27 00:10:22 -04:00
yenatch
2f5ed8468d SpecialRoamMons -> InitRoamMons 2013-08-26 19:48:44 -04:00
yenatch
9cf90f6c7b deobfuscate some encounter asm 2013-08-26 19:47:42 -04:00
yenatch
17725d7af1 battle init and some overworld actions 2013-08-24 04:10:38 -04:00
yenatch
af205a7217 BitTable2 -> EngineFlags 2013-08-23 16:08:31 -04:00
yenatch
3a24cff5eb BitTableFunc -> FlagAction 2013-08-23 15:49:24 -04:00
yenatch
bc7b63b44a EventFlags label (bittable1) 2013-08-23 15:00:07 -04:00
yenatch
849e5a7d0f game freak presents splash 2013-08-23 01:26:35 -04:00
yenatch
ac7b7ede0b more bank 0 labels instead of static addresses 2013-08-23 01:11:53 -04:00
yenatch
8105dc6c7c BoxMons in main.asm 2013-08-22 18:34:01 -04:00
yenatch
179decd644 GiveOddEgg and related asm
That's it for bank 7e
2013-08-21 17:25:24 -04:00
yenatch
7f96387411 dump odd eggs 2013-08-21 16:02:36 -04:00
yenatch
cc1f57ec93 condense IncGradGBPalTable
this way is more readable too
2013-08-21 14:49:35 -04:00
yenatch
27e1d3fabf Merge branch 'master' into merge-kanzure 2013-08-21 14:02:13 -04:00
yenatch
7b5ffb5475 more field move asm/scripts 2013-08-21 14:01:51 -04:00
yenatch
5db04abdab TileType is actually TileCollision 2013-08-21 14:01:50 -04:00
yenatch
9ac0fc631b formatting in TileTypeTable and tile checks 2013-08-21 14:01:50 -04:00
yenatch
636a960909 split out text engine 2013-08-21 14:01:49 -04:00
yenatch
c1d0253162 graphics loading functions (2bpp and 1bpp) 2013-08-21 14:01:48 -04:00
yenatch
35de889dd7 split out decompression 2013-08-21 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
99d2ee2bdc split out program init 2013-08-20 03:26:37 -04:00
yenatch
4b0889b396 remove unnecessary incbin lengths 2013-08-20 03:20:49 -04:00
yenatch
5fe7c6bb67 johto/kanto maps 2013-08-20 02:55:14 -04:00
yenatch
29085399a2 copyright graphics 2013-08-20 02:09:35 -04:00
yenatch
91474f1b86 MBC3SRAMEnable is actually MBC3SRamEnable 2013-08-20 01:38:05 -04:00
yenatch
5b7d887f9d comment program init functions 2013-08-20 01:35:15 -04:00
yenatch
df21dbccb7 $ffcf $ffd0 -> hSCX hSCY 2013-08-19 18:46:56 -04:00
yenatch
449bda272a $ffd1 $ffd2 -> hWX hWY 2013-08-19 18:44:12 -04:00
yenatch
8af06f3cc2 rename and clean up _Start, Init 2013-08-19 18:40:59 -04:00
yenatch
75d5cc3bb6 options menu 2013-08-17 05:57:14 -04:00
yenatch
deb5d1ed46 <&iimarckus> kill those labels please 2013-08-17 01:12:03 -04:00
yenatch
a29c13837d labels for IncGradGBPalTable 2013-08-17 00:53:19 -04:00
yenatch
4105ac8102 battle tower trainers and mons 2013-08-16 22:36:13 -04:00
yenatch
4398dde8cb even more phone text (bank 5d) 2013-08-16 15:25:06 -04:00
yenatch
d83f8228ce dump some mobile link text 2013-08-16 15:15:06 -04:00
yenatch
f458f96427 even more phone text (bank 29) 2013-08-16 14:43:35 -04:00
yenatch
b3dcb0e875 pokegear radio channel names 2013-08-16 14:38:59 -04:00
yenatch
ff453a514b LoadMenuDataHeader and intro player name menu 2013-08-16 04:58:14 -04:00
yenatch
caa7865ce7 extra phone text (bank 19) 2013-08-15 21:54:16 -04:00
yenatch
627914195d battle tower trainer text (bank 7b) 2013-08-15 06:09:12 -04:00
yenatch
000c6d1349 CheckContestMon and a couple labels in bank 0 2013-08-15 06:07:14 -04:00
yenatch
8ecd66f5d5 replace more addresses with labels 2013-08-14 05:42:28 -04:00
yenatch
2fb8d10c23 more bank 2 incbins 2013-08-14 05:38:12 -04:00
yenatch
7a8eb4e434 sort out player/battle backpic asm 2013-08-12 16:33:17 -04:00
yenatch
14160a180f hidden power type/power calculation 2013-08-09 17:50:34 -04:00
yenatch
94e9a3f764 specials cleanup 2013-08-09 16:24:58 -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
0ee006a145 more item effects 2013-08-03 16:25:38 -04:00
yenatch
46fea97994 more step handling 2013-08-03 16:25:38 -04:00
yenatch
09dfa9f09e incbin unown font 2013-08-03 16:25:37 -04:00
yenatch
0e50b4c798 more bank 1 incbins 2013-08-03 16:25:37 -04:00
yenatch
e2a0c68f4c comment more battle ui 2013-08-03 16:25:37 -04:00
yenatch
257302dff9 player hud stuff 2013-08-03 16:25:36 -04:00
yenatch
ce31567c4d frames 2013-08-01 15:30:48 -04:00
yenatch
d39dc68a88 field move asm 2013-08-01 05:34:10 -04:00
yenatch
59cb57b954 more cleanup 2013-07-31 19:17:35 -04:00
yenatch
814ab52b21 cleanup and bank 9 menus 2013-07-31 18:03:18 -04:00
yenatch
c9b70ba105 update predef/specials pointers 2013-07-30 01:05:20 -04:00