From 594c58a289cbad3954899d76ed000f483389472f Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 16 Jul 2020 11:19:05 -0400 Subject: Revise some map scripts, mostly for getting items --- scripts/Route24.asm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'scripts/Route24.asm') diff --git a/scripts/Route24.asm b/scripts/Route24.asm index 28151393..4dec6d2f 100755 --- a/scripts/Route24.asm +++ b/scripts/Route24.asm @@ -45,7 +45,8 @@ Route24Script0: ret CoordsData_5140e: - db $0F,$0A,$FF + db $0F,$0A + db $FF Route24Script4: ld a, [wSimulatedJoypadStatesIndex] @@ -103,12 +104,12 @@ Route24Text1: text_asm ResetEvent EVENT_NUGGET_REWARD_AVAILABLE CheckEvent EVENT_GOT_NUGGET - jr nz, .asm_514f9 + jr nz, .got_item ld hl, Route24Text_51510 call PrintText lb bc, NUGGET, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full SetEvent EVENT_GOT_NUGGET ld hl, Route24Text_5151a call PrintText @@ -130,11 +131,11 @@ Route24Text1: ld [wRoute24CurScript], a ld [wCurMapScript], a jp TextScriptEnd -.asm_514f9 +.got_item ld hl, Route24Text_51530 call PrintText jp TextScriptEnd -.BagFull +.bag_full ld hl, Route24Text_51521 call PrintText SetEvent EVENT_NUGGET_REWARD_AVAILABLE -- cgit v1.2.3 From 76b882d9523915ca8ced96e8c5e889ca2728241e Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 16 Jul 2020 12:32:19 -0400 Subject: Reformat map scripts' coordinate and movement data 'dbmapcoord' has X, Y order like other coordinate-related data macros --- scripts/Route24.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/Route24.asm') diff --git a/scripts/Route24.asm b/scripts/Route24.asm index 4dec6d2f..aed112ac 100755 --- a/scripts/Route24.asm +++ b/scripts/Route24.asm @@ -45,8 +45,8 @@ Route24Script0: ret CoordsData_5140e: - db $0F,$0A - db $FF + dbmapcoord 10, 15 + db -1 ; end Route24Script4: ld a, [wSimulatedJoypadStatesIndex] -- cgit v1.2.3