Commit graph

374 commits

Author SHA1 Message Date
pikalaxalt b8dfee5114 dbw door tiles 2016-05-22 11:40:49 -04:00
pikalaxalt 31b118ab42 Merge branch 'master' of https://github.com/pret/pokered 2016-05-13 17:59:46 -04:00
pikalaxalt 93fe306475 Split default names strings into separate lines to make it less unpleasant to read 2016-05-13 17:58:34 -04:00
IIMarckus 3fd6787692 Clean up more Yellow ifdefs. 2016-03-22 00:10:23 -06:00
Marcus Huderle 6de584fe66 Remove hardcoded length values in items.asm 2016-02-21 12:59:33 -08:00
Marcus Huderle 213f6dfc98 Remove hardcoded values for CopyData in battle core. 2016-02-20 13:54:52 -08:00
PikalaxALT 1980a5befc Macrofy sprite status data in WRA0 2016-01-29 11:20:47 -05:00
dannye 32a464b0f0 Fix logically incorrect label 2016-01-27 23:08:50 -06:00
YamaArashi 8a5a7d8e68 fix typoes 2016-01-09 03:03:55 -08:00
PikalaxALT cd3eb9867b Fix a typo 2016-01-05 21:55:39 -05:00
PikalaxALT 28dc5686b0 Fix game time labels 2016-01-03 14:18:33 -05:00
dannye 351146024b Fewer underscores in constants 2015-12-14 22:09:30 -06:00
dannye 8026d47585 No more S_ 2015-08-30 22:15:32 -05:00
dannye 5facf8377a No more wram_constants.asm
unfortunately, this means manually declaring the wEnemyMon1 party struct
2015-08-30 22:05:50 -05:00
dannye 38065a744d No more W_ 2015-08-30 21:38:41 -05:00
YamaArashi 4cfcc2f589 replaced hardcoded values in ItemUseMedicine 2015-08-30 01:08:01 -07:00
YamaArashi 4f43e47fc9 rename ItemUseBall labels 2015-08-30 00:15:59 -07:00
YamaArashi 30063216cd use the new battle type constants 2015-08-29 23:35:58 -07:00
YamaArashi 38d771dc44 commented pokeball function 2015-08-29 23:21:54 -07:00
YamaArashi b6a7e5e9cf documented flags and misc. fixes 2015-08-29 17:15:05 -07:00
YamaArashi b6ac1018c2 add border constant and clear up misnomer 2015-08-14 02:46:12 -07:00
YamaArashi 599a6aeaaf named battle and learn move variables 2015-08-14 00:36:06 -07:00
YamaArashi f6d618090a Named a test battle variable 2015-08-13 19:13:47 -07:00
YamaArashi 132d036752 named more variables 2015-08-12 22:14:31 -07:00
YamaArashi 64cfbcce7a commented SGB palette stuff 2015-08-12 02:16:56 -07:00
YamaArashi 43fddc803f constants for IntroMoveMon 2015-08-10 23:23:00 -07:00
dannye fb0a630c06 More joypad constants 2015-08-11 00:34:32 -05:00
dannye 4aedff0217 Replace hardcoded name lengths with NAME_LENGTH 2015-08-10 23:51:20 -05:00
dannye 1df1e9181e Use better wram labels in sram
this way, sram doesn't have to refer to the actual content of wram
2015-08-10 23:05:17 -05:00
dannye dfc152d667 No more $C8
Use OPP_ constants separate from trainer constants since
valid opponents can be all Pokemon and trainers
2015-08-10 11:09:16 -05:00
dannye 66bc517605 Merge branch 'master' of https://github.com/YamaArashi/pokered 2015-08-10 00:00:12 -05:00
dannye 8a6d46f3d9 Replace some hardcoded data sizes 2015-08-09 23:56:20 -05:00
YamaArashi 2b01815999 commented audio code 2015-08-08 22:32:44 -07:00
YamaArashi 40c1ecb437 fixed names 2015-08-07 12:39:29 -07:00
YamaArashi f658aff538 named wram variables 2015-08-07 05:20:37 -07:00
YamaArashi 525f1b96f3 named CountSetBits output variable 2015-08-07 04:24:06 -07:00
YamaArashi 8d30191707 more info on the bide bug 2015-08-06 23:53:23 -07:00
dannye f8a9c37a00 Use more lb
and other clean up
2015-08-05 16:25:58 -05:00
dannye 891627d4ba Rename rod functions 2015-08-05 09:33:32 -05:00
YamaArashi 56d75db28a constants for PrintNumber 2015-07-29 12:06:54 -07:00
dannye 408f9b3141 Merge branch 'master' of https://github.com/luckytyphlosion/pokered 2015-07-27 00:00:21 -05:00
dannye d7c5c8cf22 Merge branch 'master' of https://github.com/xCrystal/pokered 2015-07-26 23:23:05 -05:00
luckytyphlosion 088f40842f Bugfixes.
Fix some building issues and multiply_divide.asm
2015-07-26 18:19:34 -04:00
luckytyphlosion 222afb247d tmlearn macro.
Also multiple_divide documentation and fix improper wram comment.
2015-07-26 17:04:24 -04:00
YamaArashi 93255d6d17 yet more naming 2015-07-25 19:26:54 -07:00
YamaArashi 7f6d0d49b6 more naming variables 2015-07-24 20:27:59 -07:00
YamaArashi 12db77201f named more functions 2015-07-24 14:57:49 -07:00
YamaArashi 82512e4491 named animation functions/variables 2015-07-24 14:39:45 -07:00
xCrystal bbb86671ea Use more wram labels and other constants 2015-07-24 10:49:33 +02:00
YamaArashi 6af65df2fc named function 2015-07-23 21:00:30 -07:00
YamaArashi 323895af6d fixed hram aliases and named wram var 2015-07-23 20:48:35 -07:00
YamaArashi 04a6c306dc clean up wram aliases 2015-07-23 06:07:44 -07:00
Daniel Harding c34156c5fb Merge pull request #107 from YamaArashi/master
enumerate events
2015-07-22 10:24:00 -05:00
dannye a6f04b4349 Unify audio bank references
2→1
8→2
1f→3
2015-07-22 10:22:46 -05:00
dannye b4081e851a Rename sound effect files 2015-07-22 09:57:31 -05:00
dannye 4d88812f40 Name some battle sound effects 2015-07-21 21:04:21 -05:00
YamaArashi dcc7f3bc9f named more constants 2015-07-21 14:21:14 -07:00
YamaArashi 73171bfff5 named most of the used events 2015-07-21 10:36:03 -07:00
YamaArashi fcab935a0f enumerate events 2015-07-20 18:32:26 -07:00
YamaArashi db7d941d22 constants for flag actions 2015-07-19 20:45:34 -07:00
YamaArashi 1d86932cc9 naming 2015-07-19 17:52:26 -07:00
YamaArashi e607199397 replace uses of minus one 2015-07-19 14:01:08 -07:00
YamaArashi 02bd91b707 jpab/jpba macros 2015-07-19 11:56:13 -07:00
dannye 64b4cf624f Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
	engine/evos_moves.asm
	engine/overworld/healing_machine.asm
2015-07-19 03:52:20 -05:00
dannye ea9cc86949 Name sound effects 2015-07-19 03:46:12 -05:00
YamaArashi d0526c0362 small changes 2015-07-18 22:34:11 -07:00
YamaArashi c169073eed misc 2015-07-18 21:58:55 -07:00
dannye b96ef8d2d4 A few missed TX_ASM 2015-07-18 23:53:43 -05:00
dannye 148d3f3cf2 Consolidate coord macros 2015-07-18 15:52:03 -05:00
YamaArashi fc9af362ae fix variable naming 2015-07-18 08:17:46 -07:00
YamaArashi 6931ce9625 money / coins hram constants 2015-07-17 01:22:00 -07:00
YamaArashi aa3da5f3b0 title / diploma / vending machine 2015-07-17 01:22:00 -07:00
YamaArashi 9fbd9e9a1f intro stuff 2015-07-17 01:22:00 -07:00
dannye fb559f1f4e More direction constants
facing directions, npc movement, joypad
2015-07-17 02:52:25 -05:00
dannye 77ba61cb17 Fix Safari Zone check labels 2015-07-16 23:41:44 -05:00
dannye 40ea6a5f75 Merge branch 'master' of https://github.com/iimarckus/pokered 2015-07-16 23:27:57 -05:00
dannye 4670a1ddae Swap trade center and battle center
also rename battle center to colosseum
closes https://github.com/iimarckus/pokered/issues/102
2015-07-16 23:21:57 -05:00
YamaArashi bd7d981593 menu stuff 2015-07-15 20:04:58 -07:00
YamaArashi ac78dda7d8 more movement stuff 2015-07-15 13:58:21 -07:00
YamaArashi 7b676f5851 commented movement stuff 2015-07-15 04:27:59 -07:00
YamaArashi 994c2cbf28 named wram variables 2015-07-14 23:16:06 -07:00
YamaArashi 07dd705637 hall of fame / credits 2015-07-14 19:46:52 -07:00
YamaArashi a0ed5bd4aa field moves 2015-07-14 15:48:34 -07:00
YamaArashi 01631a2e59 player animations, emotion bubbles, etc. 2015-07-14 14:32:49 -07:00
dannye b1cb378893 Comment naming screen
also use more joypad constants
2015-07-14 03:49:49 -05:00
dannye ef9e59101e Use more screen dimension constants 2015-07-14 02:16:19 -05:00
dannye e25a7148d0 Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
	engine/town_map.asm
2015-07-14 00:58:09 -05:00
dannye b509b48a7f Use more *Coord
also town map code relabelling
YamaArashi just did town map relabelling but oh well
I aleady made the changes and don't feel like redoing it
2015-07-14 00:21:03 -05:00
YamaArashi 5d3b958763 named town map stuff 2015-07-13 19:24:07 -07:00
YamaArashi 0066e09828 named party menu/naming screen wram variables 2015-07-13 15:40:33 -07:00
YamaArashi f66a74b9fc comment slot machine 2015-07-13 13:35:35 -07:00
YamaArashi 95b1660e59 menu wram variable names 2015-07-13 00:32:03 -07:00
YamaArashi bcfca2e267 movemon and removepokemon wram variables 2015-07-12 23:36:56 -07:00
YamaArashi 4a8c9993ad named wram variables 2015-07-12 23:00:48 -07:00
YamaArashi 99df5f0fd7 use constant for bg transfer dest hram var 2015-07-12 16:37:06 -07:00
YamaArashi 849b53623b shake screen functions 2015-07-12 16:24:03 -07:00
YamaArashi a957bb1540 some battle animation stuff 2015-07-12 15:51:04 -07:00
YamaArashi 8a80f2c852 more trade comments/fixes 2015-07-12 14:15:25 -07:00
dannye 822bb2bd21 Clean up sram 2015-07-05 04:07:09 -05:00
dannye 063900c7d7 Merge pull request https://github.com/iimarckus/pokered/pull/95 from luckytyphlosion/master
and related bug fixes
2015-07-05 03:49:31 -05:00
dannye f702fc7840 Start using text predef macros
also sprite direction constants
2015-07-04 00:47:29 -05:00
U-Daniel-PC\Daniel 8431fa7756 TX_ASM 2015-07-03 14:58:50 -05:00
U-Daniel-PC\Daniel cd649184f5 Rename/organize part 1 of 4
rename functions, clean up address/wram comments, other misc
only broken up so that all changes are viewable on github
2015-07-03 14:37:53 -05:00
U-Daniel-PC\Daniel ae420a4d8f Mention Jap grammar 2015-06-12 13:45:52 -05:00
U-Daniel-PC\Daniel 4e3cd633f0 Document code related to MonName1Text 2015-06-12 13:40:51 -05:00
U-Daniel-PC\Daniel 21154bc852 Hardcoded palette constant 2015-06-12 11:42:57 -05:00
U-Daniel-PC\Daniel 013c2c7d66 Hardcoded audio bank references 2015-06-12 11:42:39 -05:00
U-Daniel-PC\Daniel 695757abe5 Name a few unknowns 2015-06-12 11:00:48 -05:00
U-Daniel-PC\Daniel 3cd3efd060 Name the last of unnamed text 2015-06-12 11:00:25 -05:00
U-Daniel-PC\Daniel 39abace569 Clean up white space 2015-06-11 17:41:33 -05:00
Daniel Harding c43c338a5f Merge pull request #96 from dannye/master
wram comments, EOLs, EOFs, and UTF-8
2015-06-04 23:02:28 -05:00
U-Daniel-PC\Daniel bdfd6ac09b ANSI->UTF-8 2015-06-04 23:01:40 -05:00
U-Daniel-PC\Daniel 10fd288ab4 Add newlines to EOFs 2015-06-01 22:15:02 -05:00
IIMarckus 26d279b551 Fix a hardcoded value by replacing it with a variable. 2015-05-31 09:15:52 -06:00
luckytyphlosion 3f70c5fc1b Update save.asm 2015-04-26 16:00:50 -04:00
luckytyphlosion 55b5d3e3af Replaced all direct addresses with labels. 2015-04-26 13:15:12 -04:00
luckytyphlosion 5f61d00089 Replaced Box Direct Addresses with Labels. 2015-04-26 11:56:15 -04:00
xCrystal 9739c26ed7 money won and trainer pic constants 2015-04-09 13:05:57 +02:00
xCrystal 9c93ef3bff user xor operator for clearing status flags
use xor operator for clearing status flags
2015-04-09 11:35:37 +02:00
xCrystal 61edd43974 Document DisableEffect and CheckEnemyStatusConditions
basically copy/paste comments and labels from
CheckPlayerStatusConditions
2015-04-09 01:17:56 +02:00
xCrystal b2dc57576d Document move effects
Document mist effect

Document recoil effect

Document heal effect

Update conversion_effect.asm

Update haze_effect.asm

Update leech_seed_effect.asm

Update pay_day_effect.asm

Update reflect_light_screen_effect.asm

Update substitute_effect.asm

Update transform_effect.asm
2015-04-08 23:54:29 +02:00
xCrystal ce9940a2eb Further split bank e stuff 2015-04-01 17:27:51 +02:00
xCrystal 10211cc461 Rename battle files and split move effects Part 5
15.asm, 16.asm, 1a.asm, 1c.asm
2015-04-01 17:05:51 +02:00
xCrystal 2fe782b11a Rename battle files and split move effects Part 4
e.asm, e_2. asm, and 14.asm
2015-04-01 17:05:50 +02:00
xCrystal 77d0e5ff84 Rename battle files and split move effects Part 3
b.asm, b_2.asm, c.asm, and d.asm
2015-04-01 17:05:49 +02:00
xCrystal 46c2a38c7c Rename battle files and split move effects Part 2
5.asm, 9.asm, and a.asm
2015-04-01 17:05:43 +02:00
xCrystal e74dce24b4 Rename battle files and split move effects Part 1
1.asm, 4.asm, and 4_2.asm
2015-04-01 17:05:10 +02:00
xCrystal 9d93b5b630 Document animation types (shake screen/blink pic) 2015-03-31 23:45:57 +02:00
xCrystal 4e2084b0f1 Name more in-battle functions and labels
and better document some animation related functions
2015-03-31 22:22:12 +02:00
xCrystal e6185ac358 Label some attack animation functions 2015-03-31 21:09:43 +02:00
xCrystal c73b5d73f4 Label some battle related functions 2015-03-31 20:50:49 +02:00
xCrystal 4ba8dd6090 Further document AI stuff 2015-03-31 20:40:22 +02:00
xCrystal 247b619e9a Some wram constants 2015-03-31 20:28:42 +02:00
xCrystal a8375aaee7 Split commentary lines that are too long 2015-03-31 20:16:31 +02:00
YamaArashi 0996a964bd commented trade amim functions 2015-03-14 15:27:58 -07:00
YamaArashi 332b7b3090 relabel and add comment 2015-03-13 19:22:55 -07:00
YamaArashi 1115b4454d commented mon_party_sprites.asm 2015-03-13 05:36:34 -07:00
U-Daniel-PC\Daniel 1c2a1076cb Low health alarm documentation
RenaKunisaki
2015-03-12 10:49:35 -04:00
U-Daniel-PC\Daniel 6cb51a1c4e Label typo
closes https://github.com/iimarckus/pokered/issues/81
2015-02-26 23:27:51 -05:00
U-Daniel-PC\Daniel 084c8407d8 Remove hard-coded wPokedexOwned/wPokedexSeen array size 2015-02-20 01:01:57 -05:00
yenatch b65c6e8156 Merge remote-tracking branch 'origin/master' 2015-02-13 14:50:56 -08:00
YamaArashi 7b7c563c93 Rename some labels 2015-02-08 18:40:08 -08:00
YamaArashi 3870f5e10a named misc functions 2015-02-08 01:44:41 -08:00
YamaArashi 1347023128 move-related things 2015-02-08 00:17:03 -08:00
YamaArashi 72bbaed99f fixed hp bar wram label and misc 2015-02-07 22:18:42 -08:00
YamaArashi 32f7cf12de Named wram symbols 2015-02-07 18:37:40 -08:00
YamaArashi 4fd7a42b23 commented battle stuff 2015-02-07 16:24:16 -08:00
YamaArashi 72265ab92a comment drain HP effect 2015-02-07 13:40:14 -08:00
YamaArashi 83023cda19 commented menu stuff 2015-02-07 12:27:36 -08:00
yenatch b35294752c rename hJoyHeldLast -> hJoyLast 2015-02-07 11:39:49 -08:00
yenatch 451f7fce29 Pick off some more static map ids. 2015-02-07 11:18:28 -08:00
YamaArashi c9b778fb00 documented bide bug 2015-02-07 04:23:34 -08:00
YamaArashi 507fcbd269 Fix typo in name 2015-02-07 03:04:50 -08:00
YamaArashi 3fdb8a0d89 serial/trade/misc 2015-02-07 02:43:08 -08:00
xCrystal 9de54645c8 add constants for volatile statuses and more battle labels/commentary/constants 2015-02-04 23:22:46 -08:00
xCrystal 97637e7ce7 More battle commentary/labels/constans and fix some spacing issues
Conflicts:
	engine/battle/core.asm
2015-02-04 23:22:25 -08:00
IIMarckus 01e314f4f5 Merge branch 'master' of /tmp/a/pokered 2015-02-04 00:51:25 -07:00
Marcus Huderle c3a5bb70d2 Use money macro for TrainerPicAndMoneyPointers. 2015-02-04 00:51:12 -07:00
U-Daniel-PC\Daniel a53b3ca561 More battle sfx ids 2015-01-27 03:27:34 -05:00
U-Daniel-PC\Daniel 8744b3bf8b Fix some sfx ids 2015-01-27 03:26:33 -05:00
Marcus Huderle 95f4f7b41f Clean up prizes data. 2015-01-24 12:52:11 -08:00
Marcus Huderle 3cf945bad4 Better documenting for GetMachinePrice and TechnicalMachinePrices. 2015-01-24 12:41:20 -08:00
U-Daniel-PC\Daniel 49a25618ea Clean up white space, fix label typo 2015-01-22 22:13:21 -05:00
xCrystal d3bf8bca5e fix duplicate labels 2015-01-21 11:24:55 +01:00
xCrystal e6499cd505 some constants in stat up/down effects 2015-01-20 20:34:56 +01:00
xCrystal 61aaa15205 rename some labels 2015-01-20 20:21:16 +01:00
xCrystal 1b62ca0555 add commentary to move effects 2015-01-20 12:12:30 +01:00
xCrystal ca6b4348c2 add commentary 2015-01-04 17:47:21 +01:00
yenatch 26227cc45f Clean up type names. 2014-12-10 20:07:01 -08:00
IIMarckus ba1a56d05c Fix typo introduced in last commit. 2014-10-22 23:30:09 -06:00
IIMarckus d0bb99ec89 Add Yellow’s slot machine graphics. 2014-10-21 01:31:34 -06:00
IIMarckus a3d3f8324a Kill version.asm. 2014-10-17 02:42:32 -06:00
IIMarckus 008cface52 Minor comment/label improvements in Cinnabar Lab. 2014-10-16 00:12:44 -06:00
IIMarckus bf6a1bab61 Better document the “can encounter Pokémon outside grass” code.
Pointed out by Lin.
2014-10-10 03:44:52 -06:00
IIMarckus 6e14461fa6 Add a lot of Yellow text changes. 2014-10-10 01:46:06 -06:00
IIMarckus 906bd59e77 Add Yellow player/rival names. 2014-10-09 00:14:18 -06:00
yenatch 070c964964 Accidentally committed .orig files from merge dff0cdeb. 2014-09-23 15:08:12 -07:00
yenatch a81487e9c6 Rename hVBlank* constants to h*. 2014-09-23 15:02:03 -07:00
yenatch dff0cdeb5a Merge remote-tracking branch 'YamaArashi/master'
Conflicts:
	constants/misc_constants.asm
	engine/battle/core.asm
	engine/menu/pokedex.asm
	engine/town_map.asm
	home.asm
	hram.asm
2014-09-20 00:57:27 -04:00
yenatch aa361c3bf7 Use move animation constants instead of static values.
This allows new moves and animations to be added without overlap.
2014-09-17 12:37:47 -07:00
YamaArashi 2ed65d9c3e Commented/labelled misc functions 2014-09-14 11:29:18 -07:00
YamaArashi 0c916aea33 Commented more sprite and map code 2014-09-13 00:50:56 -07:00
YamaArashi 91793015e5 Labelled and commented mostly sprite-related things 2014-09-09 20:55:19 -07:00
YamaArashi daf4fc87ae Add comments regarding menus and sprites 2014-09-08 23:32:33 -07:00
yenatch 8f49e37b82 Use hram constants for remaining joypad variables. 2014-08-30 19:48:49 -07:00
yenatch 365ae68d80 Use PARTY_LENGTH and related constants in menu and hud code.
This should allow reducing PARTY_LENGTH to work as intended.
Increasing it also works provided space is provided in wram, but breaks pc/saving.
2014-08-22 23:17:47 -07:00
YamaArashi 59f0507e4c Labelled many functions/variables 2014-08-08 22:39:13 -07:00
yenatch 1cf79b6f15 Fix static banks passed into GetName.
This appears to be the only other use of wPredefBank.

Chances are there are more uncaught banks. Known cases are marked as "hardcoded" or similar.
2014-08-07 21:17:44 -07:00
YamaArashi c9946975d4 Commented function
- Named and commented Func_4c70.
- Removed gfx/diagonal_lines.png, which is not actually graphics.
2014-07-28 02:22:58 -07:00
U-Fish-PC\Daniel f8b8ebea93 S_SPRITEBUFFER0 static address 2014-06-25 18:49:52 -04:00
U-Fish-PC\Daniel bd533aa79b Use *Coord instead of FuncCoord
Using 'Coord =' doesn't like using wTileMap
So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord
to avoid static addresses
2014-06-25 16:58:27 -04:00
yenatch b36f793667 Use macros for predef calls/jumps instead of static ids. 2014-06-16 13:57:26 -07:00
yenatch d10108a066 Use macros to define predefs. 2014-06-16 13:25:46 -07:00
yenatch 35f2bb90d4 Rename predef functions so they aren't excessive in length.
This is mostly because of an rgbasm bug that prevents macro arguments
from exceeding 16 characters, but the names were bad anyway.
2014-06-16 13:03:05 -07:00
yenatch 38ac74f222 Remove generated "indirect jump" comments.
The destination is obvious when using the predef macro.
2014-06-16 11:37:36 -07:00
yenatch 81bbab85ac Hall of Fame sram labels and related constants. 2014-06-14 14:24:35 -07:00
yenatch 53ae0e93fa Use monster struct macros in wram. Rename related labels for consistency. 2014-06-14 04:12:40 -07:00
U-Fish-PC\Daniel 9eefed45f7 Use MAX_LEVEL instead of 100/$64 2014-06-10 17:06:30 -04:00
U-Fish-PC\Daniel f4e2814381 More music bank references
Now the AUDIO constants in audio.asm can be edited freely
2014-06-10 01:10:11 -04:00
U-Fish-PC\Daniel fadac928bc Clean up music bank references 2014-06-09 16:18:29 -04:00