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/SafariZoneGate.asm | 54 +++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'scripts/SafariZoneGate.asm') diff --git a/scripts/SafariZoneGate.asm b/scripts/SafariZoneGate.asm index f3de556b..6f8299fc 100755 --- a/scripts/SafariZoneGate.asm +++ b/scripts/SafariZoneGate.asm @@ -139,12 +139,12 @@ SafariZoneGate_TextPointers: dw .SafariZoneEntranceText6 .SafariZoneEntranceText1 - TX_FAR _SafariZoneEntranceText1 - db "@" + text_far _SafariZoneEntranceText1 + text_end .SafariZoneEntranceText4 - TX_FAR SafariZoneEntranceText_9e6e4 - TX_ASM + text_far SafariZoneEntranceText_9e6e4 + text_asm ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID @@ -208,22 +208,22 @@ SafariZoneGate_TextPointers: jp TextScriptEnd .MakePaymentText - TX_FAR SafariZoneEntranceText_9e747 - TX_SFX_ITEM_1 - TX_FAR _SafariZoneEntranceText_75360 - db "@" + text_far SafariZoneEntranceText_9e747 + sound_get_item_1 + text_far _SafariZoneEntranceText_75360 + text_end .PleaseComeAgainText - TX_FAR _SafariZoneEntranceText_75365 - db "@" + text_far _SafariZoneEntranceText_75365 + text_end .NotEnoughMoneyText - TX_FAR _SafariZoneEntranceText_7536a - db "@" + text_far _SafariZoneEntranceText_7536a + text_end .SafariZoneEntranceText5 - TX_FAR SafariZoneEntranceText_9e814 - TX_ASM + text_far SafariZoneEntranceText_9e814 + text_asm call YesNoChoice ld a, [wCurrentMenuItem] and a @@ -255,19 +255,19 @@ SafariZoneGate_TextPointers: jp TextScriptEnd .SafariZoneEntranceText_753bb - TX_FAR _SafariZoneEntranceText_753bb - db "@" + text_far _SafariZoneEntranceText_753bb + text_end .SafariZoneEntranceText_753c0 - TX_FAR _SafariZoneEntranceText_753c0 - db "@" + text_far _SafariZoneEntranceText_753c0 + text_end .SafariZoneEntranceText6 - TX_FAR _SafariZoneEntranceText_753c5 - db "@" + text_far _SafariZoneEntranceText_753c5 + text_end .SafariZoneEntranceText2 - TX_ASM + text_asm ld hl, .FirstTimeQuestionText call PrintText call YesNoChoice @@ -281,13 +281,13 @@ SafariZoneGate_TextPointers: jp TextScriptEnd .FirstTimeQuestionText - TX_FAR _SafariZoneEntranceText_753e6 - db "@" + text_far _SafariZoneEntranceText_753e6 + text_end .ExplanationText - TX_FAR _SafariZoneEntranceText_753eb - db "@" + text_far _SafariZoneEntranceText_753eb + text_end .RegularText - TX_FAR _SafariZoneEntranceText_753f0 - db "@" + text_far _SafariZoneEntranceText_753f0 + 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/SafariZoneGate.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/SafariZoneGate.asm') diff --git a/scripts/SafariZoneGate.asm b/scripts/SafariZoneGate.asm index 6f8299fc..76f4faa6 100755 --- a/scripts/SafariZoneGate.asm +++ b/scripts/SafariZoneGate.asm @@ -25,7 +25,7 @@ SafariZoneGate_ScriptPointers: xor a ld [hJoyHeld], a ld a, SPRITE_FACING_RIGHT - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a ld a, [wCoordIndex] cp $1 jr z, .asm_7520f @@ -231,7 +231,7 @@ SafariZoneGate_TextPointers: ld hl, .SafariZoneEntranceText_753bb call PrintText xor a - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a ld a, D_DOWN ld c, $3 call SafariZoneEntranceAutoWalk @@ -243,7 +243,7 @@ SafariZoneGate_TextPointers: ld hl, .SafariZoneEntranceText_753c0 call PrintText ld a, SPRITE_FACING_UP - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a ld a, D_UP ld c, $1 call SafariZoneEntranceAutoWalk -- cgit v1.2.3