Commit graph

381 commits

Author SHA1 Message Date
Rangi be326c6565 Factor out spinner tiles from RocketHideoutB2F since they're also used by ViridianGym, and to make their data and code more accessible 2020-07-14 15:14:32 -04:00
Rangi f37cf959c9 Clean up some data, using macros for multiline list entries 2020-07-14 13:32:09 -04:00
Rangi a49ca6ef41 Factor out MapBadgeFlags and EscapeRopeTilesets data tables 2020-07-08 10:31:44 -04:00
Rangi 51ac538c25 Identify SPRITESTATEDATA2_ORIGFACINGDIRECTION 2020-07-07 16:57:51 -04:00
Rangi 4a7d1513f3 Use 'tile' and 'tiles' macros 2020-07-07 16:21:26 -04:00
Rangi 1e593d8f8c Remove c1x*/c2x* comments, use struct offset constants 2020-07-07 14:15:39 -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 f113361952 Use DEX_* constants for StarterDex 2020-07-06 19:50:36 -04:00
Rangi 772fcc7588 Specify the ldh instruction, don't turn ld into ldh 2020-07-06 19:03:05 -04:00
Rangi 9c2be80bf3 text_linkpromptbutton -> text_waitbutton
Fixes #260
2020-07-06 12:40:36 -04:00
Rangi 8a79315635 Capitalize rgbds control structures (EQU/EQUS, IF/ELIF/ELSE/ENDC, REPT/ENDR, MACRO/ENDM, etc) 2020-07-06 12:28:31 -04:00
Rangi 405889193e TM/HM constants named after moves 2020-07-05 22:52:27 -04:00
Rangi 2b2ed54bbf Identify wSpriteStateData1 and wSpriteStateData2 offsets, like pokeyellow 2020-07-05 17:51:29 -04:00
Rangi 7ab43f4d17 Port _RemovePokemon documentation from pokeyellow 2020-07-05 16:41:45 -04:00
Rangi b0aa4cb14a Port two HRAM labels from pokeyellow 2020-07-05 16:35:06 -04:00
Rangi a77999f7f1 Logical spacing in data/sgb/sgb_palettes.asm 2020-07-05 16:15:01 -04:00
Rangi b2369b0961 Port credits command constants from pokeyellow 2020-07-05 15:35:38 -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 d9db3d7495 Update map hide/show data labels
Fixes #235
2020-07-05 14:38:08 -04:00
Rangi 139a28ff99 Port pokecrystal's formatting of text commands and special characters 2020-07-04 21:14:46 -04:00
Rangi 36f8cd1477 UPDATE_PARTY_MENU_BLK_PACKET -> SET_PAL_PARTY_MENU_HP_BARS, and introduce SET_PAL_DEFAULT 2020-07-04 16:16:29 -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 053afc4634 Move more code from home.asm to home/ 2020-07-03 22:57:43 -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 62e137f6ce Factor out data/sprites/ 2020-07-03 16:58:55 -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 ccb01731fe Make suggested edits:
- data/mapWilds -> data/wild/maps
- diglett_sculpture.asm -> book_or_sculpture.asm
- relocate some audio/music constants
2020-07-03 15:57:35 -04:00
Rangi e882708b85 Split up engine/events/hidden_object_functions 2020-07-03 13:23:51 -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 87ef75c173 Add engine/movie/oak_speech/ subdirectory 2020-07-03 01:11:23 -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 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 e538d12236 Update home/audio.asm from pokecrystal 2019-04-21 19:37:53 -05:00
dannye a8133da3ee A few missed SFX constant IDs 2019-04-21 18:38:26 -05:00
dannye 735d5bd4c2 Manually merge pokecrystal audio files
and remove more CrystalComplete leftovers
2019-04-21 15:13:17 -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
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
dannye 87eed68710 Insert Crystal audio engine and music
most credit goes to Sanqui
2017-05-07 15:30:08 -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