Rangi
32ed487a47
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# Conflicts:
# audio/engine.asm
# constants/gfx_constants.asm
# constants/map_data_constants.asm
# constants/pokemon_data_constants.asm
# constants/sprite_constants.asm
# constants/wram_constants.asm
# data/maps/data.asm
# engine/battle/ai/scoring.asm
# engine/battle/core.asm
# engine/battle/effect_commands.asm
# engine/battle/misc.asm
# engine/battle_anims/getpokeballwobble.asm
# engine/breeding.asm
# engine/buy_sell_toss.asm
# engine/decorations.asm
# engine/events/battle_tower/battle_tower.asm
# engine/events/battle_tower/rules.asm
# engine/events/buena.asm
# engine/events/bug_contest/contest_2.asm
# engine/events/daycare.asm
# engine/events/dratini.asm
# engine/events/halloffame.asm
# engine/events/happiness_egg.asm
# engine/events/kurt.asm
# engine/events/lucky_number.asm
# engine/events/magnet_train.asm
# engine/events/overworld.asm
# engine/events/pokerus/pokerus.asm
# engine/events/print_unown.asm
# engine/events/print_unown_2.asm
# engine/events/unown_walls.asm
# engine/item_effects.asm
# engine/link.asm
# engine/mon_menu.asm
# engine/player_object.asm
# engine/routines/playslowcry.asm
# engine/scripting.asm
# engine/search.asm
# engine/search2.asm
# engine/specials.asm
# engine/start_menu.asm
# engine/timeset.asm
# home/battle_vars.asm
# home/map.asm
# maps/GoldenrodUndergroundSwitchRoomEntrances.asm
# maps/IlexForest.asm
# maps/KrissHouse2F.asm
# maps/Route39Barn.asm
# mobile/mobile_12_2.asm
# mobile/mobile_40.asm
# mobile/mobile_5f.asm
# wram.asm
2018-02-03 19:42:56 -05:00
Rangi
7d3ad2136a
Separate home/battle_vars.asm for easy data editing, same as home/hm_moves.asm
2018-01-25 18:10:41 -05:00
luckytyphlosion
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
xCrystal
9a3088e50c
Clean up XXX comments for unused content
2018-01-02 13:26:18 +01: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
c66d195089
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
Remy Oukaour
b006415371
Define constants for collision types
2017-12-12 16:15:58 -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
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
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
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
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
9bbb65166e
More movement stuff
2015-12-29 13:15:58 -05:00
PikalaxALT
caa83c08a7
Movement etc.
2015-12-17 15:14:51 -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
2ffcb4b490
More splits; map setup labels
2015-11-11 23:38:57 -05:00
PikalaxALT
ae2970d73b
Sprite movement function labels
2015-11-06 16:42:38 -05:00
PikalaxALT
3cadc7b012
give/takeitem *, 1: the 1 is optional
2015-11-04 20:20:14 -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
fda1f7c01a
SPRITEMOVEDATA
2015-10-31 21:05:02 -04:00
PikalaxALT
ed29db5841
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-29 23:32:11 -04:00
PikalaxALT
895e14cd05
Reworked person_event arguments
2015-07-29 18:22:23 -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
471492b775
Reverted ld_hl_pointer macro
2015-07-20 22:18:18 -04:00
PikalaxALT
d9300a9bec
Fix unnecessary white space and retire add_n_times
2015-07-20 11:28:05 -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
e674869018
Updated signpost items and person_event flags
2015-07-18 16:00:53 -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
6fee80528a
More object struct labels and constants.
2014-06-19 17:23:53 -07:00
yenatch
cf2acc1001
Use :: to export labels between objects.
...
This fixes the build.
2014-02-01 20:26:39 -05:00
yenatch
0cd1d2071f
item effect incbins
2013-12-24 17:11:52 -05:00
Mr Wint
eb5a7afe2b
* more callab/callba macros
2013-10-02 02:47:54 +02:00
yenatch
84a9b3907b
rename common/ to home/
2013-09-09 22:44:48 -04:00
