Commit graph

656 commits

Author SHA1 Message Date
YamaArashi
73171bfff5 named most of the used events 2015-07-21 10:36:03 -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
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
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
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
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
0066e09828 named party menu/naming screen wram variables 2015-07-13 15:40:33 -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
8431fa7756 TX_ASM 2015-07-03 14:58:50 -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
xCrystal
ce9940a2eb Further split bank e stuff 2015-04-01 17:27:51 +02:00
xCrystal
10211cc461 Rename battle files and split move effects Part 5
15.asm, 16.asm, 1a.asm, 1c.asm
2015-04-01 17:05:51 +02:00
xCrystal
2fe782b11a Rename battle files and split move effects Part 4
e.asm, e_2. asm, and 14.asm
2015-04-01 17:05:50 +02:00
xCrystal
77d0e5ff84 Rename battle files and split move effects Part 3
b.asm, b_2.asm, c.asm, and d.asm
2015-04-01 17:05:49 +02:00
xCrystal
46c2a38c7c Rename battle files and split move effects Part 2
5.asm, 9.asm, and a.asm
2015-04-01 17:05:43 +02: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
7b7c563c93 Rename some labels 2015-02-08 18:40:08 -08:00
YamaArashi
3870f5e10a named misc functions 2015-02-08 01:44:41 -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
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
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
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
YamaArashi
c9946975d4 Commented function
- Named and commented Func_4c70.
- Removed gfx/diagonal_lines.png, which is not actually graphics.
2014-07-28 02:22:58 -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
yenatch
80f7845a07 Explicit sections for pics, sprites and misc graphics. 2014-05-31 12:51:14 -07:00
yenatch
b32abf1f16 Split out joypad code from main.asm. 2014-05-31 12:25:40 -07:00
yenatch
188ac8a9b4 Remove redundant dimensions in image filenames. 2014-05-30 01:30:10 -07:00
yenatch
da0a72cdbf Use VRAM constants where applicable. 2014-05-29 01:31:46 -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
6c94ac1248 Recomment LoadMonData_. 2014-05-25 21:53:02 -07:00
yenatch
41906725d0 Split out item fragment code. 2014-05-25 19:53:43 -07:00
yenatch
db569956ef Split out overworld object movement. 2014-05-25 19:53:43 -07:00
yenatch
f6038a3d52 Try to clean up PrepareOAMData. 2014-05-25 19:53:15 -07:00
yenatch
5a14234b49 Split out map sprite facing data. 2014-05-25 19:16:54 -07:00
yenatch
4be11293e5 Label BCD math predefs. 2014-05-25 17:27:02 -07:00
yenatch
bba8405992 Rename GetJoypadState -> Joypad. 2014-05-25 11:21:48 -07:00
yenatch
031e33957d Rename joypad registers. 2014-05-25 10:53:09 -07:00
yenatch
1ee8de792b Move bank 0 into home.asm. 2014-05-25 10:26:42 -07:00
yenatch
d307c85499 Clean up some bank 3 functions and rename flag action functions. 2014-05-25 10:09:39 -07:00
yenatch
cdd34eb45b Use global labels for pics. 2014-05-24 21:01:59 -07:00
yenatch
64da5118df Organize file includes in banks 4 through 1e. 2014-05-24 19:57:50 -07:00
yenatch
7911bc1309 Rename engine/rng.asm to engine/random.asm. 2014-05-24 11:44:12 -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
yenatch
955b53047c More complete hardware constants. Rename joypad constants. 2014-05-23 15:25:16 -07:00
yenatch
61dbfa440b Use a dedicated label for base stats.
The existing {Bulbasaur,Ivysaur,...}BaseStats labels are for convenience.
2014-05-23 15:20:53 -07:00
yenatch
0dea0cc3fb Comment some bank 0 functions, and add wram labels for Predef. 2014-05-23 15:11:09 -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
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
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
U-Fish-PC\Daniel
b0a1502e21 More item IDs and palette function names 2014-05-16 17:27:39 -04:00
U-Fish-PC\Daniel
5296808894 Use more trainer/mon/palette constants 2014-05-16 16:15:59 -04:00
U-Fish-PC\Daniel
285cf2650d Clean up text labels, use move and type constants 2014-05-16 01:33:16 -04:00
U-Fish-PC\Daniel
ae1ebde697 Label a lot of unnamed text 2014-05-15 20:00:54 -04:00