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
|
c834bdadf2
|
spriteface → objectface, consistent with the other script commands
|
2018-02-02 21:50:43 -05:00 |
|
Rangi
|
68d855c213
|
Script commands don't have underscores
|
2018-02-02 21:09: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
|
a17623d96b
|
Add scene ID constants (TODO: meaningful names)
|
2018-01-31 23:16:51 -05:00 |
|
Rangi
|
08891da822
|
const_def N
|
2018-01-31 11:38:45 -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 |
|
Rangi
|
cb733954c6
|
SPRITEMOVEDATA_ITEM_TREE → SPRITEMOVEDATA_STILL (it's used for other things like Azalea's Slowpokes, not just items and trees)
|
2018-01-30 22:12:53 -05:00 |
|
Rangi
|
65480605e9
|
Remove unreferenced map script heading labels
|
2018-01-30 14:15:47 -05:00 |
|
Rangi
|
477adc72af
|
grep -rl warp_def . | xargs sed -i s/warp_def/warp_event/g
|
2018-01-28 13:20:04 -05:00 |
|
Rangi
|
d719d318e8
|
Remove Special_ prefix from special routines (close #478)
|
2018-01-24 11:17:05 -05:00 |
|
luckytyphlosion
|
a1951cefc0
|
Prefix wram labels with w, part 2.
|
2018-01-23 17:39:09 -05:00 |
|
Rangi
|
8f2878c37e
|
trainers put the class and id first: trainer YOUNGSTER, JOEY1, ...
|
2018-01-23 13:08:48 -05:00 |
|
Rangi
|
dea26c6639
|
hiddenitem, like itemball and object_event, puts the item first and the event last
|
2018-01-23 12:59:21 -05:00 |
|
Remy Oukaour
|
c70e8eec49
|
Comment on changeblock ids
|
2018-01-17 13:23:43 -05:00 |
|
Remy Oukaour
|
bf074f3598
|
map_header → map_def; map_header_2 → map_data
|
2018-01-16 23:25:00 -05:00 |
|
Remy Oukaour
|
5a3822fe86
|
Introduce callback, hiddenitem, conditional_event, and cmdqueue macros for map scripts
|
2018-01-13 00:47:38 -05:00 |
|
Remy Oukaour
|
4c35f3ac85
|
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
|
2017-12-28 20:56:21 -05:00 |
|
xCrystal
|
50fc9c3389
|
endm -> ENDM
|
2017-12-28 22:31:16 +01:00 |
|
Remy Oukaour
|
84e22eb578
|
Consistent (x, y) coordinate formatting in map scripts
|
2017-12-28 14:31:25 -05:00 |
|
xCrystal
|
7beb497d3a
|
Uppercase MACRO and EQU(S) according to the style guide
|
2017-12-28 13:23:44 +01:00 |
|
Remy Oukaour
|
0a1fef45fd
|
Rename maps:
- Underground -> UndergroundPath
- Route5UndergroundEntrance -> Route5UndergroundPathEntrance
- Route6UndergroundEntrance -> Route6UndergroundPathEntrance
- WarehouseEntrance -> GoldenrodUnderground
- UndergroundWarehouse -> GoldenrodUndergroundWarehouse
- UndergroundPathSwitchRoomEntrances -> GoldenrodUndergroundSwitchRoomEntrances
|
2017-12-24 18:06:12 -05:00 |
|