Commit Graph

937 Commits

Author SHA1 Message Date
yenatch
9c00912f89 Doll text.
That's it for bank 9 incbins.
2014-02-25 11:11:26 -05:00
yenatch
47e11948ea Poster scripts. 2014-02-25 09:29:38 -05:00
yenatch
4756027ee0 Decoration attributes and menus. 2014-02-25 09:12:17 -05:00
yenatch
2df85caa28 Decoration menus and a couple broken function calls. 2014-02-24 22:54:51 -05:00
yenatch
f367db0180 Misc bank 9 and text command $14 data. 2014-02-24 21:52:34 -05:00
yenatch
7601ac4cfa Assorted strings, tilemaps and menudata in bank 9. 2014-02-24 20:01:22 -05:00
yenatch
41383145f1 Consumable items and trainer card badge oam data. 2014-02-24 06:18:03 -05:00
yenatch
71cc880636 Restore byte padding to trainer backpics. 2014-02-24 04:57:28 -05:00
yenatch
602b91944f Get rid of the last bank A incbin. 2014-02-24 04:56:32 -05:00
yenatch
54a6118e0d Unused item mappings and roaming maps. 2014-02-24 04:48:17 -05:00
yenatch
3e830ab884 Fix a party menu action comment. 2014-02-24 01:00:36 -05:00
yenatch
d89ca4aead Trade tilemaps and an unreferenced function. 2014-02-24 00:58:31 -05:00
yenatch
2b882b1ef9 Trade graphics in gfx/trade. 2014-02-23 22:25:11 -05:00
yenatch
094e67f0a0 More trade text functions. 2014-02-23 21:41:36 -05:00
yenatch
876e14ece8 Disassemble a jump table related to trading. 2014-02-23 21:21:09 -05:00
yenatch
bac031156b Misc trainer card graphics. 2014-02-23 20:58:38 -05:00
yenatch
85698ddbdb Trainer card gym leader and badge graphics. 2014-02-23 20:40:47 -05:00
yenatch
229da90963 Dummy player object and incbinned data. 2014-02-23 18:26:44 -05:00
yenatch
f0580df37c Remove an incbin for Data4273 2014-02-23 17:22:47 -05:00
yenatch
a01dad8e49 Partymon structs for opponent and player parties. 2014-02-23 00:37:09 -05:00
yenatch
0ea86cecba wContestMon in Bug Catching Contest rankings. 2014-02-22 23:52:20 -05:00
yenatch
d11a23c7d1 Address comments for footprints. 2014-02-22 06:50:20 -05:00
yenatch
e9626c7710 gfx/misc/town_map.lz is actually padded 2014-02-22 06:44:47 -05:00
yenatch
43c10efb29 footprints
how did we forget that?
2014-02-22 06:25:19 -05:00
yenatch
11f8168995 Some item menu headers. 2014-02-22 06:10:54 -05:00
yenatch
44a11e6588 More Bill's PC functions. 2014-02-22 03:50:46 -05:00
yenatch
c6dd950f32 Finish off Bill's PC menudata. 2014-02-22 03:36:08 -05:00
yenatch
874736db40 Some incbinned data related to Cut. 2014-02-22 03:25:24 -05:00
yenatch
654779d2c1 Bicycle scripts and text.
Also an egg string.
2014-02-17 19:07:57 -05:00
yenatch
eeac223253 Whirlpool and fishing scripts and text. 2014-02-17 18:51:00 -05:00
yenatch
d72c1c8ee0 More field move scripts and text. 2014-02-16 23:56:51 -05:00
yenatch
30218eb3d6 Use globals to implicitly define labels before passing them into BANK(). 2014-02-04 21:30:27 -05:00
yenatch
cf2acc1001 Use :: to export labels between objects.
This fixes the build.
2014-02-01 20:26:39 -05:00
yenatch
adb3b29b4d pokedex entry banks 2014-02-01 17:06:18 -05:00
yenatch
821f2c2ea0 Merge remote-tracking branch 'kanzure/master' 2014-02-01 02:45:07 -05:00
yenatch
a643ba8996 MBC3 constants in some RTC-related functions 2014-02-01 01:51:57 -05:00
yenatch
ee098254a8 Assorted text and labels in banks 5 and A 2014-02-01 01:47:03 -05:00
U-Myles-PC\Myles
1d2da4de84 fixed bank 39 pointers, options menu commentary 2014-01-29 10:28:08 -05:00
yenatch
1ba5b0f4bc Map setup scripts and commands 2014-01-26 22:07:19 -05:00
yenatch
92aab1e185 even more battle labels 2014-01-05 07:28:55 -05:00
yenatch
4dbf0d44e0 comment and relabel more battle functions 2014-01-01 08:09:15 -05:00
yenatch
a18cab495d rename Function0x{} labels to Function{} for consistency 2013-12-31 04:10:49 -05:00
yenatch
bfaad924e7 label more pointers to Moves 2013-12-30 23:22:27 -05:00
yenatch
82214440e1 move the Moves label into battle/moves/moves.asm 2013-12-30 23:17:11 -05:00
yenatch
4612670768 more npc trade cleanup 2013-12-27 22:20:24 -05:00
yenatch
58af27eaeb label overworld loop functions 2013-12-27 05:56:23 -05:00
yenatch
ace57ec827 npc trade text/comments 2013-12-27 05:55:40 -05:00
yenatch
d8eed222b7 split out tileset animations 2013-12-26 02:09:58 -05:00
yenatch
c1096d08f6 null pointers in tileset animations 2013-12-26 02:04:03 -05:00
yenatch
f2025afdb6 label and move related asm into items/item_effects.asm
oops
2013-12-25 01:42:41 -05:00
yenatch
f99e448a73 fix a mislabeled function in bank 3 2013-12-24 22:13:17 -05:00
yenatch
fa1e93a870 evolution prerequisites and no more incbins in item effects 2013-12-24 20:49:14 -05:00
yenatch
0cd1d2071f item effect incbins 2013-12-24 17:11:52 -05:00
yenatch
5f0e279bfa Merge remote-tracking branch 'kanzure/master' into more-objects
Conflicts:
	main.asm
2013-12-23 05:21:12 -05:00
yenatch
7b20626c7b more object struct constants 2013-12-23 04:39:26 -05:00
yenatch
48db6daef9 overworld object struct constants 2013-12-22 21:28:41 -05:00
yenatch
496502b3dc no more Public in joypad interface labels 2013-12-22 17:30:35 -05:00
yenatch
18124d0a5d split out poke seer special into event/poke_seer.asm 2013-12-22 17:19:54 -05:00
yenatch
4d1091f8d9 poke seer special 2013-12-22 17:17:33 -05:00
yenatch
a15bd15e2a split gbc-only screen into misc/gbc_only.asm 2013-12-22 06:00:34 -05:00
yenatch
799f945cf5 gbc-only screen 2013-12-22 05:53:48 -05:00
yenatch
6225fca386 more title screen comments 2013-12-22 04:36:03 -05:00
yenatch
c140af9e59 some mobile stat screen icons 2013-12-21 03:02:59 -05:00
yenatch
d9ad10771c move a palette map incbin into tilesets/palette_maps.asm 2013-12-21 00:56:04 -05:00
yenatch
1ef4b0e848 move blockdata into maps.asm 2013-12-20 21:21:43 -05:00
yenatch
d4074dd385 clean up some tileset sections
also found unused metatile/collision data for a 128-block tileset
2013-12-20 21:16:57 -05:00
yenatch
a422e1b761 label the pokedex entry point 2013-12-18 21:05:50 -05:00
yenatch
5613563d1d split out battle anim object gfx 2013-12-18 03:20:12 -05:00
yenatch
2f5b9b968a anim object graphics pointers 2013-12-18 03:18:16 -05:00
yenatch
6909a00e8b button constants for some function
probably to do with mobile link
2013-12-18 02:11:24 -05:00
yenatch
12a18c8fd9 dude auto input bank 2013-12-18 02:01:29 -05:00
yenatch
6d7e674bd0 move some labels into included files 2013-12-18 01:14:48 -05:00
yenatch
7ccb6d91e6 split out the battle engine into battle/core.asm 2013-12-18 01:11:06 -05:00
yenatch
ef20124213 split out pic animation asm and clean up some more includes 2013-12-18 00:23:50 -05:00
yenatch
6690f3901a clean up pic animation sections 2013-12-18 00:11:02 -05:00
yenatch
fa2e0108b9 split out battle animation asm (bg effects, objects, commands) 2013-12-17 23:54:25 -05:00
yenatch
48be8d206c some bg effect labels 2013-12-17 23:33:15 -05:00
yenatch
b616180c10 battle animation asm cleanup 2013-12-15 02:34:26 -05:00
yenatch
b113931b83 some mobile link menu graphics 2013-12-13 20:50:08 -05:00
yenatch
ef6b8b5490 pokegear asm cleanup 2013-12-13 05:08:48 -05:00
yenatch
5708d855e5 pokeball wobbling 2013-12-13 01:07:16 -05:00
yenatch
1b7e44c729 split out sprite facing defs into engine/facings.asm 2013-12-11 22:00:56 -05:00
yenatch
418878d932 more map attribute getters and some cleanup in home/map.asm 2013-12-11 21:42:56 -05:00
yenatch
d461689704 LoadTilesetHeader 2013-12-11 17:23:33 -05:00
yenatch
46d96bc7fd more battle anim labels 2013-12-09 16:20:19 -05:00
yenatch
9eb2cf3d21 more battle animation labels 2013-12-08 16:22:35 -05:00
Bryan Bishop
0fdbdb43a7 Merge pull request #217 from yenatch/more-objects
compile and link multiple objects
2013-12-07 00:50:26 -08:00
yenatch
37dd85797a Function3af0 -> GetBattleAnimByte 2013-12-05 15:01:32 -05:00
yenatch
b85244eade labels for battle animation commands 2013-12-05 14:57:56 -05:00
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