From f28425772537f692516eda6bcd92ffe712296c38 Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Wed, 21 Apr 2021 01:42:43 +0200 Subject: [PATCH] Add missing pointers to scripts for entry to Lon Lon Ranch and door in Sanctuary --- data/data_080D5360.s | 12 +++++++++--- data/scripts/script_080100C8.inc | 1 + data/scripts/script_08014248.inc | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/data/data_080D5360.s b/data/data_080D5360.s index f4240410..15fa6e25 100644 --- a/data/data_080D5360.s +++ b/data/data_080D5360.s @@ -12621,7 +12621,9 @@ gUnk_080F2B78:: @ 080F2B78 .4byte gUnk_080F2B58 gUnk_080F2B9C:: @ 080F2B9C - .incbin "baserom.gba", 0x0F2B9C, 0x00000E0 + .incbin "baserom.gba", 0x0F2B9C, 0x00000CC + .4byte script_08010120 + .incbin "baserom.gba", 0x0F2C6C, 0x0000010 gUnk_080F2C7C:: @ 080F2C7C .incbin "baserom.gba", 0x0F2C7C, 0x00000A0 @@ -13711,7 +13713,9 @@ gUnk_080F5610:: @ 080F5610 .4byte sub_0804ED5C gUnk_080F5630:: @ 080F5630 - .incbin "baserom.gba", 0x0F5630, 0x0000030 + .incbin "baserom.gba", 0x0F5630, 0x000000C + .4byte script_08014274 + .incbin "baserom.gba", 0x0F5640, 0x0000020 gUnk_080F5660:: @ 080F5660 .incbin "baserom.gba", 0x0F5660, 0x000000C @@ -14678,7 +14682,9 @@ gUnk_080F79D0:: @ 080F79D0 .incbin "baserom.gba", 0x0F79D0, 0x0000050 gUnk_080F7A20:: @ 080F7A20 - .incbin "baserom.gba", 0x0F7A20, 0x0000024 + .incbin "baserom.gba", 0x0F7A20, 0x0000008 + .4byte script_0800B574 + .incbin "baserom.gba", 0x0F7A2C, 0x0000018 gUnk_080F7A44:: @ 080F7A44 .incbin "baserom.gba", 0x0F7A44, 0x00000B0 diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc index cb3713f2..562efdf5 100644 --- a/data/scripts/script_080100C8.inc +++ b/data/scripts/script_080100C8.inc @@ -26,6 +26,7 @@ script_08010110: Call sub_08061E90 Jump script_08010110 .2byte 0x0000 +SCRIPT_START script_08010120 BeginBlock _0807E9D4 _0807EB44 0x0004 diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc index c49a5bc0..56ab6d41 100644 --- a/data/scripts/script_08014248.inc +++ b/data/scripts/script_08014248.inc @@ -8,6 +8,7 @@ script_08014264: CallWithArg sub_08095EAC, 0x00000001 Jump script_08014264 .2byte 0x0000 +SCRIPT_START script_08014274 BeginBlock DoPostScriptAction 0x0008 EndBlock