pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity
4,008 Commits 1 Branch 0 Tags 52 MiB
67d1364c7a
Commit Graph

37 Commits

Author SHA1 Message Date
Rangi
67d1364c7a Fix triple newlines left over from removing address comments 2018-06-24 23:22:50 -04:00
mid-kid
1d9a68dbdd Remove all address comments 2018-06-24 16:13:22 +02:00
mid-kid
e8f847b537 Use structure constants for channel_struct 2018-06-04 11:35:27 +02: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
luckytyphlosion
0b45e2e846 Fix wVirtualOAM labels, part 2. 2018-01-30 14:52:46 -05:00
luckytyphlosion
a1951cefc0 Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
luckytyphlosion
f2ae74079f Prefix wram labels with w, part 1. 
Handle edge cases first.
 2018-01-23 16:45:34 -05:00
Rangi
fdda670f40 Cry headers and map headers were eliminated 2018-01-23 11:17:21 -05:00
Rangi
3a7f518de4 wStatusFlags/2 bit constants 2018-01-22 15:40:43 -05:00
Remy Oukaour
6d20cf3e80 "CryHeader" → "Cry"; "Cry" → "MonCry" 2018-01-16 23:47:45 -05:00
Remy Oukaour
bf074f3598 map_header → map_def; map_header_2 → map_data 2018-01-16 23:25:00 -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
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
xCrystal
6f0b81504d More unreferenced labels cleanup 2018-01-02 16:04:21 +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
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
Brandon Mulcahy
eb7195a780 Fix PlaySFX priority comment 2016-05-28 15:43:41 -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
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
2bd45ca574 Move effects; no more reloadmapmusic, returnafterbattle 2015-12-26 19:22:27 -05:00
PikalaxALT
92a8c491c3 Break up engine/sprites.asm; address yenatch's comments 2015-12-01 21:54:11 -05:00
PikalaxALT
812976cee6 bgcoord 2015-11-20 11:47:52 -05:00
PikalaxALT
0b8fe4bac3 More specials; bank 12 mobile 2015-11-16 22:29:54 -05:00
PikalaxALT
2ffcb4b490 More splits; map setup labels 2015-11-11 23:38:57 -05:00
PikalaxALT
adf2fe712d Various labels 2015-11-05 14:06:03 -05:00
PikalaxALT
d5ddd9e54e Move radio code to its own file 2015-07-21 01:52:46 -04:00
PikalaxALT
471492b775 Reverted ld_hl_pointer macro 2015-07-20 22:18:18 -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
yenatch
c07ed74a5d Blind wram labels part 4. 2015-02-10 15:14:41 -08: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
3624794599 Split bank 0 audio functions into home/audio.asm. 2014-05-21 16:26:28 -04:00