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 |
|
luckytyphlosion
|
f2ae74079f
|
Prefix wram labels with w, part 1.
Handle edge cases first.
|
2018-01-23 16:45:34 -05:00 |
|
Rangi
|
682548493b
|
Struct macros should have their main label outside the macro
|
2018-01-23 11:40:32 -05:00 |
|
Remy Oukaour
|
05382d3e3c
|
PARTY_LENGTH; MON_NAME; sgb_border.bin
|
2018-01-20 12:25:55 -05:00 |
|
Remy Oukaour
|
417937cffc
|
Resolve #461
|
2018-01-10 13:47:57 -05:00 |
|
xCrystal
|
ee5bf71640
|
Consistently name unknown fields in macros/wram as Fieldxx
|
2017-12-29 16:19:51 +01:00 |
|
xCrystal
|
50fc9c3389
|
endm -> ENDM
|
2017-12-28 22:31:16 +01:00 |
|
xCrystal
|
d6507e3882
|
More constants and documentation in slot machines
|
2017-12-28 19:38:15 +01:00 |
|
xCrystal
|
7beb497d3a
|
Uppercase MACRO and EQU(S) according to the style guide
|
2017-12-28 13:23:44 +01:00 |
|
Remy Oukaour
|
c05b7f41dd
|
Renaming: (fix #412)
- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event
|
2017-12-24 14:33:17 -05:00 |
|
Remy Oukaour
|
e44640b008
|
Move more main.asm code into individual files
|
2017-12-15 21:22:26 -05:00 |
|
Remy Oukaour
|
606817f18b
|
Add a map_connection_struct macro
|
2017-12-15 18:25:32 -05:00 |
|
Remy Oukaour
|
e48a401290
|
Reorganize macros
|
2017-12-14 00:36:24 -05:00 |
|
PikalaxALT
|
d84ebd2124
|
pitchoffset macro to replace forceoctave
|
2016-07-29 10:40:54 -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
|
82f1534925
|
Copycat labels; macro for the Crystal-only Unown chamber unlock words
|
2016-04-30 21:20:12 -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
|
8360a1a2e8
|
Pokegear functions and RAM labels
|
2016-01-09 23:41:03 -05:00 |
|
PikalaxALT
|
f7ee74c3b8
|
Finish labels in engine/namingscreen.asm
|
2016-01-09 19:34:14 -05:00 |
|
PikalaxALT
|
6d1b7f28c8
|
Split base stats
|
2016-01-09 16:52:34 -05:00 |
|
PikalaxALT
|
61c4cfe7d7
|
wram macros moved to new file
|
2016-01-07 18:45:32 -05:00 |
|