Commit Graph

471 Commits

Author SHA1 Message Date
Remy Oukaour
5c28d05bb4 Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
# Conflicts:
#	data/items/descriptions.asm
#	data/sprite_anims/framesets.asm
#	engine/crystal_colors.asm
#	engine/events/kurt.asm
#	engine/events/special.asm
#	engine/events/std_scripts.asm
#	engine/events_3.asm
#	engine/item_effects.asm
#	engine/namingscreen.asm
#	engine/scripting.asm
#	engine/stats_screen.asm
#	engine/trade_animation.asm
#	home/audio.asm
#	main.asm
#	maps/BattleTower1F.asm
#	maps/BattleTowerBattleRoom.asm
#	maps/BurnedTowerB1F.asm
#	maps/ElmsLab.asm
#	maps/GoldenrodDeptStore5F.asm
#	maps/GoldenrodUnderground.asm
#	maps/HallOfFame.asm
#	maps/MahoganyTown.asm
#	maps/ManiasHouse.asm
#	maps/MobileBattleRoom.asm
#	maps/MobileTradeRoomMobile.asm
#	maps/RadioTower2F.asm
#	maps/Route35NationalParkGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/Route39Farmhouse.asm
#	tilesets/palette_maps.asm
2018-01-14 22:56:36 -05:00
mid-kid
11d67567d2 Use constants for menu flags
Added a bunch of constants for the bitflags of each kind of menu. Some
are slightly vague or too long, but I'm not sure how to else name them.
2018-01-14 11:59:56 +01:00
Remy Oukaour
2ab60fa8a4 menu_coords macro for (x1, y1, x2, y2) order (see issue #440) 2018-01-13 16:38:14 -05:00
Remy Oukaour
94d6a32721 Use maskbits some more 2018-01-11 14:27:19 -05:00
Remy Oukaour
d91e42ca5e Group some mutually edited files in data/sprites/ 2018-01-10 18:10:01 -05:00
Remy Oukaour
c8575823a0 Battle data goes in data/battle/
TreeMons, like fish groups, have constants
2018-01-10 17:30:27 -05:00
Remy Oukaour
28d5169a11 maskbits <count> +- 1 2018-01-10 14:03:11 -05:00
Remy Oukaour
417937cffc Resolve #461 2018-01-10 13:47:57 -05:00
Remy Oukaour
a8cf8979d9 Do a little cleanup towards issue #465 2018-01-09 17:20:47 -05:00
Remy Oukaour
11556196ba Consistent sine wave code formatting 2018-01-09 16:39:36 -05:00
Remy Oukaour
a849c3557b More comments
Fix some constants
2018-01-09 15:39:48 -05:00
xCrystal
2c789b64b1 Predef_FlagAction -> Predef_SmallFarFlagAction 2018-01-07 11:53:20 +01:00
xCrystal
e9e8bf6eb1 Predef_Flag -> Predef_FlagAction 2018-01-05 11:05:01 +01:00
Adelaide Walter
9d0ba6bfd3 Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary). 2018-01-03 19:12:45 -05:00
Remy Oukaour
6d2dc86a38 Serve2bppRequest@VBlank → Serve2bppRequest_VBlank 2018-01-03 15:28:13 -05:00
Adelaide Walter
a298cb9990 Replace hardcoded bank with BANK function. 2018-01-03 02:19:38 -05:00
Adelaide Walter
cd8a22cd2e Replace magic reference to PackMenuGFX. 2018-01-03 01:29:52 -05:00
Adelaide Walter
51106cccd0 Scrub WRAM addresses from comments & use WRAM1_Begin where appropriate. 2018-01-03 00:19:54 -05:00
xCrystal
d7970f749a Consistent predef function names 2018-01-02 18:49:25 +01:00
xCrystal
b4a49351c1 Finish consistent Special function names 2018-01-02 17:47:58 +01:00
xCrystal
f1ea15bbfe Consolidate Special function names 2018-01-02 17:13:57 +01:00
xCrystal
6f0b81504d More unreferenced labels cleanup 2018-01-02 16:04:21 +01:00
xCrystal
9a3088e50c Clean up XXX comments for unused content 2018-01-02 13:26:18 +01:00
xCrystal
a98ed77c83 Merge 2d0ed11 and 355acfc from Roukaour/master 2018-01-01 20:25:07 +01:00
xCrystal
37369d1ae0 Rename Pals labels in WRAM bank 5 2018-01-01 20:09:53 +01:00
Remy Oukaour
2d0ed1159e Use constants for rBGPI+rOBPI auto-increment
Fix some documentation
2018-01-01 13:43:02 -05:00
yenatch
92fba8821c
Merge pull request #450 from roukaour/master
Constants for TextBoxFlags
2017-12-30 21:32:45 -05:00
Remy Oukaour
586a49c8ad lda_coord and ldcoord_a exist for this 2017-12-29 17:07:21 -05:00
xCrystal
2a7ba6685a Clean up changes in 3c6c80f 2017-12-29 19:22:33 +01:00
Remy Oukaour
e1a672e427 Constants for TextBoxFlags 2017-12-29 13:18:17 -05:00
xCrystal
3c6c80f1b2 LY_BLANK and rLCDC constants 2017-12-29 18:53:21 +01:00
xCrystal
50fc9c3389 endm -> ENDM 2017-12-28 22:31:16 +01:00
xCrystal
333524f0be Lowercase v for VRAM addresses 2017-12-28 13:32:33 +01:00
xCrystal
7beb497d3a Uppercase MACRO and EQU(S) according to the style guide 2017-12-28 13:23:44 +01:00
xCrystal
9457679af8 Prefix engine_flags wram addresses with w 2017-12-28 13:15:46 +01:00
Remy Oukaour
47e4f21e62 Keep memory map values in hardware_constants.asm 2017-12-26 23:18:05 -05:00
Remy Oukaour
5d229dcef2 Copy sram.asm's global start/end constants for wram.asm and vram.asm 2017-12-26 23:07:46 -05:00
Remy Oukaour
c4a18b1329 Correct documentation
Split out text_constants.asm
2017-12-26 22:36:01 -05:00
Remy Oukaour
b3f0e11567 Various cleanup 2017-12-26 20:33:41 -05:00
Remy Oukaour
24f0e7d045 Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers 2017-12-26 12:50:32 -05:00
Remy Oukaour
e34e68095d Resolve #428: Use HIGH(X) and LOW(X) instead of X / $100 and X % $100 or X >> 8 and X & $ff 2017-12-25 14:23:16 -05:00
yenatch
ec8c9688ce move rst.asm and interrupts.asm into home/ 2017-12-24 21:47:11 -05:00
Remy Oukaour
c05b7f41dd Renaming: (fix #412)
- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 14:33:17 -05:00
Remy Oukaour
20d6c1d876 Rename "map permissions" to "map environment" (fix #396) 2017-12-24 13:08:38 -05:00
Remy Oukaour
c66d195089 callba/callab → farcall/callfar 2017-12-24 12:47:30 -05:00
Remy Oukaour
daa071451d More comments for constant<->table correspondences 2017-12-22 23:08:55 -05:00
Remy Oukaour
14a244ad3a IsHM is not used within home/names.asm; group it with the other HM routines+data 2017-12-22 22:56:21 -05:00
Remy Oukaour
b423e3b90b Split more code from home.asm into home/ files 2017-12-22 22:50:28 -05:00
Remy Oukaour
fecc5c339a More comments for macros 2017-12-15 00:38:52 -05:00
Remy Oukaour
e48a401290 Reorganize macros 2017-12-14 00:36:24 -05:00
Remy Oukaour
138abd097d Document one more bug. 2017-12-12 23:05:30 -05:00
Remy Oukaour
b006415371 Define constants for collision types 2017-12-12 16:15:58 -05:00
Remy Oukaour
5b13a7a13b Identify more sprite-related constants
Start more documentation
2017-12-12 13:22:19 -05:00
Remy Oukaour
4afc2f01ef Add member constants for the base data struct, same as most other structs 2017-12-11 17:35:35 -05:00
Remy Oukaour
5be98bae3c Move more data tables into data/ files. 2017-12-11 15:20:32 -05:00
Remy Oukaour
41acb0667a Document macros/map.asm
Rename MORN/DAY/NITE to MORN_F/DAY_F/NITE_F; use MORN/DAY/NITE for shifted values (cleaner for person_events)
Prefix FLOOR to the `elevfloor` constants
2017-12-11 01:02:28 -05:00
Remy Oukaour
08b14e593e Rename tilesets, consistent with constant names 2017-12-10 23:56:10 -05:00
Remy Oukaour
b4261d27d8 Use new palette constants 2017-12-10 20:50:08 -05:00
Remy Oukaour
ab7025a144 Consistent code formatting: no redundant as and spaces after commas 2017-12-10 00:06:20 -05:00
Remy Oukaour
cd2a748128 More WRAM cleanup 2017-12-09 22:00:36 -05:00
Remy Oukaour
e3c686f6df Further WRAM organization 2017-12-09 15:14:51 -05:00
Remy Oukaour
5a5df2ab87 More WRAM organization 2017-12-09 14:47:32 -05:00
Remy Oukaour
16c6696dd5 Start organizing WRAM
- Use db and dw when they're more meaningful than ds 1/2
- Use unions to group related labels
2017-12-09 13:58:49 -05:00
Remy Oukaour
0b7d8d44ad More constants 2017-12-09 13:28:23 -05:00
Remy Oukaour
6a41d4f63e Define more charmap characters and use them in place of hard-coded numbers 2017-12-09 12:57:23 -05:00
Remy Oukaour
512863989f Document constants with comments, actual names, and more thorough usage 2017-12-09 02:15:46 -05:00
pfero
7c9a156133 Fix WATERTILE/WALLTILE constants
WATRTILE was wrongly defined as 15, and WALLTILE as 1. Those had to be
flipped around.
This has allowed for us to replace inmediate values with these constants
in several places to improve readability.

WATRTILE was renamed to WATERTILE in the name of readability.
2017-10-28 18:08:24 -04:00
yenatch
d0d61cb3ab Merge pull request #354 from FredrIQ/comments
Fix a reversed label mistake and reference a major bug
2017-06-24 17:43:48 -04:00
Ben10do
e6ea1889fb
Replace ‘jp [hl]’ with ‘jp hl’
The former is arguably misleading (as you don’t access the memory location in hl to retrieve the jump location), and is consequently deprecated in newer versions of rgbds.

This fix silences these deprecation warnings.
2017-06-09 22:01:10 +01:00
Fredrik Ljungdahl
f8455e9b4f Reverse the LastEnemyCounterMove and LastPlayerCounterMove labels
They were swapped
2017-01-08 01:26:48 +01:00
PikalaxALT
3bb73b2430 Merge branch 'master' of github.com:pret/pokecrystal 2016-07-29 10:40:57 -04:00
pikalaxalt
4e2487c056 hLCDCPointer and InitList 2016-06-13 22:53:33 -04:00
pikalaxalt
ca01a92880 Fix indentation in many places 2016-06-07 08:13:08 -04:00
pikalaxalt
d7a01e92e9 Remaining layout constants 2016-06-06 18:23:00 -04:00
Brandon Mulcahy
eb7195a780 Fix PlaySFX priority comment 2016-05-28 15:43:41 -04:00
pikalaxalt
789ebc7304 Port homecall macro 2016-05-27 10:41:59 -04:00
pikalaxalt
f1f3e2564c Comment on bug in ClearWRAM 2016-05-19 08:11:44 -04:00
pikalaxalt
87b733994b SPRITE_ANIM_FRAME_IDX constants 2016-05-15 22:00:17 -04:00
pikalaxalt
1fa6aecbfc Unify directional movement macros 2016-05-14 13:46:14 -04:00
pikalaxalt
6a3b3e3773 Save functions; feeble attempt at serial and link functions 2016-05-11 21:19:52 -04:00
pikalaxalt
af0119ca7e Name all printer functions 2016-05-11 17:16:03 -04:00
pikalaxalt
46ecd5b869 Name all functions in event/ 2016-05-10 12:59:34 -04:00
pikalaxalt
ae36ef2c7f Labeled every function in ROM0 that's referenced in the source 2016-05-10 12:31:49 -04:00
pikalaxalt
e95d42e0af All functions in main.asm have non-generic names 2016-05-08 14:11:24 -04:00
pikalaxalt
8c26547645 Mobile and more battle anims 2016-05-05 15:07:37 -04:00
pikalaxalt
a613ed915c HDMA transfer functions 2016-05-04 22:34:09 -04:00
pikalaxalt
3713b71d9e More splitting of main.asm; remove unneeded rept 2 2016-05-04 11:46:23 -04:00
pikalaxalt
6be4cd4da9 Local labels starting with lowercase letters are no longer decorated with a trailing colon 2016-04-10 15:01:49 -04:00
pikalaxalt
bf73772a56 Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style 2016-04-10 14:42:14 -04:00
pikalaxalt
93e12d2003 Split up banks 1-3 of main.asm 2016-03-27 12:47:28 -04:00
pikalaxalt
08e6009e61 Merge branch 'master' of https://github.com/pret/pokecrystal 2016-03-08 19:54:13 -05:00
yenatch
2270052319 Make diacritic labels less confusing in PlaceString. 2016-03-04 13:21:14 -05:00
yenatch
016c2baae2 Use the dakuten characters. 2016-03-03 00:07:17 -05:00
PikalaxALT
599e6e8d16 Battle animation annotations 2016-03-01 22:31:21 -05:00
PikalaxALT
8bf255b9f8 Prepare to merge 2016-01-18 00:39:01 -05:00
PikalaxALT
2ed6c357af More WRAM tidying 2016-01-12 12:46:18 -05:00
PikalaxALT
35f687b536 Fully label home/map_objects.asm 2016-01-11 02:36:39 -05:00
PikalaxALT
1637d915d4 Restored StandingTile and introduced LastTile 2016-01-11 02:28:09 -05:00
PikalaxALT
f7ee74c3b8 Finish labels in engine/namingscreen.asm 2016-01-09 19:34:14 -05:00
PikalaxALT
ce019e6347 Map callback constants 2016-01-06 07:44:50 -05:00
PikalaxALT
80aba7fc13 maptrigger macro 2016-01-05 08:46:37 -05:00
PikalaxALT
9bbb65166e More movement stuff 2015-12-29 13:15:58 -05:00
PikalaxALT
a2a2668233 Dummy Game 2015-12-28 17:09:53 -05:00
PikalaxALT
f030315b1f jumptable macro repurposed 2015-12-26 21:59:03 -05:00
PikalaxALT
2bd45ca574 Move effects; no more reloadmapmusic, returnafterbattle 2015-12-26 19:22:27 -05:00
PikalaxALT
a5e928eb98 writebackup --> closewindow; game corner prize vendors; others 2015-12-24 22:58:42 -05:00
PikalaxALT
8152ab612c Battle anims 2015-12-23 17:10:50 -05:00
PikalaxALT
3893feb835 Battle Anim Object struct constants 2015-12-23 14:00:29 -05:00
PikalaxALT
30b37da387 More stats screen shenanigans 2015-12-22 22:19:33 -05:00
PikalaxALT
d08199c79d Color fns, some more address decoding in link/mobile 2015-12-22 18:03:00 -05:00
PikalaxALT
047effba94 Menu joy flags; started with link address space 2015-12-20 12:54:08 -05:00
PikalaxALT
987ed1fafb More work on slots; WRAM cleanup, Move Deleter 2015-12-19 14:48:30 -05:00
PikalaxALT
3d36f1a837 Events and some WRAM cleanup 2015-12-18 20:07:09 -05:00
PikalaxALT
d644406f61 More menu stuff 2015-12-17 22:31:16 -05:00
PikalaxALT
caa83c08a7 Movement etc. 2015-12-17 15:14:51 -05:00
PikalaxALT
efee40447e Mobile trade animations, pokepic animations 2015-12-17 13:49:26 -05:00
PikalaxALT
7203e9d2cc Map script and color shenanigans 2015-12-16 21:57:42 -05:00
PikalaxALT
879b430fce Bill's PC 2015-12-16 12:36:58 -05:00
PikalaxALT
77ef8404a1 Menu 2015-12-15 18:59:49 -05:00
PikalaxALT
bb2aba7da1 No more ItemFragment 2015-12-15 10:55:56 -05:00
PikalaxALT
c635e30777 map setup and warps 2015-12-14 11:12:18 -05:00
PikalaxALT
8a439dbd05 Miscellaneous labels 2015-12-13 20:33:56 -05:00
PikalaxALT
acd92eee94 Pack 2015-12-13 14:15:16 -05:00
PikalaxALT
ecd277204a Card Flip 2015-12-11 16:59:40 -05:00
PikalaxALT
a5a8364c35 opentext and breeding 2015-12-09 18:25:44 -05:00
PikalaxALT
7f68db68ad underground switches, town map 2015-12-09 11:39:35 -05:00
PikalaxALT
92a8c491c3 Break up engine/sprites.asm; address yenatch's comments 2015-12-01 21:54:11 -05:00
PikalaxALT
0eb0c40ba7 buttonsound 2015-11-29 22:29:45 -05:00
PikalaxALT
d314bdb4fa Pokedex labels 2015-11-29 21:34:59 -05:00
PikalaxALT
8612a4a531 Renaming sections, further dissolving main.asm 2015-11-28 15:13:40 -05:00
PikalaxALT
c7985e1f3c Battle Tower scripts and text labels 2015-11-26 21:05:32 -05:00
PikalaxALT
01792e00d2 Rename several script commands 2015-11-25 10:16:29 -05:00
PikalaxALT
d972564175 link and seer labels 2015-11-23 16:04:53 -05:00
PikalaxALT
7b3090e22a Annotate battle tower text bug 2015-11-20 15:15:32 -05:00
PikalaxALT
812976cee6 bgcoord 2015-11-20 11:47:52 -05:00
PikalaxALT
93a129eb6d main.asm is now under 30k lines 2015-11-19 18:09:11 -05:00
PikalaxALT
8a6a1a7d77 CmdQueues 2015-11-18 23:16:25 -05:00
PikalaxALT
91f7491017 items/item_effects.asm; engine/evolution.asm 2015-11-18 18:35:44 -05:00
PikalaxALT
bc1870e3f4 Save, Bill's PC 2015-11-17 23:29:14 -05:00
PikalaxALT
27ef600ace Here's the mail it never fails 2015-11-17 17:56:49 -05:00
PikalaxALT
0b8fe4bac3 More specials; bank 12 mobile 2015-11-16 22:29:54 -05:00
PikalaxALT
042fc4bfe5 Split up some more banks in main.asm 2015-11-16 21:46:36 -05:00
PikalaxALT
ba871547ed engine/pokegear.asm 2015-11-16 21:07:26 -05:00
PikalaxALT
8290f851fd Further decoding of SpriteMovementData 2015-11-16 00:52:53 -05:00
PikalaxALT
aba038a4a4 Fix some movement macro/function names 2015-11-15 21:28:15 -05:00
PikalaxALT
ead04b3b75 Backup prior to global introduction of PERSONTYPE constants 2015-11-15 14:59:38 -05:00
PikalaxALT
b921226aea More map object, swap StandingTile and NextTile 2015-11-14 23:02:38 -05:00
PikalaxALT
ed44de4bb4 More map object work 2015-11-14 14:41:47 -05:00
PikalaxALT
cc8c36ee14 Creation of constants for OBJECT_09 indices 2015-11-13 18:59:49 -05:00
PikalaxALT
e0b4fc781a sprite engine; tileset constants 2015-11-13 00:49:27 -05:00
PikalaxALT
40802da3cf Map header labels, tileset constants 2015-11-12 11:10:19 -05:00
PikalaxALT
2ffcb4b490 More splits; map setup labels 2015-11-11 23:38:57 -05:00
PikalaxALT
91068077f0 Further split bank 4 2015-11-11 16:15:06 -05:00
PikalaxALT
b522b0f165 engine/mart.asm 2015-11-11 14:12:46 -05:00
PikalaxALT
4b35fa0582 Added w3 and w5 labels for misc/mobile_40.asm 2015-11-10 23:23:28 -05:00
PikalaxALT
d13fb46d40 enum macros/move_anim.asm, resolve battle/anims.asm function labels 2015-11-10 16:53:37 -05:00
PikalaxALT
ba05bfeafe Move some gfx files around, also clock reset fn 2015-11-10 11:05:26 -05:00
PikalaxALT
f1b2466cc3 Cleaning up static HRAM labels; movement stuff, route 38 trainers 2015-11-09 23:01:45 -05:00
PikalaxALT
93ab6985d2 Some work on battle animations 2015-11-09 16:41:09 -05:00
PikalaxALT
6a570ebb8e more battle core labels 2015-11-07 21:04:54 -05:00
PikalaxALT
ae2970d73b Sprite movement function labels 2015-11-06 16:42:38 -05:00
PikalaxALT
46e66077a5 BattleCommand labels copied from macros 2015-11-06 14:45:10 -05:00
PikalaxALT
f0830f084f BATTLEACTION constants 2015-11-06 09:04:27 -05:00
PikalaxALT
5eed48f05d Some battle labels 2015-11-05 19:13:09 -05:00
PikalaxALT
1205fe5100 PLAYEREVENT_ 2015-11-05 15:08:00 -05:00
PikalaxALT
adf2fe712d Various labels 2015-11-05 14:06:03 -05:00
PikalaxALT
3cadc7b012 give/takeitem *, 1: the 1 is optional 2015-11-04 20:20:14 -05:00
PikalaxALT
7fd20e6322 home/copy.asm completely labeled 2015-11-04 16:14:27 -05:00
PikalaxALT
95cb4636af Corrected some mislabeled 1bpps 2015-11-04 15:35:29 -05:00
PikalaxALT
cf5d726b7f Mon submenu, engine/menu.asm 2015-11-04 14:02:11 -05:00
PikalaxALT
91ea4a2f9b Battle Tower trainer text 2015-11-03 22:35:36 -05:00
PikalaxALT
72af3337fd No more NONE 2015-11-02 14:37:02 -05:00
PikalaxALT
e0d6e9ca7a Fix NorthMapObjectIndexBuffer etc 2015-11-02 12:54:27 -05:00
PikalaxALT
d35cfad0de object_struct 2015-11-02 11:15:32 -05:00
PikalaxALT
76e2ea534f Object masks 2015-11-01 21:17:46 -05:00
PikalaxALT
6b2d0ae841 Fix merge conflicts 2015-11-01 18:19:52 -05:00
PikalaxALT
31c407bb3d Buena local labels 2015-11-01 12:44:30 -05:00
PikalaxALT
3b4805ee98 Sweepthrough of ClearBox arg conversion to lb 2015-11-01 09:38:48 -05:00
PikalaxALT
fda1f7c01a SPRITEMOVEDATA 2015-10-31 21:05:02 -04:00
PikalaxALT
8153737bae Enumerate text constants 2015-10-30 10:34:35 -04:00
PikalaxALT
ed29db5841 No more -bash000; engine/movement.asm, SPRITEMOVEFN 2015-10-29 23:32:11 -04:00
JimB16
9a9cb38e39 merge with newest update 2015-10-26 03:26:53 +01:00
PikalaxALT
4d17f6e1f6 Address comments on PR 322 2015-10-24 19:49:19 -04:00
PikalaxALT
119d6b4119 About time I got to these functions 2015-10-24 10:39:52 -04:00
PikalaxALT
97cc513f54 Plus 4 on person events; feeble attempt to annotate color functions 2015-10-21 10:43:42 -04:00
PikalaxALT
6c25592b8c So very jumb 2015-10-19 16:49:29 -04:00
JimB16
3b9a3cc3be merge conflicts resolved 2015-10-19 16:25:15 +02:00
PikalaxALT
0a244e043c Move battle start animation functions to its own file 2015-10-19 10:23:58 -04:00
PikalaxALT
52605b764a Add commented numbers to map/group constants 2015-10-17 21:26:38 -04:00
PikalaxALT
f53d65c536 Battle intro animation function 2015-10-17 17:18:52 -04:00
PikalaxALT
da7849d800 Restructured functions in main.asm to resemble the home functions they clone 2015-10-17 13:00:34 -04:00
PikalaxALT
4fa6c6daa4 Split up bank 2; other relabelings 2015-10-16 13:35:43 -04:00
PikalaxALT
88bc86b0bb Replace Functionfb8 with FillBoxWithByte 2015-10-13 12:46:40 -04:00
PikalaxALT
327faac497 Magikarp functions moved to event/magikarp.asm 2015-10-11 12:26:39 -04:00
PikalaxALT
b68913a782 More radio labels 2015-10-09 23:09:03 -04:00
JimB16
975efb28ae Merge remote-tracking branch 'upstream/master' 2015-10-07 20:38:24 +02:00
PikalaxALT
edf42a54d5 More labels, including fns responsible for partymon generation 2015-10-07 13:19:41 -04:00
PikalaxALT
2770cfc354 soft reset 2015-10-04 14:14:51 -04:00
JimB16
0001c688d3 found functions that determine next OTPkmn 2015-09-12 04:21:00 +02:00
JimB16
a7cb2a5e9b changed more labels 2015-09-10 01:27:07 +02:00
yenatch
a129ba7b43 Nail down the rest of SRAM banks 0 and 1. 2015-08-20 23:03:05 -07:00
yenatch
9e3bd6cb9b Label scratch space and a bunch of box lists. 2015-08-19 21:51:04 -07:00
yenatch
3cd79c55a3 Merge pull request #309 from PikalaxALT/master
Wild data, save functions, fix missing include
2015-08-17 11:58:57 -04:00
PikalaxALT
895e14cd05 Reworked person_event arguments 2015-07-29 18:22:23 -04:00
yenatch
abf3fc2137 Name some map event reading functions. 2015-07-26 00:11:33 -07:00
PikalaxALT
6c3000efd2 Macro update, roam mon annotations
Updated map and mapgroup macros to get around an rgbds bug.

Legendary beast locale handling annotated and relabeled.

Added a new constant NUM_ENGINE_FLAGS for use in the EngineFlagAction function.  This will make it easier for modders to add or remove engine flags.
2015-07-25 19:02:36 -04:00
PikalaxALT
185b0a1c86 Wild Pokemon functions and data
Replaced encounter rates with percent values
Added new constants denoting the number of wild Pokemon in the grass and water wild constructs
Annotated and relabeled the encounter generating functions
Renamed a WRAM address associaed with the temporary storage of the wild Pokemon's species
Moved spawn constants to constants/map_constants.asm for use anywhere in the disassembly
2015-07-23 03:51:15 -04:00
PikalaxALT
c8960dd2c8 Various annotations
Annotated the SGB functions in predef/sgb.asm, and some of the map scripts.  Renamed several functions in home.  Renamed six WRAM addresses corresponding to party icon animations, and renamed several others relative to these.
2015-07-22 15:57:02 -04:00
PikalaxALT
d5ddd9e54e Move radio code to its own file 2015-07-21 01:52:46 -04:00
PikalaxALT
5631bdc0d7 Added labels to different parts of the map script and event headers 2015-07-21 00:02:21 -04:00
PikalaxALT
471492b775 Reverted ld_hl_pointer macro 2015-07-20 22:18:18 -04:00
PikalaxALT
06673cbee7 Named more specials, fixed a missing EOL 2015-07-20 18:59:26 -04:00
PikalaxALT
d9300a9bec Fix unnecessary white space and retire add_n_times 2015-07-20 11:28:05 -04:00
PikalaxALT
bef792f2d2 More label updates, moved predefs to new file
Also named most of the engine and event flag constants.
2015-07-20 03:51:52 -04:00
PikalaxALT
94129b6b45 Finished the decoration attributes table
Interpretation of the Decoration Attributes table is complete.

Other changes include some more event flag and function naming, as well as a minor tweak to the person_events of every map.
2015-07-19 04:58:31 -04:00
PikalaxALT
60cd04b023 Trainer data structure and field move functions
Trainer data in map scripts is now a macro-defined structure.

Field move functions in main.asm are now nearly completely annotated, with local references.

Trailing white space deleted.
2015-07-18 23:45:39 -04:00
PikalaxALT
e674869018 Updated signpost items and person_event flags 2015-07-18 16:00:53 -04:00
PikalaxALT
894955f9d9 Special script annotation, trainer constant enumeration, person-event structure update 2015-07-16 18:10:10 -04:00
PikalaxALT
39524cdb76 More enumeration of constants, more annotations of scripts. 2015-07-15 15:48:44 -04:00
IIMarckus
4d532beee6 Remove trailing newlines. 2015-06-23 12:24:51 -06:00
yenatch
c07ed74a5d Blind wram labels part 4. 2015-02-10 15:14:41 -08:00
yenatch
3fe3cd1a46 hVBlank 2015-01-19 21:31:29 -08:00
yenatch
133e2fb7a7 Use "- $ff00" instead of "& $ff" when dealing with hram. 2014-12-29 08:49:08 -08:00
yenatch
37c65c59ca Some wram labels in map connection code. 2014-12-26 20:37:18 -08:00
yenatch
f7e25beee6 Fix a static bank in map header code. 2014-12-26 15:31:48 -08:00
yenatch
a5862306b7 Split mobile/timer code out of home.asm. 2014-08-22 10:57:06 -07:00
yenatch
5337d0159e Recomment the text engine. 2014-08-14 23:50:53 -07:00
yenatch
68ee99818a Move cry functions out of home.asm. 2014-07-18 10:31:52 -07:00
yenatch
928cdcfc23 Name cry functions in home.asm. 2014-07-18 10:31:52 -07:00
yenatch
251517812f Rename the internal PlayCry function to _PlayCryHeader. 2014-07-18 10:31:52 -07:00
yenatch
ab018a5094 Cry "echo" is actually the upper byte of pitch (now a word). 2014-07-18 10:31:51 -07:00
yenatch
2955e28a42 Add address labels used by Decompress. 2014-07-18 10:31:50 -07:00
yenatch
43fb5732a2 Don't use Olivine maps to define the length of a map header.
The first and second map header labels have no semantic meaning with regard to length.
In fact, none of the labels are used at all.
2014-06-24 10:19:27 -07:00
yenatch
6fee80528a More object struct labels and constants. 2014-06-19 17:23:53 -07:00
yenatch
541a9c7347 Name the UpdateEnemyHUD predef.
Also start using hp palette constants.
2014-06-16 22:53:56 -07:00
yenatch
8639fcd29b Use a predef macro that takes labels instead of juggling constants.
Besides making predefs convenient, naming a predef no longer requires
adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
yenatch
b83f237254 Rename _GetBattleVar -> GetBattleVarAddr.
Functions prefixed with _ imply they're private.
The real purpose of this function is to use an address,
rather than saving a few cycles on push/pop.
2014-06-14 00:41:34 -07:00
yenatch
023cfdbb05 Consolidate monster structs in wram and sram.
The PartyMon struct is really the box struct with volatile variables like status added.

Some other labels have been reworked.
Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
yenatch
fd8804472d Use {hl,de,bc}coord macros wherever possible. 2014-06-04 01:10:56 -07:00
yenatch
21708a2271 Recomment lz deecompression. 2014-06-03 14:08:23 -07:00
yenatch
9755ff375a Split bank 0 battle functions into home/battle.asm. 2014-05-21 16:37:18 -04:00
yenatch
3624794599 Split bank 0 audio functions into home/audio.asm. 2014-05-21 16:26:28 -04:00
yenatch
2cb3f8e1b9 Comment music functions in home.asm. 2014-05-21 16:21:46 -04:00
yenatch
dbb7431cde Give a name to RandomRange. 2014-05-03 21:44:18 -04:00
yenatch
7ab8f76117 Label map trigger functions in home.asm. 2014-03-03 22:53:43 -05:00
yenatch
d1a54e3265 Map triggers and label some addresses in bank 0. 2014-03-03 20:48:57 -05:00
yenatch
9fb9a286ba Get rid of static rom addresses in home/text.asm. 2014-03-03 01:28:54 -05:00
yenatch
f367db0180 Misc bank 9 and text command $14 data. 2014-02-24 21:52:34 -05:00
yenatch
cf2acc1001 Use :: to export labels between objects.
This fixes the build.
2014-02-01 20:26:39 -05:00
yenatch
1ba5b0f4bc Map setup scripts and commands 2014-01-26 22:07:19 -05:00