Commit Graph

112 Commits

Author SHA1 Message Date
dannye
fc051f2130 Update audio macros and arguments
and update related labels/constants/comments
this fixes a lot of mistakes and maximizes compatibility with red
2019-09-02 03:41:25 -05:00
IIMarckus
9ddbaacea8 GlassTing (Elm's PC when email arrives) isn't in G/S either. 2019-08-16 01:09:32 -06:00
Rangi
45e3f6aca9 Identify some more WRAM labels 2019-04-19 11:35:27 -04:00
Rangi
4b4c53c7ae Format music macros like movement macros 2018-12-09 17:56:13 -05:00
mid-kid
725cee7371 Define first_music_cmd
This replaces the uses of $d0 in the audio engine with proper constants.
2018-11-21 12:12:22 +01:00
mid-kid
dac6916c8b Fix usage of endchannel_cmd 2018-11-20 21:46:00 +01:00
Rangi
eb1e3636bb Use labels instead of constants for HRAM
Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 14:28:22 -04:00
Rangi
c9cb67141b Make reviewed fixes; standardize on " + " 2018-07-29 01:40:23 -04:00
mid-kid
fdf10c9fac Fix missing newline 2018-07-18 10:55:30 +02:00
Rangi
187e30cac8 Replace more hex values with constants or decimal 2018-07-11 15:40:09 -04:00
Rangi
1caa50a647 No space between labels and bodies 2018-06-25 12:24:18 -04:00
Rangi
9f3e9145f9 Remove more triple newlines 2018-06-25 12:01:02 -04:00
Rangi
67d1364c7a Fix triple newlines left over from removing address comments 2018-06-24 23:22:50 -04:00
mid-kid
5efce10789 Remove even more address comments
That should be all of them this time
2018-06-25 02:10:37 +02:00
mid-kid
1d9a68dbdd Remove all address comments 2018-06-24 16:13:22 +02:00
mid-kid
6f4e968b70 Fix DangetSoundHigh -> DangerSoundHigh 2018-06-05 10:13:09 +02:00
mid-kid
38ede6d7f0 Clean up PlayDanger 2018-06-04 14:34:35 +02:00
mid-kid
e8f847b537 Use structure constants for channel_struct 2018-06-04 11:35:27 +02:00
mid-kid
5e9c785b3f Merge branch 'master' of https://github.com/pret/pokecrystal 2018-06-04 11:05:53 +02:00
Rangi
846e3e65de adc a, 0 → adc 0; fix comments 2018-05-20 17:55:27 -04:00
mid-kid
8d10a987a3 Change sfx and cry branch labels to local labels
They're local anyway, and this makes them look more like loops.
2018-05-13 01:42:26 +02:00
Rangi
7307fc8dce Use constants for bit/set/res more 2018-04-05 11:44:02 -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
e32e5212af use "x + -1" not "x +- 1"
(TODO: use "x - 1" once rgbds allows it)
2018-02-02 22:55:38 -05:00
Rangi
47e704b931 Correction, wave patterns are quite interesting. 2018-01-26 11:39:35 -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
Remy Oukaour
25048bd12d wiggle → wobble 2018-01-19 00:16:08 -05:00
Remy Oukaour
6d20cf3e80 "CryHeader" → "Cry"; "Cry" → "MonCry" 2018-01-16 23:47:45 -05:00
Remy Oukaour
7b3de85a06 Avoid "+- 1" at every maskbits 2018-01-16 17:27:50 -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
94d6a32721 Use maskbits some more 2018-01-11 14:27:19 -05:00
Adelaide Walter
76ee2f58c4 WRAM1_Begin -> wd000 2018-01-03 00:40:59 -05:00
xCrystal
ee5bf71640 Consistently name unknown fields in macros/wram as Fieldxx 2017-12-29 16:19:51 +01:00
Remy Oukaour
af5f884314 Align columns 2017-12-26 13:06:27 -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
aeee49d29b Change a few Unknown labels 2017-12-24 20:07:23 -05:00
Remy Oukaour
fbf931f5d3 Ad some more constants for meaningful audio WRAM bits 2017-12-16 00:50:03 -05:00
Remy Oukaour
253c09949b Move data/audio/ back into audio/
Keep trainer data together
2017-12-15 12:38:59 -05:00
Remy Oukaour
6ab1d028bb Split items/ and trainers/ into their data/ and engine/ components
Move some data into a pokemon/ subdirectory
2017-12-14 23:00:54 -05:00
Remy Oukaour
5b13a7a13b Identify more sprite-related constants
Start more documentation
2017-12-12 13:22:19 -05:00
Remy Oukaour
213dcc70d7 More consistent data tables 2017-12-11 22:59:30 -05:00
Remy Oukaour
f1f84743f7 Keep table labels in the same files as their contents. 2017-12-11 22:44:25 -05:00
Remy Oukaour
5be98bae3c Move more data tables into data/ files. 2017-12-11 15:20:32 -05:00
Remy Oukaour
699495bfcb Consistent capitalization for map names, matching their constants 2017-12-10 13:37:15 -05:00
Remy Oukaour
ab7025a144 Consistent code formatting: no redundant as and spaces after commas 2017-12-10 00:06:20 -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
mid-kid
f619e84e4f Remove useless file
Also fixed a comment on top of music_pointers.asm
2017-11-30 21:44:27 +01:00
Ben10do
e6ea1889fb
Replace ‘jp [hl]’ with ‘jp hl’
The former is arguably misleading (as you don’t access the memory location in hl to retrieve the jump location), and is consequently deprecated in newer versions of rgbds.

This fix silences these deprecation warnings.
2017-06-09 22:01:10 +01:00