Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# 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
This commit is contained in:
Rangi
2018-02-03 18:21:53 -05:00
parent 6ff2cb20e6 b35eb72290
commit 32ed487a47
367 changed files with 8920 additions and 8922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
data/maps/attributes.asm
View File

@@ -26,39 +26,39 @@ connection: MACRO
if "\1" == "north"
map_id \3
dw \2_Blocks + \3_WIDTH * (\3_HEIGHT - 3) + \5
dw OverworldMap + \4 + 3
dw wOverworldMap + \4 + 3
db \6
db \3_WIDTH
db \3_HEIGHT * 2 - 1
db (\4 - \5) * -2
dw OverworldMap + \3_HEIGHT * (\3_WIDTH + 6) + 1
dw wOverworldMap + \3_HEIGHT * (\3_WIDTH + 6) + 1
elif "\1" == "south"
map_id \3
dw \2_Blocks + \5
dw OverworldMap + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3
dw wOverworldMap + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3
db \6
db \3_WIDTH
db 0
db (\4 - \5) * -2
dw OverworldMap + \3_WIDTH + 7
dw wOverworldMap + \3_WIDTH + 7
elif "\1" == "west"
map_id \3
dw \2_Blocks + (\3_WIDTH * \5) + \3_WIDTH - 3
dw OverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3)
dw wOverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3)
db \6
db \3_WIDTH
db (\4 - \5) * -2
db \3_WIDTH * 2 - 1
dw OverworldMap + \3_WIDTH * 2 + 6
dw wOverworldMap + \3_WIDTH * 2 + 6
elif "\1" == "east"
map_id \3
dw \2_Blocks + (\3_WIDTH * \5)
dw OverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3
dw wOverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3
db \6
db \3_WIDTH
db (\4 - \5) * -2
db 0
dw OverworldMap + \3_WIDTH + 7
dw wOverworldMap + \3_WIDTH + 7
endc
ENDM