Commit graph

309 commits

Author SHA1 Message Date
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 b6a7e5e9cf documented flags and misc. fixes 2015-08-29 17:15:05 -07:00
YamaArashi 696cffd3ae item name length constant 2015-08-14 04:11:53 -07:00
YamaArashi b6ac1018c2 add border constant and clear up misnomer 2015-08-14 02:46:12 -07:00
YamaArashi 132d036752 named more variables 2015-08-12 22:14:31 -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 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 dfa266f05c Use constants for elevator floors 2015-08-10 10:03:55 -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 525f1b96f3 named CountSetBits output variable 2015-08-07 04:24:06 -07:00
dannye f8a9c37a00 Use more lb
and other clean up
2015-08-05 16:25:58 -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
YamaArashi e6d02b4b7b make route22 rival events more consistent 2015-07-23 21:20:20 -07:00
YamaArashi 6af65df2fc named function 2015-07-23 21:00:30 -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
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 fd2b4b6c74 gym leader events 2015-07-20 19:41:23 -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 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
dannye fb559f1f4e More direction constants
facing directions, npc movement, joypad
2015-07-17 02:52:25 -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 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 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 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
dannye f702fc7840 Start using text predef macros
also sprite direction constants
2015-07-04 00:47:29 -05:00
U-Daniel-PC\Daniel bc6f0bc08a More TX_ASM 2015-07-03 22:49:20 -05:00
U-Daniel-PC\Daniel 5d9d26bd5c No more ldh 2015-07-03 15:13:35 -05:00
U-Daniel-PC\Daniel 8431fa7756 TX_ASM 2015-07-03 14:58:50 -05:00
U-Daniel-PC\Daniel f4a31b3e0b Rename/organize part 2 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:38:12 -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 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 32f7cf12de Named wram symbols 2015-02-07 18:37:40 -08: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
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 5459477ecd Merge branch 'master' of https://github.com/dannye/pokered 2014-10-20 18:56:21 -06:00
IIMarckus 519dd7fd56 Improve labels for Yellow Safari Zone entrance. 2014-10-18 08:57:53 -06:00
IIMarckus a36e090d43 Add parts of the Safari Zone entrance script from Yellow. 2014-10-17 22:47:31 -06:00
IIMarckus deb2db01cb Replace hardcoded pointer with label. 2014-10-17 13:16:11 -06:00
IIMarckus 292cf55bad More idioms. 2014-10-17 09:28:15 -06:00
IIMarckus 7db2fe99f8 Add more from the beach house. 2014-10-17 08:13:51 -06:00
IIMarckus 008cface52 Minor comment/label improvements in Cinnabar Lab. 2014-10-16 00:12:44 -06:00
U-Daniel-PC\Daniel 0991bd3abe A few static hide/show ids 2014-09-26 09:26:18 -04:00
U-Daniel-PC\Daniel 4d60e6f1a9 Enumerate hide/show constants 2014-09-26 07:37:21 -04:00
U-Daniel-PC\Daniel de39851f4a Make Hide/Show objects more dynamic
be on the look out for more static ids in the wild
unused constants are still included because a
script could be written to check whether the player
has picked up an item/fought a legendary etc.
2014-09-25 19:21:49 -04: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
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
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
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 53ae0e93fa Use monster struct macros in wram. Rename related labels for consistency. 2014-06-14 04:12:40 -07:00
U-Fish-PC\Daniel b83acb03e5 Clean up white space 2014-06-09 16:58:02 -04:00
U-Fish-PC\Daniel 32de1b2694 Relabel a few missed map scripts and TheEndTextString 2014-05-31 10:35:46 -04:00
U-Fish-PC\Daniel 286c160c27 Merge branch 'master' of https://github.com/yenatch/pokered
Conflicts:
	engine/battle/1c.asm
2014-05-30 13:17:47 -04:00
yenatch da0a72cdbf Use VRAM constants where applicable. 2014-05-29 01:31:46 -07:00
U-Fish-PC\Daniel 89be95cded TM_28 in Cerulean script 2014-05-28 15:30:06 -04: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 4be11293e5 Label BCD math predefs. 2014-05-25 17:27:02 -07:00
yenatch 031e33957d Rename joypad registers. 2014-05-25 10:53:09 -07:00
yenatch d307c85499 Clean up some bank 3 functions and rename flag action functions. 2014-05-25 10:09:39 -07:00
yenatch 64479cd642 Rename random number function and hram labels.
GenRandom -> Random
GenRandomInBattle -> BattleRandom
H_RAND1 -> hRandomAdd
H_RAND2 -> hRandomSub
2014-05-24 11:40:38 -07:00
yenatch 8f8281fe6e Comment some more bank 0 functions. 2014-05-23 15:34:35 -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 77e300927b Name hidden object routines 2014-05-21 19:13:07 -04:00
U-Fish-PC\Daniel a9528fc870 More misc relabelling 2014-05-21 13:10:07 -04:00
U-Fish-PC\Daniel f29c4e473e Misc relabelling 2014-05-21 11:58:18 -04:00
U-Fish-PC\Daniel d693721f97 Use constants for the starter mons 2014-05-21 09:54:33 -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 24c01b09bb Pull map scripts out of main.asm 2014-05-18 14:19:10 -04:00