Commit Graph

1484 Commits

Author SHA1 Message Date
Bryan Bishop 998fa0b198 remove the do_macro_sanity_check global 2013-08-31 09:37:55 -05:00
Bryan Bishop 0f28e96e4d remove the show_original_lines global 2013-08-31 09:37:02 -05:00
Bryan Bishop a6237d6825 remove an Exception from preprocessor
It wasn't meant to be left in there anyway.
2013-08-31 09:29:54 -05:00
Bryan Bishop 97ef590f9e Merge pull request #180 from yenatch/master
label renaming
2013-08-31 07:20:25 -07:00
yenatch 2acccc3ea5 rename FarBattleTextBox to StdBattleTextBox
that's it for bad Far usage
2013-08-31 03:54:02 -04:00
Bryan Bishop 73905420f8 Merge pull request #179 from kanzure/remove-preprocessor-skippable-macros
Remove preprocessor skippable macros
2013-08-30 20:22:58 -07: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 5342f8d630 NUM_POKEMON constant
before we were just using CELEBI, but there's no way that's gonna pan out
2013-08-30 22:07:56 -04:00
yenatch 17f25691db Function378b is IsAPokemon 2013-08-30 20:53:42 -04:00
Bryan Bishop 5e70ac56ea remove ItemFragment from preprocessor
It's not required.

see #178
2013-08-30 18:36:14 -05:00
Bryan Bishop 69adf48a54 remove "skippable_macros" from preprocessor
The preprocessor no longer has the concept of skippable_macros and now
always skips any line that starts with "db" or "dw" because neither of
these should be treated as macros.

fixes #178
2013-08-30 18:27:03 -05: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
Bryan Bishop 8fe7f4c3a5 HACK: re-instate the ItemFragment macro hack
This is to fix the preprocessor temporarily. Maybe ItemFragment can be
removed completely.
2013-08-30 17:23:43 -05:00
yenatch 7cc320e835 Coins in main.asm 2013-08-30 17:50:46 -04:00
yenatch 674229228f Coins wram label 2013-08-30 17:48:59 -04:00
yenatch d2ff1d7aaa Merge remote-tracking branch 'kanzure/master' 2013-08-30 16:41:35 -04:00
yenatch 0b36af8da5 Merge pull request #3 from kanzure/proposed-yenatch-master
Proposed merge of kanzure/master into yenatch/master
2013-08-30 13:33:09 -07:00
Bryan Bishop 9152664ca5 Merge pull request #177 from yenatch/split-main
split out a bunch of bank 0 from main.asm
2013-08-30 13:06:57 -07:00
Bryan Bishop d2333a90c9 Merge branch 'kanzure/master' into yenatch/master 2013-08-30 14:16:50 -05:00
Bryan Bishop 3e5b09b941 Merge pull request #176 from yenatch/interrupts
finally give labels to interrupts
2013-08-30 11:54:08 -07:00
Bryan Bishop a5f226246e Merge pull request #175 from yenatch/rename-bittables
toss the useless "bittable" convention for event and engine flags
2013-08-30 11:43:23 -07:00
Bryan Bishop 9ce504f528 Merge pull request #174 from yenatch/boxmons
boxmons and related structs
2013-08-30 11:35:49 -07:00
yenatch b86d0da040 less arbitrary wram clearing in game init 2013-08-30 14:21:26 -04:00
yenatch 3aabca9baa remove a section def in the middle of the player struct 2013-08-30 14:20:01 -04:00
yenatch 79bcda11ad PCItems and game init formatting 2013-08-30 04:57:32 -04:00
yenatch 320142fdda PCItems in wram 2013-08-30 00:07:51 -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 c4a764ce10 use more bank 0 labels in engine/scripting.asm 2013-08-29 23:20:09 -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