Commit Graph

341 Commits

Author SHA1 Message Date
IIMarckus
3425fd6ef8 Sync somewhat with pokeyellow. 2016-06-08 05:45:50 -06:00
IIMarckus
6e8c3883e4 Part 1 of syncing with pokered. 2016-06-08 05:44:58 -06:00
IIMarckus
674b4dcc4a Remove the Beach House option. 2016-06-07 23:55:55 -06:00
pikalaxalt
19656f9dee No more standalone WRAM addresses in the Event Flags array 2016-06-08 01:05:34 -04:00
pikalaxalt
5da4ad3d5c Merge branch 'master' of github.com:pret/pokeyellow 2016-06-08 00:35:33 -04:00
pikalaxalt
9346a39a8a Printer labels 2016-06-07 22:18:07 -04:00
pikalaxalt
5630392f9f More Pikachu function documentation 2016-06-06 15:21:01 -04:00
pikalaxalt
96a58ce52a Split out pikachu engine functions; sprite state data macros 2016-06-06 12:09:36 -04:00
dannye
2bb64d11e6 Clean up main.asm
recreated deleted file that never should have been unused
2016-06-06 11:04:20 -05:00
dannye
a33f356461 Remove unused source files 2016-06-06 03:22:40 -05:00
dannye
a070bdcb21 Clean up white space 2016-06-06 01:22:22 -05:00
pikalaxalt
e123bdf978 Resolve HRAM labels in Bank 3E 2016-06-05 12:42:34 -04:00
pikalaxalt
63123f9ad3 Remaining maps in bank 1D (and the whole ROM) 2016-06-03 23:25:35 -04:00
pikalaxalt
b170bb4f13 Silph Co 11F 2016-06-03 23:06:52 -04:00
pikalaxalt
35cc755f66 Remaining maps in Bank 11 2016-06-03 21:16:31 -04:00
pikalaxalt
718ae4194b Remaining maps in bank 14 2016-06-03 19:25:57 -04:00
pikalaxalt
bb2aea02d5 Rocket Hideout and tileset headers 2016-06-03 15:42:29 -04:00
pikalaxalt
02dc94721b Victory Road 3F 2016-06-03 09:09:36 -04:00
pikalaxalt
0a2b8a28eb Vermilion House 3 2016-06-03 08:41:20 -04:00
pikalaxalt
2d68444e20 Victory Road 2F 2016-06-03 00:01:37 -04:00
pikalaxalt
8455e51b86 Seafoam Islands 1 and Route 22 Gate 2016-06-02 23:45:22 -04:00
pikalaxalt
76185838e2 Saffron Mart, Pokecenter, and Silph 1F 2016-06-02 14:30:10 -04:00
pikalaxalt
eb83973a64 Indigo Plateau Lobby 2016-06-02 13:18:57 -04:00
pikalaxalt
f90a30fedb Cinnabar Pokecenter 2016-06-02 13:07:08 -04:00
pikalaxalt
c104a1481a Cinnabar Gym 2016-06-02 11:38:27 -04:00
pikalaxalt
5e0709b60f Seafoam Islands 2-5 2016-06-02 10:18:22 -04:00
pikalaxalt
a2befe3463 Remaining maps in Fuchsia 2016-06-01 22:00:46 -04:00
pikalaxalt
14ef52bdd8 Fuchsia House 1 and Fuchsia Pokecenter 2016-06-01 19:18:42 -04:00
pikalaxalt
68dbc1cace Fuchsia Mart 2016-06-01 18:56:11 -04:00
pikalaxalt
0acd7a594d All of Pokemon Tower 2016-06-01 17:24:31 -04:00
pikalaxalt
4cc8f9f8ca Lavender Mart and Pokecenter 2016-06-01 10:26:45 -04:00
pikalaxalt
94bc94817c Celadon Diner 2016-06-01 09:57:59 -04:00
pikalaxalt
4b91cc770e Text macros; Prize Room 2016-06-01 09:44:32 -04:00
pikalaxalt
bd7620b851 Celadon Prize Room 2016-06-01 08:31:42 -04:00
pikalaxalt
65d66e10ba Celadon Mart 5F 2016-06-01 08:28:26 -04:00
pikalaxalt
6006a9df06 Game Corner 2016-05-31 22:41:22 -04:00
pikalaxalt
6d80537563 Celadon Pokecenter 2016-05-31 21:58:46 -04:00
pikalaxalt
7607ab4ff4 Celadon Manion Eevee room 2016-05-31 21:47:52 -04:00
pikalaxalt
6ddc1b23e3 First four Celadon Mansion maps 2016-05-31 21:05:54 -04:00
pikalaxalt
1ecccfcf22 Celadon Mart Roof and Elevator 2016-05-31 20:01:36 -04:00
pikalaxalt
3fe30c7dbf Celadon Mart 1F 2016-05-31 18:24:47 -04:00
pikalaxalt
3ebb84d4c5 Fix hide show constants 2016-05-31 16:16:19 -04:00
pikalaxalt
439efda1ba Champion's room; resolve predefs 2016-05-31 15:55:39 -04:00
pikalaxalt
170d64252d Lance's room and its clones 2016-05-31 14:25:37 -04:00
pikalaxalt
39d5645610 Victory Road 1F 2016-05-31 14:17:20 -04:00
pikalaxalt
9298c87bc6 The rest of SS Anne 2016-05-31 14:01:10 -04:00
pikalaxalt
799b0ad911 Most of SS Anne 2016-05-31 13:45:47 -04:00
pikalaxalt
3f6268d11c VermilionDock 2016-05-31 13:07:24 -04:00
pikalaxalt
b7a20f1386 Vermilion Fan Club 2016-05-31 11:46:02 -04:00
pikalaxalt
755ca8914d Vermilion Pokemon Center 2016-05-31 09:37:09 -04:00
pikalaxalt
b1bcb5b372 Bill's House 2016-05-30 20:27:55 -04:00
pikalaxalt
faaf1c4346 Routes 11 and 12 gates 2016-05-30 18:25:34 -04:00
pikalaxalt
a443384a21 Rock Tunnel Pokecenter 2016-05-30 15:53:23 -04:00
pikalaxalt
5f729c22b5 Add missing file; route 7/8 gates and route 8 path entrance 2016-05-30 15:16:58 -04:00
pikalaxalt
3eae968b30 Daycare 2016-05-30 13:59:23 -04:00
pikalaxalt
6e3581df4b Mt Moon Pokemon Center 2016-05-30 11:38:46 -04:00
pikalaxalt
ae723a0655 Cerulean Bike Shop 2016-05-30 10:04:13 -04:00
pikalaxalt
0cf9f485b1 Guys we need to disassemble Misty 2016-05-30 09:47:14 -04:00
pikalaxalt
5d6f3ec1d4 Cerulean Pokemon Center; Func_5c0d4; space after comma in engine/menu/pokedex.asm 2016-05-30 09:36:57 -04:00
pikalaxalt
0d687ba25a TX_SFX_KEY_ITEM and mapconst macro 2016-05-30 09:08:40 -04:00
pikalaxalt
a8b3d3612e Bulbasaur house in Cerulean 2016-05-29 22:36:26 -04:00
pikalaxalt
b8cced19fc Mt Moon B2F 2016-05-29 20:52:05 -04:00
pikalaxalt
873ab5ace1 Mt Moon B1F 2016-05-29 16:49:54 -04:00
pikalaxalt
9abb620338 Pewter Pokecenter 2016-05-29 16:24:41 -04:00
pikalaxalt
92f3f9119e Pewter houses, Pewter mart 2016-05-29 15:29:40 -04:00
pikalaxalt
591752d5ee Pewter Gym and Museum 2F 2016-05-29 14:35:16 -04:00
pikalaxalt
9c380e8de7 Museum 1F local scripts 2016-05-29 14:14:29 -04:00
pikalaxalt
287fc9855f Museum 1F far text scripts 2016-05-29 14:08:51 -04:00
pikalaxalt
2792f51d73 Another chunk of bank 3c 2016-05-29 10:55:45 -04:00
pikalaxalt
a86cd928c9 Viridian Forest and other functions 2016-05-29 00:10:38 -04:00
pikalaxalt
e48e466f39 Various interior maps on route 2 2016-05-28 22:53:44 -04:00
pikalaxalt
ba224a0430 Viridian Trainer School 2016-05-28 18:39:53 -04:00
pikalaxalt
c93574436f Viridian Mart 2016-05-28 17:43:51 -04:00
pikalaxalt
40fce3a7d2 Viridian pokecenter 2016-05-28 17:16:06 -04:00
pikalaxalt
ff62edda93 Oaks Lab rewrite part 5 (finish) 2016-05-28 16:07:46 -04:00
pikalaxalt
e698f02b76 Oaks Lab rewrite part 4 2016-05-28 15:56:04 -04:00
pikalaxalt
49c31daedc Oak's Lab Rewrite part 3 2016-05-28 14:00:44 -04:00
pikalaxalt
034b268aad Oak's Lab Rewrite part 2 2016-05-28 12:07:11 -04:00
pikalaxalt
dcd1ecc18f Oak's Lab Rewrite part 1 2016-05-28 09:28:59 -04:00
pikalaxalt
9835d77c28 Blue's House 2016-05-27 23:08:50 -04:00
pikalaxalt
d04de35b92 Red's House 2F 2016-05-27 22:45:40 -04:00
pikalaxalt
e51658fed0 Red's House 1F 2016-05-27 22:27:35 -04:00
pikalaxalt
dc8677aa1c Route 9 incl. AJ fight 2016-05-27 19:59:12 -04:00
pikalaxalt
f0125912ea Route 18 scripts 2016-05-27 19:11:47 -04:00
pikalaxalt
7caa8c4be0 Route 19 2016-05-27 18:33:42 -04:00
pikalaxalt
f508b92637 How did I forget to set tracking on these? 2016-05-27 12:47:43 -04:00
pikalaxalt
35ab6056ca Route 6 scripts 2016-05-27 12:46:48 -04:00
pikalaxalt
2b96f4165f Vermilion City scripts 2016-05-27 12:32:34 -04:00
pikalaxalt
33c2637c16 Route 23 2016-05-27 10:28:02 -04:00
pikalaxalt
7a649c27ba Route 22 2016-05-27 10:08:04 -04:00
pikalaxalt
4878c11856 Route 25 scripts 2016-05-27 09:38:27 -04:00
pikalaxalt
40f0dba6c1 Route 24 scripts 2016-05-27 09:22:38 -04:00
pikalaxalt
e44ad103a3 Name Yellow-specific event flags in Pallet and Vermilion 2016-05-27 08:26:16 -04:00
pikalaxalt
1f4f4b99a8 Update Celadon scripts 2016-05-27 08:20:56 -04:00
pikalaxalt
edafbab453 Disassemble Pallet Town 2016-05-26 22:02:52 -04:00
pikalaxalt
c1be6f7374 Hey, I found a thing! 2016-05-26 21:12:12 -04:00
pikalaxalt
8916d80ef4 Disassemble Route 1 2016-05-26 18:57:48 -04:00
pikalaxalt
ce63981699 Final phase 3 of Viridian City script disassembly 2016-05-26 18:24:54 -04:00
pikalaxalt
fdfc393da3 Disassemble Yellow Viridian scripts 2016-05-26 16:44:47 -04:00
pikalaxalt
b53be53ba3 Phase 1 of viridian city script disassembly 2016-05-26 15:46:46 -04:00
pikalaxalt
bcf3fe249e Include and fix Cerulean scripts 2016-05-26 15:02:53 -04:00
pikalaxalt
3239ab648c Add Pewter City and fix scripts 2016-05-26 13:28:30 -04:00
pikalaxalt
054cb312c7 Include Route 5 2016-05-26 11:09:15 -04:00
pikalaxalt
7229ccb81b Include route 7 and link club headers/data 2016-05-26 10:17:33 -04:00
pikalaxalt
604fc2ada3 Actually include the Beach House scripts and headers 2016-05-24 21:46:08 -04:00
pikalaxalt
10f2d4e69d Yellow-ize evolution code 2016-05-23 16:54:51 -04:00
luckytyphlosion
5b53dbe15d Bank7 misc functions
Also delete gfx/intro_nido pngs (aren't used in the build)
2016-05-23 15:52:20 -04:00
pikalaxalt
31b118ab42 Merge branch 'master' of https://github.com/pret/pokered 2016-05-13 17:59:46 -04:00
IIMarckus
adc6a3aac7 Clean up script labels in marts and Pokémon Centers. 2016-04-08 19:04:36 -06:00
IIMarckus
72790bcbac Clean up labels and trainer headers for overworld Pokémon. 2016-04-06 20:58:45 -06:00
PikalaxALT
1980a5befc Macrofy sprite status data in WRA0 2016-01-29 11:20:47 -05:00
luckytyphlosion
c99606ee24 Minor fixes 2016-01-09 14:32:16 -05:00
PikalaxALT
28dc5686b0 Fix game time labels 2016-01-03 14:18:33 -05:00
luckytyphlosion
f0915e2b66 More BankF documentation
Also introduce bit direction constants and setpal macros
2015-12-29 14:53:57 -05:00
luckytyphlosion
47979336e2 Start disassembling bank0F (Battle)
All current findings will be located in engine/battle/core_.asm
2015-12-26 16:27:21 -05:00
luckytyphlosion
5aa4d6c777 Fewer underscores in constants
dannye
2015-12-22 16:06:11 -05:00
Marcus Huderle
1a5a108bdf Label elite four scripts more completely. 2015-12-18 20:03:09 -08:00
dannye
351146024b Fewer underscores in constants 2015-12-14 22:09:30 -06:00
luckytyphlosion
6ddc025942 engine/battle/trainer_ai.asm 2015-12-06 16:08:20 -05:00
luckytyphlosion
cb414f1480 overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE
Also make replace.sh take args
2015-10-29 14:23:30 -04:00
luckytyphlosion
bb97b63af1 Complete documentation of bank3
Also: split out bcd predefs from yellow/main.asm, start removing traces
of W_
2015-10-18 15:37:40 -04:00
dannye
38065a744d No more W_ 2015-08-30 21:38:41 -05:00
luckytyphlosion
d2ed7674f4 Merge branch 'master' of https://github.com/iimarckus/pokered
Doesn't build.
2015-08-30 17:55:02 -04:00
YamaArashi
30063216cd use the new battle type constants 2015-08-29 23:35:58 -07:00
YamaArashi
b6a7e5e9cf documented flags and misc. fixes 2015-08-29 17:15:05 -07:00
YamaArashi
696cffd3ae item name length constant 2015-08-14 04:11:53 -07:00
YamaArashi
b6ac1018c2 add border constant and clear up misnomer 2015-08-14 02:46:12 -07:00
YamaArashi
132d036752 named more variables 2015-08-12 22:14:31 -07:00
dannye
fb0a630c06 More joypad constants 2015-08-11 00:34:32 -05:00
dannye
4aedff0217 Replace hardcoded name lengths with NAME_LENGTH 2015-08-10 23:51:20 -05:00
dannye
dfc152d667 No more $C8
Use OPP_ constants separate from trainer constants since
valid opponents can be all Pokemon and trainers
2015-08-10 11:09:16 -05:00
dannye
dfa266f05c Use constants for elevator floors 2015-08-10 10:03:55 -05:00
dannye
66bc517605 Merge branch 'master' of https://github.com/YamaArashi/pokered 2015-08-10 00:00:12 -05:00
dannye
8a6d46f3d9 Replace some hardcoded data sizes 2015-08-09 23:56:20 -05:00
YamaArashi
2b01815999 commented audio code 2015-08-08 22:32:44 -07:00
YamaArashi
525f1b96f3 named CountSetBits output variable 2015-08-07 04:24:06 -07:00
dannye
f8a9c37a00 Use more lb
and other clean up
2015-08-05 16:25:58 -05:00
YamaArashi
93255d6d17 yet more naming 2015-07-25 19:26:54 -07:00
YamaArashi
7f6d0d49b6 more naming variables 2015-07-24 20:27:59 -07:00
YamaArashi
82512e4491 named animation functions/variables 2015-07-24 14:39:45 -07:00
YamaArashi
e6d02b4b7b make route22 rival events more consistent 2015-07-23 21:20:20 -07:00
YamaArashi
6af65df2fc named function 2015-07-23 21:00:30 -07:00
YamaArashi
04a6c306dc clean up wram aliases 2015-07-23 06:07:44 -07:00
Daniel Harding
c34156c5fb Merge pull request #107 from YamaArashi/master
enumerate events
2015-07-22 10:24:00 -05:00
dannye
a6f04b4349 Unify audio bank references
2→1
8→2
1f→3
2015-07-22 10:22:46 -05:00
YamaArashi
dcc7f3bc9f named more constants 2015-07-21 14:21:14 -07:00
YamaArashi
73171bfff5 named most of the used events 2015-07-21 10:36:03 -07:00
YamaArashi
fd2b4b6c74 gym leader events 2015-07-20 19:41:23 -07:00
YamaArashi
fcab935a0f enumerate events 2015-07-20 18:32:26 -07:00
YamaArashi
db7d941d22 constants for flag actions 2015-07-19 20:45:34 -07:00