From e7784604ce2417b99419e0e1855c8657f80bcc79 Mon Sep 17 00:00:00 2001 From: May Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Mon, 12 Dec 2022 06:17:33 +0000 Subject: [PATCH] Faraway Island warp now works Essentially, I bruteforced making it work; made the tiles we desire be warps for us instead. You do this by noting the bottom-left tile of the block for some reason, so tile $30 of forest will be a warp tile even though it really looks like it shouldn't be. As far as I can tell, there are no consequences for this war crime code as long as you don't put a warp where it shouldn't be. --- data/tilesets/warp_tile_ids.asm | 2 +- maps/FarawayIslandOutside.blk | 2 +- scan_includes.exe.stackdump | 4 ++-- scripts/Route1.asm | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index 5466ac2c..fc396bc3 100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -50,7 +50,7 @@ ENDM warp_tiles $5E .ForestWarpTileIDs: - warp_tiles $5A, $5C, $3A, $50, $51, $52, $53 ; tiles $50 through $53 are the arrow tiles used in the Safari Zone. These are custom additions for Faraway Island. + warp_tiles $5A, $5C, $3A, $30, $50, $51 ; $30, $50, and $51 are for Faraway Island, intended for the upward ($58) and downward ($59) blocks we use to signify warps. - PvK .DojoWarpTileIDs: .GymWarpTileIDs: diff --git a/maps/FarawayIslandOutside.blk b/maps/FarawayIslandOutside.blk index baf86d56..e76560a8 100644 --- a/maps/FarawayIslandOutside.blk +++ b/maps/FarawayIslandOutside.blk @@ -1,3 +1,3 @@ -@B-@B-@B-@B-@B-@B-<===>XB-@ACGFCEFB-DGFCEFcCF-@AA +@BB-@BB-@BB-@BB-@BB-@BB-<===>XB-@ACGFCEFB-DGFCEFcCF-@AA BbAAB--@AC? BACEF--DGF@AAABAB----@AB@CG?CFCF-c--@AB@BA@BEF---<=@aF@BA@B-----@@BADFADF--c--@DFEEEEGF-----@'Y&----c-DE \ No newline at end of file diff --git a/scan_includes.exe.stackdump b/scan_includes.exe.stackdump index 0393dd6d..19b16799 100644 --- a/scan_includes.exe.stackdump +++ b/scan_includes.exe.stackdump @@ -1,11 +1,11 @@ Exception: STATUS_ACCESS_VIOLATION at rip=00100401246 -rax=FFFFFFF7FFF8CD51 rbx=0000000000000818 rcx=0000000800000010 +rax=FFFFFFF7FFF8CD51 rbx=000000000000084E rcx=0000000800000010 rdx=0000000000000000 rsi=0000000800059544 rdi=0000000000000000 r8 =00000000FFFFC7C4 r9 =0000000000000000 r10=0000000100000000 r11=0000000100401282 r12=00000008000732B0 r13=0000000100403148 r14=0000000000000000 r15=0000000000000001 rbp=0000000100403156 rsp=00000000FFFFCA60 -program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 2248, thread main +program=C:\cygwin64\home\chipp\kep-hack\tools\scan_includes.exe, pid 177, thread main cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B Stack trace: Frame Function Args diff --git a/scripts/Route1.asm b/scripts/Route1.asm index d08c2744..bd866bd5 100644 --- a/scripts/Route1.asm +++ b/scripts/Route1.asm @@ -1,6 +1,6 @@ Route1_Script: jp EnableAutoTextBoxDrawing - ld hl, Route1_ScriptPointers + ;ld hl, Route1_ScriptPointers ld a, [wRoute1CurScript] jp CallFunctionInTable @@ -130,4 +130,4 @@ StarterMons_Oak: ; starter the rival picked, oak trainer number. way easier than storing oak's "choice" db STARTER1, 2 ; Venusaur db STARTER2, 3 ; Charizard - db STARTER3, 1 ; Totartle \ No newline at end of file + db STARTER3, 1 ; Totartle