Commit graph

1568 commits

Author SHA1 Message Date
yenatch
b452726f9a rename existing map text files and put them in text/maps/ 2014-01-22 17:38:14 -05:00
yenatch
32de715f5f Merge branch 'split-audio' into text
Conflicts:
	main.asm
2014-01-22 17:37:22 -05:00
yenatch
c832fd85c5 bump pokemontools for merging the previous bump
this brings pokemontools up to date, including some map editor fixes
2014-01-22 16:38:16 -05:00
yenatch
2c2111b7a5 Merge remote-tracking branch 'iimarckus/master' into resplit-audio
Conflicts:
	main.asm
2014-01-22 16:37:07 -05:00
yenatch
53a4432e68 use 'next' macro in strings 2014-01-22 01:21:41 -05:00
yenatch
7a69bfaa92 text macros in pokedex entries 2014-01-22 00:56:48 -05:00
yenatch
fea5be4699 rename and add some text macros
cont replaces next, and next becomes a generic newline.
para replaces page (now used for pokedex entries).
dex ends a pokedex entry.
2014-01-22 00:55:41 -05:00
yenatch
2ac15d2475 text macros in text/ 2014-01-21 21:09:32 -05:00
yenatch
1295e2a605 clean up missed text macros in main.asm 2014-01-21 21:09:31 -05:00
yenatch
3964e6a137 use text macros in main.asm 2014-01-21 21:09:31 -05:00
yenatch
795decd080 Add text macros
Before text looked like:

_CeladonCityText2: ; a5a4b (29:5a4b)
	db $0, "Heheh! This GYM", $4f
	db "is great! It's", $55
	db "full of women!", $57

Now it looks like:

_CeladonCityText2: ; a5a4b (29:5a4b)
	text "Heheh! This GYM"
	line "is great! It's"
	next "full of women!"
	done
2014-01-21 21:09:22 -05:00
yenatch
93e1316e3d bump pokemontools to play nice with EQUS 2014-01-21 17:49:30 -05:00
yenatch
ccd5d2387d condense MapSongBanks 2014-01-21 14:29:14 -05:00
yenatch
5914bb67ac use music constants everywhere
some sfx are treated as music, but don't have constants yet
2014-01-21 14:24:40 -05:00
yenatch
001270908a define music constants instead of running around with ((label-$4000)/3) 2014-01-21 14:08:06 -05:00
yenatch
2622824f1b rearrange audio.asm 2014-01-09 15:01:49 -05:00
yenatch
1107dff7c1 fix some duty labels 2014-01-09 14:42:47 -05:00
yenatch
068992617d split instrument duty into audio/ 2014-01-09 14:42:42 -05:00
yenatch
4cdc06b2c3 consolidate red/blue diffs in sfx 2014-01-09 14:17:58 -05:00
yenatch
10bb09c4e2 split audio components into audio_red.o and audio_blue.o 2014-01-09 13:52:12 -05:00
Marcus Huderle
47ec18ffa3 Labeled some more hardcoded banks and the OldManItemList. 2014-01-07 21:19:25 -06:00
yenatch
5acb7d8294 dedicated version includes 2014-01-07 19:13:37 -05:00
Marcus Huderle
fdb4498eb8 Labeled lots of hardcoded banks. 2014-01-07 12:12:05 -06:00
yenatch
94d755003e split out the audio engines 2014-01-06 22:34:14 -05:00
Marcus Huderle
fb1ad40a10 Some more arbitrary labeling of unknown things. 2014-01-06 21:11:08 -06:00
Marcus Huderle
85f8430315 wram labels and text/function labels. 2014-01-06 12:10:06 -06:00
Marcus Huderle
e54be71308 Some OT and name WRAM labels. 2014-01-05 18:24:01 -06:00
yenatch
65245542c7 Makefile: baserom compare is optional 2014-01-04 18:10:53 -05:00
yenatch
628da34ae7 INSTALL: pokered compiles without a base rom 2014-01-04 18:10:53 -05:00
yenatch
5033ed32a3 untranslated good rod fisherman text
Only fishing
        It romance of a man!
        Heboi fishing rod
        Magikarp only I but such tangles
        If it is this good fishing rod
        It not you catch a better mon!
2014-01-04 18:10:34 -05:00
yenatch
30453b5c77 relabel good rod script in fuchsia house 3
how
2014-01-04 06:26:51 -05:00
yenatch
99555a209f more unknown data 2014-01-04 06:06:34 -05:00
yenatch
a0b3d29a37 unused intro animation data
just a blank entry
2014-01-04 05:41:46 -05:00
yenatch
7cedb7ff08 unknown coordinate data
related to the cable club?
2014-01-04 05:36:28 -05:00
yenatch
b926d25c39 TitleMon scrolling 2014-01-04 04:00:14 -05:00
yenatch
842bf15b5f some ATTR_BLK sgb packets 2014-01-04 02:37:47 -05:00
yenatch
7bd34b8f4e a dummy "TRAINER" string for trainer names 2014-01-03 22:19:12 -05:00
yenatch
093a5b9a4d vermilion gym trash can puzzle data 2014-01-03 22:06:51 -05:00
yenatch
ffc0b8f9de repeated critical move table and recomment MoreCalculateDamage 2014-01-03 16:21:07 -05:00
yenatch
d32e480f03 label remaining rom addresses
doesn't count incbins
2014-01-03 15:02:18 -05:00
Marcus Huderle
6ae2307ced Misc. labeling and unknown moves list incbin. 2013-12-28 12:55:29 -06:00
Marcus Huderle
24988da53f Credits order INCBIN and more labeling. 2013-12-27 11:41:54 -06:00
Marcus Huderle
124b9c2954 Fixed mislabeled pointer. 2013-12-26 17:40:11 -06:00
Marcus Huderle
c1c5b8ecb3 Labeled lots of hardcoded pointers. Hidden object pointers are all labeled. 2013-12-26 15:15:33 -06:00
Marcus Huderle
7092b24e80 Spinner Tiles facing directions INCBIN. 2013-12-26 13:17:38 -06:00
Marcus Huderle
0abba45a65 RocketHideoutElevator INCBINs. 2013-12-26 12:48:40 -06:00
Marcus Huderle
13c5037d29 SilphCoElevator INCBINs. 2013-12-26 12:41:25 -06:00
Marcus Huderle
4d256df1d3 CeladonMartElevator INCINBs. 2013-12-25 20:22:23 -06:00
Marcus Huderle
4f03df7c46 Labeling of Vermilion Gym script and Player jumping y coordinates INCBIN. 2013-12-25 19:57:40 -06:00
Marcus Huderle
77f2adcc73 Labeled Vermilion Gym trash pointers. 2013-12-24 11:49:49 -06:00