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

18
engine/events/elevator.asm
View File

@@ -29,7 +29,7 @@ Elevator:: ; 1342d
; 1345a
.LoadFloors: ; 1345a
ld de, CurElevator
ld de, wCurElevator
ld bc, 4
ld hl, wElevatorPointer
ld a, [hli]
@@ -60,9 +60,9 @@ Elevator:: ; 1342d
call GetFarByte
ld c, a
inc hl
ld a, [BackupMapGroup]
ld a, [wBackupMapGroup]
ld d, a
ld a, [BackupMapNumber]
ld a, [wBackupMapNumber]
ld e, a
ld b, 0
.loop2
@@ -111,7 +111,7 @@ Elevator_GoToFloor: ; 134c0
ld bc, 4
call AddNTimes
inc hl
ld de, BackupWarpNumber
ld de, wBackupWarpNumber
ld a, [wElevatorPointerBank]
ld bc, 3
call FarCopyBytes
@@ -151,7 +151,7 @@ Elevator_WhichFloorText: ; 0x1350d
Elevator_GetCurrentFloorText: ; 13512
ld hl, Options
ld hl, wOptions
ld a, [hl]
push af
set NO_TEXT_SCROLL, [hl]
@@ -165,7 +165,7 @@ Elevator_GetCurrentFloorText: ; 13512
hlcoord 4, 4
call Elevator_GetCurrentFloorString
pop af
ld [Options], a
ld [wOptions], a
ret
; 13537
@@ -179,7 +179,7 @@ Elevator_GetCurrentFloorString: ; 1353f
ld a, [wElevatorOriginFloor]
ld e, a
ld d, 0
ld hl, CurElevatorFloors
ld hl, wCurElevatorFloors
add hl, de
ld a, [hl]
pop de
@@ -198,14 +198,14 @@ Elevator_MenuData: ; 0x13558
db SCROLLINGMENU_DISPLAY_ARROWS ; flags
db 4, 0 ; rows, columns
db 1 ; horizontal spacing
dbw 0, CurElevator
dbw 0, wCurElevator
dba GetElevatorFloorStrings
dba NULL
dba NULL
; 13568
GetElevatorFloorStrings: ; 13568
ld a, [MenuSelection]
ld a, [wMenuSelection]
GetFloorString: ; 1356b
push de
call FloorToString