diff options
| -rw-r--r-- | Add-a-new-Mart.md | 14 | ||||
| -rw-r--r-- | Automatically-reuse-Repel.md | 6 | ||||
| -rw-r--r-- | Code-cleanup.md | 4 | ||||
| -rw-r--r-- | Expand-tilesets-from-192-to-255-tiles.md | 2 | ||||
| -rw-r--r-- | Infinitely-reusable-TMs.md | 2 | ||||
| -rw-r--r-- | Remove-the-artificial-save-delay.md | 4 | ||||
| -rw-r--r-- | Remove-the-redundant-move-grammar-table.md | 22 | ||||
| -rw-r--r-- | Rock-Climb.md | 6 |
8 files changed, 30 insertions, 30 deletions
diff --git a/Add-a-new-Mart.md b/Add-a-new-Mart.md index 3ac5c20..49cde71 100644 --- a/Add-a-new-Mart.md +++ b/Add-a-new-Mart.md @@ -224,31 +224,31 @@ Edit [engine/items/mart.asm](../blob/master/engine/items/mart.asm): ... + +Text_ShadyShop_Intro: -+ text_jump ShadyShop_IntroText ++ text_far ShadyShop_IntroText + db "@" + +Text_ShadyShop_ComeAgain: -+ text_jump ShadyShop_ComeAgainText ++ text_far ShadyShop_ComeAgainText + db "@" + +Text_ShadyShop_HowMany: -+ text_jump ShadyShop_HowManyText ++ text_far ShadyShop_HowManyText + db "@" + +Text_ShadyShop_CostsThisMuch: -+ text_jump ShadyShop_CostsThisMuchText ++ text_far ShadyShop_CostsThisMuchText + db "@" + +Text_ShadyShop_InsufficientFunds: -+ text_jump ShadyShop_InsufficientFundsText ++ text_far ShadyShop_InsufficientFundsText + db "@" + +Text_ShadyShop_BagFull: -+ text_jump ShadyShop_BagFullText ++ text_far ShadyShop_BagFullText + db "@" + +Text_ShadyShop_HereYouGo: -+ text_jump ShadyShop_HereYouGoText ++ text_far ShadyShop_HereYouGoText + db "@" ``` diff --git a/Automatically-reuse-Repel.md b/Automatically-reuse-Repel.md index 5915903..b309ae8 100644 --- a/Automatically-reuse-Repel.md +++ b/Automatically-reuse-Repel.md @@ -65,7 +65,7 @@ The file that defines item effects is, predictably, [engine/items/item_effects.a TextJump_RepelUsedEarlierIsStillInEffect: ; The REPEL used earlier is still in effect. - text_jump Text_RepelUsedEarlierIsStillInEffect + text_far Text_RepelUsedEarlierIsStillInEffect db "@" ``` @@ -116,7 +116,7 @@ Edit [engine/events/misc_scripts_2.asm](../blob/master/engine/events/misc_script .text ; REPEL's effect wore off. - text_jump UnknownText_0x1bd308 + text_far UnknownText_0x1bd308 db "@" +UseAnotherRepelScript:: @@ -130,7 +130,7 @@ Edit [engine/events/misc_scripts_2.asm](../blob/master/engine/events/misc_script + end + +.text: -+ text_jump UseAnotherRepelText ++ text_far UseAnotherRepelText + db "@" ``` diff --git a/Code-cleanup.md b/Code-cleanup.md index 512c807..d63fa5d 100644 --- a/Code-cleanup.md +++ b/Code-cleanup.md @@ -43,12 +43,12 @@ grep -rE --include='*.asm' --exclude-dir=mobile '^\s(bit|res|set) [0-7],' ### Text label styles in [data/text/](../tree/master/data/text/) -Currently a mixture of `Text_*`, `*Text`, and `BattleText_*`. Likewise for the [engine/](../tree/master/engine/) labels that just `text_jump` to one of them. +Currently a mixture of `Text_*`, `*Text`, and `BattleText_*`. Likewise for the [engine/](../tree/master/engine/) labels that just `text_far` to one of them. The convention that should be used is as follows: - Use suffixes, i.e. not `Text_Something`, but `SomethingText`. Same for `Movement`. -- Labels that are referenced through `text_jump` should be prefixed with an underscore, e.g. `SomethingText: text_jump _SomethingText`. +- Labels that are referenced through `text_far` should be prefixed with an underscore, e.g. `SomethingText: text_far _SomethingText`. ### WRAM label style diff --git a/Expand-tilesets-from-192-to-255-tiles.md b/Expand-tilesets-from-192-to-255-tiles.md index 3c6bba2..28ef659 100644 --- a/Expand-tilesets-from-192-to-255-tiles.md +++ b/Expand-tilesets-from-192-to-255-tiles.md @@ -570,7 +570,7 @@ Edit [engine/pokemon/correct_nick_errors.asm](../blob/master/engine/pokemon/corr ; table defining which characters are actually text commands ; format: ; ≥ < - db TX_START, TX_BOX + 1 + db "<NULL>", "ガ" db "<PLAY_G>", "<JP_18>" + 1 db "<NI>", "<NO>" + 1 db "<ROUTE>", "<GREEN>" + 1 diff --git a/Infinitely-reusable-TMs.md b/Infinitely-reusable-TMs.md index 7bcccdc..22da3fb 100644 --- a/Infinitely-reusable-TMs.md +++ b/Infinitely-reusable-TMs.md @@ -178,7 +178,7 @@ Edit [engine/items/mart.asm](../blob/master/engine/items/mart.asm): + ret + +.AlreadyHaveTMText: -+ text_jump AlreadyHaveTMText ++ text_far AlreadyHaveTMText + db "@" ``` diff --git a/Remove-the-artificial-save-delay.md b/Remove-the-artificial-save-delay.md index ecefefd..993a08c 100644 --- a/Remove-the-artificial-save-delay.md +++ b/Remove-the-artificial-save-delay.md @@ -71,7 +71,7 @@ The deleted function also references a text element, which in turn makes a far j ```diff -Text_SavingDontTurnOffThePower: - ; SAVING… DON'T TURN OFF THE POWER. -- text_jump UnknownText_0x1c456d +- text_far UnknownText_0x1c456d - db "@" ``` @@ -228,7 +228,7 @@ Fortunately, since the game already contains separate texts for each situation, -Text_AlreadyASaveFile: - ; There is already a save file. Is it OK to overwrite? -- text_jump UnknownText_0x1c45a3 +- text_far UnknownText_0x1c45a3 - db "@" ``` diff --git a/Remove-the-redundant-move-grammar-table.md b/Remove-the-redundant-move-grammar-table.md index ba87a21..14aa09e 100644 --- a/Remove-the-redundant-move-grammar-table.md +++ b/Remove-the-redundant-move-grammar-table.md @@ -75,7 +75,7 @@ Edit [engine/battle/used_move_text.asm](../blob/master/engine/battle/used_move_t ```diff UsedMoveText: ; this is a stream of text and asm from 105db9 to 105ef6 - text_jump _ActorNameText + text_far _ActorNameText start_asm ldh a, [hBattleTurn] and a @@ -133,14 +133,14 @@ Edit [engine/battle/used_move_text.asm](../blob/master/engine/battle/used_move_t ret -UsedMove1Text: -- text_jump _UsedMove1Text +- text_far _UsedMove1Text - start_asm - jr UsedMoveText_CheckObedience - -UsedMove2Text: -- text_jump _UsedMove2Text +- text_far _UsedMove2Text +UsedMoveInsteadText: -+ text_jump _UsedMoveText ++ text_far _UsedMoveText start_asm -UsedMoveText_CheckObedience: ; check obedience @@ -152,14 +152,14 @@ Edit [engine/battle/used_move_text.asm](../blob/master/engine/battle/used_move_t ret .UsedInsteadText: - text_jump _UsedInsteadText + text_far _UsedInsteadText start_asm .GetMoveNameText: ld hl, MoveNameText ret MoveNameText: - text_jump _MoveNameText + text_far _MoveNameText - start_asm -; get start address - ld hl, .endusedmovetexts @@ -192,19 +192,19 @@ Edit [engine/battle/used_move_text.asm](../blob/master/engine/battle/used_move_t - dw EndUsedMove5Text - -EndUsedMove1Text: -- text_jump _EndUsedMove1Text +- text_far _EndUsedMove1Text - db "@" -EndUsedMove2Text: -- text_jump _EndUsedMove2Text +- text_far _EndUsedMove2Text - db "@" -EndUsedMove3Text: -- text_jump _EndUsedMove3Text +- text_far _EndUsedMove3Text - db "@" -EndUsedMove4Text: -- text_jump _EndUsedMove4Text +- text_far _EndUsedMove4Text - db "@" -EndUsedMove5Text: -- text_jump _EndUsedMove5Text +- text_far _EndUsedMove5Text db "@" - -GetMoveGrammar: diff --git a/Rock-Climb.md b/Rock-Climb.md index 9474151..2d3dd09 100644 --- a/Rock-Climb.md +++ b/Rock-Climb.md @@ -293,15 +293,15 @@ Edit [engine/events/overworld.asm](../blob/master/engine/events/overworld.asm): + step_end + +AskRockClimbText: -+ text_jump _AskRockClimbText ++ text_far _AskRockClimbText + db "@" + +UsedRockClimbText: -+ text_jump _UsedRockClimbText ++ text_far _UsedRockClimbText + db "@" + +CantRockClimbText: -+ text_jump _CantRockClimbText ++ text_far _CantRockClimbText + db "@" ``` |