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

70 Commits

Author SHA1 Message Date
Rangi f5c9958aea Rename some call/jump script commands to avoid confusion with jr/jp asm instructions 
Fixes #580
 2019-03-10 16:39:31 -04:00
Rangi e002b536af Rename more script commands for consistency and predictability 
Fixes #540
 2019-03-10 16:00:19 -04:00
Rangi 3202c4f3df Resolve issue #575: Rename text commands 2018-11-18 12:41:11 -05:00
Rangi 0680bf99d3 Label more map scripts 2018-02-28 17:47:31 -05:00
Rangi 43b5f90457 Replace "Map<MapName>Signpost<#>Script" labels 2018-02-27 19:33:38 -05:00
Rangi 335c2699f0 Merge branch 'master' of https://github.com/pret/pokecrystal 
# Conflicts:
#	constants/map_constants.asm
#	constants/wram_constants.asm
#	data/radio/oaks_pkmn_talk_routes.asm
#	data/radio/pnp_hidden_places.asm
#	engine/battle/core.asm
#	engine/breeding.asm
#	engine/phone/phone_scripts.asm
#	engine/radio.asm
#	maps/BattleTower1F.asm
#	maps/OlivineLighthouse2F.asm
#	maps/OlivineLighthouse6F.asm
#	maps/PokemonFanClub.asm
#	maps/RadioTower1F.asm
#	maps/RadioTower2F.asm
#	maps/Route30BerryHouse.asm
#	maps/Route34IlexForestGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/RuinsOfAlphKabutoChamber.asm
#	maps/RuinsOfAlphResearchCenter.asm
#	maps/VermilionPort.asm
#	maps/VictoryRoad.asm
 2018-02-25 20:39:54 -05:00
surskitty e668b6cf3a Merge branch 'master' of github.com:pret/pokecrystal 2018-02-03 22:18:56 -05: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 68d855c213 Script commands don't have underscores 2018-02-02 21:09:17 -05:00
surskitty b37cc569be Radio Card local jumps 2018-02-02 11:30:16 -05:00
Rangi 48f4f2366e Align map event coordinate columns 2018-02-01 22:22:07 -05:00
Rangi 3088a77a21 warp_event x, y, map, warp_id 2018-02-01 21:54:00 -05:00
Rangi 08891da822 const_def N 2018-01-31 11:38:45 -05:00
Rangi 50a78c0876 Forgot the person→object rename 2018-01-31 11:08:47 -05:00
Rangi a2607623d3 Comment the person constants sections, like the others 2018-01-31 11:04:17 -05:00
Rangi 65480605e9 Remove unreferenced map script heading labels 2018-01-30 14:15:47 -05:00
Rangi 477adc72af grep -rl warp_def . | xargs sed -i s/warp_def/warp_event/g 2018-01-28 13:20:04 -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 8f2878c37e trainers put the class and id first: `trainer YOUNGSTER, JOEY1, ...` 2018-01-23 13:08:48 -05:00
Remy Oukaour e69544b61f More Unicode 2018-01-19 02:30:19 -05:00
Remy Oukaour bf074f3598 map_header → map_def; map_header_2 → map_data 2018-01-16 23:25:00 -05:00
Remy Oukaour d83aefb30a Use more constants in scripts 2018-01-12 02:27:42 -05:00
Remy Oukaour 2f0973f3e0 Clean up some hex values in map scripts 2018-01-09 18:45:25 -05:00
Remy Oukaour 84e22eb578 Consistent (x, y) coordinate formatting in map scripts 2017-12-28 14:31:25 -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 17058aaec2 Auto-label more map scripts 2017-12-17 20:56:35 -05:00
Remy Oukaour 3ed016f9e0 Auto-label more map scripts 2017-12-17 20:17:30 -05:00
Remy Oukaour b4261d27d8 Use new palette constants 2017-12-10 20:50:08 -05:00
Remy Oukaour 66527d861f "Trainer*AfterBattleText" labels 2017-12-10 15:44:41 -05:00
surskitty 15015e4877 Making all Rocket Grunts call the constant. 2017-11-27 00:38:15 -05:00
pikalaxalt 1fa6aecbfc Unify directional movement macros 2016-05-14 13:46:14 -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 a5a8364c35 opentext and breeding 2015-12-09 18:25:44 -05:00
PikalaxALT 0eb0c40ba7 buttonsound 2015-11-29 22:29:45 -05:00
PikalaxALT 0d944f5915 Person event constants for each map 2015-11-27 00:22:14 -05:00
PikalaxALT 01792e00d2 Rename several script commands 2015-11-25 10:16:29 -05:00
PikalaxALT 36470537e0 Globally introduce PERSONTYPE constants 2015-11-15 15:07:20 -05:00
PikalaxALT 3cadc7b012 give/takeitem *, 1: the 1 is optional 2015-11-04 20:20:14 -05:00
PikalaxALT 72af3337fd No more NONE 2015-11-02 14:37:02 -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 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 4fa6c6daa4 Split up bank 2; other relabelings 2015-10-16 13:35:43 -04:00
PikalaxALT d42330ed8b Annotation of PrintNum arguments in bc, and radio functions 2015-10-10 18:00:12 -04:00
PikalaxALT aa27080e29 Split fourth-to-last byte of person_event into nybble arguments 2015-07-31 15:16:53 -04:00
PikalaxALT 895e14cd05 Reworked person_event arguments 2015-07-29 18:22:23 -04:00
PikalaxALT 432df825d4 Replaced GROUP_, MAP_ references with the map macro 
Updated macros that rely on the GROUP_, MAP_ constants to use the map macro

Added GROUP_NONE and MAP_NONE for the sake of compatibility with this new scheme

Added new macro elevfloor to simplify the definition of elevators under this new scheme
 2015-07-23 12:59:19 -04:00