Commit graph

1602 commits

Author SHA1 Message Date
U-Fish-PC\Daniel 7df715d0c4 Add song alternate start labels 2013-10-14 00:41:56 -04:00
U-Fish-PC\Daniel 5e7ecff26c Update submodule 2013-10-13 12:27:02 -04:00
U-Fish-PC\Daniel 8edfcc4b1e All music and sfx 2013-10-12 14:40:37 -04:00
IIMarckus 3016f72851 Fix CheckIfInOutsideMap comments.
Pointed out by 80C.
2013-09-25 23:28:16 -06:00
IIMarckus 3c14752719 Merge branch 'comments' of https://github.com/dannye/pokered 2013-09-17 22:50:33 -06:00
U-Fish-PC\Daniel d7aa1d61cd Merge remote-tracking branch 'kanzure/use-new-preprocessor' 2013-09-16 15:50:02 -04:00
Bryan Bishop fecbe4a60c bump and support latest pokemontools 2013-09-16 12:42:46 -05:00
U-Fish-PC\Daniel cd433d32ee Merge branch 'comments' 2013-09-16 13:18:37 -04:00
U-Fish-PC\Daniel 4000d7a23a Merge branch 'master' into comments 2013-09-16 13:12:42 -04:00
U-Fish-PC\Daniel 11aa33e49c revert pokemontools to 7aa016fb 2013-09-16 12:57:41 -04:00
U-Fish-PC\Daniel 5537897109 give consistency to map names 2013-09-16 12:10:26 -04:00
U-Fish-PC\Daniel 3b62d2a6f6 gbz80disasm for pokered fix 2013-09-11 12:22:11 -04:00
dannye d256be1b09 Merge pull request #1 from kanzure/dannye-incbins
Merge so that iimarckus does less work
2013-09-10 20:04:54 -07:00
Bryan Bishop e47308a1f8 Merge branch kanzure/master into dannye-incbins
Conflicts:
	extras
2013-09-10 20:08:49 -05:00
U-Fish-PC\Daniel a684941cfc Add labels to recently added asm 2013-09-10 20:57:44 -04:00
U-Fish-PC\Daniel 351c48959a Add misc asm 2013-09-10 20:51:45 -04:00
U-Fish-PC\Daniel 929dce66e4 add misc asm 2013-09-10 20:46:10 -04:00
U-Fish-PC\Daniel 21ffdf684a Include text command $0a in UnnamedText_27fb3 2013-09-10 20:42:09 -04:00
U-Fish-PC\Daniel 89eba26278 misc asm 2013-09-10 20:38:18 -04:00
U-Fish-PC\Daniel 6a589c3278 Add HMMoveArray 2013-09-10 18:33:53 -04:00
U-Fish-PC\Daniel 7380b242b0 Add misc asm 2013-09-10 18:24:04 -04:00
U-Fish-PC\Daniel 54a0478d9c Add UnnamedText_1ebe2 2013-09-10 18:09:01 -04:00
U-Fish-PC\Daniel e93809a84b Add CinnabarGymGateCoords 2013-09-10 18:03:38 -04:00
U-Fish-PC\Daniel 778dbb83ba Add UnnamedText_1eae3 2013-09-10 13:20:10 -04:00
U-Fish-PC\Daniel 3b3051ea09 Add PointerTable_1ea60 and organize PointerTable labels 2013-09-10 13:13:45 -04:00
U-Fish-PC\Daniel a1a3393317 un-incbin misc asm 2013-09-10 13:00:53 -04:00
U-Fish-PC\Daniel 6637f8a69a Add UnnamedText_1e940 2013-09-10 12:53:06 -04:00
U-Fish-PC\Daniel 3bdb704dc4 Add UnnamedText_1cae8 2013-09-10 12:46:57 -04:00
U-Fish-PC\Daniel 7ef33f15f3 Add TownMapOrder 2013-09-10 11:56:29 -04:00
U-Fish-PC\Daniel 5fd2c9b7d4 Merge branch 'comments' of https://github.com/dannye/pokered 2013-09-08 10:19:47 -04:00
U-Fish-PC\Daniel c29ed3b405 Split blank_leader_names and circle_tile 2013-09-08 10:18:05 -04:00
U-Fish-PC\Daniel 55d5a879dd Merge branch 'incbin' of https://github.com/dannye/pokered 2013-09-06 20:05:23 -04:00
U-Fish-PC\Daniel 1b19d68671 Add bank 1C palette packets 2013-09-06 18:26:20 -04:00
U-Fish-PC\Daniel 52e7b42e89 Add UnknownText_74229 2013-09-06 17:08:11 -04:00
U-Fish-PC\Daniel 068cb7d736 Add To text string 2013-09-06 17:02:31 -04:00
U-Fish-PC\Daniel ab5a944c3e Add spaces text string 2013-09-06 16:56:22 -04:00
U-Fish-PC\Daniel 7134eec5cb Remove INCBIN "baserom.gbc" from a comment 2013-09-06 16:54:04 -04:00
U-Fish-PC\Daniel 9234945074 Organize Game Freak OAM data 2013-09-06 14:26:50 -04:00
U-Fish-PC\Daniel 182228fdc3 Merge branch 'incbin' of https://github.com/dannye/pokered 2013-09-05 01:06:31 -04:00
U-Fish-PC\Daniel 7ed5d291f1 Add mon's nest text string 2013-09-05 01:05:58 -04:00
iimarckus 37c8017536 Merge pull request #3 from dannye/comments
Add comments on bit 3 of battle status 3 to DeterminePaletteID:
2013-09-04 20:38:49 -07:00
Bryan Bishop 3ded09ef5d Merge branch 'use-pokemontools' into master
Conflicts:
	extras
	extras/analyze_incbins.py
2013-09-04 22:22:52 -05:00
Bryan Bishop 32265fb71b make pokeblue.gbc compile again 2013-09-04 21:50:58 -05:00
U-Fish-PC\Daniel 353e7f1d56 Merge branch 'incbin' of https://github.com/dannye/pokered 2013-09-04 21:39:57 -04:00
U-Fish-PC\Daniel d265d52c1e Add two safari text strings 2013-09-04 21:39:02 -04:00
U-Fish-PC\Daniel 214b2cb0d9 Merge branch 'incbin' of https://github.com/dannye/pokered 2013-09-03 14:23:50 -04:00
U-Fish-PC\Daniel 288ba5a50f Add Game Freak intro OAM data 2013-09-03 14:22:34 -04:00
U-Fish-PC\Daniel d294801560 Merge branch 'master' of https://github.com/iimarckus/pokered 2013-09-03 11:45:38 -04:00
IIMarckus 0fe8e003e4 Merge branch 'incbin' of https://github.com/dannye/pokered into dannye-incbin 2013-09-02 17:38:12 -06:00
U-Fish-PC\Daniel 6e024a5f38 Update labels for consistency 2013-09-02 19:19:48 -04:00