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 |
|