Commit graph

302 commits

Author SHA1 Message Date
Rangi bfd9f617c9 Use constants to delineate map types, and factor out more data 2020-08-31 10:23:19 -04:00
Rangi 69788c536b Add comments associating constants with data, and identify some more data 2020-07-20 12:31:35 -04:00
Rangi 76289dfda0 Port dbsprite macro for OAM y,x,tile,attr data from pokecrystal 2020-07-17 15:58:06 -04:00
Rangi f53341efa1 Define constants for subanimations' base coords and frame block modes 2020-07-17 15:16:54 -04:00
Rangi 3c1cdbc4d0 Identify remaining tilemap IDs 2020-07-17 13:47:33 -04:00
Rangi 30ecbf6ea3 SONY -> RIVAL 2020-07-17 13:27:27 -04:00
Rangi 2454296d32 Update sprite names
These are based on the trainers that use them, and synced with pokegold/pokecrysal when possible
2020-07-17 12:48:15 -04:00
Rangi 884ef9c1a8 Factor out animation tilemaps 2020-07-16 22:23:31 -04:00
Rangi 6f7337bbb1 Define constants for subanimation transform types 2020-07-16 22:14:39 -04:00
Rangi 2f43a41100 Use a battle_anim macro for move animations' special effects and subanimations
Move animations' sound IDs are off by one from move IDs.
2020-07-16 21:45:30 -04:00
Rangi 0db7ee08ff Use a macro for BattleTransition_DoubleCircle data 2020-07-16 20:11:00 -04:00
Rangi cd71ae03af Separate move/battle animation data from move data (to do: further identify animation data labels+constants) 2020-07-16 19:50:48 -04:00
Rangi 58f1089370 Define constants for default trainer DVs 2020-07-16 09:40:30 -04:00
Rangi f37cf959c9 Clean up some data, using macros for multiline list entries 2020-07-14 13:32:09 -04:00
Rangi 4a7d1513f3 Use 'tile' and 'tiles' macros 2020-07-07 16:21:26 -04:00
Rangi 13129459f1 Sync coordinate macros with pokecrystal 2020-07-07 11:30:10 -04:00
Rangi 45ed05decf Use HIGH() and LOW() 2020-07-07 11:10:29 -04:00
Rangi 06db7ec55b callba/callab -> farcall/callfar; jpba/jpab -> farjp/jpfar 2020-07-06 21:18:22 -04:00
Rangi 77ed5f3820 Use ASCII quotes in comments 2020-07-06 21:15:12 -04:00
Rangi 772fcc7588 Specify the ldh instruction, don't turn ld into ldh 2020-07-06 19:03:05 -04:00
Rangi 2b2ed54bbf Identify wSpriteStateData1 and wSpriteStateData2 offsets, like pokeyellow 2020-07-05 17:51:29 -04:00
Rangi a77999f7f1 Logical spacing in data/sgb/sgb_palettes.asm 2020-07-05 16:15:01 -04:00
Rangi 155695cbfe Use constants for damage limits in CalculateDamage
Fixes #255
2020-07-05 15:12:29 -04:00
Rangi b30b14f322 Correct comments in AISwitchIfEnoughMons
Fixes #244
2020-07-05 14:40:20 -04:00
Rangi 139a28ff99 Port pokecrystal's formatting of text commands and special characters 2020-07-04 21:14:46 -04:00
Rangi e4e0af4d67 Remove remaining raw $xxxx values, and replace "+ -1" with "- 1" (supported by rgbds 0.4.0) 2020-07-04 01:00:45 -04:00
Rangi 6ef36800b0 Replace raw hex values with HRAM constants
To do: turn constants into labels and use ldh
2020-07-03 22:22:09 -04:00
Rangi 35deb77113 H_CONSTANTNAMES -> hConstantNames 2020-07-03 19:59:41 -04:00
Rangi 9878f01e29 Organize macros/ like pokecrystal
While doing so I replaced the StopAllMusic macro with a SFX_STOP_ALL_MUSIC constant and applied it throughout the code.
2020-07-03 16:37:47 -04:00
Rangi c9c59dc343 Reorganize constants/
To do: add comments associating constants with data and code
2020-07-03 12:44:47 -04:00
Rangi b29e5ee203 Add subdirectories to data/ similar to pokecrystal
Top level text/ is now solely for the former text/maps/ files, and other files are in their respective subdirectories in data/.
2020-07-03 11:51:00 -04:00
Rangi f275790aec Add subdirectories to engine/ similar to pokecrystal 2020-07-02 23:30:21 -04:00
Rangi 929c7f6f7d Remove RAM address comments 2020-06-27 23:03:39 -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
dannye 9a8811b492 Misc minor clean up
spotted by comparing against pokeyellow
2020-05-24 18:59:05 -05: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 f99a715fae Replace some hard-coded values with constants 2019-07-07 00:44:21 -04:00
dannye e538d12236 Update home/audio.asm from pokecrystal 2019-04-21 19:37:53 -05:00
dannye b1108ba91e Merge branch 'master' of https://github.com/pret/pokered 2019-04-13 17:21:23 -05:00
dannye e2c81e10f1 Merge commit '42cfe3d36192aca4d0c4ca222be0088c03236e0d' 2019-04-13 16:30:36 -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
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
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
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 87eed68710 Insert Crystal audio engine and music
most credit goes to Sanqui
2017-05-07 15:30:08 -05:00
YamaArashi 46fbe5531b fix incorrect comment 2017-01-16 14:42:15 -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
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 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 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
IIMarckus 3fd6787692 Clean up more Yellow ifdefs. 2016-03-22 00:10:23 -06:00
Marcus Huderle 213f6dfc98 Remove hardcoded values for CopyData in battle core. 2016-02-20 13:54:52 -08: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 30063216cd use the new battle type constants 2015-08-29 23:35:58 -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
dannye 4aedff0217 Replace hardcoded name lengths with NAME_LENGTH 2015-08-10 23:51:20 -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 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
YamaArashi 56d75db28a constants for PrintNumber 2015-07-29 12:06:54 -07:00
dannye d7c5c8cf22 Merge branch 'master' of https://github.com/xCrystal/pokered 2015-07-26 23:23:05 -05: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 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 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
dannye 4d88812f40 Name some battle sound effects 2015-07-21 21:04:21 -05: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 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 c169073eed misc 2015-07-18 21:58:55 -07: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 bd7d981593 menu stuff 2015-07-15 20:04:58 -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 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 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 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
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 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
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
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
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