Rangi
145efc1353
Use constants for screen size in metatiles
2018-04-04 16:14:48 -04:00
Rangi
0447ee0cf9
Relabel some map-related WRAM
...
wMisc -> {wSurroundingTiles, wBoxPartialData, wLink_c608}
wOverworldMap -> {wOverworldMapBlocks, wHallOfFamePokemonList}
2018-03-19 11:36:14 -04:00
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
6ff2cb20e6
map → map_id; map_def → map; map_data → map_attributes
2018-02-03 17:11:55 -05:00
Rangi
d719d318e8
Remove Special_ prefix from special routines ( close #478 )
2018-01-24 11:17:05 -05:00
luckytyphlosion
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
Rangi
ead103d2c6
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440 )
2018-01-23 16:08:43 -05:00
Rangi
3a7f518de4
wStatusFlags/2 bit constants
2018-01-22 15:40:43 -05:00
Remy Oukaour
0c6338836d
Resolve #471 (although link code still needs more cleanup, like its WRAM labels)
2018-01-19 14:49:43 -05:00
Remy Oukaour
99f26a6097
Compute wc7e8 size
2018-01-18 01:28:51 -05:00
Remy Oukaour
b1c808f9f8
Rename some tilesets ( close #467 )
2018-01-17 14:50:34 -05:00
Remy Oukaour
bf074f3598
map_header → map_def; map_header_2 → map_data
2018-01-16 23:25:00 -05:00
Remy Oukaour
dfcca93b45
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460 )
...
# Conflicts:
# engine/battle/core.asm
# engine/save.asm
2018-01-14 23:00:22 -05:00
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
Remy Oukaour
94d6a32721
Use maskbits some more
2018-01-11 14:27:19 -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
a849c3557b
More comments
...
Fix some constants
2018-01-09 15:39:48 -05:00
Adelaide Walter
9d0ba6bfd3
Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary).
2018-01-03 19:12:45 -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
333524f0be
Lowercase v for VRAM addresses
2017-12-28 13:32:33 +01:00
xCrystal
9457679af8
Prefix engine_flags wram addresses with w
2017-12-28 13:15:46 +01: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
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
138abd097d
Document one more bug.
2017-12-12 23:05:30 -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
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
5a5df2ab87
More WRAM organization
2017-12-09 14:47:32 -05:00
Remy Oukaour
512863989f
Document constants with comments, actual names, and more thorough usage
2017-12-09 02:15:46 -05:00
pikalaxalt
d7a01e92e9
Remaining layout constants
2016-06-06 18:23:00 -04:00
pikalaxalt
ae36ef2c7f
Labeled every function in ROM0 that's referenced in the source
2016-05-10 12:31: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
599e6e8d16
Battle animation annotations
2016-03-01 22:31:21 -05:00
PikalaxALT
2ed6c357af
More WRAM tidying
2016-01-12 12:46:18 -05:00
PikalaxALT
1637d915d4
Restored StandingTile and introduced LastTile
2016-01-11 02:28:09 -05:00
PikalaxALT
ce019e6347
Map callback constants
2016-01-06 07:44:50 -05:00
PikalaxALT
d08199c79d
Color fns, some more address decoding in link/mobile
2015-12-22 18:03:00 -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
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
ecd277204a
Card Flip
2015-12-11 16:59:40 -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
d314bdb4fa
Pokedex labels
2015-11-29 21:34:59 -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
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
27ef600ace
Here's the mail it never fails
2015-11-17 17:56:49 -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
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
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
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
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
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
JimB16
3b9a3cc3be
merge conflicts resolved
2015-10-19 16:25:15 +02:00
PikalaxALT
edf42a54d5
More labels, including fns responsible for partymon generation
2015-10-07 13:19:41 -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
3cd79c55a3
Merge pull request #309 from PikalaxALT/master
...
Wild data, save functions, fix missing include
2015-08-17 11:58:57 -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
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
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
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
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