From 139a28ff9906d728a6820fe678a2a616eb309421 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 4 Jul 2020 17:09:35 -0400 Subject: Port pokecrystal's formatting of text commands and special characters --- scripts/Route22Gate.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'scripts/Route22Gate.asm') diff --git a/scripts/Route22Gate.asm b/scripts/Route22Gate.asm index 86b1220d..b7fcc8f5 100755 --- a/scripts/Route22Gate.asm +++ b/scripts/Route22Gate.asm @@ -57,7 +57,7 @@ Route22Gate_TextPointers: dw Route22GateText1 Route22GateText1: - TX_ASM + text_asm ld a, [wObtainedBadges] bit 0, a jr nz, .asm_1e6f6 @@ -75,8 +75,8 @@ Route22GateText1: jp TextScriptEnd Route22GateText_1e704: - TX_FAR _Route22GateText_1e704 - TX_ASM + text_far _Route22GateText_1e704 + text_asm ld a, SFX_DENIED call PlaySoundWaitForCurrent call WaitForSoundToFinish @@ -84,10 +84,10 @@ Route22GateText_1e704: ret Route22GateText_1e715: - TX_FAR _Route22GateText_1e715 - db "@" + text_far _Route22GateText_1e715 + text_end Route22GateText_1e71a: - TX_FAR _Route22GateText_1e71a - TX_SFX_ITEM_1 - db "@" + text_far _Route22GateText_1e71a + sound_get_item_1 + text_end -- cgit v1.2.3 From 2b2ed54bbf017943ba2343cd6c1dbe88b8f34a4e Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 5 Jul 2020 17:29:11 -0400 Subject: Identify wSpriteStateData1 and wSpriteStateData2 offsets, like pokeyellow --- scripts/Route22Gate.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/Route22Gate.asm') diff --git a/scripts/Route22Gate.asm b/scripts/Route22Gate.asm index b7fcc8f5..e2311b95 100755 --- a/scripts/Route22Gate.asm +++ b/scripts/Route22Gate.asm @@ -37,7 +37,7 @@ Route22GateScript_1e6ba: ld [wSimulatedJoypadStatesIndex], a ld a, D_DOWN ld [wSimulatedJoypadStatesEnd], a - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a ld [wJoyIgnore], a jp StartSimulatingJoypadStates -- cgit v1.2.3