Rangi
|
612fd7cb96
|
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# maps/KrissHouse2F.asm
|
2018-02-15 21:21:58 -05:00 |
|
yenatch
|
4046b41c3a
|
Merge pull request #487 from luckytyphlosion/master
Fix more w-izing edge cases.
|
2018-02-15 21:14:22 -05:00 |
|
Rangi
|
62d6f72bb3
|
Make tileset palette maps easier to edit
|
2018-02-09 13:50:20 -05:00 |
|
Rangi
|
c158404b7c
|
questionmark is not a pokemon pic
|
2018-02-07 14:43:58 -05:00 |
|
Rangi
|
118c387d73
|
Remove commented G/S roaming Suicune code
|
2018-02-05 22:03:40 -05:00 |
|
Rangi
|
71f51955c9
|
Terser name for the does-nothing effect
|
2018-02-05 13:07:22 -05:00 |
|
Rangi
|
c648a6ced9
|
Off by one
|
2018-02-05 13:05:26 -05:00 |
|
Rangi
|
96c058f0a7
|
No redundant item effect labels
|
2018-02-05 13:03:05 -05:00 |
|
luckytyphlosion
|
8b007e8d51
|
Fix more w-izing edge cases.
|
2018-02-04 22:45:04 -05:00 |
|
Rangi
|
f8f3294130
|
Add ROOF_ constants
|
2018-02-04 21:39:46 -05:00 |
|
Rangi
|
bc3cc69749
|
Consistent "X percent [+/- Y]" order
|
2018-02-04 21:21:34 -05:00 |
|
Rangi
|
d6b00d0cc1
|
Sync code with wiki
|
2018-02-04 13:16:40 -05:00 |
|
Rangi
|
6c405e3859
|
Keep specials files together
|
2018-02-04 12:03:31 -05:00 |
|
Rangi
|
885080f213
|
"chances" → "probabilities", since other files use that term and "changes" exists right next to it
|
2018-02-04 11:46:53 -05:00 |
|
Rangi
|
ac15415949
|
Sync _
|
2018-02-03 22:57:57 -05:00 |
|
Rangi
|
79849a7e40
|
db/dw, and keep unused space away from labels
|
2018-02-03 21:22:06 -05:00 |
|
Rangi
|
73ea7c6326
|
Macro factors out sine code, just like sine data, since it's used 5 times
|
2018-02-03 21:11:55 -05:00 |
|
Rangi
|
271aa20b73
|
Keep documentation in sync with new WRAM labels
|
2018-02-03 20:40:21 -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 |
|
yenatch
|
b35eb72290
|
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
|
2018-02-03 17:15:20 -05:00 |
|
Rangi
|
6ff2cb20e6
|
map → map_id; map_def → map; map_data → map_attributes
|
2018-02-03 17:11:55 -05:00 |
|
Rangi
|
bf138d94d4
|
scene_def → scene_var (for "variable", like loadvar, copybytetovar, etc)
|
2018-02-03 16:20:19 -05:00 |
|
Rangi
|
b0d84c64a6
|
Use fixed-point DIV function for a generalized sine_wave table macro
|
2018-02-03 13:26:34 -05:00 |
|
Rangi
|
d11cac9e83
|
can't achieve this with rgbds 0.3.5
|
2018-02-03 01:55:22 -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
|
45373ec601
|
sine_wave macro parameterizes table size, not frequency ("amplitude" was an incorrect comment)
|
2018-02-02 22:45:42 -05:00 |
|
Rangi
|
f258ff8a41
|
oops
|
2018-02-02 22:28:29 -05:00 |
|
Rangi
|
07fddb1803
|
Legacy support macros
|
2018-02-02 22:24:50 -05:00 |
|
Rangi
|
c834bdadf2
|
spriteface → objectface, consistent with the other script commands
|
2018-02-02 21:50:43 -05:00 |
|
Rangi
|
aa8db1632c
|
Remove checkmorn/checkday/checknite macros
|
2018-02-02 21:20:13 -05:00 |
|
Rangi
|
2a53d75807
|
Similar formatting for similar WRAM areas
|
2018-02-02 21:15:15 -05:00 |
|
Rangi
|
68d855c213
|
Script commands don't have underscores
|
2018-02-02 21:09:17 -05:00 |
|
Rangi
|
b7e44124d3
|
Fix confusing label
|
2018-02-02 12:29:42 -05:00 |
|
Rangi
|
7a532435bf
|
Missed some SCENE constants
|
2018-02-01 23:35:28 -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
|
323ef81286
|
More comments and macros
|
2018-02-01 15:19:27 -05:00 |
|
Rangi
|
b2970e75f4
|
SCENE_DEFAULT=0 and SCENE_FINISHED=1 (generic constants for a common scene pattern)
|
2018-02-01 15:06:06 -05:00 |
|
Rangi
|
b54a7b7795
|
Quick scene explanation
|
2018-02-01 13:08:30 -05:00 |
|
Rangi
|
fcfe77bc3d
|
Meaningful scene constant names
(Two common patterns: 0=default event and 1=nothing; and 0=nothing and 1=some event)
|
2018-02-01 13:03:21 -05:00 |
|
Rangi
|
936a170e0d
|
MobileTradeRoom matches MobileBattleRoom
|
2018-01-31 23:21:15 -05:00 |
|
Rangi
|
a17623d96b
|
Add scene ID constants (TODO: meaningful names)
|
2018-01-31 23:16:51 -05:00 |
|
Rangi
|
7d6e82ef1c
|
NPC trade constants don't all just start with TRADE_
|
2018-01-31 21:16:57 -05:00 |
|
Rangi
|
b04f41da98
|
enum_start like const_def
|
2018-01-31 12:21:36 -05:00 |
|
Rangi
|
0eeb00d6ac
|
Official egg group names
|
2018-01-31 12:03:43 -05:00 |
|
Rangi
|
b8f4b1b8a7
|
MINERAL egg group works
|
2018-01-31 11:45:18 -05:00 |
|
Rangi
|
08891da822
|
const_def N
|
2018-01-31 11:38:45 -05:00 |
|
Rangi
|
9e368eee1f
|
Add TOC
|
2018-01-31 11:11:09 -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 |
|