Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,810 Commits 2 Branches 0 Tags 183 MiB
Commit Graph

55 Commits

Author SHA1 Message Date
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 a9334f7468 Correct engine flag constants 2018-01-31 10:55:35 -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 3a7f518de4 wStatusFlags/2 bit constants 2018-01-22 15:40:43 -05:00
Remy Oukaour bf074f3598 map_header → map_def; map_header_2 → map_data 2018-01-16 23:25:00 -05:00
xCrystal b4e087167f More unreferenced labels and unused text 2018-01-02 19:38:56 +01:00
xCrystal f1ea15bbfe Consolidate Special function names 2018-01-02 17:13:57 +01:00
xCrystal 9457679af8 Prefix engine_flags wram addresses with w 2017-12-28 13:15:46 +01: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 213dcc70d7 More consistent data tables 2017-12-11 22:59:30 -05:00
Remy Oukaour 31cce83e9b Move lots of data tables into individual data/ files 
(This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.)
 2017-12-11 14:23:18 -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
pikalaxalt 98f443f70c engine/events.asm labels finished 
fixed palred/green/blue macros
 2016-05-17 08:40:56 -04:00
pikalaxalt ae36ef2c7f Labeled every function in ROM0 that's referenced in the source 2016-05-10 12:31:49 -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 1637d915d4 Restored StandingTile and introduced LastTile 2016-01-11 02:28:09 -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 f485a45cda More mobile-related labels; remove unneeded map object constants 2015-12-26 12:01:21 -05:00
PikalaxALT efe3462f9a Replaced SignpostItem with Hidden(ItemName) 2015-12-15 11:21:58 -05:00
PikalaxALT 92a8c491c3 Break up engine/sprites.asm; address yenatch's comments 2015-12-01 21:54:11 -05:00
PikalaxALT 01792e00d2 Rename several script commands 2015-11-25 10:16:29 -05:00
PikalaxALT 24b7b2c1cf Foreign language font handling in mail 2015-11-22 12:01:58 -05:00
PikalaxALT 8a6a1a7d77 CmdQueues 2015-11-18 23:16:25 -05:00
PikalaxALT b921226aea More map object, swap StandingTile and NextTile 2015-11-14 23:02:38 -05:00
PikalaxALT e0b4fc781a sprite engine; tileset constants 2015-11-13 00:49: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 3b4805ee98 Sweepthrough of ClearBox arg conversion to lb 2015-11-01 09:38:48 -05:00
PikalaxALT ed29db5841 No more -bash000; engine/movement.asm, SPRITEMOVEFN 2015-10-29 23:32:11 -04:00
PikalaxALT 119d6b4119 About time I got to these functions 2015-10-24 10:39:52 -04:00
PikalaxALT 96b0e448c4 Labeling of AI item and wild encounter functions 2015-10-07 21:27:32 -04:00
PikalaxALT c50b49bd62 Renamed some unused specials 2015-10-01 16:55:24 -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 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 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 0fcef5fc08 More annotations and interpretations of functions and scripts 2015-07-17 17:17:10 -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 849595e537 Blindly use wram labels for everything except mobile, part 2. 2015-02-10 14:18:23 -08:00