From f4a31b3e0b7ca89e14c4e3836f3d3ad15f38e5ce Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Fri, 3 Jul 2015 14:38:12 -0500 Subject: Rename/organize part 2 of 4 rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github --- scripts/silphcoelevator.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/silphcoelevator.asm') diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm index 48d406cc..746ad15d 100755 --- a/scripts/silphcoelevator.asm +++ b/scripts/silphcoelevator.asm @@ -32,9 +32,9 @@ SilphCoElevatorScript_457ea: ; 457ea (11:57ea) ret SilphCoElevatorScript_457f1: ; 457f1 (11:57f1) - ld hl, SilphCoElavatorFloors ; $5804 + ld hl, SilphCoElavatorFloors call LoadItemList - ld hl, SilphCoElevatorWarpMaps ; $5811 + ld hl, SilphCoElevatorWarpMaps ld de, wcc5b ld bc, $16 call CopyData @@ -72,6 +72,6 @@ SilphCoElevatorTextPointers: ; 45833 (11:5833) SilphCoElevatorText1: ; 45835 (11:5835) db $08 ; asm call SilphCoElevatorScript_457f1 - ld hl, SilphCoElevatorWarpMaps ; $5811 + ld hl, SilphCoElevatorWarpMaps predef Func_1c9c6 jp TextScriptEnd -- cgit v1.2.3 From 8431fa7756dace97413f4c35aaa44cd92cf5b6df Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Fri, 3 Jul 2015 14:58:50 -0500 Subject: TX_ASM --- scripts/silphcoelevator.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/silphcoelevator.asm') diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm index 746ad15d..161b5ece 100755 --- a/scripts/silphcoelevator.asm +++ b/scripts/silphcoelevator.asm @@ -70,7 +70,7 @@ SilphCoElevatorTextPointers: ; 45833 (11:5833) dw SilphCoElevatorText1 SilphCoElevatorText1: ; 45835 (11:5835) - db $08 ; asm + TX_ASM call SilphCoElevatorScript_457f1 ld hl, SilphCoElevatorWarpMaps predef Func_1c9c6 -- cgit v1.2.3 From 6af65df2fcc0b8018f3e9e81de25a76425ff0c3e Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Thu, 23 Jul 2015 21:00:30 -0700 Subject: named function --- scripts/silphcoelevator.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/silphcoelevator.asm') diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm index 161b5ece..b328c14c 100755 --- a/scripts/silphcoelevator.asm +++ b/scripts/silphcoelevator.asm @@ -73,5 +73,5 @@ SilphCoElevatorText1: ; 45835 (11:5835) TX_ASM call SilphCoElevatorScript_457f1 ld hl, SilphCoElevatorWarpMaps - predef Func_1c9c6 + predef DisplayElevatorFloorMenu jp TextScriptEnd -- cgit v1.2.3 From 93255d6d17fbb3702a0f8670d7ecc2ed627af2a7 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 25 Jul 2015 19:26:54 -0700 Subject: yet more naming --- scripts/silphcoelevator.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/silphcoelevator.asm') diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm index b328c14c..36dbb6d2 100755 --- a/scripts/silphcoelevator.asm +++ b/scripts/silphcoelevator.asm @@ -16,9 +16,9 @@ SilphCoElevatorScript: ; 457c0 (11:57c0) SilphCoElevatorScript_457dc: ; 457dc (11:57dc) ld hl, wWarpEntries - ld a, [wd73b] + ld a, [wWarpedFromWhichWarp] ld b, a - ld a, [wd73c] + ld a, [wWarpedFromWhichMap] ld c, a call SilphCoElevatorScript_457ea -- cgit v1.2.3 From 8a6d46f3d9ba4fb6939eb9ea9949f47aa8608d4a Mon Sep 17 00:00:00 2001 From: dannye Date: Sun, 9 Aug 2015 23:56:20 -0500 Subject: Replace some hardcoded data sizes --- scripts/silphcoelevator.asm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts/silphcoelevator.asm') diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm index 36dbb6d2..5bd189ae 100755 --- a/scripts/silphcoelevator.asm +++ b/scripts/silphcoelevator.asm @@ -36,7 +36,7 @@ SilphCoElevatorScript_457f1: ; 457f1 (11:57f1) call LoadItemList ld hl, SilphCoElevatorWarpMaps ld de, wcc5b - ld bc, $16 + ld bc, SilphCoElevatorWarpMapsEnd - SilphCoElevatorWarpMaps call CopyData ret @@ -60,6 +60,7 @@ SilphCoElevatorWarpMaps: ; 45811 (11:45811) db $02, SILPH_CO_9F db $02, SILPH_CO_10F db $01, SILPH_CO_11F +SilphCoElevatorWarpMapsEnd: SilphCoElevatorScript_45827: ; 45827 (11:5827) call Delay3 -- cgit v1.2.3 From dfa266f05cb909c0e79d8c21b83a7a744a99b64a Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 10 Aug 2015 10:03:55 -0500 Subject: Use constants for elevator floors --- scripts/silphcoelevator.asm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'scripts/silphcoelevator.asm') diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm index 5bd189ae..3e36214e 100755 --- a/scripts/silphcoelevator.asm +++ b/scripts/silphcoelevator.asm @@ -42,7 +42,17 @@ SilphCoElevatorScript_457f1: ; 457f1 (11:57f1) SilphCoElavatorFloors: ; 45804 (11:45804) db $0B ; num elements in list - db $56, $57, $58, $59, $5A, $5B, $5C, $5D, $5E, $5F, $60 ; "1F", "2F", "3F", "4F", ... , "11F" + db FLOOR_1F + db FLOOR_2F + db FLOOR_3F + db FLOOR_4F + db FLOOR_5F + db FLOOR_6F + db FLOOR_7F + db FLOOR_8F + db FLOOR_9F + db FLOOR_10F + db FLOOR_11F db $FF ; terminator SilphCoElevatorWarpMaps: ; 45811 (11:45811) -- cgit v1.2.3 From 132d0367522b7acce602b146ca69bfad87ef96c6 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Wed, 12 Aug 2015 22:14:31 -0700 Subject: named more variables --- scripts/silphcoelevator.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/silphcoelevator.asm') diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm index 3e36214e..d080cfef 100755 --- a/scripts/silphcoelevator.asm +++ b/scripts/silphcoelevator.asm @@ -35,7 +35,7 @@ SilphCoElevatorScript_457f1: ; 457f1 (11:57f1) ld hl, SilphCoElavatorFloors call LoadItemList ld hl, SilphCoElevatorWarpMaps - ld de, wcc5b + ld de, wElevatorWarpMaps ld bc, SilphCoElevatorWarpMapsEnd - SilphCoElevatorWarpMaps call CopyData ret -- cgit v1.2.3