surskitty
|
e668b6cf3a
|
Merge branch 'master' of github.com:pret/pokecrystal
|
2018-02-03 22:18:56 -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
|
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
|
68d855c213
|
Script commands don't have underscores
|
2018-02-02 21:09:17 -05:00 |
|
surskitty
|
2edf131b05
|
Route 30 Berry Speech House labels
|
2018-02-02 16:52:15 -05:00 |
|
surskitty
|
955e43c630
|
Labels, labels, labels
|
2018-02-02 12:08:43 -05:00 |
|
surskitty
|
1b3a269812
|
Local jumps, once again.
|
2018-02-02 11:57:24 -05:00 |
|
surskitty
|
507a8f3535
|
Ruins of Alph partial labels
|
2018-02-02 11:57:11 -05:00 |
|
surskitty
|
b37cc569be
|
Radio Card local jumps
|
2018-02-02 11:30:16 -05:00 |
|
surskitty
|
ddd0b6f958
|
Jasmine and Amphy labels
|
2018-02-02 11:13:28 -05:00 |
|
surskitty
|
f1e4951cf1
|
Sailor Huey labels
|
2018-02-02 11:02:31 -05:00 |
|
surskitty
|
b94c1f7084
|
Labelling the Victory Road rival script
|
2018-02-02 10:57:06 -05:00 |
|
surskitty
|
b53b03eed0
|
Labelling Buena's subroutines.
|
2018-02-01 23:39:14 -05:00 |
|
Rangi
|
7a532435bf
|
Missed some SCENE constants
|
2018-02-01 23:35:28 -05:00 |
|
surskitty
|
ae909428ae
|
Incomplete labelling
|
2018-02-01 23:30:17 -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
|
b2970e75f4
|
SCENE_DEFAULT=0 and SCENE_FINISHED=1 (generic constants for a common scene pattern)
|
2018-02-01 15:06:06 -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
|
08891da822
|
const_def N
|
2018-01-31 11:38:45 -05:00 |
|