Commit graph

389 commits

Author SHA1 Message Date
Rangi 929c7f6f7d Remove RAM address comments 2020-06-27 23:03:39 -04:00
Rangi 6b19b301f4 Move trade bubble from gfx/icons to gfx/trade 2020-06-27 22:44:05 -04:00
Rangi eeb45036e2 Individual images for party menu icon graphics 2020-06-27 22:16:01 -04:00
Rangi 76d02feca0 Move mon_nest_icon.png to gfx/town_map 2020-06-27 21:43:32 -04:00
Rangi d5089d3c62 Organize gfx/ 2020-06-27 21:43:32 -04:00
Rangi 4b853ad676
Separate maps.asm, pics.asm, sprites.asm, and tilesets.asm from main.asm (#251)
Each new file builds its own .o, along with separate main.o and home.o, which necessitates many more "exported::" labels.
2020-06-27 15:32:24 -04:00
Rangi 0a62d48df2 Move more tables from engine/ to data/
This also splits the end of engine/battle/core.asm into engine/battle/effects.asm.
2020-06-23 17:50:50 -04:00
Daniel Harding bdeb494add
Merge pull request #243 from Nog-Frog/rename-unused-cd40
Name UnusedCD40
2020-06-21 12:23:10 -05:00
Akatsuki-py a3b6d69efc remove two whitespaces 2020-06-06 10:50:05 +09:00
Akatsuki-py 09f07502b3 fix SubtractAmountPaidFromMoney comment 2020-06-05 04:32:12 +09:00
Nog-Frog 7ecfd641fb Name UnusedCD40
Every man deserves a name :)
2020-05-29 10:07:53 +03:00
Daniel Harding 6119945fca
Merge pull request #241 from Nog-Frog/Fix-Sent-To-Box
Change "Set to box" to "Sent to box"
2020-05-27 14:34:34 -05:00
Daniel Harding d29d0224e5
Merge pull request #239 from Akatsuki-py/use_rept
Use rept macro in CopyHealingMachineOAM
2020-05-27 14:34:06 -05:00
Nog-Frog 39f0bcb987 Change "Set to box" to "Sent to box" 2020-05-26 15:14:46 +03:00
dannye 9a8811b492 Misc minor clean up
spotted by comparing against pokeyellow
2020-05-24 18:59:05 -05:00
akatsuki-py 07165f25dc use rept macro 2020-05-24 04:58:12 +09:00
Akatsuki-py 1682aeb62a Fix comment from Y pos to X pos 2020-05-01 02:27:49 +09:00
Daniel Harding 5048f24816
Merge pull request #223 from pret/audio-macros
Audio macros
2020-02-05 17:59:01 -06:00
Thomas Winwood d8605df73d Use percent macro for trainer AI packages 2019-11-23 19:47:46 +00:00
dannye 20c4116788 Update audio macro names
change audio channel numbers from 0-7 back to 1-8
change all note macros back to single note macro
todo: fix comments with old macro names, update noise macros/instrument names
2019-07-27 23:21:39 -05:00
Rangi 092be231cc Merge branch 'master' of https://github.com/pret/pokered 2019-07-07 00:44:30 -04:00
Rangi f99a715fae Replace some hard-coded values with constants 2019-07-07 00:44:21 -04:00
dannye a8133da3ee A few missed SFX constant IDs 2019-04-21 18:38:26 -05:00
Rangi c779602459 Rename map files, labels, and constants to be consistent and work with Polished Map 2019-01-01 23:33:10 -05:00
luckytyphlosion dcaca64f5e Clean up pre-linkerscript remnants. 2018-11-18 18:29:24 -05:00
Pokeglitch 808c2509b0 Updated constants for intro 2018-06-23 11:37:58 -04:00
Pokeglitch 01fe449837 Updated the intro 2018-06-22 23:06:05 -04:00
dannye 98f09b6d26 Use rgblink dmg mode 2018-03-24 13:41:54 -05:00
yenatch c80eddf988 add wEvosMoves instead of using eevee 2018-03-21 18:55:09 -04:00
bitman44 2056bdda52 Cleaned up name formatting 2018-03-21 06:51:03 -05:00
bitman44 8251c6138e Replaced instances of Mon### with the Pokemon's name 2018-03-20 20:27:28 -05:00
yenatch f75049feef Use rgbgfx and c tools instead of the submodule. 2018-03-10 18:53:04 -05:00
xCrystal 237aeb8fbd Add space between arguments in assembly instructions and remove redundant a in instructions like add a, x 2017-12-30 01:54:27 +01:00
xCrystal 94b9a86c8b Uppercase battle status constants 2017-12-30 00:59:48 +01:00
dannye 9dc48a1be7 Replace hardcoded address offset 2017-12-02 14:40:34 -06:00
dannye 19e4e188ce Catch a missed hide/show ID 2017-10-29 13:22:17 -05:00
yenatch 5c24193831 Merge pull request #167 from Pokechu22/rgbds-0.3.3
Update for RGBDS 0.3.3
2017-09-29 22:41:34 -04:00
dannye 7a9a1b1e55 Fix typos in comments 2017-06-24 15:01:43 -05:00
Antonio Niño Díaz 9ea25bc8cd Replace deprecated mnemonics by the correct ones
The old mnemonics generate warnings with new versions of rgbds. This
patch replaces them by the correct ones.

Signed-off-by: Antonio Niño Díaz <antonio_nd@outlook.com>
2017-06-09 22:54:09 +01:00
dannye e9f33ce19c Typo: SFX_POKEFLUE → SFX_POKEFLUTE 2017-05-08 02:54:20 -05:00
Joe Farebrother 39d31cecb2 Gave names to the functions and labels and adresses used in DivideBCD
and added a few comments
2017-03-19 21:09:24 +00:00
Joe Farebrother ce35f2f7a1 Gave the labels in _MoveMon more descriptive names and added a few comments 2017-03-19 20:35:40 +00:00
YamaArashi 46fbe5531b fix incorrect comment 2017-01-16 14:42:15 -08:00
YamaArashi 7c3a90bf01 use actual predef label 2017-01-07 11:13:52 -08:00
YamaArashi 3068ab2e19 use text constants in poison.asm 2016-12-31 17:36:05 -08:00
YamaArashi bf67f7174d split code out of main.asm 2016-12-31 17:23:54 -08:00
YamaArashi 77c3e22a4e use more HRAM constants 2016-10-29 10:32:03 -07:00
YamaArashi 4d61c35172 correct mistaken comments 2016-10-29 02:04:48 -07:00
YamaArashi bb1bf5e6a7 link battle action constants 2016-10-29 01:44:13 -07:00
YamaArashi d1162fec71 correct comments about teleport effect 2016-10-16 22:30:32 -07:00
YamaArashi c2381bb3e6 split bank 1 into files 2016-09-17 18:17:57 -07:00
YamaArashi 6f1ac06e03 pull some bank 1 code out of main.asm 2016-09-17 17:37:32 -07:00
dannye 52bb07ca18 Replace unnecessary tabs with spaces 2016-07-27 22:33:48 -05:00
dannye 5207a14af3 Redo audio header macro 2016-07-27 22:08:13 -05:00
dannye 25c27785aa A few missed hardcoded decimal points 2016-07-18 01:48:34 -05:00
dannye 7c01509b6b Merge branch 'master' of https://github.com/pret/pokered 2016-07-18 01:32:24 -05:00
dannye 80bae03975 Clean up text commands 2016-07-18 01:17:03 -05:00
YamaArashi 3a6a300da4 sync text 2016-06-12 10:11:31 -07:00
YamaArashi bcb251261d sync tileset WRAM labels 2016-06-12 01:07:52 -07:00
YamaArashi 61ee396786 more syncing with pokeyellow 2016-06-12 00:52:14 -07:00
YamaArashi fd2235e678 sync engine code with pokeyellow 2016-06-12 00:52:13 -07:00
dannye a51037eeee Remove the last address comments
except for wram.asm and sram.asm
also delete unused yellow file
2016-06-12 02:19:44 -05:00
dannye 48e0125bd6 Remove some leftover address comments 2016-06-12 01:42:19 -05:00
YamaArashi 7f34e28f24 remove address comments 2016-06-11 17:24:04 -07:00
pikalaxalt d8dae96f35 Implement handy text macros from yellow 2016-06-09 21:20:02 -04:00
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