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
PikalaxALT
ef98c44edd
Person action and facing labels, part 1
2016-09-27 09:37:10 -04:00
PikalaxALT
d84ebd2124
pitchoffset macro to replace forceoctave
2016-07-29 10:40:54 -04:00
pikalaxalt
295604cbb5
Placeholder non-generic names for engine/color functions
2016-05-11 09:49:03 -04:00
pikalaxalt
76819398a9
reinterpret sound_duty macro
2016-05-10 16:46:46 -04:00
pikalaxalt
ebf6ed8a14
No more unknownmusic
2016-05-10 16:38:40 -04:00
pikalaxalt
f8c14d97e5
Pitch wheel
2016-05-10 14:33:24 -04:00
pikalaxalt
ae36ef2c7f
Labeled every function in ROM0 that's referenced in the source
2016-05-10 12:31:49 -04:00
pikalaxalt
3713b71d9e
More splitting of main.asm; remove unneeded rept 2
2016-05-04 11:46:23 -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
599e6e8d16
Battle animation annotations
2016-03-01 22:31:21 -05:00
PikalaxALT
b272c0c375
Fix marts using hard-coded bank number
2016-01-27 12:25:12 -05:00
PikalaxALT
1637d915d4
Restored StandingTile and introduced LastTile
2016-01-11 02:28:09 -05:00
PikalaxALT
8152ab612c
Battle anims
2015-12-23 17:10:50 -05:00
PikalaxALT
acd92eee94
Pack
2015-12-13 14:15:16 -05:00
PikalaxALT
5b7fc7b0fa
More battle tower shenanigans
2015-12-08 16:06:13 -05:00
PikalaxALT
0549e3413f
audio flag constants
2015-12-07 18:33:04 -05:00
PikalaxALT
7d8cb98c76
cry constants
2015-12-07 15:22:55 -05:00
PikalaxALT
159d3efc8f
new and updated music macros
2015-12-07 11:28:58 -05:00
PikalaxALT
02d05255fe
A stab at audio engine.
2015-12-06 22:36:09 -05:00
PikalaxALT
2ffcb4b490
More splits; map setup labels
2015-11-11 23:38:57 -05:00
PikalaxALT
f1b2466cc3
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-09 23:01:45 -05:00
PikalaxALT
adf2fe712d
Various labels
2015-11-05 14:06:03 -05:00
PikalaxALT
c5527a02ae
dbw BANK, addr replaced with dba
2015-11-03 19:43:47 -05:00
PikalaxALT
72af3337fd
No more NONE
2015-11-02 14:37:02 -05:00
PikalaxALT
ed29db5841
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-29 23:32:11 -04:00
PikalaxALT
895e14cd05
Reworked person_event arguments
2015-07-29 18:22:23 -04:00
PikalaxALT
471492b775
Reverted ld_hl_pointer macro
2015-07-20 22:18:18 -04:00
IIMarckus
4d532beee6
Remove trailing newlines.
2015-06-23 12:24:51 -06:00
U-Daniel-PC\Daniel
fa1c2c573a
Final music incbins
2015-02-15 21:22:51 -05:00
yenatch
8e03321069
Blindly use wram labels for everything except mobile, part 1.
...
Wram banks and mobile make this tough, since any address can secretly be a ghost.
As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-10 00:53:03 -08:00
yenatch
fe230e2e7d
Get rid of one-byte incbins in sound data.
2015-01-27 15:04:01 -08:00
yenatch
b9110b015d
Condense cry headers to one line.
...
Keep the unused labels for readability (and maybe some symfile magic).
2014-07-18 17:03: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
7ab25c9f59
Danger in the sound engine.
2014-04-22 00:02:52 -04:00
yenatch
3848af8e0e
Better labels for drumkits.
...
Also use noise commands for instruments.
2014-04-10 21:31:55 -04:00
yenatch
cb40ed08dd
Use labels in audio/sfx_pointers.asm
2014-02-06 21:22:45 -05:00
yenatch
55f60dffe1
Use labels in audio/cry_pointers.asm
2014-02-06 21:22:45 -05:00
yenatch
236f914bbe
Empty cry headers (for slots 252-255).
2014-02-06 21:22:45 -05:00
yenatch
fd1e8d9daf
Dump the sound effects
2014-02-06 21:22:45 -05:00
yenatch
466c507549
Dump the cries
2014-02-06 21:22:44 -05:00
yenatch
cfa8cb7b15
Redump music for whitespace formatting changes
...
to avoid a bigger diff later
2014-02-06 21:22:44 -05:00
yenatch
cf2acc1001
Use :: to export labels between objects.
...
This fixes the build.
2014-02-01 20:26:39 -05:00
yenatch
e937d6f25c
audio: note duration from 0-15 to 1-16 to match pokered
2013-12-28 20:32:05 -05:00
yenatch
8627d1760e
dump the music again
2013-11-07 01:18:50 -05:00
yenatch
6f1928eaea
stack music command labels
2013-11-05 15:19:12 -05:00
yenatch
12f0be8ccc
recomment ReadNoiseSample
2013-11-05 15:04:26 -05:00
yenatch
b2dd26c8a0
rename ParseCommand to ParseMusicCommand
2013-11-05 14:40:55 -05:00
yenatch
946a213f09
fix labels for SoundRestart and UpdateSound
2013-10-11 02:55:01 -04:00
yenatch
aae33da95b
fix LoadMusicByte naming scheme
2013-10-08 13:34:32 -04:00
yenatch
91b822ceb8
rename 'LoadMusic' to '_PlayMusic'
2013-10-08 13:26:05 -04:00
yenatch
789469c465
rename 'StartMusic' to 'PlayMusic'
2013-10-08 13:21:15 -04:00
yenatch
963fe4808b
rename 'LoadSFX' to '_PlaySFX'
2013-10-08 13:13:35 -04:00
yenatch
4ac678313f
rename 'PlaySFX' to 'PlayStereoSFX'
2013-10-08 13:05:52 -04:00
yenatch
2a0089b92b
shorten some overly long music filenames
2013-09-01 14:41:16 -04:00
yenatch
16507d3989
fix sfx pointer comments
2013-05-02 19:59:03 -04:00
yenatch
8bbfa54059
PlayCryHeader and related wram
2013-02-23 16:57:25 -05:00
yenatch
f56f340ce1
Label hw registers
2013-02-22 20:02:10 -05:00
yenatch
ee347bff48
Dump cry headers
2013-02-11 04:13:31 -05:00
yenatch
31a907d7c7
Move music/ into audio/
2013-02-05 18:08:20 -05:00
yenatch
ff5bd60966
Clean up and condense music includes
2013-02-05 18:00:32 -05:00
yenatch
9acf56102a
Split audio engine and pointers into files
...
Creates folder audio/
2013-02-05 16:48:46 -05:00
