Commit Graph

957 Commits

Author SHA1 Message Date
yenatch
9f53825ce2 move common asm from engine/ to common/
engine/ was getting really bloated and common asm wasnt what it was made for
2013-09-07 23:38:19 -04:00
yenatch
7a3a4f913b split fruit tree asm out into engine/fruit_trees.asm 2013-09-07 23:26:28 -04:00
yenatch
8018614585 split type strings and related asm out into text/types.asm 2013-09-07 23:24:22 -04:00
yenatch
e13f03ae44 comment PrintMonTypes 2013-09-07 23:22:17 -04:00
yenatch
3b119687f3 leftover trainer class names from red
you can find these in pokered at TrainerNamePointers (9:7e64)
2013-09-07 22:48:07 -04:00
Bryan Bishop
4f7824ff08 whitespace -> tabs in main.asm
How did these get in here?
2013-09-07 19:53:22 -05:00
yenatch
353b4ac6da fix up TreeMons/RockMons 2013-09-07 17:35:41 -04:00
yenatch
6e5876377f split out std scripts from main.asm 2013-09-07 15:30:07 -04:00
yenatch
ed2063276a add a menudata2 header in std scripts
thats it for std incbins
2013-09-07 15:26:52 -04:00
yenatch
eaaf719440 label some jumps in std scripts 2013-09-07 14:42:28 -04:00
yenatch
3301e5b77b shorten PrintMoveDescription -> PrintMoveDesc so rgbds doesnt choke
still need to fix this 15-char macro argument limit
2013-09-07 14:14:29 -04:00
yenatch
5376a0c96b the bomb 3
std scripts
2013-09-07 05:08:12 -04:00
yenatch
6f541d5723 labels for each predef
also fix up any labels that got missed

finally found a reference to the weird nop function (Function2d43)
2013-09-06 22:50:58 -04:00
yenatch
266e401b7d the bomb 2
remaining predef asm
2013-09-06 18:31:40 -04:00
yenatch
67dd49967d labels for each special
also fix up labels from last commit
2013-09-06 04:04:27 -04:00
yenatch
1660b814e8 the bomb
specials asm dump
2013-09-06 03:50:55 -04:00
yenatch
fb68f75d9f update some labels and special/predef pointers 2013-09-06 01:57:03 -04:00
yenatch
a4707eccaf couple more specials in bank 3 2013-09-05 17:40:21 -04:00
yenatch
2aff956ba4 some specials in bank 3 and unown dex asm 2013-09-05 17:05:30 -04:00
yenatch
b417d08f2e recomment CheckShininess and CheckContestMon 2013-09-04 04:33:38 -04:00
yenatch
5888db3493 recomment Predef and GetPredefFn -> GetPredefPointer 2013-09-04 04:05:15 -04:00
yenatch
715a19fd59 split farcall functions into engine/farcall.asm 2013-09-03 21:15:03 -04:00
yenatch
1eab7959f4 formatting in the map engine 2013-09-03 20:49:05 -04:00
yenatch
d93d17b43b split out game time functions into engine/game_time.asm 2013-09-03 18:58:16 -04:00
yenatch
2c36afc6c3 recomment game time functions 2013-09-03 18:56:59 -04:00
yenatch
340e31d839 split menu functions into engine/menu.asm 2013-09-03 18:43:15 -04:00
yenatch
23bb05851b split Sine/Cosine into engine/sine.asm 2013-09-03 18:40:12 -04:00
yenatch
12e6ff3fc6 split map object functions into engine/map_objects.asm 2013-09-03 18:39:19 -04:00
yenatch
71bbd77261 split some RTC interfaces into engine/rtc.asm 2013-09-03 18:35:37 -04:00
yenatch
004956798c split vram functions out into engine/video.asm 2013-09-03 18:32:55 -04:00
yenatch
dad64b1d9d split out rst vectors 2013-09-03 18:17:33 -04:00
yenatch
0caac30f27 clean up rst vectors 2013-09-03 18:16:56 -04:00
yenatch
bd8be2b02e split out hardware interrupts 2013-09-03 17:57:47 -04:00
yenatch
affec2ac95 clean up interrupts 2013-09-03 17:48:18 -04:00
yenatch
20919e4d8a formatting at Start 2013-09-03 17:45:37 -04:00
yenatch
7bc23f0862 condense bank 0 includes 2013-09-03 17:44:24 -04:00
yenatch
04fc9c4748 fix interface label for UpdateTimePals 2013-09-03 17:38:45 -04:00
yenatch
b74e63a20d split out delay functions 2013-09-03 17:36:55 -04:00
yenatch
d2eeab62ea split out marts 2013-09-03 17:35:17 -04:00
yenatch
15076861f1 split out trainer dvs 2013-09-03 17:32:54 -04:00
yenatch
bbe8756302 recomment trainer dvs 2013-09-03 17:31:57 -04:00
yenatch
0ed9164ccc decoration names 2013-09-03 17:26:27 -04:00
yenatch
1cef08db06 some asm pointer tables in bank 5f 2013-09-03 17:24:35 -04:00
yenatch
171c21be69 dump move tutor asm in bank 40 2013-09-03 17:09:48 -04:00
yenatch
2b2018a83a more bank 4 asm
this stuff looks like it's related to phone call timing
2013-09-03 06:38:07 -04:00
yenatch
5dd127300c even more incbinned asm in bank 4 2013-09-03 06:07:45 -04:00
yenatch
5641ea009c disassemble more incbins in bank 4 2013-09-03 05:56:07 -04:00
yenatch
0eff98ecf1 the rest of TMHMMoves 2013-09-03 03:56:11 -04:00
yenatch
bf4bedc4bf more bank 4 functions and CanLearnTMHMMove 2013-09-03 03:54:13 -04:00
yenatch
0d3de2e30b GetTMHMMove and renamed TechnicalMachines -> TMHMMoves 2013-09-03 03:39:21 -04:00
yenatch
edc354152e formatting in MoveInfoBox and related functions 2013-09-02 06:40:30 -04:00
yenatch
9f7c4ef0b4 Sine and Cosine 2013-09-02 00:12:27 -04:00
yenatch
5b38b377f2 wram labels for graphics requests 2013-09-01 15:24:07 -04:00
yenatch
e3da601cee split out tileset headers from main into tilesets/tileset_headers.asm 2013-09-01 14:43:25 -04:00
yenatch
4a4dd20a6d split tileset palette maps out of main into tilesets/palette_maps.asm 2013-09-01 14:43:24 -04:00
yenatch
7cac61f3bd split tileset data out from main into tilesets/ 2013-09-01 14:43:23 -04:00
yenatch
5147e6c0a2 random 0s in tileset data was actually lz padding
i guess someone liked their filesizes nice and even?
2013-09-01 14:42:49 -04:00
yenatch
3010731347 split out blockdata includes from main into maps/ 2013-09-01 14:41:21 -04:00
yenatch
2a0089b92b shorten some overly long music filenames 2013-09-01 14:41:16 -04:00
yenatch
1a02ed6b37 get rid of the last static address in tileset animation arrays 2013-09-01 03:13:17 -04:00
yenatch
7d5e5b8182 recomment _AnimateTileset 2013-09-01 00:52:19 -04:00
yenatch
cc2906b68f consistent casing for Tileset labels
wram labels were using TileSet for some reason
2013-09-01 00:09:57 -04:00
yenatch
8190c3e5e7 rename DoTileAnimation to AnimateTileset 2013-09-01 00:07:10 -04:00
yenatch
fc6bc8e311 rename graphics request handlers to Serve1bppRequest and Serve2bppRequest
these had some really dumb names
2013-09-01 00:02:35 -04:00
yenatch
abce472354 fix PushOAM references in VBlank 2013-08-31 21:47:28 -04:00
yenatch
28fd514bef recomment tileset animation interface 2013-08-31 21:47:22 -04:00
yenatch
0a821fe964 recomment bg map update functions 2013-08-31 21:47:05 -04:00
yenatch
2acccc3ea5 rename FarBattleTextBox to StdBattleTextBox
that's it for bad Far usage
2013-08-31 03:54:02 -04:00
yenatch
b333b18dbd Function2f79 is PickUpItem 2013-08-30 23:07:08 -04:00
yenatch
c402a16def undo overcommenting in BattleRandom
these comments made sense before hram and rst constants were established
2013-08-30 23:03:15 -04:00
yenatch
c9d3881a2f rename RNG to Random
also fix 'Far' naming scheme for BattleRandom

this was a long time coming
2013-08-30 22:59:40 -04:00
yenatch
70ecde3f78 StartTitleScreen -> TitleScreen
also undo "far" naming scheme
2013-08-30 22:47:20 -04:00
yenatch
523abc2d0e formatting in oak speech 2013-08-30 22:46:28 -04:00
yenatch
21248effe4 NUM_POKEMON in main.asm 2013-08-30 22:25:50 -04:00
yenatch
17f25691db Function378b is IsAPokemon 2013-08-30 20:53:42 -04:00
yenatch
f4572ecd4d use more egg constants in main 2013-08-30 19:14:04 -04:00
yenatch
4983c46a26 use callab/callba macros for known FarCalls 2013-08-30 18:57:31 -04:00
yenatch
7cc320e835 Coins in main.asm 2013-08-30 17:50:46 -04:00
yenatch
b86d0da040 less arbitrary wram clearing in game init 2013-08-30 14:21:26 -04:00
yenatch
79bcda11ad PCItems and game init formatting 2013-08-30 04:57:32 -04:00
yenatch
2f169fd2f9 clean up bank 7e includes 2013-08-29 23:27:57 -04:00
yenatch
fd74b4d379 move battle tower mon handling asm into battle_tower.asm 2013-08-29 23:27:17 -04:00
yenatch
7201ea8f0a move GiveOddEgg into odd_eggs.asm 2013-08-29 23:26:01 -04:00
yenatch
55cd892026 fix/add some missing function labels in bank 0 2013-08-29 23:19:21 -04:00
yenatch
fb28d24bd7 condense repeated asm with rept macros 2013-08-29 21:42:28 -04:00
yenatch
579ab13507 proper labeling of common function GetSpritePalette 2013-08-29 21:20:45 -04:00
yenatch
64a6af4052 condense some repetitive asm with rept macros 2013-08-29 21:20:37 -04:00
yenatch
cc98fab33e move VBlank interrupt label from main.asm to engine/vblank.asm 2013-08-29 19:40:33 -04:00
yenatch
2c16bc7ab9 move copy asm from main.asm to engine/copy.asm 2013-08-29 19:39:21 -04:00
yenatch
04da88a285 move palette asm from main.asm to engine/palettes.asm 2013-08-29 19:37:35 -04:00
yenatch
6d29673a5f move time-related asm from main.asm into engine/time.asm 2013-08-29 19:32:03 -04:00
yenatch
6467755568 move serial asm from main.asm into engine/serial.asm 2013-08-29 19:11:39 -04:00
yenatch
2341bb148a move more joypad code from main.asm into engine/joypad.asm 2013-08-29 19:10:06 -04:00
yenatch
dd11c22b31 more joypad function cleanup 2013-08-29 19:08:25 -04:00
yenatch
0a829301ae reformat some joypad functions 2013-08-29 18:59:05 -04:00
yenatch
906496e107 split lcd functions out of main.asm 2013-08-29 18:52:26 -04:00
yenatch
2b5b6f3e3a split fading functions out of main.asm 2013-08-29 18:50:59 -04:00
yenatch
37a841797e secret ruins of alph water stone room asm 2013-08-29 16:03:32 -04:00
yenatch
ae1d50c026 warp sound effects in field moves 2013-08-29 15:24:37 -04:00
yenatch
a167620109 more field move scripts and some map header references 2013-08-29 14:49:07 -04:00
yenatch
1a5f9426c8 get rid of a trailing incbin at the end of bank 21 2013-08-29 03:21:51 -04:00
yenatch
99760c2cc9 more hlcoords in bank 1 2013-08-29 03:04:23 -04:00
yenatch
9d1a6fe5bb more field move scripts 2013-08-29 02:53:04 -04:00
yenatch
a4b69a123f more text_jumps in known functions 2013-08-29 02:23:29 -04:00
yenatch
7fe1fa58e3 hram constants in serial interrupt 2013-08-28 04:29:20 -04:00
yenatch
faae0e1029 serial interrupt 2013-08-28 01:24:52 -04:00
yenatch
8898f63fc7 timer interrupt 2013-08-27 23:38:05 -04:00
yenatch
651e0a4245 LYOverrides in main.asm 2013-08-27 20:56:28 -04:00
yenatch
25dcc71c4c rename some LCD functions 2013-08-27 20:46:15 -04:00
yenatch
12ab33b37e rename FarCall family labels
FarJump labels renamed to FarCall
register aliases JpHl and JpDe renamed to _hl_ and _de_
2013-08-27 18:16:42 -04:00
yenatch
be9c504b24 rename PushScriptPointer -> CallScript 2013-08-27 18:00:41 -04:00
yenatch
886ab68884 add some field move asm and scripts 2013-08-27 17:11:24 -04:00
yenatch
94fc90a243 badge engine flags in main.asm 2013-08-27 16:23:53 -04:00
yenatch
2b10d184b0 recomment some common asm (rtc/lcd) 2013-08-27 00:10:22 -04:00
yenatch
2f5ed8468d SpecialRoamMons -> InitRoamMons 2013-08-26 19:48:44 -04:00
yenatch
9cf90f6c7b deobfuscate some encounter asm 2013-08-26 19:47:42 -04:00
yenatch
17725d7af1 battle init and some overworld actions 2013-08-24 04:10:38 -04:00
yenatch
af205a7217 BitTable2 -> EngineFlags 2013-08-23 16:08:31 -04:00
yenatch
3a24cff5eb BitTableFunc -> FlagAction 2013-08-23 15:49:24 -04:00
yenatch
bc7b63b44a EventFlags label (bittable1) 2013-08-23 15:00:07 -04:00
yenatch
849e5a7d0f game freak presents splash 2013-08-23 01:26:35 -04:00
yenatch
ac7b7ede0b more bank 0 labels instead of static addresses 2013-08-23 01:11:53 -04:00
yenatch
8105dc6c7c BoxMons in main.asm 2013-08-22 18:34:01 -04:00
yenatch
179decd644 GiveOddEgg and related asm
That's it for bank 7e
2013-08-21 17:25:24 -04:00
yenatch
7f96387411 dump odd eggs 2013-08-21 16:02:36 -04:00
yenatch
cc1f57ec93 condense IncGradGBPalTable
this way is more readable too
2013-08-21 14:49:35 -04:00
yenatch
27e1d3fabf Merge branch 'master' into merge-kanzure 2013-08-21 14:02:13 -04:00
yenatch
7b5ffb5475 more field move asm/scripts 2013-08-21 14:01:51 -04:00
yenatch
5db04abdab TileType is actually TileCollision 2013-08-21 14:01:50 -04:00
yenatch
9ac0fc631b formatting in TileTypeTable and tile checks 2013-08-21 14:01:50 -04:00
yenatch
636a960909 split out text engine 2013-08-21 14:01:49 -04:00
yenatch
c1d0253162 graphics loading functions (2bpp and 1bpp) 2013-08-21 14:01:48 -04:00
yenatch
35de889dd7 split out decompression 2013-08-21 14:01:46 -04:00
yenatch
802c3149c0 Merge commit 'd2d5c09'
Conflicts:
	main.asm
	wram.asm

Git couldn't figure out what this commit did, so it was redone to merge.
2013-08-21 13:54:35 -04:00
yenatch
99d2ee2bdc split out program init 2013-08-20 03:26:37 -04:00
yenatch
4b0889b396 remove unnecessary incbin lengths 2013-08-20 03:20:49 -04:00
yenatch
5fe7c6bb67 johto/kanto maps 2013-08-20 02:55:14 -04:00
yenatch
29085399a2 copyright graphics 2013-08-20 02:09:35 -04:00
yenatch
91474f1b86 MBC3SRAMEnable is actually MBC3SRamEnable 2013-08-20 01:38:05 -04:00
yenatch
5b7d887f9d comment program init functions 2013-08-20 01:35:15 -04:00
yenatch
df21dbccb7 $ffcf $ffd0 -> hSCX hSCY 2013-08-19 18:46:56 -04:00
yenatch
449bda272a $ffd1 $ffd2 -> hWX hWY 2013-08-19 18:44:12 -04:00
yenatch
8af06f3cc2 rename and clean up _Start, Init 2013-08-19 18:40:59 -04:00
yenatch
75d5cc3bb6 options menu 2013-08-17 05:57:14 -04:00
yenatch
deb5d1ed46 <&iimarckus> kill those labels please 2013-08-17 01:12:03 -04:00
yenatch
a29c13837d labels for IncGradGBPalTable 2013-08-17 00:53:19 -04:00
yenatch
4105ac8102 battle tower trainers and mons 2013-08-16 22:36:13 -04:00
yenatch
4398dde8cb even more phone text (bank 5d) 2013-08-16 15:25:06 -04:00
yenatch
d83f8228ce dump some mobile link text 2013-08-16 15:15:06 -04:00
yenatch
f458f96427 even more phone text (bank 29) 2013-08-16 14:43:35 -04:00
yenatch
b3dcb0e875 pokegear radio channel names 2013-08-16 14:38:59 -04:00
yenatch
ff453a514b LoadMenuDataHeader and intro player name menu 2013-08-16 04:58:14 -04:00
yenatch
caa7865ce7 extra phone text (bank 19) 2013-08-15 21:54:16 -04:00
yenatch
627914195d battle tower trainer text (bank 7b) 2013-08-15 06:09:12 -04:00
yenatch
000c6d1349 CheckContestMon and a couple labels in bank 0 2013-08-15 06:07:14 -04:00
yenatch
8ecd66f5d5 replace more addresses with labels 2013-08-14 05:42:28 -04:00
yenatch
2fb8d10c23 more bank 2 incbins 2013-08-14 05:38:12 -04:00
yenatch
7a8eb4e434 sort out player/battle backpic asm 2013-08-12 16:33:17 -04:00
yenatch
14160a180f hidden power type/power calculation 2013-08-09 17:50:34 -04:00
yenatch
94e9a3f764 specials cleanup 2013-08-09 16:24:58 -04:00
yenatch
d2d5c09b1d update section names to comply with rgbds redefinitions
HOME -> ROM0
DATA, CODE -> ROMX
BSS -> WRAM0, WRAMX

new to rgbds are banked VRAM and SRAM
2013-08-04 05:04:13 -04:00
yenatch
c01c2ad3c4 dump marts and related asm 2013-08-03 17:26:58 -04:00
yenatch
0ee006a145 more item effects 2013-08-03 16:25:38 -04:00
yenatch
46fea97994 more step handling 2013-08-03 16:25:38 -04:00
yenatch
09dfa9f09e incbin unown font 2013-08-03 16:25:37 -04:00
yenatch
0e50b4c798 more bank 1 incbins 2013-08-03 16:25:37 -04:00
yenatch
e2a0c68f4c comment more battle ui 2013-08-03 16:25:37 -04:00
yenatch
257302dff9 player hud stuff 2013-08-03 16:25:36 -04:00
yenatch
ce31567c4d frames 2013-08-01 15:30:48 -04:00
yenatch
d39dc68a88 field move asm 2013-08-01 05:34:10 -04:00
yenatch
59cb57b954 more cleanup 2013-07-31 19:17:35 -04:00
yenatch
814ab52b21 cleanup and bank 9 menus 2013-07-31 18:03:18 -04:00
yenatch
c9b70ba105 update predef/specials pointers 2013-07-30 01:05:20 -04:00
yenatch
4cb7c4e407 update known labels in main 2013-07-30 00:32:18 -04:00
yenatch
50f1d7b788 no more incbins in bank 0 2013-07-29 23:58:02 -04:00
yenatch
7db40e0395 no more incbins in bank f 2013-07-29 17:53:59 -04:00
yenatch
ed200a5a16 fill out bank f more 2013-07-29 13:58:20 -04:00
yenatch
39d84d4491 bank f 2013-07-28 18:20:08 -04:00
yenatch
03413c9f43 common text 2 and some fixes to compile 2013-07-28 17:16:51 -04:00
yenatch
3070aeb915 make way for bank 6f 2013-07-28 03:39:05 -04:00
yenatch
5001d9b023 bank 6f is common text 2013-07-28 03:32:25 -04:00
yenatch
a0d54cce51 couple bank e functions 2013-07-28 03:12:03 -04:00
yenatch
5b07ea19d0 move descriptions 2013-07-27 16:31:29 -04:00
yenatch
0d0066a0da picking at bank 0 incbins 2013-07-27 15:19:35 -04:00
yenatch
5ecf9f1081 were gonna get bank 0 done!! 2013-07-27 05:43:15 -04:00
yenatch
6343e2ddaf Reset 2013-07-26 23:49:33 -04:00
yenatch
be0af35e3f over a million hours in gedit 2013-07-26 22:19:26 -04:00
yenatch
bdd31cb8c5 fix replaced label comment 2013-07-25 21:30:48 -04:00
yenatch
45f52b0f71 Remove erroneous TileX/Y labels 2013-07-25 21:20:19 -04:00
yenatch
4d72b06bcc replace known addresses with labels 2013-07-25 21:08:30 -04:00
IIMarckus
3a6e587121 Add Time Capsule item conversions.
From http://forums.glitchcity.info/index.php/topic,6719.msg190623/topicseen.html#msg190623
2013-07-25 06:33:28 -06:00
yenatch
184a984941 autogbzdisasm trial run 2013-07-24 18:32:45 -04:00
yenatch
83139cb7d6 Text_1354 is used globally 2013-07-24 03:47:52 -04:00
yenatch
1518925365 main menu and untranslated mobile text 2013-07-22 04:28:34 -04:00
yenatch
65bd235e61 even more bank 1 asm 2013-07-22 03:08:03 -04:00
yenatch
9c7b0932fc more bank 1 asm 2013-07-21 05:54:31 -04:00
yenatch
8e27cfbc1a movement command asm 2013-07-20 22:34:40 -04:00
yenatch
6fb2cd6613 no more incbins in bank 25 2013-07-20 01:46:56 -04:00
yenatch
8d75f962e4 more sprite asm 2013-07-14 14:51:07 -04:00
yenatch
bf2a4b8a84 Sprite headers 2013-07-12 16:18:52 -04:00
yenatch
1da2a7a5c4 Outdoor sprites and sprite constants 2013-07-12 14:50:37 -04:00
yenatch
90c18c5cf3 rst $28 -> JumpTable 2013-07-10 19:17:04 -04:00
yenatch
37c009ca1c player/script events 2013-07-10 19:17:04 -04:00
yenatch
24daef7afb SelectMenu 2013-07-10 19:17:03 -04:00
yenatch
dca6fd37cd start using relevant constants in wram.asm 2013-07-10 19:17:03 -04:00
yenatch
fbf9ae7877 clean up StartMenu 2013-07-10 19:17:02 -04:00
yenatch
6597eb7e50 Overworld input handling 2013-07-10 19:17:02 -04:00
yenatch
b9dfd607bb DoPlayerMovement and recomment ow surfing checks 2013-06-27 00:34:49 -04:00
yenatch
fb931fe616 move miscellaneous asm into engine/ 2013-06-17 21:30:36 -04:00
yenatch
20c0c0e233 BadgeStatBoosts 2013-06-17 18:31:11 -04:00
yenatch
869de91bd5 LostBattle and HalveMoney 2013-06-17 18:19:45 -04:00
yenatch
ef6767f1a9 OakSpeech formatting 2013-06-14 02:29:46 -04:00
yenatch
7213916ccc DrawIntroPlayerPic 2013-06-14 01:09:23 -04:00
Bryan Bishop
4eebcf0ae2 Merge remote-tracking branch 'yenatch/master'
Also merge pull request #145.
2013-06-12 22:44:45 -05:00
yenatch
c26d758fee DecompressPredef 2013-06-10 21:58:25 -04:00
yenatch
a018828016 Player backpic and consistent names for player characters
Male player is now Chris. Female player is Kris.
2013-06-09 14:32:13 -04:00
yenatch
77aa2d9e16 recomment text box functions 2013-05-31 19:07:07 -04:00
yenatch
3975e86baa remove \@s from local labels
\@ is used for anonymous labels in rgbds macros. this has no effect on local labels.
2013-05-31 18:22:32 -04:00
Bryan Bishop
723645b470 rename bank3{0,1}.asm to sprites_{1,2}.asm 2013-05-30 16:29:53 -05:00
Bryan Bishop
3517a4f500 remove two commented incbin lines 2013-05-30 16:28:56 -05:00
yenatch
11cb016019 JpDe 2013-05-29 14:49:42 -04:00
yenatch
eb75c58023 heavy ball 2013-05-27 23:28:21 -04:00
Kat Harrison
e08e7cf7b2 Include overworld sprites
Created /extras/overworldripper.py and used it to extract overworld sprites and convert them to png files.
2013-05-27 23:07:34 -04:00
yenatch
122e243624 mistook sprout tower pillar for minecart graphics 2013-05-22 17:07:18 -04:00
Bryan Bishop
103ac439ed Merge pull request #140 from yenatch/master
tile animations and map header updates
2013-05-22 13:48:45 -07:00
yenatch
ee4203a56d minecart tile animations 2013-05-22 14:57:33 -04:00
IIMarckus
620cf7a2a7 Disassemble Kris's PC. 2013-05-22 01:11:07 -06:00
yenatch
c15e7b8619 safari fountain tile animations 2013-05-22 02:56:25 -04:00
IIMarckus
56d0175ad8 Add Prof. Oak's PC. 2013-05-21 17:03:31 -06:00
yenatch
6dde0b274d ilex forest tree tile animations 2013-05-21 18:32:55 -04:00
yenatch
2236e27933 cave water + park fountain tile animations 2013-05-21 12:37:58 -04:00
yenatch
7232eb5d64 fix calls to $1078 (PlaceString) 2013-05-14 13:28:50 -04:00
yenatch
ea8bfe03b6 add char 4b and cleanup surrounding chars 2013-05-14 13:25:30 -04:00
yenatch
0f3e9c6f7e mixed up connection y/x offset wram labels 2013-05-13 22:09:01 -04:00
yenatch
956cb50712 EnterMapConnection 2013-05-13 20:52:10 -04:00
yenatch
e384a889cc GetAnyMapBlockdataBank 2013-05-13 19:08:46 -04:00
yenatch
ceb4c138db FillMapConnections 2013-05-13 18:49:45 -04:00
yenatch
db84ec18d9 connection wram labels for each direction 2013-05-13 18:47:31 -04:00
yenatch
6464df7b11 GetMapConnection 2013-05-13 15:41:09 -04:00
IIMarckus
f5d1572adb Add more stuff related to player naming. 2013-05-13 02:21:56 -06:00
IIMarckus
e7208f1964 Add some naming screen stuff. 2013-05-12 18:36:40 -06:00
IIMarckus
5419d34a21 Add Oak's speech. 2013-05-12 17:10:29 -06:00
IIMarckus
5ac569e5f3 Add pointers to Oak speech text. 2013-05-12 16:55:25 -06:00
Bryan Bishop
35d77a2988 Merge pull request #132 from yenatch/master
map groups + gfx.py fix
2013-05-12 07:53:46 -07:00
yenatch
4b4445138d fix map group label numbering 2013-05-12 10:50:15 -04:00
Bryan Bishop
f5ec58bea0 Merge pull request #131 from Sanky/master
tiny newline funcs
2013-05-12 07:43:07 -07:00
Sanky
029648ec12 disasm tiny newline chars 2013-05-12 16:41:28 +02:00
Bryan Bishop
cf4ec47b15 Merge pull request #130 from Sanky/master
Menu stuff, battle text split & extras.
2013-05-12 06:21:45 -07:00
Sanky
b3d8c2ec49 Split battle text from main. 2013-05-12 12:38:49 +02:00
Sanky
f9c057f488 more menu stuff 2013-05-10 23:44:27 +02:00
yenatch
d0ef05a6fd dump item effects 2013-05-08 02:02:15 -04:00
Sanky
d590a169c4 disasm some menu stuff 2013-05-08 01:43:29 +02:00
yenatch
5859040555 more thorough ai commenting 2013-05-06 14:36:32 -04:00
yenatch
9f5396eff6 clean up ai scoring 2013-05-06 02:39:01 -04:00
yenatch
3beab7dd92 move ai scoring out of main.asm 2013-05-05 19:56:17 -04:00
yenatch
c82216441a ai scoring part 2 2013-05-05 19:52:07 -04:00
yenatch
d3ec3bbaca ai scoring dump 2013-05-05 18:31:46 -04:00
yenatch
ef6e77a5c3 AI move scoring 2013-05-04 21:17:04 -07:00
yenatch
c539a96f78 fruit trees 2013-05-03 19:34:19 -04:00
yenatch
f3d0f2f1a4 user/opponent party attribute functions 2013-05-03 02:43:04 -04:00
yenatch
0cbea9b553 bank 0 battle functions 2013-05-03 00:22:28 -04:00
yenatch
417a73d61a More bank 0 functions 2013-05-03 00:09:54 -04:00
yenatch
ec3f279d53 SimpleMultiply and SimpleDivide 2013-05-02 22:45:34 -04:00
yenatch
993eecdc4a MBC constants in the wild 2013-05-02 22:38:48 -04:00
yenatch
b921c130e8 Clean up and add a couple functions in bank 0
Mostly related to sound
2013-05-02 22:38:48 -04:00
yenatch
10604fe8b3 sfx constants in the wild 2013-05-02 22:38:42 -04:00
yenatch
45343b07c7 dump item attributes 2013-04-30 02:04:36 -04:00
yenatch
3f07cd95f7 GetItemAttr and related fns 2013-04-30 02:04:32 -04:00
yenatch
ef946c51ad more bank b fns
ClearBattleRAM and FillBox (predef $13)
2013-04-30 02:03:39 -04:00
yenatch
e8fb1bc632 finish PlayBattleMusic 2013-04-29 16:52:27 -04:00
yenatch
94cdb091c9 i have a clue what most of this does 2013-04-29 16:32:05 -04:00
yenatch
620d5c09c7 More labels in LoadEnemyMon 2013-04-29 15:49:58 -04:00
yenatch
f2185cd0e4 BaseStats is now BaseData 2013-04-29 15:11:48 -04:00
yenatch
652d26bb05 base stat labels + GetCurNick 2013-04-29 14:46:32 -04:00
yenatch
c80b2e376e getname functions 2013-04-29 13:45:41 -04:00
yenatch
6f6988e3d1 more effect constants 2013-04-27 17:35:14 -04:00
yenatch
ff96e5590a type printing functions 2013-04-27 17:30:47 -04:00
yenatch
ec1f8e1f94 dump and include beta maps 2013-04-25 15:44:40 -04:00
yenatch
c0918f94fd there is no Move0 2013-04-25 13:21:49 -04:00
yenatch
7503f9074c effect command cleanup
-weather and badge type boosts
2013-04-20 02:38:56 -04:00
yenatch
736275ae0a pokedex entries got caught in the map header move 2013-04-12 17:24:16 -04:00
yenatch
48f5e7dfb8 Shuckle special 2013-04-08 13:12:58 -04:00
yenatch
b998f4594c Move effect pointers 2013-03-31 21:39:12 -04:00
yenatch
6c3ec2d13d Multiply and Divide 2013-03-30 01:58:22 -04:00
yenatch
dc81d0cfcf dump move effects 2013-03-29 18:54:42 -04:00
yenatch
57b3127497 Fix parameter spacing in incbins 2013-03-28 01:40:01 -04:00
yenatch
50e9c799aa Minor formatting in main 2013-03-28 01:40:00 -04:00
yenatch
b6ab385d3c More battletexts 2013-03-27 17:30:20 -04:00
yenatch
d2f6b6febe Identify more move effect commands 2013-03-27 03:33:24 -04:00
yenatch
3e6c37fe52 Move effect commands dump 2013-03-26 20:39:56 -04:00
yenatch
b582066865 Give labels to some BattleTexts 2013-03-26 07:04:34 -04:00
yenatch
edfffec831 Various battle-related bank0 asm and wram/constants 2013-03-26 05:22:22 -04:00
yenatch
87c36ebbc0 Fishing encounter data and related asm 2013-03-22 04:17:14 -04:00
yenatch
f0346a9982 various minor additions
-battle variable constants
-step counters
-turn update fns
2013-03-22 04:15:35 -04:00
yenatch
d775767651 Flesh out HRAM labels 2013-03-20 22:55:09 -04:00
yenatch
bcf9eadadf Parse and dump tilesets
Metatiles (blocks), palette maps, collision, tile animations
2013-03-18 00:40:27 -04:00
Bryan Bishop
393b4971f4 include some http ascii from the ROM 2013-03-01 21:40:01 -06:00
Bryan Bishop
cb1d7f812b Merge pull request #118 from yenatch/master
gender check & square root
2013-03-01 12:22:09 -08:00
yenatch
767cc1376b GetSquareRoot 2013-02-28 17:28:35 -05:00
Bryan Bishop
ef4b04f12c comments for GetScriptByte 2013-02-28 15:45:34 -06:00
Bryan Bishop
e0ca5a243f $26d4 is GetScriptByte 2013-02-28 15:38:03 -06:00
yenatch
37355aef99 Gender check 2013-02-28 15:03:52 -05:00
IIMarckus
3633411a9b Add a little to the hall of fame functions. 2013-02-28 00:16:08 -07:00
Bryan Bishop
23003bd772 disassemble scripting engine commands
All commands are in scripting.asm, and there's also a small python
script that was written to assist with some of the automation.
2013-02-27 23:31:12 -06:00
yenatch
aa6cd5f7aa Split credits out 2013-02-26 00:51:05 -05:00
yenatch
823b7e3b9d Credits script and parser
This is the first time two wram addresses overlap.
2013-02-26 00:47:46 -05:00
yenatch
13d74188ca Add credit string pointers 2013-02-25 15:47:16 -05:00
yenatch
05def441e8 Include some more gfx 2013-02-25 14:16:59 -05:00
yenatch
98e623a44a Truncate empty incbins (mostly EOB) 2013-02-24 17:59:38 -05:00
yenatch
89e2edf1f7 More title screen asm 2013-02-24 04:18:03 -05:00
yenatch
78e0e17e53 finally disassemble FarCall (rst $8) 2013-02-24 04:17:58 -05:00
yenatch
8bbfa54059 PlayCryHeader and related wram 2013-02-23 16:57:25 -05:00
yenatch
f56f340ce1 Label hw registers 2013-02-22 20:02:10 -05:00
yenatch
da406973c5 Split out joypad 2013-02-22 20:02:03 -05:00
yenatch
9102b9a498 Move fonts into gfx/misc 2013-02-22 19:53:14 -05:00
yenatch
340e028c49 spruce up CheckUnownLetter 2013-02-18 20:14:30 -05:00
yenatch
fd51a5a3b1 Split magikarp length calcs out 2013-02-18 20:14:25 -05:00
yenatch
7e3ae21e53 Split landmarks out 2013-02-17 02:56:50 -05:00
yenatch
23bdfa2b4c Split move names out 2013-02-17 02:45:38 -05:00
yenatch
a2de02b504 Split item names and descriptions from main.asm 2013-02-17 02:42:29 -05:00
yenatch
59f6291afb Split common text out of main.asm 2013-02-17 02:19:49 -05:00
yenatch
48dbfc6333 Split map scripts, text, events from main.asm
The commit we deserve
2013-02-17 01:59:06 -05:00
yenatch
860d7447f9 Point to map groups instead of their first header 2013-02-15 23:25:29 -05:00
yenatch
b52aa98325 Split map headers and second map headers from main.asm 2013-02-15 22:02:15 -05:00
yenatch
5447792dd5 Last map header label 2013-02-12 14:58:17 -05:00
yenatch
39171b916d Fix compressed graphics and filestructure
-No more /lz folders.

-Fixed some lz files that didn't have terminators
  An extraction error caused some lz files in gfx/misc/ to lack
  terminators. These slipped through the cracks since they were
  surrounded by incbins calculated from the filesize, and the
  original decompression was done from the baserom, where
  terminators were intact.

  There might be more offending lz files.
2013-02-11 16:59:06 -05:00
yenatch
ee347bff48 Dump cry headers 2013-02-11 04:13:31 -05:00
yenatch
087e2556f2 Move compressed trainer pics into the main folder 2013-02-09 05:08:56 -05:00
yenatch
76b284c8f0 Dump and include trainer palettes 2013-02-09 04:54:18 -05:00
yenatch
90af5b2a5e dump and incbin monster palettes 2013-02-07 21:19:38 -05:00
yenatch
034609e725 Split pic pointers into files 2013-02-05 18:28:45 -05:00
yenatch
e1b1f88645 Rename pokedex entry files 2013-02-05 18:13:19 -05:00
yenatch
31a907d7c7 Move music/ into audio/ 2013-02-05 18:08:20 -05:00
yenatch
ff5bd60966 Clean up and condense music includes 2013-02-05 18:00:32 -05:00
yenatch
9acf56102a Split audio engine and pointers into files
Creates folder audio/
2013-02-05 16:48:46 -05:00
yenatch
8902050000 Move VBlank function to a file 2013-02-05 15:40:25 -05:00
yenatch
a058572fd5 Consistent SECTION spacing 2013-02-05 04:25:04 -05:00
yenatch
75ab33b311 Saner file distribution
Moved files from data/ into new folders:
-battle/
-stats/
-trainers/
2013-02-05 03:56:27 -05:00
yenatch
c811b20b65 Move BitTable2 to a file
Currently, rgbasm's maximum macro parameter length is sixteen chars.
A couple wram labels were changed to accomodate this for now.
2013-02-05 03:16:46 -05:00
yenatch
4d84813798 Split Pokemon names off into a file 2013-02-05 00:42:07 -05:00
yenatch
40b477b442 Split base stats off into a file 2013-02-05 00:39:22 -05:00
yenatch
70fd04dc24 Split pokedex entries off into files 2013-02-05 00:35:16 -05:00
yenatch
45a06d040c Split evos/attacks off into files 2013-02-04 23:59:01 -05:00
yenatch
8d0a9d3e86 Split move list off into a file 2013-02-04 23:26:38 -05:00
yenatch
51afe79d00 Split pokedex orders off into files 2013-02-04 23:26:08 -05:00
yenatch
d2d7571e98 Split trainers off into files
The base label has been renamed from TrainerGroupHeader to Group.

Trainer formatting still needs to be fixed.
2013-02-04 20:20:10 -05:00
yenatch
28b56c51bb Split type matchup off into a file
This sets precedent for including constants in context.
2013-02-04 16:22:10 -05:00
yenatch
0935908367 Split wild encounters off into files 2013-02-04 15:47:44 -05:00
yenatch
4108c9eb79 Split egg moves off into files 2013-02-04 15:25:04 -05:00
yenatch
1e5bcb5268 Some more icon asm 2013-02-04 04:33:53 -05:00
Bryan Bishop
21429332ef Merge pull request #103 from yenatch/master
Fly / town map.
2013-02-03 21:46:09 -08:00
yenatch
54d4818d4f Fly / town map 2013-02-04 00:39:30 -05:00
Bryan Bishop
7f0fdb19cd Merge pull request #101 from Sanky/master
Menu icons.
2013-02-03 08:56:41 -08:00
Sanky
a632c8d6b7 Add menu icons. 2013-02-03 11:39:53 +01:00
Bryan Bishop
016174486f Merge pull request #98 from Sanky/master
Assorted menu code, will probably regret this.
2013-02-03 01:46:07 -08:00
IIMarckus
f39048982f Replace some hardcoded addresses with local labels. 2013-02-02 22:36:50 -07:00
IIMarckus
cdcb635a4a Add blackout points / fly location data. 2013-02-02 21:50:53 -07:00
Sanky
7df002c3e2 Merge https://github.com/kanzure/pokecrystal
Conflicts:
	constants.asm
	extras/crystal.py
	main.asm
2013-02-02 23:20:50 +01:00
yenatch
ec66551519 Decompression function 2013-02-02 08:00:50 -05:00
yenatch
4bc2564a6b VBlank and dependencies
VBlank has seven different modes. The one that sees the
most use is mode 0, which performs all basic display and
audio functions. The purpose of the others is unknown.

VBlank relies on the following functions:

-joypad
-cgb palette update
-dmg -> cgb pal conversion
-bg map update
-vram tile update
-tile animations
-serial request
-game timer

Tile animation is large enough to warrant its own commit.
2013-02-02 07:23:50 -05:00
yenatch
479c18920e Add japanese credits text 2013-02-01 04:57:25 -05:00
yenatch
341fa891bc Credits
Just the strings for now. These are probably pointed to from elsewhere.

There is an unused/dummied string at line 90029 ("????????@").
Could someone have been removed from the credits?
2013-01-31 21:56:06 -05:00
yenatch
b13fba2500 Some more uncompressed gfx 2013-01-30 22:41:26 -05:00
yenatch
71bc143687 A couple more general functions 2013-01-30 01:38:32 -05:00
yenatch
a687ec48c6 give names to some rst commands 2013-01-25 03:42:39 -05:00
yenatch
859edf6f6b split off animation data chunks into files 2013-01-23 16:47:10 -05:00
yenatch
9aaa774c68 rename unown animation pointer files 2013-01-23 16:44:26 -05:00
yenatch
54f3eb847e include pic animations in main.asm 2013-01-23 15:28:19 -05:00
yenatch
d340d840fe restructure pic graphics 2013-01-22 04:22:53 -05:00
yenatch
c01422136e really fix incbin in bank $2f 2013-01-17 00:18:43 -05:00
Bryan Bishop
0c3ba162e0 fix incbin in bank $2f 2013-01-16 23:13:02 -06:00
Bryan Bishop
1713771629 Merge remote branch 'remotes/yenatch/master'
fixes #88
2013-01-16 23:02:08 -06:00
Sanky
6b8d77ffb2 Disasm EggStatsScreen and related. Add coord macros. 2013-01-16 17:25:01 +01:00
yenatch
1ac5a72392 bank 6c text 2013-01-15 18:03:45 -05:00
yenatch
2327841dd6 pokecenter nurse script 2013-01-15 16:52:05 -05:00
Sanky
ab7120cfa1 disasm some stats screen related code 2013-01-15 21:18:42 +01:00
Bryan Bishop
e92a9ead39 Merge pull request #87 from iimarckus/shootbreeze
phone call texts and phone call scripts
2013-01-14 20:44:50 -08:00
IIMarckus
92e20d0c59 Add phone scripts for Mom, Bill, Elm, and unused. 2013-01-14 21:24:45 -07:00
Sanky
0600437b71 Disasm more party menu-related functions. 2013-01-14 17:02:11 +01:00
Sanky
7b3e7a8de0 disasm PrintPartyMenuText 2013-01-14 09:40:27 +01:00
yenatch
23511b8416 script special for pokerus check 2013-01-14 01:40:00 -05:00
yenatch
80e760544d add pokerus check 2013-01-14 01:03:14 -05:00
IIMarckus
4ee88cd762 Add lots of phone call texts. 2013-01-13 15:40:23 -07:00
yenatch
2f136d26fd reformat title screen palettes 2013-01-13 00:39:00 -05:00
yenatch
61a3d14593 disassemble title screen init 2013-01-12 23:55:01 -05:00
yenatch
ad46a9359b make some labels saner 2013-01-11 15:08:28 -05:00
yenatch
7d55a39096 comment LoadEnemyMon and related fns; add RNG fns 2013-01-11 02:18:34 -05:00
Bryan Bishop
314c4ff12b Merge pull request #57 from yenatch/master
clean up pic pointers/incbins
2013-01-09 09:47:24 -08:00
IIMarckus
29cce49fcb Pull out some code related to map names / item descriptions. 2013-01-08 22:45:27 -07:00
IIMarckus
65d081334e Add string pointers and coordinates for town map locations. 2013-01-08 21:33:38 -07:00
yenatch
f4cd4152d7 fix pic incbin formatting 2013-01-07 02:25:01 -05:00
yenatch
8c6669f961 bank 5a is a carbon copy of bank 59 2013-01-07 00:17:56 -05:00
yenatch
a6087b0f93 trainer dvs 2013-01-05 00:33:21 -05:00
yenatch
2cdf7a3688 include all compressed and decompressed graphics
* frontpics & animation tiles
* backpics
* trainer pics
* attack animation gfx
* intro gfx
* intro tilemaps
* title gfx
* tilesets
* player backpic
* dude backpic
* pokegear/town map

fixes #33, #34 and #35
2013-01-04 04:08:13 -06:00
yenatch
9a64bb1581 remove last incbin in bank 3a 2013-01-01 14:20:15 -05:00
yenatch
afd101ebf8 bank 70 (text) 2012-12-31 23:53:30 -05:00
Bryan Bishop
e01f991e7f pedantic whitespace fix 2012-12-31 01:30:30 -06:00
Bryan Bishop
e9cf4a1c75 pedantic comma format fix 2012-12-31 01:29:30 -06:00
Bryan Bishop
3ade49faee pokemon base stats structure + removed junk files 2012-12-31 00:35:19 -05:00
Bryan Bishop
0eb28d0e67 update address syntax again 2012-12-26 20:18:12 -06:00