Commit Graph

632 Commits

Author SHA1 Message Date
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