Commit graph

65 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
695757abe5 Name a few unknowns 2015-06-12 11:00:48 -05: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
YamaArashi
0996a964bd commented trade amim functions 2015-03-14 15:27:58 -07:00
YamaArashi
332b7b3090 relabel and add comment 2015-03-13 19:22:55 -07:00
YamaArashi
1115b4454d commented mon_party_sprites.asm 2015-03-13 05:36:34 -07:00
U-Daniel-PC\Daniel
084c8407d8 Remove hard-coded wPokedexOwned/wPokedexSeen array size 2015-02-20 01:01:57 -05: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
YamaArashi
32f7cf12de Named wram symbols 2015-02-07 18:37:40 -08:00
YamaArashi
4fd7a42b23 commented battle stuff 2015-02-07 16:24:16 -08:00
YamaArashi
83023cda19 commented menu stuff 2015-02-07 12:27:36 -08:00
YamaArashi
3fdb8a0d89 serial/trade/misc 2015-02-07 02:43:08 -08:00
Marcus Huderle
95f4f7b41f Clean up prizes data. 2015-01-24 12:52:11 -08: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
070c964964 Accidentally committed .orig files from merge dff0cdeb. 2014-09-23 15:08:12 -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
8f49e37b82 Use hram constants for remaining joypad variables. 2014-08-30 19:48:49 -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