Merge pull request #573 from mid-kid/master

text_jump → text_far
This commit is contained in:
Rangi 2018-11-11 17:07:17 -05:00 committed by GitHub
commit ffd2b70902
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
91 changed files with 878 additions and 873 deletions

View File

@ -4,16 +4,20 @@
- [**GBZ80 instructions**][gbz80-instructions]: List of CPU instructions and their effects.
- [**RGBASM features**][rgbasm-features]: How to use the assembler features: constants, labels, sections, macros, etc.
- [**RGBLINK features**][rgblink-features]: How to use the linker, including the [pokecrystal.link](/pokecrystal.link) linkerscript.
- [**ASMSchool**][asmschool]: A gameboy assembly tutorial.
- [**GB ASM Tutorial**][gb-asm-tutorial]: A newer but still in-progress asm tutorial.
- [**Pan Docs**][pan-docs]: Everything You Always Wanted To Know About GAMEBOY (but were afraid to ask).
- [**GameBoy Programming Manual**][gb-manual]: The official GameBoy programming and hardware manual by Nintendo.
- [**GameBoy Opcode Summary**][gb-opcodes]: Describes the opcodes of GameBoy assembly language.
- [**GameBoy Memory Map**][gb-memory-map]: Describes the GameBoy Color address space.
- [**awesome-gbdev**][awesome-gbdev]: A curated list of Game Boy development resources such as tools, docs, emulators, related projects and open-source ROMs.
[rgbds-doc]: https://rednex.github.io/
[rgbds-doc]: https://rednex.github.io/rgbds/
[rgbasm-features]: https://rednex.github.io/rgbds/rgbasm.5.html
[rgblink-features]: https://rednex.github.io/rgbds/rgblink.5.html
[gbz80-instructions]: https://rednex.github.io/rgbds/gbz80.7.html
[asmschool]: http://gameboy.mongenel.com/asmschool.html
[gb-asm-tutorial]: https://eldred.fr/gb-asm-tutorial/
[pan-docs]: http://bgb.bircd.org/pandocs.htm
[gb-manual]: https://ia801906.us.archive.org/19/items/GameBoyProgManVer1.1/GameBoyProgManVer1.1.pdf
[gb-opcodes]: http://www.devrs.com/gb/files/opcodes.html

View File

@ -708,7 +708,7 @@ AI_Switch:
ret
TextJump_EnemyWithdrew:
text_jump Text_EnemyWithdrew
text_far Text_EnemyWithdrew
db "@"
Function384d5: ; This appears to be unused
@ -828,5 +828,5 @@ PrintText_UsedItemOn:
jp PrintText
TextJump_EnemyUsedOn:
text_jump Text_EnemyUsedOn
text_far Text_EnemyUsedOn
db "@"

View File

@ -7398,7 +7398,7 @@ BoostExp:
ret
Text_MonGainedExpPoint:
text_jump Text_Gained
text_far Text_Gained
start_asm
ld hl, TextJump_StringBuffer2ExpPoints
ld a, [wStringBuffer2 + 2] ; IsTradedMon
@ -7409,11 +7409,11 @@ Text_MonGainedExpPoint:
ret
TextJump_ABoostedStringBuffer2ExpPoints:
text_jump Text_ABoostedStringBuffer2ExpPoints
text_far Text_ABoostedStringBuffer2ExpPoints
db "@"
TextJump_StringBuffer2ExpPoints:
text_jump Text_StringBuffer2ExpPoints
text_far Text_StringBuffer2ExpPoints
db "@"
AnimateExpBar:
@ -7664,29 +7664,29 @@ SendOutMonText:
jp BattleTextBox
JumpText_GoMon:
text_jump Text_GoMon
text_far Text_GoMon
start_asm
jr Function_TextJump_BattleMonNick01
JumpText_DoItMon:
text_jump Text_DoItMon
text_far Text_DoItMon
start_asm
jr Function_TextJump_BattleMonNick01
JumpText_GoForItMon:
text_jump Text_GoForItMon
text_far Text_GoForItMon
start_asm
jr Function_TextJump_BattleMonNick01
JumpText_YourFoesWeakGetmMon:
text_jump Text_YourFoesWeakGetmMon
text_far Text_YourFoesWeakGetmMon
start_asm
Function_TextJump_BattleMonNick01:
ld hl, TextJump_BattleMonNick01
ret
TextJump_BattleMonNick01:
text_jump Text_BattleMonNick01
text_far Text_BattleMonNick01
db "@"
WithdrawMonText:
@ -7694,7 +7694,7 @@ WithdrawMonText:
jp BattleTextBox
.WithdrawMonText:
text_jump Text_BattleMonNickComma
text_far Text_BattleMonNickComma
start_asm
; Print text to withdraw mon
; depending on HP the message is different
@ -7745,15 +7745,15 @@ WithdrawMonText:
ret
TextJump_ThatsEnoughComeBack:
text_jump Text_ThatsEnoughComeBack
text_far Text_ThatsEnoughComeBack
db "@"
TextJump_OKComeBack:
text_jump Text_OKComeBack
text_far Text_OKComeBack
db "@"
TextJump_GoodComeBack:
text_jump Text_GoodComeBack
text_far Text_GoodComeBack
db "@"
Unreferenced_TextJump_ComeBack:
@ -7762,7 +7762,7 @@ Unreferenced_TextJump_ComeBack:
ret
TextJump_ComeBack:
text_jump Text_ComeBack
text_far Text_ComeBack
db "@"
Unreferenced_HandleSafariAngerEatingStatus:

View File

@ -4542,7 +4542,7 @@ BattleCommand_StatUpMessage:
jp BattleTextBox
.stat
text_jump UnknownText_0x1c0cc6
text_far UnknownText_0x1c0cc6
start_asm
ld hl, .up
ld a, [wLoweredStat]
@ -4552,11 +4552,11 @@ BattleCommand_StatUpMessage:
ret
.wayup
text_jump UnknownText_0x1c0cd0
text_far UnknownText_0x1c0cd0
db "@"
.up
text_jump UnknownText_0x1c0ce0
text_far UnknownText_0x1c0ce0
db "@"
BattleCommand_StatDownMessage:
@ -4572,7 +4572,7 @@ BattleCommand_StatDownMessage:
jp BattleTextBox
.stat
text_jump UnknownText_0x1c0ceb
text_far UnknownText_0x1c0ceb
start_asm
ld hl, .fell
ld a, [wLoweredStat]
@ -4582,10 +4582,10 @@ BattleCommand_StatDownMessage:
ret
.sharplyfell
text_jump UnknownText_0x1c0cf5
text_far UnknownText_0x1c0cf5
db "@"
.fell
text_jump UnknownText_0x1c0d06
text_far UnknownText_0x1c0d06
db "@"
TryLowerStat:
@ -5636,7 +5636,7 @@ BattleCommand_Charge:
jp EndMoveEffect
.UsedText:
text_jump UnknownText_0x1c0d0e ; "<USER>"
text_far UnknownText_0x1c0d0e ; "<USER>"
start_asm
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
@ -5668,32 +5668,32 @@ BattleCommand_Charge:
.RazorWind:
; 'made a whirlwind!'
text_jump UnknownText_0x1c0d12
text_far UnknownText_0x1c0d12
db "@"
.Solarbeam:
; 'took in sunlight!'
text_jump UnknownText_0x1c0d26
text_far UnknownText_0x1c0d26
db "@"
.SkullBash:
; 'lowered its head!'
text_jump UnknownText_0x1c0d3a
text_far UnknownText_0x1c0d3a
db "@"
.SkyAttack:
; 'is glowing!'
text_jump UnknownText_0x1c0d4e
text_far UnknownText_0x1c0d4e
db "@"
.Fly:
; 'flew up high!'
text_jump UnknownText_0x1c0d5c
text_far UnknownText_0x1c0d5c
db "@"
.Dig:
; 'dug a hole!'
text_jump UnknownText_0x1c0d6c
text_far UnknownText_0x1c0d6c
db "@"
BattleCommand3c:

View File

@ -6,7 +6,7 @@ DisplayUsedMoveText:
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
@ -58,12 +58,12 @@ UsedMoveText:
ret
UsedMove1Text:
text_jump _UsedMove1Text
text_far _UsedMove1Text
start_asm
jr UsedMoveText_CheckObedience
UsedMove2Text:
text_jump _UsedMove2Text
text_far _UsedMove2Text
start_asm
UsedMoveText_CheckObedience:
; check obedience
@ -75,14 +75,14 @@ UsedMoveText_CheckObedience:
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
@ -115,19 +115,19 @@ MoveNameText:
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:

View File

@ -22,7 +22,7 @@ CheckForMobileBattleRules:
.ExcuseMeText:
; Excuse me!
text_jump UnknownText_0x1c5937
text_far UnknownText_0x1c5937
db "@"
_CheckForBattleTowerRules:
@ -57,7 +57,7 @@ _CheckForBattleTowerRules:
JumpText_ExcuseMeYoureNotReady:
; Excuse me. You're not ready.
text_jump Text_ExcuseMeYoureNotReady
text_far Text_ExcuseMeYoureNotReady
db "@"
BattleTower_PleaseReturnWhenReady:
@ -67,37 +67,37 @@ BattleTower_PleaseReturnWhenReady:
.PleaseReturnWhenReady:
; Please return when you're ready.
text_jump UnknownText_0x1c5962
text_far UnknownText_0x1c5962
db "@"
JumpText_NeedAtLeastThreeMon:
; You need at least three #MON.
text_jump UnknownText_0x1c5983
text_far UnknownText_0x1c5983
db "@"
JumpText_EggDoesNotQualify:
; Sorry, an EGG doesn't qualify.
text_jump UnknownText_0x1c59a3
text_far UnknownText_0x1c59a3
db "@"
JumpText_OnlyThreeMonMayBeEntered:
; Only three #MON may be entered.
text_jump Text_OnlyThreeMonMayBeEntered
text_far Text_OnlyThreeMonMayBeEntered
db "@"
JumpText_TheMonMustAllBeDifferentKinds:
; The @ #MON must all be different kinds.
text_jump Text_TheMonMustAllBeDifferentKinds
text_far Text_TheMonMustAllBeDifferentKinds
db "@"
JumpText_TheMonMustNotHoldTheSameItems:
; The @ #MON must not hold the same items.
text_jump Text_TheMonMustNotHoldTheSameItems
text_far Text_TheMonMustNotHoldTheSameItems
db "@"
JumpText_YouCantTakeAnEgg:
; You can't take an EGG!
text_jump Text_YouCantTakeAnEgg
text_far Text_YouCantTakeAnEgg
db "@"
BattleTower_ExecuteJumptable:

File diff suppressed because it is too large Load Diff

View File

@ -148,31 +148,31 @@ BuenaPrize:
.Text_AskWhichPrize:
; Which prize would you like?
text_jump UnknownText_0x1c589f
text_far UnknownText_0x1c589f
db "@"
.Text_IsThatRight:
; ? Is that right?
text_jump UnknownText_0x1c58bc
text_far UnknownText_0x1c58bc
db "@"
.Text_HereYouGo: ; Here you go!
text_jump UnknownText_0x1c58d1
text_far UnknownText_0x1c58d1
db "@"
.Text_NotEnoughPoints:
; You don't have enough points.
text_jump UnknownText_0x1c58e0
text_far UnknownText_0x1c58e0
db "@"
.Text_NoRoom:
; You have no room for it.
text_jump UnknownText_0x1c58ff
text_far UnknownText_0x1c58ff
db "@"
.Text_PleaseComeBackAgain:
; Oh. Please come back again!
text_jump UnknownText_0x1c591a
text_far UnknownText_0x1c591a
db "@"
Buena_DisplayBlueCardBalance:

View File

@ -34,5 +34,5 @@ BugContest_SetCaughtContestMon:
.caughttext
; Caught @ !
text_jump UnknownText_0x1c10c0
text_far UnknownText_0x1c10c0
db "@"

View File

@ -34,10 +34,10 @@ BugCatchingContestReturnToGateScript:
BugCatchingContestText_BeeepTimesUp:
; ANNOUNCER: BEEEP! Time's up!
text_jump UnknownText_0x1bd2ca
text_far UnknownText_0x1bd2ca
db "@"
BugCatchingContestText_ContestIsOver:
; ANNOUNCER: The Contest is over!
text_jump UnknownText_0x1bd2e7
text_far UnknownText_0x1bd2e7
db "@"

View File

@ -88,7 +88,7 @@ DisplayCaughtContestMonStats:
SwitchMonText:
; Switch #MON?
text_jump UnknownText_0x1c10cf
text_far UnknownText_0x1c10cf
db "@"
DisplayAlreadyCaughtText:
@ -98,7 +98,7 @@ DisplayAlreadyCaughtText:
.AlreadyCaughtText:
; You already caught a @ .
text_jump UnknownText_0x1c10dd
text_far UnknownText_0x1c10dd
db "@"
DummyPredef2F:

View File

@ -26,7 +26,7 @@ _BugContestJudging:
jp BugContest_GetPlayersResult
BugContest_FirstPlaceText:
text_jump ContestJudging_FirstPlaceText
text_far ContestJudging_FirstPlaceText
start_asm
ld de, SFX_1ST_PLACE
call PlaySFX
@ -36,12 +36,12 @@ BugContest_FirstPlaceText:
BugContest_FirstPlaceScoreText:
; The winning score was @ points!
text_jump ContestJudging_FirstPlaceScoreText
text_far ContestJudging_FirstPlaceScoreText
db "@"
BugContest_SecondPlaceText:
; Placing second was @ , who caught a @ !@ @
text_jump ContestJudging_SecondPlaceText
text_far ContestJudging_SecondPlaceText
start_asm
ld de, SFX_2ND_PLACE
call PlaySFX
@ -51,12 +51,12 @@ BugContest_SecondPlaceText:
BugContest_SecondPlaceScoreText:
; The score was @ points!
text_jump ContestJudging_SecondPlaceScoreText
text_far ContestJudging_SecondPlaceScoreText
db "@"
BugContest_ThirdPlaceText:
; Placing third was @ , who caught a @ !@ @
text_jump ContestJudging_ThirdPlaceText
text_far ContestJudging_ThirdPlaceText
start_asm
ld de, SFX_3RD_PLACE
call PlaySFX
@ -66,7 +66,7 @@ BugContest_ThirdPlaceText:
BugContest_ThirdPlaceScoreText:
; The score was @ points!
text_jump ContestJudging_ThirdPlaceScoreText
text_far ContestJudging_ThirdPlaceScoreText
db "@"
LoadContestantName:

View File

@ -168,7 +168,7 @@ DayCareAskDepositPokemon:
.DummyText:
;
text_jump UnknownText_0x1bdaa7
text_far UnknownText_0x1bdaa7
db "@"
DayCare_DepositPokemonText:
@ -297,102 +297,102 @@ PrintDayCareText:
.DayCareManIntro:
; I'm the DAY-CARE MAN. Want me to raise a #MON?
text_jump UnknownText_0x1bdaa9
text_far UnknownText_0x1bdaa9
db "@"
.DayCareManOddEgg:
; I'm the DAY-CARE MAN. Do you know about EGGS? I was raising #MON with my wife, you see. We were shocked to find an EGG! How incredible is that? So, want me to raise a #MON?
text_jump UnknownText_0x1bdad8
text_far UnknownText_0x1bdad8
db "@"
.DayCareLadyIntro:
; I'm the DAY-CARE LADY. Should I raise a #MON for you?
text_jump UnknownText_0x1bdb85
text_far UnknownText_0x1bdb85
db "@"
.DayCareLadyOddEgg:
; I'm the DAY-CARE LADY. Do you know about EGGS? My husband and I were raising some #MON, you see. We were shocked to find an EGG! How incredible could that be? Should I raise a #MON for you?
text_jump UnknownText_0x1bdbbb
text_far UnknownText_0x1bdbbb
db "@"
.WhichOne:
; What should I raise for you?
text_jump UnknownText_0x1bdc79
text_far UnknownText_0x1bdc79
db "@"
.JustOneMon:
; Oh? But you have just one #MON.
text_jump UnknownText_0x1bdc97
text_far UnknownText_0x1bdc97
db "@"
.CantAcceptEgg:
; Sorry, but I can't accept an EGG.
text_jump UnknownText_0x1bdcb8
text_far UnknownText_0x1bdcb8
db "@"
.RemoveMail:
; Remove MAIL before you come see me.
text_jump UnknownText_0x1bdcda
text_far UnknownText_0x1bdcda
db "@"
.LastHealthyMon:
; If you give me that, what will you battle with?
text_jump UnknownText_0x1bdcff
text_far UnknownText_0x1bdcff
db "@"
.OkayIllRaiseYourMon:
; OK. I'll raise your @ .
text_jump UnknownText_0x1bdd30
text_far UnknownText_0x1bdd30
db "@"
.ComeBackForItLater:
; Come back for it later.
text_jump UnknownText_0x1bdd4b
text_far UnknownText_0x1bdd4b
db "@"
.AreWeGeniusesOrWhat:
; Are we geniuses or what? Want to see your @ ?
text_jump UnknownText_0x1bdd64
text_far UnknownText_0x1bdd64
db "@"
.AskRetrieveMon:
; Your @ has grown a lot. By level, it's grown by @ . If you want your #MON back, it will cost ¥@ .
text_jump UnknownText_0x1bdd96
text_far UnknownText_0x1bdd96
db "@"
.PerfectHeresYourMon:
; Perfect! Here's your #MON.
text_jump UnknownText_0x1bde04
text_far UnknownText_0x1bde04
db "@"
.GotBackMon:
; got back @ .
text_jump UnknownText_0x1bde1f
text_far UnknownText_0x1bde1f
db "@"
.ImmediatelyWithdrawMon:
; Huh? Back already? Your @ needs a little more time with us. If you want your #MON back, it will cost ¥100.
text_jump UnknownText_0x1bde32
text_far UnknownText_0x1bde32
db "@"
.PartyFull:
; You have no room for it.
text_jump UnknownText_0x1bdea2
text_far UnknownText_0x1bdea2
db "@"
.NotEnoughMoney:
; You don't have enough money.
text_jump UnknownText_0x1bdebc
text_far UnknownText_0x1bdebc
db "@"
.OhFineThen:
; Oh, fine then.
text_jump UnknownText_0x1bded9
text_far UnknownText_0x1bded9
db "@"
.ComeAgain:
; Come again.
text_jump UnknownText_0x1bdee9
text_far UnknownText_0x1bdee9
db "@"
DayCareManOutside:
@ -405,7 +405,7 @@ DayCareManOutside:
.NotYet:
; Not yet…
text_jump UnknownText_0x1bdef6
text_far UnknownText_0x1bdef6
db "@"
.AskGiveEgg:
@ -447,27 +447,27 @@ DayCareManOutside:
.IntroText:
; Ah, it's you! We were raising your #MON, and my goodness, were we surprised! Your #MON had an EGG! We don't know how it got there, but your #MON had it. You want it?
text_jump UnknownText_0x1bdf00
text_far UnknownText_0x1bdf00
db "@"
.GotEggText:
; received the EGG!
text_jump UnknownText_0x1bdfa5
text_far UnknownText_0x1bdfa5
db "@"
.TakeGoodCareOfItText:
; Take good care of it.
text_jump UnknownText_0x1bdfba
text_far UnknownText_0x1bdfba
db "@"
.IllKeepItThanksText:
; Well then, I'll keep it. Thanks!
text_jump UnknownText_0x1bdfd1
text_far UnknownText_0x1bdfd1
db "@"
.PartyFullText:
; You have no room in your party. Come back later.
text_jump UnknownText_0x1bdff2
text_far UnknownText_0x1bdff2
db "@"
DayCare_GiveEgg:

View File

@ -139,7 +139,7 @@ Elevator_AskWhichFloor:
Elevator_WhichFloorText:
; Which floor?
text_jump UnknownText_0x1bd2bc
text_far UnknownText_0x1bd2bc
db "@"
Elevator_GetCurrentFloorText:

View File

@ -97,21 +97,21 @@ GetFruitTreeItem:
INCLUDE "data/items/fruit_trees.asm"
FruitBearingTreeText:
text_jump _FruitBearingTreeText
text_far _FruitBearingTreeText
db "@"
HeyItsFruitText:
text_jump _HeyItsFruitText
text_far _HeyItsFruitText
db "@"
ObtainedFruitText:
text_jump _ObtainedFruitText
text_far _ObtainedFruitText
db "@"
FruitPackIsFullText:
text_jump _FruitPackIsFullText
text_far _FruitPackIsFullText
db "@"
NothingHereText:
text_jump _NothingHereText
text_far _NothingHereText
db "@"

View File

@ -43,10 +43,10 @@ ItemFinder:
.Text_FoundSomething:
; Yes! ITEMFINDER indicates there's an item nearby.
text_jump UnknownText_0x1c0a77
text_far UnknownText_0x1c0a77
db "@"
.Text_FoundNothing:
; Nope! ITEMFINDER isn't responding.
text_jump UnknownText_0x1c0aa9
text_far UnknownText_0x1c0aa9
db "@"

View File

@ -5,7 +5,7 @@ Kurt_PrintTextWhichApricorn:
.Text:
; Which APRICORN should I use?
text_jump UnknownText_0x1bc06b
text_far UnknownText_0x1bc06b
db "@"
Kurt_PrintTextHowMany:
@ -15,7 +15,7 @@ Kurt_PrintTextHowMany:
.Text:
; How many should I make?
text_jump UnknownText_0x1bc089
text_far UnknownText_0x1bc089
db "@"
SelectApricornForKurt:

View File

@ -208,12 +208,12 @@ CheckForLuckyNumberWinners:
.FoundPartymonText:
; Congratulations! We have a match with the ID number of @ in your party.
text_jump UnknownText_0x1c1261
text_far UnknownText_0x1c1261
db "@"
.FoundBoxmonText:
; Congratulations! We have a match with the ID number of @ in your PC BOX.
text_jump UnknownText_0x1c12ae
text_far UnknownText_0x1c12ae
db "@"
PrintTodaysLuckyNumber:

View File

@ -73,7 +73,7 @@ CheckMagikarpLength:
.MeasureItText:
; Let me measure that MAGIKARP. …Hm, it measures @ .
text_jump UnknownText_0x1c1203
text_far UnknownText_0x1c1203
db "@"
Magikarp_LoadFeetInchesChars:
@ -313,5 +313,5 @@ MagikarpHouseSign:
.CurrentRecordtext:
; "CURRENT RECORD"
text_jump UnknownText_0x1c123a
text_far UnknownText_0x1c123a
db "@"

View File

@ -29,12 +29,12 @@ FindItemInBallScript::
.text_found
; found @ !
text_jump UnknownText_0x1c0a1c
text_far UnknownText_0x1c0a1c
db "@"
.text_bag_full
; But can't carry any more items.
text_jump UnknownText_0x1c0a2c
text_far UnknownText_0x1c0a2c
db "@"
.TryReceiveItem:

Some files were not shown because too many files have changed in this diff Show More