Commit graph

266 commits

Author SHA1 Message Date
Bryan Bishop 266ed4458a even more labels around PrintTexts
hg-commit-id: 037e2acc7eff
2012-01-22 16:09:19 -06:00
Bryan Bishop 11de09f8a4 more labels near PrintTexts
hg-commit-id: 1f8265c70cc2
2012-01-22 15:48:37 -06:00
Bryan Bishop 0b372300a0 jp $24D7 -> jp TextScriptEnd
hg-commit-id: 20b61588eaa7
2012-01-22 14:41:47 -06:00
Bryan Bishop 64d03ff5d5 fix PrintText-related labels
hg-commit-id: df1ffaeafdfa
2012-01-22 14:40:58 -06:00
Bryan Bishop edf9217846 labels inside NameRaterText1 and BikeShop texts
hg-commit-id: 507b255471cb
2012-01-22 14:10:57 -06:00
Bryan Bishop 199b5fb5f2 fix labels in BikeShopText1
hg-commit-id: 7870cbb1af58
2012-01-22 14:00:24 -06:00
Bryan Bishop c2e2e32a29 improvements to OaksLab, labeling, etc.
hg-commit-id: 66b0109d94d7
2012-01-22 13:51:52 -06:00
Bryan Bishop a4429495db jp $24d7 -> jp TextScriptEnd
hg-commit-id: 381d79318d0c
2012-01-22 12:53:24 -06:00
Bryan Bishop 24b67f3c0f improvements to choose mon text in OaksLab
hg-commit-id: c2b4d54abc07
2012-01-22 12:52:46 -06:00
Bryan Bishop 16927e5da1 fix TX_FAR mistaken for asm
hg-commit-id: a572ddb3219c
2012-01-22 12:02:35 -06:00
Bryan Bishop a2da76d315 add some labels around PrintText calls
hg-commit-id: be7e81581365
2012-01-22 11:58:39 -06:00
Bryan Bishop f855b8e335 dump in comments for CriticalHitProbability
hg-commit-id: fc95e9d2f2d7
2012-01-21 23:42:58 -06:00
Bryan Bishop e51029c125 commenting for DecrementPP from DarkShikari
hg-commit-id: 4fc5d67d4912
2012-01-21 22:56:46 -06:00
Bryan Bishop 2d2d187399 fix comments in ReadFishingGroup
hg-commit-id: 9ce0d88455a8
2012-01-21 18:43:47 -06:00
Bryan Bishop ac46a1dfa5 clean up rod code labels
hg-commit-id: 0b6dcc434492
2012-01-21 18:09:08 -06:00
Bryan Bishop c76b65f90b fix GiveItems
hg-commit-id: 0222de43f4b8
2012-01-21 18:04:54 -06:00
Bryan Bishop 8d8258f5e6 replaced $3e2e with GiveItem in some texts
hg-commit-id: dda17ec62888
2012-01-21 17:38:16 -06:00
KuroiIeWa5Da 76a9b1ce58 merge from iimarckus
hg-commit-id: af64ce989c39
2012-01-21 01:28:48 -06:00
KuroiIeWa5Da f82a5ca95f seperated music from common.asm, fixed some minor spelling errors
hg-commit-id: 338a5af36008
2012-01-21 01:27:44 -06:00
IIMarckus 4fb07a5808 Add the list of TM/HM moves.
hg-commit-id: eb2f28b54ef6
2012-01-20 23:19:10 -07:00
KuroiIeWa5Da e7dfe391f1 kanzure merge
hg-commit-id: 666ca4b94d7a
2012-01-20 23:41:53 -06:00
KuroiIeWa5Da c0aea369da Experimental change for actual music data
hg-commit-id: 57a01bf5d4f1
2012-01-20 23:41:08 -06:00
IIMarckus 153b21fb48 Comment improvements (SuperRodCode).
hg-commit-id: acf34e68b820
2012-01-20 21:47:59 -07:00
IIMarckus 27f13ecc9a Slight comment improvement (PP restore when healing).
hg-commit-id: df69d6aa600f
2012-01-20 20:59:55 -07:00
IIMarckus 1cf26c32c2 Rename “Attacks” to “Moves.”
hg-commit-id: 2a4797bf3b55
2012-01-20 20:58:11 -07:00
IIMarckus 54d33af4d8 Revert c9792f6418fb.
hg-commit-id: e188197ef682
2012-01-20 20:53:40 -07:00
IIMarckus 10e3b3deec Fix typo: Celedon → Celadon.
hg-commit-id: 5ba18e9ddcda
2012-01-20 20:52:07 -07:00
IIMarckus be09ba8191 Fix whitespace.
hg-commit-id: b7dcdb0f1e12
2012-01-20 20:51:23 -07:00
IIMarckus 4a98e21dc3 Cleanup: rival team selection code, for all appearances.
hg-commit-id: f3ab1f798a62
2012-01-20 20:49:15 -07:00
Bryan Bishop 380aaa82c5 Merge KuroiIeWa5Da/pokered (music headers)
hg-commit-id: 0949619c775c
2012-01-20 19:07:20 -06:00
KuroiIeWa5Da cb8afd8eae labeled Indigo Plateau music data
hg-commit-id: 9d66d8bd4c21
2012-01-20 18:51:38 -06:00
Bryan Bishop 332f141623 figuring out SuperRodCode
hg-commit-id: ed1db927ca67
2012-01-20 18:47:18 -06:00
KuroiIeWa5Da 3cfe0ea9f6 labeled Routes4 music data and made music data labels cleaner
hg-commit-id: 02c3815268dc
2012-01-20 18:44:48 -06:00
KuroiIeWa5Da 63d65af763 labeled Routes3 music data
hg-commit-id: 34709ee21fa2
2012-01-20 18:30:03 -06:00
KuroiIeWa5Da ad4a292596 labeled Routes2 music data
hg-commit-id: dfec501ea816
2012-01-20 18:21:22 -06:00
KuroiIeWa5Da a1c2c592df labeled Routes1 music data
hg-commit-id: 63c4ece6edd8
2012-01-20 17:56:47 -06:00
KuroiIeWa5Da 25fd511714 labeled Pokemon Healed music data
hg-commit-id: 5986ad3e5b6c
2012-01-20 17:18:00 -06:00
KuroiIeWa5Da fa11f7bd88 minor fix to labeled Safari Zone music data
hg-commit-id: 9a90932439ff
2012-01-20 17:11:32 -06:00
KuroiIeWa5Da c8b176ee6f labeled Safari Zone music data
hg-commit-id: dad0ae0eefff
2012-01-20 17:09:53 -06:00
KuroiIeWa5Da 93dce655e1 labeled Museum Guy music Data
hg-commit-id: 094678ff2fe9
2012-01-20 17:05:58 -06:00
KuroiIeWa5Da 97a8bfbfc9 labeled Meet Rival music data
hg-commit-id: 09befbea6e0a
2012-01-20 16:59:22 -06:00
KuroiIeWa5Da 76cf322c5b minor fix to Meet Professor Oak music data
hg-commit-id: 34a08f29485b
2012-01-20 16:53:51 -06:00
KuroiIeWa5Da 073981a956 labeled meet Professor Oak music data
hg-commit-id: c8e33eaf9f42
2012-01-20 16:49:14 -06:00
KuroiIeWa5Da d3d913e13b labeled SSAnne music data
hg-commit-id: 0defa8755180
2012-01-20 16:38:46 -06:00
KuroiIeWa5Da 8517c9f7b7 labeled more music in bank 2 including lavender town
hg-commit-id: 967b4cbc54dc
2012-01-20 16:07:59 -06:00
KuroiIeWa5Da 16535c0bb0 labeled cinnabar music data
hg-commit-id: e339acd29c0f
2012-01-20 15:29:20 -06:00
KuroiIeWa5Da 6e48e6bbf7 merge
hg-commit-id: ea60b3417955
2012-01-20 15:15:01 -06:00
KuroiIeWa5Da 6e679fd29c Finished Celedon & Cinnabar Island in bank 2
hg-commit-id: d08b172fdc6f
2012-01-20 15:14:21 -06:00
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
KuroiIeWa5Da 5ed66553b6 Inserted several text and text pointers
hg-commit-id: a546098b74ec
2012-01-18 11:57:43 -06:00
Bryan Bishop bfab42297e daycare text and 4 unknown bytes at 0x8ac8b
hg-commit-id: fce5114fe2cb
2012-01-18 11:51:39 -06:00