Commit graph

249 commits

Author SHA1 Message Date
Rangi
6f7337bbb1 Define constants for subanimation transform types 2020-07-16 22:14:39 -04:00
Rangi
41a9e30268 Add constants for move animations' frame blocks 2020-07-16 22:00:16 -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
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
b9a113a9f4
Merge pull request #276 from TheFakeMateo/master
Deobfuscate exit warps on indoor maps
2020-07-16 08:19:51 -04:00
TheFakeMateo
4ecff22f71 Deobfuscate exit warps on indoor maps 2020-07-15 18:12:58 -05:00
Rangi
4b4ad9894e Disassemble the BLUEMONS.GB debug ROM 2020-07-15 13:35:39 -04:00
Rangi
254f26bf6b Align constant comments as a column 2020-07-15 12:45:17 -04:00
Rangi
15bcd88228 Indent comments that describe data table macro formats 2020-07-15 12:39:50 -04:00
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
fcb573f4ac Use a macro for warp tile IDs, like other tile behaviors 2020-07-14 14:33:16 -04:00
Rangi
eb1ca5813b Define cries with a mon_cry macro 2020-07-14 14:20:38 -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
4a7d1513f3 Use 'tile' and 'tiles' macros 2020-07-07 16:21:26 -04:00
Rangi
bbc257476f PSYCHIC -> PSYCHIC_TYPE (PSYCHIC is ambiguous with PSYCHIC_M) 2020-07-07 10:54:05 -04:00
Rangi
453bb5c38e Use STARTER[123] constants in TitleMons 2020-07-06 20:35:59 -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
d08eb86233 Automatically list all TM##_MOVE and HM##_MOVE values 2020-07-06 12:22:20 -04:00
Rangi
6ad4c26a03 Align tmhm learnsets in rows of 5 2020-07-06 11:19:53 -04:00
Rangi
25a3e67b94 add_tm and add_hm define TM##_MOVE and HM##_MOVE constants, to avoid repeating the move names twice 2020-07-06 09:32:55 -04:00
Rangi
405889193e TM/HM constants named after moves 2020-07-05 22:52:27 -04:00
Rangi
66ebe56adc Port pokecrystal's base data and tmhm structure
To do: TM/HM constants named after moves
2020-07-05 21:59:32 -04:00
Rangi
a77999f7f1 Logical spacing in data/sgb/sgb_palettes.asm 2020-07-05 16:15:01 -04:00
Rangi
6137f5accb Port and improve hidden_object macro from pokeyellow 2020-07-05 15:57:07 -04:00
Rangi
b2369b0961 Port credits command constants from pokeyellow 2020-07-05 15:35:38 -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
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
cdfab2e819 Document why Mew is set apart 2020-07-03 23:19:59 -04:00
Rangi
f9dc42a740 Factor out Mew's pics and base data 2020-07-03 22:59:12 -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
55bb99580e data/mapHeaders -> data/maps/headers; data/mapObjects -> data/maps/objects
To do: Polished Map support for loading the objects
2020-07-03 18:19:56 -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
710c3275fc Simplify map connections
To do: Polished Map support for detecting the tileset
2020-07-03 15:49:12 -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
eeb45036e2 Individual images for party menu icon graphics 2020-06-27 22:16:01 -04:00
Rangi
209ecc1919 Merge pic/ into gfx/ 2020-06-27 21:43:32 -04:00
Rangi
e770ee77ce Replace .tilecoll files with tile ID db data 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
SatoMew
df2a68d6de Replace the few instances of Unknown Dungeon with Cerulean Cave 2019-04-08 18:47:31 +01: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
9b6f57832e Another map header fix 2018-07-28 15:56:50 -04:00
Pokeglitch
ae2c1036ea Fixed some map header files 2018-07-28 15:51:17 -04:00
Daniel Harding
c9da8510c8
Merge pull request #187 from Rangi42/master
Document MissingNo's base stats, and silence an rgbds warning
2018-07-15 21:45:22 -05:00
Daniel Harding
929c65f805
Merge pull request #188 from snelson3/consistent-map-header-comments
make comments consistent throughout all mapHeader files
2018-07-15 21:44:14 -05:00
Sam Nelson
ee72316102 make comments consistent throughout all mapHeader files 2018-07-15 10:50:44 -07:00
Rangi
462088a25c Document the origin of MissingNo's base stats. 2018-07-08 16:25:39 -04:00
Urs-Bjoern Schmidt
b4ab6dc701 Fixed some inconsistencies in the usage of the if-def directive. 2018-07-02 11:34:11 +02:00
yenatch
5c4397c899 spaces in EvosMoves 2018-03-22 23:20:55 -04:00
yenatch
bd35b37262 use constants for wEvosMoves size 2018-03-22 23:09:49 -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
Remy Oukaour
2e0183fc27 Block IDs use hex; zero connections use dec 2018-01-29 11:46:45 -05:00
Remy Oukaour
dd4f0a0064 Use base 10 (note, the previous commit resolves #173) 2018-01-29 11:12:59 -05:00
Remy Oukaour
d271d69175 Add warp, sign, and warp_to macros for data/mapObjects definitions 2018-01-29 02:31:32 -05:00
dannye
7a9a1b1e55 Fix typos in comments 2017-06-24 15:01:43 -05:00
Summate
0eedb40608 Continuing the source-level documentation of roughly where trainers can be found 2016-09-04 14:31:59 -05:00
dannye
52bb07ca18 Replace unnecessary tabs with spaces 2016-07-27 22:33:48 -05: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
YamaArashi
7f34e28f24 remove address comments 2016-06-11 17:24:04 -07:00
pikalaxalt
a2f7701f34 Merge branch 'master' of https://github.com/pret/pokered 2016-06-09 20:45:02 -04:00
IIMarckus
674b4dcc4a Remove the Beach House option. 2016-06-07 23:55:55 -06:00
pikalaxalt
0d687ba25a TX_SFX_KEY_ITEM and mapconst macro 2016-05-30 09:08:40 -04:00
pikalaxalt
3fe60f7793 Remove the last remaining IF DEF(_YELLOW) 2016-05-13 18:00:38 -04:00
pikalaxalt
31b118ab42 Merge branch 'master' of https://github.com/pret/pokered 2016-05-13 17:59:46 -04:00
dannye
38ea9cd829 Fix typo: ninetails.asm -> ninetales.asm 2016-04-25 22:01:13 -05:00
IIMarckus
c9bed2d447 Add a TX_MART macro for inventories. 2016-04-08 20:16:42 -06:00
IIMarckus
adc6a3aac7 Clean up script labels in marts and Pokémon Centers. 2016-04-08 19:04:36 -06:00
IIMarckus
3fd6787692 Clean up more Yellow ifdefs. 2016-03-22 00:10:23 -06:00
IIMarckus
757114cad2 Get rid of yellow ifdefs in wild Pokémon. 2016-02-12 21:10:58 -07:00
IIMarckus
360a2200b1 Remove misleading (unreferenced) labels. 2016-01-30 20:40:12 -07:00
PikalaxALT
1980a5befc Macrofy sprite status data in WRA0 2016-01-29 11:20:47 -05:00
YamaArashi
8a5a7d8e68 fix typoes 2016-01-09 03:03:55 -08:00
dannye
351146024b Fewer underscores in constants 2015-12-14 22:09:30 -06:00
IIMarckus
94e609b4bc vertical space is cheap. also remove address comments and yellow ifs. 2015-12-06 14:20:26 -07:00
dannye
38065a744d No more W_ 2015-08-30 21:38:41 -05:00
YamaArashi
64cfbcce7a commented SGB palette stuff 2015-08-12 02:16:56 -07: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
31d267d4ad Clean up data/evos_moves.asm 2015-08-10 10:52:35 -05:00
dannye
8a6d46f3d9 Replace some hardcoded data sizes 2015-08-09 23:56:20 -05: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
90482175c3 More bugfixes.
Fix some tm compatibility issues.
2015-07-26 18:53:58 -04: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
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
dannye
006507ed53 A few missed object constants 2015-07-18 23:39:29 -05:00
dannye
4452acb021 Fix object constant names
swap LEFT and RIGHT
FACE is better named STAY because sprites that have no range do not
necessarily face any direction
STAY has been renamed to NONE because sprites that use this will
spin randomly, except for the item/voltorb/electrode sprite

I never should have listened to https://github.com/iimarckus/pokered/issues/89
2015-07-18 22:36:22 -05:00
dannye
0e48333fb8 Map object macro
closes https://github.com/iimarckus/pokered/issues/89
2015-07-18 22:22:51 -05:00
dannye
0ad1153f16 Simplify map connections
let the macros calculate the connection strip length instead of passing it as an arg
don't pass map dimensions since they can be inferred from map ids

todo: figure out why certain south and east connections get an extra 3
added to the connection strip length
2015-07-18 15:20:07 -05:00
dannye
a002d01860 Clean up map connections
closes https://github.com/iimarckus/pokered/issues/85
2015-07-18 12:23:49 -05:00
dannye
b85d7c65f3 Enumerate map constants
closes https://github.com/iimarckus/pokered/issues/86
2015-07-17 11:20:35 -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
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
dannye
f702fc7840 Start using text predef macros
also sprite direction constants
2015-07-04 00:47:29 -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
yenatch
451f7fce29 Pick off some more static map ids. 2015-02-07 11:18:28 -08:00
YamaArashi
3fdb8a0d89 serial/trade/misc 2015-02-07 02:43:08 -08:00
Marcus Huderle
6143848c7e Added bcd macros with coins and money aliases. 2015-02-04 00:51:12 -07: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
IIMarckus
5ea1d8a61f Labels for Fuji in Pokémon Tower. 2014-10-26 21:00:29 -06:00
IIMarckus
9004b33ab7 Add a shifted person object on Route 19 in Yellow. 2014-10-17 13:24:51 -06:00
IIMarckus
21b2ab0065 Fix a few more bugs in the beach house. 2014-10-17 13:08:40 -06:00
IIMarckus
1d579928dc Modularize the beach house. 2014-10-17 12:16:52 -06:00
IIMarckus
16ad16302e Add the beach house tileset. 2014-10-17 11:13:22 -06:00
IIMarckus
50a39daa74 More idioms. 2014-10-17 09:24:04 -06:00
IIMarckus
60bc4b9b9b Fix Route 19 for Yellow. 2014-10-17 09:01:48 -06:00
IIMarckus
7db2fe99f8 Add more from the beach house. 2014-10-17 08:13:51 -06:00
IIMarckus
a3d3f8324a Kill version.asm. 2014-10-17 02:42:32 -06:00
IIMarckus
6e14461fa6 Add a lot of Yellow text changes. 2014-10-10 01:46:06 -06:00
yenatch
46722e5b3b Merge remote-tracking branch 'danny/master' 2014-09-19 22:03:57 -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
U-Daniel-PC\Daniel
3379bd7b73 Fix capitalization 2014-09-20 00:32:05 -04:00
U-Daniel-PC\Daniel
dac95cb42b Merge branch 'master' of https://github.com/iimarckus/pokered 2014-09-19 23:19:05 -04: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
yenatch
342791a001 Use a macro for move attributes.
The formatting was pretty bad, so that's fixed too.
2014-09-01 17:59:10 -07:00
U-Daniel-PC\Daniel
57113a7651 Don't redundantly define sprite dimensions
dimensions are defined in the .pic files
2014-07-15 09:31:30 -05:00
U-Fish-PC\Daniel
b83acb03e5 Clean up white space 2014-06-09 16:58:02 -04:00
yenatch
26361410b6 Comment SGB packets. 2014-06-06 22:08:06 -07:00
yenatch
35493bef27 Merge remote-tracking branch 'danny/master' 2014-06-06 16:03:47 -07:00
yenatch
6d8c6055b5 Split more code out of home.asm. 2014-05-31 12:25:34 -07:00
U-Fish-PC\Daniel
462a7e8cb9 Remove duplicated data 2014-05-31 10:30:02 -04:00
yenatch
188ac8a9b4 Remove redundant dimensions in image filenames. 2014-05-30 01:30:10 -07:00
yenatch
40c17c906b Remove most static wram addresses. Use labels instead.
For unknown addresses, use "w<address>".

Label overleads are still an issue.
2014-05-26 22:04:39 -07:00
yenatch
5a14234b49 Split out map sprite facing data. 2014-05-25 19:16:54 -07:00
U-Fish-PC\Daniel
15427f5320 Pull a lot of engine out of main.asm 2014-05-22 18:13:20 -04:00
U-Fish-PC\Daniel
ea3ba4cde3 Pull out map header pointers and banks 2014-05-21 19:50:57 -04:00
U-Fish-PC\Daniel
77e300927b Name hidden object routines 2014-05-21 19:13:07 -04:00
U-Fish-PC\Daniel
a02c327910 Use more constants in object data 2014-05-21 15:49:59 -04:00
U-Fish-PC\Daniel
02e6e3765e Fix capitalization, remove white space, remove vicctreebel.asm 2014-05-19 20:06:21 -04:00
U-Fish-PC\Daniel
1a0992a2f1 Merge branch 'master' of https://github.com/huderlem/pokered into pull-data
Conflicts:
	main.asm
	text.asm
	text/maps/route_22.asm
2014-05-19 16:05:19 -04:00
U-Fish-PC\Daniel
82ffb336a9 Pull more data out of main.asm 2014-05-19 08:05:48 -04:00
U-Fish-PC\Daniel
24c01b09bb Pull map scripts out of main.asm 2014-05-18 14:19:10 -04:00
U-Fish-PC\Daniel
4e4e72d02a Pull map headers out of main.asm 2014-05-17 17:18:23 -04:00
U-Fish-PC\Daniel
e1a931df6a Pull map objects out of main.asm 2014-05-17 15:43:13 -04:00
U-Fish-PC\Daniel
b438d0c1d7 Organize base stats and wild mon data (Koolboyman) 2014-05-16 22:32:35 -04:00
U-Fish-PC\Daniel
1e86625c87 Pull most data out of main.asm 2014-05-16 19:50:38 -04:00