Commit Graph

1048 Commits

Author SHA1 Message Date
yenatch
be0c7962b0 YesNoBox 2013-12-04 03:07:58 -05:00
yenatch
099e17bbaf comment some battle animation asm 2013-12-04 02:33:46 -05:00
yenatch
3de254f7a2 more 3pt macro labels; shorten 3pt macros to take just a label
static addresses should be avoided anyway
2013-12-02 14:18:03 -05:00
yenatch
ce37f0f970 labels for every 3callasm 2013-12-01 18:26:05 -05:00
yenatch
9aaa5f24bb shorten redundant text_jump macros 2013-12-01 17:54:09 -05:00
yenatch
c0e2170f01 some oam constants 2013-12-01 16:40:56 -05:00
yenatch
d7bf70f3c9 home.o 2013-11-29 02:30:08 -05:00
yenatch
2ec12a22af gfx/pics.o 2013-11-29 02:11:40 -05:00
yenatch
c2889215a8 audio.o and misc/crystal_misc.o 2013-11-29 01:51:27 -05:00
yenatch
b18beef4d5 more landmark constants and rename FlypointPerms -> VisitedSpawns 2013-11-29 00:38:22 -05:00
yenatch
5c76249488 flypoints and spawn points 2013-11-28 04:35:14 -05:00
yenatch
fd73d41e6b redone landmarks, now with constants 2013-11-28 03:54:21 -05:00
yenatch
ac65a8b821 engine/credits_crystal.o 2013-11-28 01:38:49 -05:00
yenatch
ddfda26725 facing structs and other movement stuff 2013-11-28 00:54:43 -05:00
yenatch
e3e1298196 enumerate battle var constants 2013-11-27 14:45:43 -05:00
yenatch
57736ce19c recomment battle vars 2013-11-27 14:45:42 -05:00
yenatch
d2dc732600 split some more and recomment more home asm 2013-11-27 14:45:42 -05:00
yenatch
41f149c7f1 maps.o and stats/pokedex/entries.o 2013-11-27 14:45:42 -05:00
yenatch
04eb541f83 proper section names and bank constants 2013-11-26 04:29:47 -05:00
yenatch
3eb9851b84 text in slots asm 2013-11-25 19:10:04 -05:00
yenatch
15d7d65355 jumptable in slots asm 2013-11-25 19:10:00 -05:00
yenatch
f16193dc91 move more credits asm into engine/credits.asm 2013-11-24 04:26:10 -05:00
yenatch
25325139e6 more credits labels and theend graphic 2013-11-24 04:09:17 -05:00
Bryan Bishop
112de1c172 Merge pull request #216 from yenatch/master
1bpp handling
2013-11-23 00:39:48 -08:00
yenatch
cf6295cb9f objects for event handling and scripting 2013-11-23 02:51:48 -05:00
yenatch
29afa24f0b split more event handling out of main 2013-11-23 02:33:53 -05:00
yenatch
8bb8546497 buena text 2013-11-22 05:38:52 -05:00
yenatch
0ccfccf4bf move map groups into maps/map_headers.asm 2013-11-22 05:05:25 -05:00
yenatch
bd392da29e split event handling into engine/events.asm 2013-11-22 05:04:32 -05:00
yenatch
bcd833e758 version checks for event script commands and move in related asm 2013-11-22 04:51:47 -05:00
yenatch
94188ee0f7 version-sensitive objects for egg moves and evos/attacks
this way main.o and wram.o are version-neutral
2013-11-22 00:14:55 -05:00
yenatch
f6706ecb09 finally compile multiple objects
pokecrystal.asm doesnt really make sense now so its gone

add includes.asm so objects have a standard include set
2013-11-20 06:35:10 -05:00
yenatch
a082f314b3 evolution animation 2013-11-18 20:48:00 -05:00
Bryan Bishop
74afd6d680 Merge pull request #215 from yenatch/master
dump the music again
2013-11-14 12:02:49 -08:00
Bryan Bishop
40ed4545b2 local labels for some mobile link battles 2013-11-12 01:39:41 -06:00
Bryan Bishop
2ee4938987 fix typo in PartyMenuSelect comment 2013-11-12 01:05:54 -06:00
Bryan Bishop
02d001a1f4 label CheckInMobileLinkBattle 2013-11-12 01:05:21 -06:00
Bryan Bishop
a99a205b28 labels for some battle menus 2013-11-12 00:29:26 -06:00
yenatch
42a0396b6a get rid of external song labels 2013-11-07 01:18:58 -05:00
yenatch
86cdb9e013 Merge commit 'cf966bb8' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 18:02:17 -04:00
yenatch
193dbd53a6 Merge commit '0ead58cd' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 17:57:27 -04:00
yenatch
52a6b7da8e Merge commit '946a213f' into merge-mrwint 2013-10-25 17:54:04 -04:00
yenatch
9e81c46cbf Merge commit '66ef1838' into merge-mrwint
Conflicts:
	home/map.asm
2013-10-25 17:53:16 -04:00
yenatch
933634d913 Merge commit 'da689fa7' into merge-mrwint 2013-10-25 17:45:25 -04:00
yenatch
9d02e1063f Merge commit '8b8de40' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 17:44:50 -04:00
yenatch
6ea15c444e Merge commit '650dc98b' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 17:34:45 -04:00
yenatch
a41b870dfa Merge commit '754325b2' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 17:21:20 -04:00
yenatch
15a6bd55f4 Merge commit 'e1cce1c' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 17:06:19 -04:00
yenatch
32ede188d7 Merge commit 'a0ba53e' into merge-mrwint 2013-10-25 16:55:58 -04:00
yenatch
2ca81c9d73 Merge commit 'aae33da9' into merge-mrwint 2013-10-25 16:55:41 -04:00
yenatch
4fcabdc07b Merge commit '91b822c' into merge-mrwint 2013-10-25 16:51:24 -04:00
yenatch
bd49428c4a Merge commit '789469c' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 16:48:29 -04:00
yenatch
2a08b8b7ce Merge commit '963fe48' into merge-mrwint 2013-10-25 16:41:19 -04:00
yenatch
da22ada91c Merge commit '546c17ad' into merge-mrwint
Conflicts:
	engine/scripting.asm
	main.asm
2013-10-25 16:23:16 -04:00
yenatch
7a13251d03 Merge commit '4ac6783' into merge-mrwint 2013-10-25 16:17:52 -04:00
yenatch
b8603ecb92 Merge commit 'ec77075a' into merge-mrwint
Conflicts:
	main.asm
2013-10-25 16:04:31 -04:00
yenatch
cf966bb824 rename tilemap coordinate functions 2013-10-13 02:26:42 -04:00
yenatch
0ead58cdaa fix labels for and rename GetBattleVarPair to GetBattleVar 2013-10-11 03:04:21 -04:00
yenatch
946a213f09 fix labels for SoundRestart and UpdateSound 2013-10-11 02:55:01 -04:00
yenatch
66ef183847 relabel LoadMapGroupRoof 2013-10-11 02:31:51 -04:00
yenatch
da689fa7d6 roof graphics 2013-10-11 01:43:15 -04:00
yenatch
8b8de40525 roofs for each map group 2013-10-11 01:36:11 -04:00
yenatch
650dc98be4 game freak logo 2013-10-10 03:12:02 -04:00
yenatch
754325b270 use the IntroLogoGFX label in existing asm 2013-10-10 03:02:14 -04:00
yenatch
e1cce1cfb9 fix padding in compressed intro graphics 2013-10-08 22:28:51 -04:00
yenatch
a0ba53e09d stop hardcoding the return bank for _LoadMusicByte 2013-10-08 13:37:11 -04:00
yenatch
aae33da95b fix LoadMusicByte naming scheme 2013-10-08 13:34:32 -04:00
yenatch
91b822ceb8 rename 'LoadMusic' to '_PlayMusic' 2013-10-08 13:26:05 -04:00
yenatch
789469c465 rename 'StartMusic' to 'PlayMusic' 2013-10-08 13:21:15 -04:00
yenatch
963fe4808b rename 'LoadSFX' to '_PlaySFX' 2013-10-08 13:13:35 -04:00
yenatch
546c17ad37 rename 'StartSFX' to 'PlaySFX' 2013-10-08 13:10:36 -04:00
yenatch
ec77075a47 ContestMons 2013-10-08 12:44:45 -04:00
Mr Wint
dfa9adcaeb * added index comments to pointer lists
* added map header wram addresses
* analyzed some assembly
2013-10-05 04:03:34 +02:00
Mr Wint
6ddd1d8b46 * fixed call and jump labels in home bank
* added some more assembly
2013-10-02 07:11:54 +02:00
Mr Wint
c666d1014a * make jumps and calls use labels 2013-10-02 06:53:35 +02:00
Mr Wint
c5ff1606f0 * last callab/callba macros 2013-10-02 03:55:40 +02:00
Mr Wint
181840cf43 * even more callab/callba macros 2013-10-02 03:20:48 +02:00
Mr Wint
eb5a7afe2b * more callab/callba macros 2013-10-02 02:47:54 +02:00
Mr Wint
fa673df4fa * applied callab/callba macros where possible
* corrected some mislabeled jump addresses
2013-10-02 01:59:16 +02:00
Mr Wint
255135d187 * extracted and added a bunch of assembly 2013-10-01 23:23:21 +02:00
yenatch
eebf069839 missed some bit2 script commands 2013-10-01 01:01:43 -04:00
yenatch
f6a5d7b2f2 split pokedex flag handling into home/pokedex_flags.asm 2013-09-18 21:54:31 -04:00
yenatch
f958ba0e6d recomment IsInArray 2013-09-18 21:48:04 -04:00
yenatch
c074231a07 move window asm into home/window.asm 2013-09-18 21:40:48 -04:00
yenatch
5a4e4bdb41 fix some farcalls in window asm 2013-09-18 21:39:14 -04:00
yenatch
5249fd9773 fix padding in .lz files for attack graphics 2013-09-18 21:31:40 -04:00
yenatch
663c523ac4 fix formatting in player pic asm 2013-09-18 21:10:25 -04:00
yenatch
48bab16ea4 move dratini special into event/dratini.asm 2013-09-18 21:04:16 -04:00
yenatch
7cef3b76de move mon icons into menu/mon_icons.asm 2013-09-18 20:58:32 -04:00
yenatch
1e56e3e9af more encounter functions 2013-09-18 20:50:42 -04:00
yenatch
ee47d6ed17 more mobile functions 2013-09-16 17:52:23 -04:00
yenatch
e770ae20b2 clean up a couple mobile function comments
nothing here is actually commented out
2013-09-16 17:42:19 -04:00
yenatch
237861b553 rename hall of fame labels 2013-09-16 17:42:11 -04:00
yenatch
9ae1cd6a1c split title screen functions into engine/title.asm 2013-09-15 18:59:53 -04:00
yenatch
0ce5c4fe93 split the mobile adapter library into lib/mobile/ 2013-09-15 18:58:37 -04:00
yenatch
013c6fc368 some time-dependent function 2013-09-15 18:17:02 -04:00
yenatch
3370a04d9e split color asm and data into engine/color.asm 2013-09-15 18:02:02 -04:00
yenatch
c3cab23cda dump a palette set at the end of bank 2 2013-09-15 17:29:53 -04:00
yenatch
dd473e565b incbin some 0s back 2013-09-15 17:24:56 -04:00
yenatch
c738318dc0 move part of an incbin into predef/cgb.asm 2013-09-15 17:08:10 -04:00
yenatch
ab91f49e3b remove some incbins in bank 2 2013-09-15 17:01:17 -04:00
yenatch
44fac4fd70 finish an old script pointer table 2013-09-12 05:37:53 -04:00
yenatch
e1c3fee926 change old .tx includes to .asm
these were forgotten about with the last preprocessor change.
this is required for object dependencies to be handled by make.
2013-09-11 01:16:33 -04:00
yenatch
84a9b3907b rename common/ to home/ 2013-09-09 22:44:48 -04:00
Bryan Bishop
33d7ef72fe Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds
https://github.com/kanzure/pokecrystal/pull/198
2013-09-09 16:00:05 -05:00
Bryan Bishop
3a2dbb5289 Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds
https://github.com/kanzure/pokecrystal/pull/198
2013-09-09 15:59:08 -05:00
Bryan Bishop
37e1aa4e8e Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds
https://github.com/kanzure/pokecrystal/pull/198
2013-09-09 15:56:49 -05:00
Bryan Bishop
35324ae43f Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds
https://github.com/kanzure/pokecrystal/pull/198
2013-09-09 15:55:43 -05:00
yenatch
608d0d86e4 move name rater asm into event/name_rater.asm 2013-09-09 16:09:34 -04:00
yenatch
0fc0c0bebc name rater special 2013-09-09 15:47:32 -04:00
yenatch
429417da74 name a couple specials 2013-09-09 15:39:43 -04:00
yenatch
cc41f68c34 split sgb-to-cgb asm into predef/cgb.asm 2013-09-09 15:34:09 -04:00
yenatch
dab74d719e cgb replacements for sgb layouts 2013-09-09 15:12:30 -04:00
yenatch
e33423374b split sgb stuff into predef/sgb.asm 2013-09-09 14:33:04 -04:00
yenatch
de8e7ca422 sgb layout predef 2013-09-09 14:17:03 -04:00
yenatch
a6c7200782 CheckCGB 2013-09-09 12:56:13 -04:00
yenatch
5bbcedb886 typo in CheckContestMon 2013-09-09 12:49:26 -04:00
yenatch
2b4a5bdd8d comment flag predef
this is like FlagAction but with index c instead of de
2013-09-09 12:47:02 -04:00
yenatch
771ebcbf23 PokedexSeen and PokedexCaught were swapped 2013-09-09 02:40:27 -04:00
yenatch
106b0e139f clean up more bank 0 2013-09-09 02:26:46 -04:00
yenatch
53b7926f5e move multiplication/division functions into common/math.asm 2013-09-09 01:21:36 -04:00
yenatch
ee04a2fcd9 split more copy functions into common/copy2.asm 2013-09-09 01:11:41 -04:00
yenatch
60c1061a67 clean up some common includes and give names to wram copy functions 2013-09-09 01:10:07 -04:00
yenatch
abb7f2fa20 split Predef into common/predef.asm 2013-09-08 23:54:37 -04:00
yenatch
4778276f33 split serial handshake into common/handshake.asm 2013-09-08 23:53:04 -04:00
Bryan Bishop
6d7043c0c6 Merge pull request #197 from yenatch/master
comment some move effects
2013-09-08 20:24:26 -07:00
yenatch
9f7adeafcf ItemIsMail and comment thief move effect 2013-09-08 23:18:30 -04:00
Bryan Bishop
78a3951d47 Merge pull request #196 from yenatch/std-scripts
std scripts
2013-09-08 17:06:54 -07:00
Bryan Bishop
50232cc92b Merge pull request #195 from yenatch/predefs
predefs
2013-09-08 16:47:29 -07:00
Bryan Bishop
740f91370d Merge pull request #190 from yenatch/master
specials
2013-09-08 09:15:46 -07:00
yenatch
e7318ed4bc move double speed functions into common/double_speed.asm 2013-09-08 03:14:24 -04:00
yenatch
4a04a09a6b labels for cgb double speed functions 2013-09-08 03:12:48 -04:00
yenatch
844546f849 split sram access asm into common/sram.asm 2013-09-08 02:50:06 -04:00
yenatch
edf939a07b split Random into common/random.asm 2013-09-08 02:47:52 -04:00
yenatch
3b70005fb0 split item interfaces into common/item.asm 2013-09-08 01:45:54 -04:00
yenatch
f0cf86777b fix item asm labels
CheckItem was called PickUpItem by mistake

Also label TossItem and ReceiveItem
2013-09-08 01:43:51 -04:00
yenatch
d05adc4f98 Function2f17 -> IsInJohto 2013-09-08 00:48:12 -04:00
yenatch
705e682468 split InitString asm into common/string.asm 2013-09-08 00:22:33 -04:00
yenatch
82c3bb464f split flag action asm into common/flag.asm 2013-09-08 00:20:28 -04:00
yenatch
f513cdd888 split map engine asm into common/map.asm 2013-09-08 00:14:26 -04:00
yenatch
847843d866 rename BUTTON_A and BUTTON_B constants to A_BUTTON and B_BUTTON 2013-09-07 23:49:20 -04:00
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