Commit graph

266 commits

Author SHA1 Message Date
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
Bryan Bishop 169e7b4987 finish bank $23 and bank $24
hg-commit-id: f08f6f570a70
2012-01-18 11:45:26 -06:00
Bryan Bishop 31937abd49 text for receiving a rod, i think
hg-commit-id: c8f7c496f3c7
2012-01-18 11:39:54 -06:00
Bryan Bishop 6074f10922 ReceivedHM02 text
hg-commit-id: 79804cb7c997
2012-01-18 11:22:58 -06:00
Bryan Bishop bc2a683eea "You don't have the BOULDERBADGE yet!"
hg-commit-id: eb81a7e9e831
2012-01-18 11:21:58 -06:00
Bryan Bishop 6851e2a03d more gate badge check text
hg-commit-id: ad8ad9a49ea6
2012-01-18 11:20:55 -06:00
Bryan Bishop 47514fbf02 insert more text for BillsHouse
hg-commit-id: ca5e83f9f8a4
2012-01-18 11:18:46 -06:00
Bryan Bishop ee7589dd00 league badge check texts
hg-commit-id: 50c9c5900637
2012-01-18 11:13:38 -06:00
Bryan Bishop 3e34adf7d0 insert text about beating contest trainers
hg-commit-id: 64241c2dd6d4
2012-01-18 11:08:32 -06:00
Bryan Bishop 538be0f781 insert text about receiving items
hg-commit-id: aea261e98ddf
2012-01-18 11:07:30 -06:00
Bryan Bishop a44325ab63 "stopped evolving" text
hg-commit-id: c4c9efbdb264
2012-01-18 11:04:50 -06:00
Bryan Bishop 2990c721eb "is evolving" text
hg-commit-id: 401fb59df75b
2012-01-18 11:03:10 -06:00
Bryan Bishop c31b6a654c some status-related text?
hg-commit-id: e9cf161a93b1
2012-01-18 11:02:22 -06:00
Bryan Bishop c5c2463e9f "So, you want the fire #MON, CHARMANDER?"
hg-commit-id: c83df792151d
2012-01-18 10:51:18 -06:00
Bryan Bishop feaff9507a insert some texts in bank $25
hg-commit-id: c2436fd96678
2012-01-18 10:48:26 -06:00
Bryan Bishop b3aa565d8a text for ReceivedOldAmberText
hg-commit-id: b90b544fc952
2012-01-18 10:39:40 -06:00
Bryan Bishop d421ea65b5 text for receiving TM27
hg-commit-id: 130efb1d0681
2012-01-18 10:38:22 -06:00
Bryan Bishop 586464b29b text for ViridianMartParcelQuestText
hg-commit-id: c8c207ae698d
2012-01-18 10:36:25 -06:00
Bryan Bishop d7588d1e36 switch @, $50 to @@
hg-commit-id: 3e116891bf00
2012-01-18 09:27:17 -06:00
stag019 a44a296bfb Probably something in bank 1D, I don't really remember.
hg-commit-id: 13f6a88b5fea
2012-01-18 09:23:11 -05:00
stag019 11326fa4b0 Some more bank 1D changes.
hg-commit-id: 9076099b2def
2012-01-18 07:07:12 -05:00
IIMarckus 497f9b6602 The python tools should spit out tabs, not spaces.
hg-commit-id: fc09f0bbe4b3
2012-01-18 00:46:27 -07:00
KuroiIeWa5Da 964b461383 Added Viridian Gym Text 12
hg-commit-id: 8da77801ef01
2012-01-18 01:21:06 -06:00
IIMarckus 024cd7f6b8 Merge.
hg-commit-id: a7ba9c9ef933
2012-01-18 00:12:25 -07:00
IIMarckus 5351f55c0e Strip redundant comments from map header pointers.
hg-commit-id: d44d520e7b41
2012-01-18 00:10:53 -07:00
IIMarckus 148534cc5c Add where the pointers come from for freeze maps.
hg-commit-id: 4eb10320bf19
2012-01-18 00:09:22 -07:00
KuroiIeWa5Da f68dc60990 synchroized MapBanks with MapHeaders
hg-commit-id: fad82e1cb088
2012-01-18 00:26:51 -06:00
KuroiIeWa5Da dcb93dc0e9 Minor: prefixed 118 with id=118
hg-commit-id: 2ab07a3ca26c
2012-01-18 00:20:01 -06:00
KuroiIeWa5Da 4e19891384 Connected Hall of fame room
hg-commit-id: 644c9fedbc25
2012-01-18 00:19:12 -06:00
KuroiIeWa5Da f1c6d94d39 Finalized Gary map
hg-commit-id: e2ffb49499cc
2012-01-18 00:17:00 -06:00
stag019 25cc7be1a5 A tiny bit of work on bank 1D.
hg-commit-id: 24baa3f0143a
2012-01-18 00:39:13 -05:00
Bryan Bishop 8d6fc27586 spacing near INCBINs
hg-commit-id: 1d68ed48a045
2012-01-17 20:56:48 -06:00
Bryan Bishop b8100083ca insert many many more texts
hg-commit-id: 50dfe24e0bad
2012-01-17 20:37:55 -06:00
Bryan Bishop 95b86a5b6e insert many texts and TX_FARs and labels
hg-commit-id: 66eeac9d26a9
2012-01-17 17:24:32 -06:00
Bryan Bishop 438456a3a7 switch money sign back in common.asm
hg-commit-id: 99a5394d5391
2012-01-17 11:02:20 -06:00
IIMarckus e83d265166 Use the currency character in appropriate text.
hg-commit-id: b7e03f7a6c6e
2012-01-17 01:53:37 -07:00
Bryan Bishop 362fd20ef4 first use of TX_RAM
hg-commit-id: 3234114a2064
2012-01-17 01:33:54 -06:00
Bryan Bishop 5f7bb0da72 Merge in new Route2 work.
hg-commit-id: b67f316a108a
2012-01-16 23:41:16 -06:00
Bryan Bishop 7e592a9d98 fix naming of map size constants
hg-commit-id: 4477820444cd
2012-01-16 23:31:20 -06:00
Bryan Bishop 0db823f485 revert tileset constants
hg-commit-id: 1f114203aa14
2012-01-16 22:53:00 -06:00
KuroiIeWa5Da 577869304c Cleaned up and finalized route 2
hg-commit-id: e96ff3835e91
2012-01-16 18:28:00 -06:00
KuroiIeWa5Da 7c2a27f551 Merged
hg-commit-id: e6b2ec71c261
2012-01-16 17:41:39 -06:00
KuroiIeWa5Da 4bd2d5dfb9 Cleaned Up Pallet Town Header
hg-commit-id: 01c19ef1ce18
2012-01-16 17:16:00 -06:00
IIMarckus d01dc95f3c Strip out 00s at the end of text banks.
Not other banks, because it’s possible for there to be 00‐terminated data…

hg-commit-id: 676b7b4c3ba1
2012-01-16 15:52:28 -07:00
Bryan Bishop 40c2ce0bec Merge in Route2 from KuroiIeWa5Da.
Also, this reverts the additional awk flag- it breaks bsd awk.

hg-commit-id: eb7be134dd2c
2012-01-16 10:27:12 -06:00
KuroiIeWa5Da 6c3eb008fe final updates to route 2
hg-commit-id: a6a84735b057
2012-01-16 05:18:15 -06:00
KuroiIeWa5Da ad8782826e Added Route2 Header
hg-commit-id: 0feabe501ffb
2012-01-16 04:33:48 -06:00
Bryan Bishop 968c0c493c formulas for map header connections instead of raw values
hg-commit-id: b6822898d929
2012-01-16 01:40:25 -06:00
Bryan Bishop f0d8e69adc replace connection pointers with formulas
hg-commit-id: 92972d3acaea
2012-01-15 17:20:06 -06:00
Bryan Bishop f8291c9cda oops, forgot constants for PalletTown
hg-commit-id: 10d0aebb1bc5
2012-01-15 16:49:38 -06:00
Bryan Bishop a8ef3c70db replace dimensions with constants in map headers
hg-commit-id: 53c4303c9648
2012-01-15 16:22:35 -06:00
Bryan Bishop e6ef3e385a switch a few map sizes to use their constants
hg-commit-id: 7f047374cb40
2012-01-15 15:48:17 -06:00
Bryan Bishop 1f1f31ff9c connection_helper - print out a formula for connection math
hg-commit-id: 27e8096bb251
2012-01-15 15:45:09 -06:00
Bryan Bishop 254dfd6f30 more south connections in map headers
hg-commit-id: 0f3ddff0265c
2012-01-15 11:45:21 -06:00
Bryan Bishop 809997ab28 south connection labels in some map headers
hg-commit-id: 19914077a48f
2012-01-15 11:34:12 -06:00
Bryan Bishop 11b77e4b19 sprinkle in some constants into PalletTown's map header
hg-commit-id: 9943efb479d3
2012-01-15 09:42:09 -06:00
Bryan Bishop 404043a902 Merge in sawakita's W_PEOPLEMOVEMENTS changes.
hg-commit-id: 047693a39b24
2012-01-15 09:22:34 -06:00
Bryan Bishop e37784f90f Merge in stag019's work.
hg-commit-id: 6deea39e5051
2012-01-15 09:21:31 -06:00
Sawakita 916b313517 Fix a RAM location mis-labeling. At $D4E4 there is the list of current map's people-movement-permissions, not the list of map's text-pointers.
hg-commit-id: 409379e6e31e
2012-01-15 15:40:13 +01:00
stag019 5df6a4c1fc Game Corner Prizes in Red vs. Blue.
hg-commit-id: 63a73389f134
2012-01-15 03:03:59 -05:00
stag019 781ec0aa20 Misc. Red/Blue differences.
hg-commit-id: 6b104b168595
2012-01-15 02:47:47 -05:00
Bryan Bishop f22a89b46d Merge.
hg-commit-id: 59809815188e
2012-01-15 00:44:19 -06:00
stag019 74360178fb Palette differences between Red and Blue version.
hg-commit-id: 3bebb464b5f7
2012-01-15 01:15:58 -05:00
Bryan Bishop b62a5935b8 helpful labels on ItemUsePtrTable
hg-commit-id: b956db05c482
2012-01-14 23:37:12 -06:00
Bryan Bishop 61dfed9839 ItemUsePokedex is a simple jump
hg-commit-id: 3e7c01dc6583
2012-01-14 23:25:18 -06:00
Bryan Bishop 5f124fb0b8 item $7 is surfboard (buggy?)
hg-commit-id: 088044256f47
2012-01-14 23:19:47 -06:00
Bryan Bishop e2e478c199 _OaksLabText39 for "Those are PokeBALLs" etc.
hg-commit-id: 0ba99920297c
2012-01-14 22:22:34 -06:00
Bryan Bishop 967a79bc72 remaining texts for OaksLabTexts
hg-commit-id: 00d1e357f05b
2012-01-14 22:13:46 -06:00
Bryan Bishop 0e10c92093 fix IndigoPlateauLobbyTexts
hg-commit-id: fbca9dd730b5
2012-01-14 21:55:53 -06:00
Bryan Bishop 07016dcf45 insert _VermilionCityText14 machop text
hg-commit-id: 22d36f8bc08e
2012-01-14 21:49:55 -06:00
Bryan Bishop 52661e4a44 catch a case of W_MAPTEXTPTRLIST
hg-commit-id: 528b631e06fa
2012-01-14 21:04:01 -06:00
Bryan Bishop a9cd1ffa32 add label for VermilionDockTexts
hg-commit-id: a73c4e4084cc
2012-01-14 20:56:49 -06:00
Bryan Bishop 78e8b6be4a found CinnabarPokecenterBlocks
hg-commit-id: 6b9d3183411d
2012-01-14 20:54:33 -06:00
Bryan Bishop 2bc10aff68 DiglettsCaveTexts overlap
hg-commit-id: 355ecf74fd4a
2012-01-14 20:53:03 -06:00
Bryan Bishop 4899ee7924 UndergroundPathWETexts is crazy
hg-commit-id: 641154b3c753
2012-01-14 20:51:43 -06:00
Bryan Bishop 4dd274387a found SSAnne10Blocks
hg-commit-id: 51b5991cdf1a
2012-01-14 20:44:20 -06:00
Bryan Bishop 1e740d9959 blocks label for UndergroundTunnelEntranceRoute7Blocks
hg-commit-id: 57fcfd3633e2
2012-01-14 20:41:48 -06:00
Bryan Bishop f422f7b820 found UndergroundTunnelEntranceRoute6Blocks
hg-commit-id: dc408f474542
2012-01-14 20:40:53 -06:00
Bryan Bishop 72957b4248 found ViridianForestEntranceBlocks
hg-commit-id: 844dd74970d7
2012-01-14 20:40:08 -06:00
Bryan Bishop c703d6e949 found Route2GateBlocks
hg-commit-id: 1b9495511f7c
2012-01-14 20:39:26 -06:00
Bryan Bishop febb075ea6 add SaffronPokecenter blocks and texts
hg-commit-id: 83f3135b6883
2012-01-14 20:38:41 -06:00
Bryan Bishop dfade84e47 map blocks for ViridianForest
hg-commit-id: 40ac908d575c
2012-01-14 20:37:08 -06:00
Bryan Bishop fc49cb7123 improve VermilionPokecenter texts and blocks
hg-commit-id: 93334ea888b4
2012-01-14 20:33:44 -06:00
Bryan Bishop 283480a850 LavenderMart blocks and texts label
hg-commit-id: 99c9dbbdc924
2012-01-14 20:31:37 -06:00
Bryan Bishop 8685de410a fix up LavenderPokecenter with blocks and texts
hg-commit-id: fdf8add5eb64
2012-01-14 20:29:42 -06:00
Bryan Bishop dc9bc1033f found CeruleanMartBlocks
hg-commit-id: a8fef244a0eb
2012-01-14 20:26:43 -06:00
Bryan Bishop 74b8e8169f fix CeruleanPokecenterTexts
hg-commit-id: 51ac47654d4a
2012-01-14 20:26:00 -06:00
Bryan Bishop c16a1b6125 fix PewterPokecenterTexts
hg-commit-id: 87a55898863b
2012-01-14 20:25:01 -06:00
Bryan Bishop b3032ce520 found Route11Texts
hg-commit-id: 2d51934a7079
2012-01-14 20:21:40 -06:00
Bryan Bishop e6b938b99f found Route6Texts
hg-commit-id: 50f2cbdad674
2012-01-14 20:18:40 -06:00
Bryan Bishop 0f4163d4c6 found VermilionHouse2Blocks
hg-commit-id: 7d6db59be5b1
2012-01-14 20:16:17 -06:00
Bryan Bishop 4908dbcec6 found Route12HouseBlocks
hg-commit-id: 102458660615
2012-01-14 20:14:57 -06:00
Bryan Bishop 289a5755a4 add blocks, texts and script for Mansion4
hg-commit-id: bdabcd18b56a
2012-01-14 20:06:56 -06:00
Bryan Bishop e54f6f78ce clean up Mansion3 blocks, texts and script
hg-commit-id: 1465686539d5
2012-01-14 19:59:53 -06:00
Bryan Bishop 34f159c528 dump in Mansion3Script
hg-commit-id: 33c87a799d37
2012-01-14 19:57:42 -06:00
Bryan Bishop b610edaee1 add script, texts and blocks for Mansion2
hg-commit-id: 9bccdc4e5ae9
2012-01-14 19:56:45 -06:00
Bryan Bishop c4a49e4a35 label MtMoon2Texts
hg-commit-id: d611dcf926dc
2012-01-14 19:50:34 -06:00
Bryan Bishop 6ed8c81511 IndigoPlateauTexts and IndigoPlateauObject are the same
hg-commit-id: f154acbb6735
2012-01-14 19:48:22 -06:00
Bryan Bishop 0dadb5af63 found Route18GateHeaderBlocks
hg-commit-id: f4746986760f
2012-01-14 19:46:56 -06:00
Bryan Bishop f856b01586 found Route18GateBlocks
hg-commit-id: 8127339e24bb
2012-01-14 19:45:55 -06:00
Bryan Bishop bc1dd1675a found Route16GateUpstairsBlocks
hg-commit-id: 7241182d59fd
2012-01-14 19:45:18 -06:00