Commit graph

168 commits

Author SHA1 Message Date
KuroiIeWa5Da 1326a261c9 kanzure merge
hg-commit-id: ce878c247a5f
2012-01-20 12:12:12 -06:00
stag019 237f289640 Pokeblue: Another one bytes the dust!
hg-commit-id: 6e25d6a0163d
2012-01-20 00:26:32 -05:00
Bryan Bishop fc7ed05cb3 UnnamedText_196de for stag019
hg-commit-id: 9c9c29021e9b
2012-01-19 22:45:36 -06:00
KuroiIeWa5Da c59ffccb51 Labeled a few sound pointers
hg-commit-id: 83ad56401dbc
2012-01-19 20:10:17 -06:00
KuroiIeWa5Da 7fe4dbb027 Updated music pointers and data labels for Pokecenter and Gym
hg-commit-id: 6242c6afdc0c
2012-01-19 19:27:17 -06:00
Bryan Bishop 7c03eac5bb Move music back. Music has pointers that need to change.
hg-commit-id: 355ceca6c2ba
2012-01-19 18:10:32 -06:00
Bryan Bishop 83b516d501 Merge Sanky/pokered (HealParty)
hg-commit-id: fc805c8b9c6d
2012-01-19 16:21:28 -06:00
Sanky 5e4bcfc0b2 Merge
hg-commit-id: a3be68843101
2012-01-19 23:20:44 +01:00
Sanky bf93a628eb HealParty script (Predef 7)
hg-commit-id: f92994d7ba58
2012-01-19 23:20:23 +01:00
KuroiIeWa5Da da7fd359eb kanzure Merge
hg-commit-id: 21fa90b84836
2012-01-19 15:43:01 -06:00
KuroiIeWa5Da 14703cff50 Extracted 2 more music data files. PalletTown music header and data is finished
hg-commit-id: 56a7780bb473
2012-01-19 15:38:21 -06:00
Bryan Bishop 571cbba9a4 constants for bag items and bag item counts
hg-commit-id: ca595212ee40
2012-01-19 14:10:49 -06:00
Bryan Bishop 484eed1044 incorp Route12Text13, Route12Text14
hg-commit-id: 571e3fd01c36
2012-01-19 13:21:19 -06:00
Bryan Bishop bed1f9de97 minor touch-ups and missed TX_FARs
hg-commit-id: 584a09bfde83
2012-01-19 13:09:25 -06:00
KuroiIeWa5Da 6e67137e75 Added 1st music data file, fixed some minor naming issues for Linux
hg-commit-id: 1d2b7e0d97b4
2012-01-19 10:28:02 -06:00
Bryan Bishop dac8f912af replace some labels in PointerTable6F74?
hg-commit-id: c9792f6418fb
2012-01-19 06:59:50 -06:00
Bryan Bishop 815b823b1a Merge KuroiIeWa5Da/pokered with music headers.
hg-commit-id: b624e31d6035
2012-01-19 06:51:48 -06:00
Bryan Bishop 2183c74f3a minor commenting
hg-commit-id: f8978705795a
2012-01-19 06:46:25 -06:00
Bryan Bishop 430d435ff3 use map constants in hide/show object index
hg-commit-id: d85ce38911bb
2012-01-19 06:26:08 -06:00
KuroiIeWa5Da d9e1b33fcb Added Sound Map Headers for bank 2 and tile collision files plus some other minor fixes
hg-commit-id: 427ef8cd033b
2012-01-19 06:12:36 -06:00
Bryan Bishop 37b4b0c988 miscellaneous texts
hg-commit-id: 36fafd06df3f
2012-01-19 06:05:30 -06:00
Bryan Bishop e61417016e comment on FirstMapSpec was wrong about RedHouse1F
hg-commit-id: 3bb8584a3a0c
2012-01-19 05:48:59 -06:00
Bryan Bishop 883ea518ff extract .tilecoll files
hg-commit-id: 79e6ba077076
2012-01-19 05:12:44 -06:00
Bryan Bishop 4906792d16 removed -b from makefile again
hg-commit-id: 6986d2b7539d
2012-01-19 04:49:35 -06:00
Bryan Bishop fb16957951 SafariZoneEntranceScript2 through 6
hg-commit-id: ddc086ff5bb6
2012-01-19 04:14:38 -06:00
Bryan Bishop 347b506ee1 CinnabarGymScript2 and CinnabarGymScript3
hg-commit-id: 053de28b383a
2012-01-19 03:54:55 -06:00
Bryan Bishop 384b20df83 work on the Gary_h header and scripts
hg-commit-id: e6ad3d9b2c02
2012-01-19 03:44:31 -06:00
Bryan Bishop fdfd3c8cca finish texts in bank $21
hg-commit-id: bab9b89a6cec
2012-01-19 03:25:21 -06:00
Bryan Bishop e8f248ad67 texts in bank $21 including mew text
hg-commit-id: c58744ce9c8c
2012-01-19 03:24:24 -06:00
Bryan Bishop 9cfb4fb1aa finish inserting texts into bank $2A
hg-commit-id: c57bbbfe8d23
2012-01-19 03:08:40 -06:00
IIMarckus 50e0970d47 Cleanup of Oak’s Lab scripts.
hg-commit-id: afd0c1ae3ed0
2012-01-18 23:48:31 -07:00
IIMarckus 08ea1fa6f1 Use tabs for indentation, not spaces.
hg-commit-id: e5f18384709d
2012-01-18 21:17:28 -07:00
IIMarckus 7d7c1732e5 Merge.
hg-commit-id: ffdb5f9edfeb
2012-01-18 20:59:51 -07:00
Bryan Bishop 6f7006f918 some bike texts
hg-commit-id: d8994e6c1a2a
2012-01-18 21:16:16 -06:00
IIMarckus d227ac9c37 Get some more script pointers from Oak’s Lab, missed the first time around.
hg-commit-id: c020481126e0
2012-01-18 20:15:00 -07:00
Bryan Bishop 3fd40f1f4c finish texts in bank $29
hg-commit-id: ea888632d30e
2012-01-18 20:58:16 -06:00
Bryan Bishop 0e1f425e22 finish bank $28 texts
hg-commit-id: d60593be567b
2012-01-18 20:30:11 -06:00
Bryan Bishop 609c797640 fill out some texts in bank $1d
hg-commit-id: 4f85e12d3d1f
2012-01-18 19:24:28 -06:00
KuroiIeWa5Da 571b97c32e Extracted Tileset collision data
hg-commit-id: cdb49c9e2ccc
2012-01-18 14:33:39 -06:00
Bryan Bishop 3d74d5a220 finish texts in bank $27
hg-commit-id: dd520c6866b8
2012-01-18 14:30:08 -06:00
Bryan Bishop 6958e60f09 finish up bank $26 with some trading texts
hg-commit-id: eb053c22ca58
2012-01-18 14:00:46 -06:00
Bryan Bishop 95f69d6ee4 finish up bank $25 with pokedex rating text
hg-commit-id: b797e5e30f7e
2012-01-18 13:53:57 -06:00
Bryan Bishop 23fbb3b65d finish bank $22 with texts
hg-commit-id: 5ad22b1fd1b8
2012-01-18 13:48:53 -06:00
Bryan Bishop 8cbb6b6977 texts about leveling up, bait, exp. share
hg-commit-id: c6de295a6e7d
2012-01-18 13:06:37 -06:00
Bryan Bishop 38370d844d text for 'once released, gone forever'
hg-commit-id: ccf78d6c8f92
2012-01-18 12:29:32 -06:00
Bryan Bishop 4b7fce42fd text for "PROF.OAK's PC"
hg-commit-id: efde8bc6b852
2012-01-18 12:28:42 -06:00
Bryan Bishop e7ab00bb4c some trading-related text
hg-commit-id: e83351dc67d2
2012-01-18 12:27:13 -06:00
Bryan Bishop 7d7f6753ea Merge KuroiIeWa5Da/pokered.
hg-commit-id: 8246be52661a
2012-01-18 12:07:32 -06:00
Bryan Bishop b4ad9d97b6 guard/water text
hg-commit-id: 5a839741011c
2012-01-18 12:01:29 -06:00
Bryan Bishop d5f1914a45 more daycare texts
hg-commit-id: 4f0570329567
2012-01-18 12:00:12 -06:00