Commit graph

1975 commits

Author SHA1 Message Date
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
dannye
340230e997 Enumerate more constants 2015-07-19 00:43:43 -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
b96ef8d2d4 A few missed TX_ASM 2015-07-18 23:53:43 -05: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
148d3f3cf2 Consolidate coord macros 2015-07-18 15:52:03 -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
Daniel Harding
54c1893d57 Merge pull request #104 from YamaArashi/master
fix variable naming
2015-07-18 12:29:05 -05:00
dannye
a002d01860 Clean up map connections
closes https://github.com/iimarckus/pokered/issues/85
2015-07-18 12:23:49 -05:00
YamaArashi
fc9af362ae fix variable naming 2015-07-18 08:17:46 -07:00
dannye
b85d7c65f3 Enumerate map constants
closes https://github.com/iimarckus/pokered/issues/86
2015-07-17 11:20:35 -05:00
Daniel Harding
6e46ec61f9 Merge pull request #103 from YamaArashi/master
Misc changes again
2015-07-17 10:49:54 -05: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
YamaArashi
9fbd9e9a1f intro stuff 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
77ba61cb17 Fix Safari Zone check labels 2015-07-16 23:41:44 -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
Daniel Harding
9e77982bc8 Merge pull request #101 from YamaArashi/master
Misc changes
2015-07-16 14:36:48 -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
7b676f5851 commented movement stuff 2015-07-15 04:27:59 -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
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
5d3b958763 named town map stuff 2015-07-13 19:24:07 -07: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
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
YamaArashi
8a80f2c852 more trade comments/fixes 2015-07-12 14:15:25 -07:00
dannye
822bb2bd21 Clean up sram 2015-07-05 04:07:09 -05:00
dannye
063900c7d7 Merge pull request https://github.com/iimarckus/pokered/pull/95 from luckytyphlosion/master
and related bug fixes
2015-07-05 03:49:31 -05:00
dannye
f702fc7840 Start using text predef macros
also sprite direction constants
2015-07-04 00:47:29 -05:00