foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-22 22:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split hSpriteIndexOrTextID into hSpriteIndex and hTextID (#462)

Browse source 
Also identify `wPPUpCountAndMaxPP`
This commit is contained in:
Sylvie 2024-09-18 21:01:18 -04:00 • committed by GitHub
parent 1f6e2bf999
commit 613d34678b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
73 changed files with 182 additions and 181 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/text/text_2.asm
View file

@ -1781,7 +1781,7 @@ _WillBeTradedText::
done done
_TextIDErrorText:: _TextIDErrorText::
text_decimal hSpriteIndexOrTextID, 1, 2 text_decimal hTextID, 1, 2
text " ERROR." text " ERROR."
done done

2
engine/battle/battle_transitions.asm
View file

@ -11,7 +11,7 @@ BattleTransition:
; Determine which OAM block is being used by the enemy trainer sprite (if there ; Determine which OAM block is being used by the enemy trainer sprite (if there
; is one). ; is one).
ld hl, wSpritePlayerStateData1ImageIndex ld hl, wSpritePlayerStateData1ImageIndex
ldh a, [hSpriteIndexOrTextID] ; enemy trainer sprite index (0 if wild battle) ldh a, [hSpriteIndex] ; enemy trainer sprite index (0 if wild battle)
ld c, a ld c, a
ld b, 0 ld b, 0
ld de, $10 ld de, $10

2
engine/battle/wild_encounters.asm
View file

@ -90,7 +90,7 @@ TryDoWildEncounter:
.lastRepelStep .lastRepelStep
ld [wRepelRemainingSteps], a ld [wRepelRemainingSteps], a
ld a, TEXT_REPEL_WORE_OFF ld a, TEXT_REPEL_WORE_OFF
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
call DisplayTextID call DisplayTextID
.CantEncounter2 .CantEncounter2

4
engine/events/card_key.asm
View file

@ -28,7 +28,7 @@ PrintCardKeyText:
call GetCoordsInFrontOfPlayer call GetCoordsInFrontOfPlayer
push de push de
tx_pre_id CardKeySuccessText tx_pre_id CardKeySuccessText
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call PrintPredefTextID call PrintPredefTextID
pop de pop de
srl d srl d
@ -55,7 +55,7 @@ PrintCardKeyText:
jp PlaySound jp PlaySound
.noCardKey .noCardKey
tx_pre_id CardKeyFailText tx_pre_id CardKeyFailText
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp PrintPredefTextID jp PrintPredefTextID
INCLUDE "data/events/card_key_maps.asm" INCLUDE "data/events/card_key_maps.asm"

2
engine/events/hidden_objects/safari_game.asm
View file

@ -41,7 +41,7 @@ SafariZoneGameOver:
cp SFX_SAFARI_ZONE_PA cp SFX_SAFARI_ZONE_PA
jr nz, .waitForMusicToPlay jr nz, .waitForMusicToPlay
ld a, TEXT_SAFARI_GAME_OVER ld a, TEXT_SAFARI_GAME_OVER
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [wPlayerMovingDirection], a ld [wPlayerMovingDirection], a

4
engine/events/pick_up_item.asm
View file

@ -1,7 +1,7 @@
PickUpItem: PickUpItem:
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ldh a, [hSpriteIndexOrTextID] ldh a, [hSpriteIndex]
ld b, a ld b, a
ld hl, wMissableObjectList ld hl, wMissableObjectList
.missableObjectsListLoop .missableObjectsListLoop
@ -18,7 +18,7 @@ PickUpItem:
ldh [hMissableObjectIndex], a ldh [hMissableObjectIndex], a
ld hl, wMapSpriteExtraData ld hl, wMapSpriteExtraData
ldh a, [hSpriteIndexOrTextID] ldh a, [hSpriteIndex]
dec a dec a
add a add a
ld d, 0 ld d, 0

4
engine/events/poison.asm
View file

@ -53,7 +53,7 @@ ApplyOutOfBattlePoisonDamage:
ld [wJoyIgnore], a ld [wJoyIgnore], a
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld a, TEXT_MON_FAINTED ld a, TEXT_MON_FAINTED
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
pop de pop de
pop hl pop hl
@ -100,7 +100,7 @@ ApplyOutOfBattlePoisonDamage:
jr nz, .noBlackOut jr nz, .noBlackOut
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld a, TEXT_BLACKED_OUT ld a, TEXT_BLACKED_OUT
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld hl, wStatusFlags4 ld hl, wStatusFlags4
set BIT_BATTLE_OVER_OR_BLACKOUT, [hl] set BIT_BATTLE_OVER_OR_BLACKOUT, [hl]

21
engine/events/prize_menu.asm
View file

@ -56,17 +56,14 @@ WhichPrizeTextPtr:
text_end text_end
GetPrizeMenuId: GetPrizeMenuId:
; determine which one among the three ; determine which one among the three prize texts has been selected using the text ID (stored in [hTextID])
; prize-texts has been selected ; prize texts' IDs are TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_1-TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_3
; using the text ID (stored in [hSpriteIndexOrTextID]) ; load the three prizes at wPrize1-wPrice3
; load the three prizes at wd13d-wd13f ; load the three prices at wPrize1Price-wPrize3Price
; load the three prices at wd141-wd146 ; display the three prizes' names, distinguishing between Pokemon names and item names (specifically TMs)
; display the three prizes' names ldh a, [hTextID]
; (distinguishing between Pokemon names sub TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_1
; and Items (specifically TMs) names) ld [wWhichPrizeWindow], a ; prize texts' relative ID (i.e. 0-2)
ldh a, [hSpriteIndexOrTextID]
sub 3 ; prize-texts' id are 3, 4 and 5
ld [wWhichPrizeWindow], a ; prize-texts' id (relative, i.e. 0, 1 or 2)
add a add a
add a add a
ld d, 0 ld d, 0
@ -88,7 +85,7 @@ GetPrizeMenuId:
ld bc, 6 ld bc, 6
call CopyData call CopyData
ld a, [wWhichPrizeWindow] ld a, [wWhichPrizeWindow]
cp 2 ;is TM_menu? cp 2 ; is TM_menu?
jr nz, .putMonName jr nz, .putMonName
ld a, [wPrize1] ld a, [wPrize1]
ld [wd11e], a ld [wd11e], a

7
engine/items/item_effects.asm
View file

@ -688,11 +688,11 @@ ItemUseSurfboard:
jp PrintText jp PrintText
.tryToStopSurfing .tryToStopSurfing
xor a xor a
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndex], a
ld d, 16 ; talking range in pixels (normal range) ld d, 16 ; talking range in pixels (normal range)
call IsSpriteInFrontOfPlayer2 call IsSpriteInFrontOfPlayer2
res 7, [hl] res 7, [hl]
ldh a, [hSpriteIndexOrTextID] ldh a, [hSpriteIndex]
and a ; is there a sprite in the way? and a ; is there a sprite in the way?
jr nz, .cannotStopSurfing jr nz, .cannotStopSurfing
ld hl, TilePairCollisionsWater ld hl, TilePairCollisionsWater
@ -2512,9 +2512,10 @@ GetMaxPP:
and %11000000 ; get PP Up count and %11000000 ; get PP Up count
pop bc pop bc
or b ; place normal max PP in 6 lower bits of a or b ; place normal max PP in 6 lower bits of a
assert wMoveData + MOVE_PP + 1 == wPPUpCountAndMaxPP
ld h, d ld h, d
ld l, e ld l, e
inc hl ; hl = wcd73 inc hl ; hl = wPPUpCountAndMaxPP
ld [hl], a ld [hl], a
xor a ; add the bonus for the existing PP Up count xor a ; add the bonus for the existing PP Up count
ld [wUsingPPUp], a ld [wUsingPPUp], a

2
engine/menus/display_text_id_init.asm
View file

@ -5,7 +5,7 @@ DisplayTextIDInit::
ld a, [wAutoTextBoxDrawingControl] ld a, [wAutoTextBoxDrawingControl]
bit 0, a bit 0, a
jr nz, .skipDrawingTextBoxBorder jr nz, .skipDrawingTextBoxBorder
ldh a, [hSpriteIndexOrTextID] ; text ID (or sprite ID) ldh a, [hTextID]
and a and a
jr nz, .notStartMenu jr nz, .notStartMenu
; if text ID is 0 (i.e. the start menu) ; if text ID is 0 (i.e. the start menu)

6
engine/overworld/push_boulder.asm
View file

@ -6,15 +6,15 @@ TryPushingBoulder::
bit BIT_BOULDER_DUST, a bit BIT_BOULDER_DUST, a
ret nz ret nz
xor a xor a
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndex], a
call IsSpriteInFrontOfPlayer call IsSpriteInFrontOfPlayer
ldh a, [hSpriteIndexOrTextID] ldh a, [hSpriteIndex]
ld [wBoulderSpriteIndex], a ld [wBoulderSpriteIndex], a
and a and a
jp z, ResetBoulderPushFlags jp z, ResetBoulderPushFlags
ld hl, wSpritePlayerStateData1MovementStatus ld hl, wSpritePlayerStateData1MovementStatus
ld d, $0 ld d, $0
ldh a, [hSpriteIndexOrTextID] ldh a, [hSpriteIndex]
swap a swap a
ld e, a ld e, a
add hl, de add hl, de

20
home/overworld.asm
View file

@ -76,7 +76,7 @@ OverworldLoopLessDelay::
jr z, .startButtonNotPressed jr z, .startButtonNotPressed
; if START is pressed ; if START is pressed
xor a ; TEXT_START_MENU xor a ; TEXT_START_MENU
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp .displayDialogue jp .displayDialogue
.startButtonNotPressed .startButtonNotPressed
bit BIT_A_BUTTON, a bit BIT_A_BUTTON, a
@ -92,7 +92,7 @@ OverworldLoopLessDelay::
and a and a
jp z, OverworldLoop ; jump if a hidden object or bookshelf was found, but not if a card key door was found jp z, OverworldLoop ; jump if a hidden object or bookshelf was found, but not if a card key door was found
call IsSpriteOrSignInFrontOfPlayer call IsSpriteOrSignInFrontOfPlayer
ldh a, [hSpriteIndexOrTextID] ldh a, [hTextID]
and a and a
jp z, OverworldLoop jp z, OverworldLoop
.displayDialogue .displayDialogue
@ -1072,11 +1072,11 @@ LoadEastWestConnectionsTileMap::
ret ret
; function to check if there is a sign or sprite in front of the player ; function to check if there is a sign or sprite in front of the player
; if so, it is stored in [hSpriteIndexOrTextID] ; if so, it is stored in [hTextID]
; if not, [hSpriteIndexOrTextID] is set to 0 ; if not, [hTextID] is set to 0
IsSpriteOrSignInFrontOfPlayer:: IsSpriteOrSignInFrontOfPlayer::
xor a xor a
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
ld a, [wNumSigns] ld a, [wNumSigns]
and a and a
jr z, .extendRangeOverCounter jr z, .extendRangeOverCounter
@ -1106,7 +1106,7 @@ IsSpriteOrSignInFrontOfPlayer::
dec c dec c
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
ldh [hSpriteIndexOrTextID], a ; store sign text ID ldh [hTextID], a ; store sign text ID
pop bc pop bc
pop hl pop hl
ret ret
@ -1127,7 +1127,7 @@ IsSpriteOrSignInFrontOfPlayer::
jr nz, .counterTilesLoop jr nz, .counterTilesLoop
; part of the above function, but sometimes its called on its own, when signs are irrelevant ; part of the above function, but sometimes its called on its own, when signs are irrelevant
; the caller must zero [hSpriteIndexOrTextID] ; the caller must zero [hTextID]
IsSpriteInFrontOfPlayer:: IsSpriteInFrontOfPlayer::
ld d, $10 ; talking range in pixels (normal range) ld d, $10 ; talking range in pixels (normal range)
IsSpriteInFrontOfPlayer2:: IsSpriteInFrontOfPlayer2::
@ -1212,7 +1212,7 @@ IsSpriteInFrontOfPlayer2::
ld l, a ; hl = x#SPRITESTATEDATA1_MOVEMENTSTATUS ld l, a ; hl = x#SPRITESTATEDATA1_MOVEMENTSTATUS
set 7, [hl] ; set flag to make the sprite face the player set 7, [hl] ; set flag to make the sprite face the player
ld a, e ld a, e
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
ret ret
; function to check if the player will jump down a ledge and check if the tile ahead is passable (when not surfing) ; function to check if the player will jump down a ledge and check if the tile ahead is passable (when not surfing)
@ -1231,9 +1231,9 @@ CollisionCheckOnLand::
and d ; check if a sprite is in the direction the player is trying to go and d ; check if a sprite is in the direction the player is trying to go
jr nz, .collision jr nz, .collision
xor a xor a
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call IsSpriteInFrontOfPlayer ; check for sprite collisions again? when does the above check fail to detect a sprite collision? call IsSpriteInFrontOfPlayer ; check for sprite collisions again? when does the above check fail to detect a sprite collision?
ldh a, [hSpriteIndexOrTextID] ldh a, [hTextID]
and a ; was there a sprite collision? and a ; was there a sprite collision?
jr nz, .collision jr nz, .collision
; if no sprite collision ; if no sprite collision

2
home/predef_text.asm
View file

@ -1,5 +1,5 @@
PrintPredefTextID:: PrintPredefTextID::
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
ld hl, TextPredefs ld hl, TextPredefs
call SetMapTextPointer call SetMapTextPointer
ld hl, wTextPredefFlag ld hl, wTextPredefFlag

4
home/text.asm
View file

@ -117,13 +117,13 @@ NullChar:: ; unused
pop hl pop hl
; A "<NULL>" character in a printed string ; A "<NULL>" character in a printed string
; displays an error message with the current value ; displays an error message with the current value
; of hSpriteIndexOrTextID in decimal format. ; of hTextID in decimal format.
; This is a debugging leftover. ; This is a debugging leftover.
ld de, TextIDErrorText ld de, TextIDErrorText
dec de dec de
ret ret
TextIDErrorText:: ; "[hSpriteIndexOrTextID] ERROR." TextIDErrorText:: ; "[hTextID] ERROR."
text_far _TextIDErrorText text_far _TextIDErrorText
text_end text_end

9
home/text_script.asm
View file

@ -1,6 +1,7 @@
; this function is used to display sign messages, sprite dialog, etc. ; this function is used to display sign messages, sprite dialog, etc.
; INPUT: [hSpriteIndexOrTextID] = sprite ID or text ID ; INPUT: [hSpriteIndex] = sprite ID or [hTextID] = text ID
DisplayTextID:: DisplayTextID::
assert hSpriteIndex == hTextID ; these are at the same memory location
ldh a, [hLoadedROMBank] ldh a, [hLoadedROMBank]
push af push af
farcall DisplayTextIDInit ; initialization farcall DisplayTextIDInit ; initialization
@ -18,7 +19,7 @@ DisplayTextID::
ld h, [hl] ld h, [hl]
ld l, a ; hl = map text pointer ld l, a ; hl = map text pointer
ld d, $00 ld d, $00
ldh a, [hSpriteIndexOrTextID] ; text ID ldh a, [hTextID]
ld [wSpriteIndex], a ld [wSpriteIndex], a
dict TEXT_START_MENU, DisplayStartMenu dict TEXT_START_MENU, DisplayStartMenu
@ -29,7 +30,7 @@ DisplayTextID::
ld a, [wNumSprites] ld a, [wNumSprites]
ld e, a ld e, a
ldh a, [hSpriteIndexOrTextID] ; sprite ID ldh a, [hSpriteIndex] ; sprite ID
cp e cp e
jr z, .spriteHandling jr z, .spriteHandling
jr nc, .skipSpriteHandling jr nc, .skipSpriteHandling
@ -42,7 +43,7 @@ DisplayTextID::
pop bc pop bc
pop de pop de
ld hl, wMapSpriteData ; NPC text entries ld hl, wMapSpriteData ; NPC text entries
ldh a, [hSpriteIndexOrTextID] ldh a, [hSpriteIndex]
dec a dec a
add a add a
add l add l

4
home/trainers.asm
View file

@ -7,7 +7,7 @@ StoreTrainerHeaderPointer::
ret ret
; executes the current map script from the function pointer array provided in de. ; executes the current map script from the function pointer array provided in de.
; a: map script index to execute (unless overridden by [wd733] bit 4) ; a: map script index to execute (unless overridden by [wStatusFlags7] BIT_USE_CUR_MAP_SCRIPT)
; hl: trainer header pointer ; hl: trainer header pointer
ExecuteCurMapScriptInTable:: ExecuteCurMapScriptInTable::
push af push af
@ -165,7 +165,7 @@ DisplayEnemyTrainerTextAndStartBattle::
ret nz ; return if the enemy trainer hasn't finished walking to the player's sprite ret nz ; return if the enemy trainer hasn't finished walking to the player's sprite
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, [wSpriteIndex] ld a, [wSpriteIndex]
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndex], a
call DisplayTextID call DisplayTextID
; fall through ; fall through

2
home/uncompress.asm
View file

@ -52,7 +52,7 @@ _UncompressSpriteData::
; bit 0 decides in which one the first chunk is placed ; bit 0 decides in which one the first chunk is placed
; fall through ; fall through
; uncompresses a chunk from the sprite input data stream (pointed to at wd0da) into sSpriteBuffer1 or sSpriteBuffer2 ; uncompresses a chunk from the sprite input data stream (pointed to by wSpriteInputPtr) into sSpriteBuffer1 or sSpriteBuffer2
; each chunk is a 1bpp sprite. A 2bpp sprite consist of two chunks which are merged afterwards ; each chunk is a 1bpp sprite. A 2bpp sprite consist of two chunks which are merged afterwards
; note that this is an endless loop which is terminated during a call to MoveToNextBufferPosition by manipulating the stack ; note that this is an endless loop which is terminated during a call to MoveToNextBufferPosition by manipulating the stack
UncompressSpriteDataLoop:: UncompressSpriteDataLoop::

2
ram/hram.asm
View file

@ -16,7 +16,7 @@ hPreviousTileset::
hRLEByteValue:: hRLEByteValue::
db db
hSpriteIndexOrTextID:: ; DisplayTextID's argument hTextID:: ; DisplayTextID's argument
hPartyMonIndex:: hPartyMonIndex::
db db

1
ram/wram.asm
View file

@ -882,6 +882,7 @@ wNameBuffer:: ds NAME_BUFFER_LENGTH
NEXTU NEXTU
; data copied from Moves for one move ; data copied from Moves for one move
wMoveData:: ds MOVE_LENGTH wMoveData:: ds MOVE_LENGTH
wPPUpCountAndMaxPP:: db
NEXTU NEXTU
; amount of money made from one use of Pay Day ; amount of money made from one use of Pay Day

4
scripts/AgathasRoom.asm
View file

@ -75,7 +75,7 @@ AgathasRoomDefaultScript:
jr z, AgathaScriptWalkIntoRoom jr z, AgathaScriptWalkIntoRoom
.stopPlayerFromLeaving .stopPlayerFromLeaving
ld a, TEXT_AGATHASROOM_AGATHA_DONT_RUN_AWAY ld a, TEXT_AGATHASROOM_AGATHA_DONT_RUN_AWAY
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, D_UP ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
@ -111,7 +111,7 @@ AgathasRoomAgathaEndBattleScript:
cp $ff cp $ff
jp z, ResetAgathaScript jp z, ResetAgathaScript
ld a, TEXT_AGATHASROOM_AGATHA ld a, TEXT_AGATHASROOM_AGATHA
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, SCRIPT_CHAMPIONSROOM_PLAYER_ENTERS ld a, SCRIPT_CHAMPIONSROOM_PLAYER_ENTERS
ld [wChampionsRoomCurScript], a ld [wChampionsRoomCurScript], a

2
scripts/BillsHouse.asm
View file

@ -110,7 +110,7 @@ BillsHouseCleanupScript:
BillsHousePCScript: BillsHousePCScript:
ld a, TEXT_BILLSHOUSE_ACTIVATE_PC ld a, TEXT_BILLSHOUSE_ACTIVATE_PC
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, SCRIPT_BILLSHOUSE_DEFAULT ld a, SCRIPT_BILLSHOUSE_DEFAULT
ld [wBillsHouseCurScript], a ld [wBillsHouseCurScript], a

4
scripts/BrunosRoom.asm
View file

@ -75,7 +75,7 @@ BrunosRoomDefaultScript:
jr z, BrunoScriptWalkIntoRoom jr z, BrunoScriptWalkIntoRoom
.stopPlayerFromLeaving .stopPlayerFromLeaving
ld a, TEXT_BRUNOSROOM_BRUNO_DONT_RUN_AWAY ld a, TEXT_BRUNOSROOM_BRUNO_DONT_RUN_AWAY
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID ; "Don't run away!" call DisplayTextID ; "Don't run away!"
ld a, D_UP ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
@ -111,7 +111,7 @@ BrunosRoomBrunoEndBattleScript:
cp $ff cp $ff
jp z, ResetBrunoScript jp z, ResetBrunoScript
ld a, TEXT_BRUNOSROOM_BRUNO ld a, TEXT_BRUNOSROOM_BRUNO
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp DisplayTextID jp DisplayTextID
BrunosRoom_TextPointers: BrunosRoom_TextPointers:

6
scripts/CeladonGym.asm
View file

@ -45,20 +45,20 @@ CeladonGymErikaPostBattleScript:
CeladonGymReceiveTM21: CeladonGymReceiveTM21:
ld a, TEXT_CELADONGYM_RAINBOWBADGE_INFO ld a, TEXT_CELADONGYM_RAINBOWBADGE_INFO
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_BEAT_ERIKA SetEvent EVENT_BEAT_ERIKA
lb bc, TM_MEGA_DRAIN, 1 lb bc, TM_MEGA_DRAIN, 1
call GiveItem call GiveItem
jr nc, .BagFull jr nc, .BagFull
ld a, TEXT_CELADONGYM_RECEIVED_TM21 ld a, TEXT_CELADONGYM_RECEIVED_TM21
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_GOT_TM21 SetEvent EVENT_GOT_TM21
jr .gymVictory jr .gymVictory
.BagFull .BagFull
ld a, TEXT_CELADONGYM_TM21_NO_ROOM ld a, TEXT_CELADONGYM_TM21_NO_ROOM
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
.gymVictory .gymVictory
ld hl, wObtainedBadges ld hl, wObtainedBadges

10
scripts/CeruleanCity.asm
View file

@ -28,7 +28,7 @@ CeruleanCityRocketDefeatedScript:
ld [wJoyIgnore], a ld [wJoyIgnore], a
SetEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF SetEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF
ld a, TEXT_CERULEANCITY_ROCKET ld a, TEXT_CERULEANCITY_ROCKET
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
xor a ; SCRIPT_CERULEANCITY_DEFAULT xor a ; SCRIPT_CERULEANCITY_DEFAULT
ld [wJoyIgnore], a ld [wJoyIgnore], a
@ -58,7 +58,7 @@ ENDC
ld [wSprite02StateData1FacingDirection], a ld [wSprite02StateData1FacingDirection], a
call Delay3 call Delay3
ld a, TEXT_CERULEANCITY_ROCKET ld a, TEXT_CERULEANCITY_ROCKET
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp DisplayTextID jp DisplayTextID
.skipRocketThiefEncounter .skipRocketThiefEncounter
CheckEvent EVENT_BEAT_CERULEAN_RIVAL CheckEvent EVENT_BEAT_CERULEAN_RIVAL
@ -131,7 +131,7 @@ CeruleanCityRivalBattleScript:
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, TEXT_CERULEANCITY_RIVAL ld a, TEXT_CERULEANCITY_RIVAL
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld hl, wStatusFlags3 ld hl, wStatusFlags3
set BIT_TALKED_TO_TRAINER, [hl] set BIT_TALKED_TO_TRAINER, [hl]
@ -174,7 +174,7 @@ CeruleanCityRivalDefeatedScript:
ld [wJoyIgnore], a ld [wJoyIgnore], a
SetEvent EVENT_BEAT_CERULEAN_RIVAL SetEvent EVENT_BEAT_CERULEAN_RIVAL
ld a, TEXT_CERULEANCITY_RIVAL ld a, TEXT_CERULEANCITY_RIVAL
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, SFX_STOP_ALL_MUSIC ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a ld [wNewSoundID], a
@ -295,7 +295,7 @@ CeruleanCityRocketText:
ld hl, .IGiveUpText ld hl, .IGiveUpText
ld de, .IGiveUpText ld de, .IGiveUpText
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ldh a, [hSpriteIndexOrTextID] ldh a, [hTextID]
ld [wSpriteIndex], a ld [wSpriteIndex], a
call EngageMapTrainer call EngageMapTrainer
call InitBattleEnemyParameters call InitBattleEnemyParameters

6
scripts/CeruleanGym.asm
View file

@ -45,20 +45,20 @@ CeruleanGymMistyPostBattleScript:
CeruleanGymReceiveTM11: CeruleanGymReceiveTM11:
ld a, TEXT_CERULEANGYM_MISTY_CASCADE_BADGE_INFO ld a, TEXT_CERULEANGYM_MISTY_CASCADE_BADGE_INFO
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_BEAT_MISTY SetEvent EVENT_BEAT_MISTY
lb bc, TM_BUBBLEBEAM, 1 lb bc, TM_BUBBLEBEAM, 1
call GiveItem call GiveItem
jr nc, .BagFull jr nc, .BagFull
ld a, TEXT_CERULEANGYM_MISTY_RECEIVED_TM11 ld a, TEXT_CERULEANGYM_MISTY_RECEIVED_TM11
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_GOT_TM11 SetEvent EVENT_GOT_TM11
jr .gymVictory jr .gymVictory
.BagFull .BagFull
ld a, TEXT_CERULEANGYM_MISTY_TM11_NO_ROOM ld a, TEXT_CERULEANGYM_MISTY_TM11_NO_ROOM
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
.gymVictory .gymVictory
ld hl, wObtainedBadges ld hl, wObtainedBadges

12
scripts/ChampionsRoom.asm
View file

@ -56,7 +56,7 @@ ChampionsRoomRivalReadyToBattleScript:
ld hl, wOptions ld hl, wOptions
res BIT_BATTLE_ANIMATION, [hl] res BIT_BATTLE_ANIMATION, [hl]
ld a, TEXT_CHAMPIONSROOM_RIVAL ld a, TEXT_CHAMPIONSROOM_RIVAL
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call Delay3 call Delay3
ld hl, wStatusFlags3 ld hl, wStatusFlags3
@ -99,7 +99,7 @@ ChampionsRoomRivalDefeatedScript:
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, TEXT_CHAMPIONSROOM_RIVAL ld a, TEXT_CHAMPIONSROOM_RIVAL
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call ChampionsRoom_DisplayTextID_AllowABSelectStart call ChampionsRoom_DisplayTextID_AllowABSelectStart
ld a, CHAMPIONSROOM_RIVAL ld a, CHAMPIONSROOM_RIVAL
ldh [hSpriteIndex], a ldh [hSpriteIndex], a
@ -111,7 +111,7 @@ ChampionsRoomRivalDefeatedScript:
ChampionsRoomOakArrivesScript: ChampionsRoomOakArrivesScript:
farcall Music_Cities1AlternateTempo farcall Music_Cities1AlternateTempo
ld a, TEXT_CHAMPIONSROOM_OAK ld a, TEXT_CHAMPIONSROOM_OAK
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call ChampionsRoom_DisplayTextID_AllowABSelectStart call ChampionsRoom_DisplayTextID_AllowABSelectStart
ld a, CHAMPIONSROOM_OAK ld a, CHAMPIONSROOM_OAK
ldh [hSpriteIndex], a ldh [hSpriteIndex], a
@ -152,7 +152,7 @@ ChampionsRoomOakCongratulatesPlayerScript:
ldh [hSpriteFacingDirection], a ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
ld a, TEXT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER ld a, TEXT_CHAMPIONSROOM_OAK_CONGRATULATES_PLAYER
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call ChampionsRoom_DisplayTextID_AllowABSelectStart call ChampionsRoom_DisplayTextID_AllowABSelectStart
ld a, SCRIPT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL ld a, SCRIPT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL
ld [wChampionsRoomCurScript], a ld [wChampionsRoomCurScript], a
@ -165,7 +165,7 @@ ChampionsRoomOakDisappointedWithRivalScript:
ldh [hSpriteFacingDirection], a ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
ld a, TEXT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL ld a, TEXT_CHAMPIONSROOM_OAK_DISAPPOINTED_WITH_RIVAL
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call ChampionsRoom_DisplayTextID_AllowABSelectStart call ChampionsRoom_DisplayTextID_AllowABSelectStart
ld a, SCRIPT_CHAMPIONSROOM_OAK_COME_WITH_ME ld a, SCRIPT_CHAMPIONSROOM_OAK_COME_WITH_ME
ld [wChampionsRoomCurScript], a ld [wChampionsRoomCurScript], a
@ -178,7 +178,7 @@ ChampionsRoomOakComeWithMeScript:
ldh [hSpriteFacingDirection], a ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
ld a, TEXT_CHAMPIONSROOM_OAK_COME_WITH_ME ld a, TEXT_CHAMPIONSROOM_OAK_COME_WITH_ME
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call ChampionsRoom_DisplayTextID_AllowABSelectStart call ChampionsRoom_DisplayTextID_AllowABSelectStart
ld de, OakExitChampionsRoomMovement ld de, OakExitChampionsRoomMovement
ld a, CHAMPIONSROOM_OAK ld a, CHAMPIONSROOM_OAK

12
scripts/CinnabarGym.asm
View file

@ -38,7 +38,7 @@ CinnabarGymResetScripts:
ret ret
CinnabarGymSetTrainerHeader: CinnabarGymSetTrainerHeader:
ldh a, [hSpriteIndexOrTextID] ldh a, [hTextID]
ld [wTrainerHeaderFlagBit], a ld [wTrainerHeaderFlagBit], a
ret ret
@ -88,7 +88,7 @@ CinnabarGymGetOpponentTextScript:
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, [wOpponentAfterWrongAnswer] ld a, [wOpponentAfterWrongAnswer]
ld [wTrainerHeaderFlagBit], a ld [wTrainerHeaderFlagBit], a
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp DisplayTextID jp DisplayTextID
CinnabarGymFlagAction: CinnabarGymFlagAction:
@ -145,20 +145,20 @@ CinnabarGymBlainePostBattleScript:
; fallthrough ; fallthrough
CinnabarGymReceiveTM38: CinnabarGymReceiveTM38:
ld a, TEXT_CINNABARGYM_BLAINE_VOLCANO_BADGE_INFO ld a, TEXT_CINNABARGYM_BLAINE_VOLCANO_BADGE_INFO
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_BEAT_BLAINE SetEvent EVENT_BEAT_BLAINE
lb bc, TM_FIRE_BLAST, 1 lb bc, TM_FIRE_BLAST, 1
call GiveItem call GiveItem
jr nc, .BagFull jr nc, .BagFull
ld a, TEXT_CINNABARGYM_BLAINE_RECEIVED_TM38 ld a, TEXT_CINNABARGYM_BLAINE_RECEIVED_TM38
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_GOT_TM38 SetEvent EVENT_GOT_TM38
jr .gymVictory jr .gymVictory
.BagFull .BagFull
ld a, TEXT_CINNABARGYM_BLAINE_TM38_NO_ROOM ld a, TEXT_CINNABARGYM_BLAINE_TM38_NO_ROOM
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
.gymVictory .gymVictory
ld hl, wObtainedBadges ld hl, wObtainedBadges
@ -190,7 +190,7 @@ CinnabarGym_TextPointers:
dw_const CinnabarGymBlaineTM38NoRoomText, TEXT_CINNABARGYM_BLAINE_TM38_NO_ROOM dw_const CinnabarGymBlaineTM38NoRoomText, TEXT_CINNABARGYM_BLAINE_TM38_NO_ROOM
CinnabarGymStartBattleScript: CinnabarGymStartBattleScript:
ldh a, [hSpriteIndexOrTextID] ldh a, [hSpriteIndex]
ld [wSpriteIndex], a ld [wSpriteIndex], a
call EngageMapTrainer call EngageMapTrainer
call InitBattleEnemyParameters call InitBattleEnemyParameters

2
scripts/CinnabarIsland.asm
View file

@ -26,7 +26,7 @@ CinnabarIslandDefaultScript:
ld a, PLAYER_DIR_UP ld a, PLAYER_DIR_UP
ld [wPlayerMovingDirection], a ld [wPlayerMovingDirection], a
ld a, TEXT_CINNABARISLAND_DOOR_IS_LOCKED ld a, TEXT_CINNABARISLAND_DOOR_IS_LOCKED
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a

6
scripts/FightingDojo.asm
View file

@ -49,7 +49,7 @@ FightingDojoDefaultScript:
ldh [hSpriteFacingDirection], a ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
ld a, TEXT_FIGHTINGDOJO_KARATE_MASTER ld a, TEXT_FIGHTINGDOJO_KARATE_MASTER
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ret ret
@ -72,7 +72,7 @@ FightingDojoKarateMasterPostBattleScript:
ld [wJoyIgnore], a ld [wJoyIgnore], a
SetEventRange EVENT_BEAT_KARATE_MASTER, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 SetEventRange EVENT_BEAT_KARATE_MASTER, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3
ld a, TEXT_FIGHTINGDOJO_KARATE_MASTER_I_WILL_GIVE_YOU_A_POKEMON ld a, TEXT_FIGHTINGDOJO_KARATE_MASTER_I_WILL_GIVE_YOU_A_POKEMON
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
xor a ; SCRIPT_FIGHTINGDOJO_DEFAULT xor a ; SCRIPT_FIGHTINGDOJO_DEFAULT
ld [wJoyIgnore], a ld [wJoyIgnore], a
@ -117,7 +117,7 @@ FightingDojoKarateMasterText:
ld hl, .DefeatedText ld hl, .DefeatedText
ld de, .DefeatedText ld de, .DefeatedText
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ldh a, [hSpriteIndexOrTextID] ldh a, [hSpriteIndex]
ld [wSpriteIndex], a ld [wSpriteIndex], a
call EngageMapTrainer call EngageMapTrainer
call InitBattleEnemyParameters call InitBattleEnemyParameters

6
scripts/FuchsiaGym.asm
View file

@ -47,20 +47,20 @@ FuchsiaGymKogaPostBattleScript:
; fallthrough ; fallthrough
FuchsiaGymReceiveTM06: FuchsiaGymReceiveTM06:
ld a, TEXT_FUCHSIAGYM_KOGA_SOUL_BADGE_INFO ld a, TEXT_FUCHSIAGYM_KOGA_SOUL_BADGE_INFO
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_BEAT_KOGA SetEvent EVENT_BEAT_KOGA
lb bc, TM_TOXIC, 1 lb bc, TM_TOXIC, 1
call GiveItem call GiveItem
jr nc, .BagFull jr nc, .BagFull
ld a, TEXT_FUCHSIAGYM_KOGA_RECEIVED_TM06 ld a, TEXT_FUCHSIAGYM_KOGA_RECEIVED_TM06
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_GOT_TM06 SetEvent EVENT_GOT_TM06
jr .gymVictory jr .gymVictory
.BagFull .BagFull
ld a, TEXT_FUCHSIAGYM_KOGA_TM06_NO_ROOM ld a, TEXT_FUCHSIAGYM_KOGA_TM06_NO_ROOM
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
.gymVictory .gymVictory
ld hl, wObtainedBadges ld hl, wObtainedBadges

2
scripts/GameCorner.asm
View file

@ -58,7 +58,7 @@ GameCornerRocketBattleScript:
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, TEXT_GAMECORNER_ROCKET_AFTER_BATTLE ld a, TEXT_GAMECORNER_ROCKET_AFTER_BATTLE
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, GAMECORNER_ROCKET ld a, GAMECORNER_ROCKET
ldh [hSpriteIndex], a ldh [hSpriteIndex], a

1
scripts/GameCornerPrizeRoom.asm
View file

@ -8,6 +8,7 @@ GameCornerPrizeRoom_TextPointers:
dw_const GameCornerPRizeRoomPrizeVendorText, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_1 dw_const GameCornerPRizeRoomPrizeVendorText, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_1
dw_const GameCornerPRizeRoomPrizeVendorText, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_2 dw_const GameCornerPRizeRoomPrizeVendorText, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_2
dw_const GameCornerPRizeRoomPrizeVendorText, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_3 dw_const GameCornerPRizeRoomPrizeVendorText, TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_3
EXPORT TEXT_GAMECORNERPRIZEROOM_PRIZE_VENDOR_1 ; used by engine/events/prize_menu.asm
GameCornerPrizeRoomBaldingGuyText: GameCornerPrizeRoomBaldingGuyText:
text_far _GameCornerPrizeRoomBaldingGuyText text_far _GameCornerPrizeRoomBaldingGuyText

2
scripts/HallOfFame.asm
View file

@ -92,7 +92,7 @@ HallOfFameOakCongratulationsScript:
inc a ; PLAYER_DIR_RIGHT inc a ; PLAYER_DIR_RIGHT
ld [wPlayerMovingDirection], a ld [wPlayerMovingDirection], a
ld a, TEXT_HALLOFFAME_OAK ld a, TEXT_HALLOFFAME_OAK
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a ld [wJoyIgnore], a

4
scripts/LancesRoom.asm
View file

@ -63,7 +63,7 @@ LancesRoomDefaultScript:
cp $3 ; Is player standing next to Lance's sprite? cp $3 ; Is player standing next to Lance's sprite?
jr nc, .notStandingNextToLance jr nc, .notStandingNextToLance
ld a, TEXT_LANCESROOM_LANCE ld a, TEXT_LANCESROOM_LANCE
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp DisplayTextID jp DisplayTextID
.notStandingNextToLance .notStandingNextToLance
cp $5 ; Is player standing on the entrance staircase? cp $5 ; Is player standing on the entrance staircase?
@ -90,7 +90,7 @@ LancesRoomLanceEndBattleScript:
cp $ff cp $ff
jp z, ResetLanceScript jp z, ResetLanceScript
ld a, TEXT_LANCESROOM_LANCE ld a, TEXT_LANCESROOM_LANCE
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp DisplayTextID jp DisplayTextID
WalkToLance: WalkToLance:

4
scripts/LoreleisRoom.asm
View file

@ -77,7 +77,7 @@ LoreleisRoomDefaultScript:
jr z, LoreleiScriptWalkIntoRoom jr z, LoreleiScriptWalkIntoRoom
.stopPlayerFromLeaving .stopPlayerFromLeaving
ld a, TEXT_LORELEISROOM_DONT_RUN_AWAY ld a, TEXT_LORELEISROOM_DONT_RUN_AWAY
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID ; "Don't run away!" call DisplayTextID ; "Don't run away!"
ld a, D_UP ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesEnd], a
@ -113,7 +113,7 @@ LoreleisRoomLoreleiEndBattleScript:
cp $ff cp $ff
jp z, ResetLoreleiScript jp z, ResetLoreleiScript
ld a, TEXT_LORELEISROOM_LORELEI ld a, TEXT_LORELEISROOM_LORELEI
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp DisplayTextID jp DisplayTextID
LoreleisRoom_TextPointers: LoreleisRoom_TextPointers:

4
scripts/MtMoonB2F.asm
View file

@ -65,7 +65,7 @@ MtMoonB2FDefaultScript:
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a
ld a, TEXT_MTMOONB2F_SUPER_NERD ld a, TEXT_MTMOONB2F_SUPER_NERD
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp DisplayTextID jp DisplayTextID
MtMoonB2FCheckGotAFossil: MtMoonB2FCheckGotAFossil:
@ -137,7 +137,7 @@ MtMoonB2FSuperNerdTakesOtherFossilScript:
ld a, $1 ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld a, TEXT_MTMOONB2F_SUPER_NERD_THEN_THIS_IS_MINE ld a, TEXT_MTMOONB2F_SUPER_NERD_THEN_THIS_IS_MINE
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
CheckEvent EVENT_GOT_DOME_FOSSIL CheckEvent EVENT_GOT_DOME_FOSSIL
jr z, .got_dome_fossil jr z, .got_dome_fossil

2
scripts/Museum1F.asm
View file

@ -26,7 +26,7 @@ Museum1FDefaultScript:
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a
ld a, TEXT_MUSEUM1F_SCIENTIST1 ld a, TEXT_MUSEUM1F_SCIENTIST1
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp DisplayTextID jp DisplayTextID
Museum1FNoopScript: Museum1FNoopScript:

32
scripts/OaksLab.asm
View file

@ -129,19 +129,19 @@ OaksLabOakChooseMonSpeechScript:
ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, TEXT_OAKSLAB_RIVAL_FED_UP_WITH_WAITING ld a, TEXT_OAKSLAB_RIVAL_FED_UP_WITH_WAITING
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call Delay3 call Delay3
ld a, TEXT_OAKSLAB_OAK_CHOOSE_MON ld a, TEXT_OAKSLAB_OAK_CHOOSE_MON
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call Delay3 call Delay3
ld a, TEXT_OAKSLAB_RIVAL_WHAT_ABOUT_ME ld a, TEXT_OAKSLAB_RIVAL_WHAT_ABOUT_ME
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call Delay3 call Delay3
ld a, TEXT_OAKSLAB_OAK_BE_PATIENT ld a, TEXT_OAKSLAB_OAK_BE_PATIENT
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_OAK_ASKED_TO_CHOOSE_MON SetEvent EVENT_OAK_ASKED_TO_CHOOSE_MON
xor a xor a
@ -167,7 +167,7 @@ OaksLabPlayerDontGoAwayScript:
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
call UpdateSprites call UpdateSprites
ld a, TEXT_OAKSLAB_OAK_DONT_GO_AWAY_YET ld a, TEXT_OAKSLAB_OAK_DONT_GO_AWAY_YET
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, $1 ld a, $1
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a
@ -301,7 +301,7 @@ OaksLabRivalChoosesStarterScript:
ldh [hSpriteFacingDirection], a ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
ld a, TEXT_OAKSLAB_RIVAL_ILL_TAKE_THIS_ONE ld a, TEXT_OAKSLAB_RIVAL_ILL_TAKE_THIS_ONE
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, [wRivalStarterBallSpriteIndex] ld a, [wRivalStarterBallSpriteIndex]
cp OAKSLAB_CHARMANDER_POKE_BALL cp OAKSLAB_CHARMANDER_POKE_BALL
@ -330,7 +330,7 @@ OaksLabRivalChoosesStarterScript:
ldh [hSpriteFacingDirection], a ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
ld a, TEXT_OAKSLAB_RIVAL_RECEIVED_MON ld a, TEXT_OAKSLAB_RIVAL_RECEIVED_MON
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_GOT_STARTER SetEvent EVENT_GOT_STARTER
xor a xor a
@ -355,7 +355,7 @@ OaksLabRivalChallengesPlayerScript:
ld a, MUSIC_MEET_RIVAL ld a, MUSIC_MEET_RIVAL
call PlayMusic call PlayMusic
ld a, TEXT_OAKSLAB_RIVAL_ILL_TAKE_YOU_ON ld a, TEXT_OAKSLAB_RIVAL_ILL_TAKE_YOU_ON
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, $1 ld a, $1
ldh [hNPCPlayerRelativePosPerspective], a ldh [hNPCPlayerRelativePosPerspective], a
@ -440,7 +440,7 @@ OaksLabRivalStartsExitScript:
ld c, 20 ld c, 20
call DelayFrames call DelayFrames
ld a, TEXT_OAKSLAB_RIVAL_SMELL_YOU_LATER ld a, TEXT_OAKSLAB_RIVAL_SMELL_YOU_LATER
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
farcall Music_RivalAlternateStart farcall Music_RivalAlternateStart
ld a, OAKSLAB_RIVAL ld a, OAKSLAB_RIVAL
@ -516,7 +516,7 @@ OaksLabRivalArrivesAtOaksRequestScript:
call PlaySound call PlaySound
farcall Music_RivalAlternateStart farcall Music_RivalAlternateStart
ld a, TEXT_OAKSLAB_RIVAL_GRAMPS ld a, TEXT_OAKSLAB_RIVAL_GRAMPS
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call OaksLabCalcRivalMovementScript call OaksLabCalcRivalMovementScript
ld a, HS_OAKS_LAB_RIVAL ld a, HS_OAKS_LAB_RIVAL
@ -561,21 +561,21 @@ OaksLabOakGivesPokedexScript:
ld [wJoyIgnore], a ld [wJoyIgnore], a
call OaksLabRivalFaceUpOakFaceDownScript call OaksLabRivalFaceUpOakFaceDownScript
ld a, TEXT_OAKSLAB_RIVAL_WHAT_DID_YOU_CALL_ME_FOR ld a, TEXT_OAKSLAB_RIVAL_WHAT_DID_YOU_CALL_ME_FOR
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call DelayFrame call DelayFrame
call OaksLabRivalFaceUpOakFaceDownScript call OaksLabRivalFaceUpOakFaceDownScript
ld a, TEXT_OAKSLAB_OAK_I_HAVE_A_REQUEST ld a, TEXT_OAKSLAB_OAK_I_HAVE_A_REQUEST
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call DelayFrame call DelayFrame
call OaksLabRivalFaceUpOakFaceDownScript call OaksLabRivalFaceUpOakFaceDownScript
ld a, TEXT_OAKSLAB_OAK_MY_INVENTION_POKEDEX ld a, TEXT_OAKSLAB_OAK_MY_INVENTION_POKEDEX
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call DelayFrame call DelayFrame
ld a, TEXT_OAKSLAB_OAK_GOT_POKEDEX ld a, TEXT_OAKSLAB_OAK_GOT_POKEDEX
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call Delay3 call Delay3
ld a, HS_POKEDEX_1 ld a, HS_POKEDEX_1
@ -586,7 +586,7 @@ OaksLabOakGivesPokedexScript:
predef HideObject predef HideObject
call OaksLabRivalFaceUpOakFaceDownScript call OaksLabRivalFaceUpOakFaceDownScript
ld a, TEXT_OAKSLAB_OAK_THAT_WAS_MY_DREAM ld a, TEXT_OAKSLAB_OAK_THAT_WAS_MY_DREAM
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, OAKSLAB_RIVAL ld a, OAKSLAB_RIVAL
ldh [hSpriteIndex], a ldh [hSpriteIndex], a
@ -595,7 +595,7 @@ OaksLabOakGivesPokedexScript:
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
call Delay3 call Delay3
ld a, TEXT_OAKSLAB_RIVAL_LEAVE_IT_ALL_TO_ME ld a, TEXT_OAKSLAB_RIVAL_LEAVE_IT_ALL_TO_ME
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_GOT_POKEDEX SetEvent EVENT_GOT_POKEDEX
SetEvent EVENT_OAK_GOT_PARCEL SetEvent EVENT_OAK_GOT_PARCEL

4
scripts/PalletTown.asm
View file

@ -47,7 +47,7 @@ PalletTownOakHeyWaitScript:
xor a xor a
ld [wOakWalkedToPlayer], a ld [wOakWalkedToPlayer], a
ld a, TEXT_PALLETTOWN_OAK ld a, TEXT_PALLETTOWN_OAK
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a ld [wJoyIgnore], a
@ -101,7 +101,7 @@ PalletTownOakNotSafeComeWithMeScript:
ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, TEXT_PALLETTOWN_OAK ld a, TEXT_PALLETTOWN_OAK
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
; set up movement script that causes the player to follow Oak to his lab ; set up movement script that causes the player to follow Oak to his lab
ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN

6
scripts/PewterCity.asm
View file

@ -34,7 +34,7 @@ ENDC
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, TEXT_PEWTERCITY_YOUNGSTER ld a, TEXT_PEWTERCITY_YOUNGSTER
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp DisplayTextID jp DisplayTextID
PewterCityPlayerLeavingEastCoords: PewterCityPlayerLeavingEastCoords:
@ -60,7 +60,7 @@ PewterCitySuperNerd1ShowsPlayerMuseumScript:
ld hl, wMiscFlags ld hl, wMiscFlags
set BIT_NO_SPRITE_UPDATES, [hl] set BIT_NO_SPRITE_UPDATES, [hl]
ld a, TEXT_PEWTERCITY_SUPER_NERD1_ITS_RIGHT_HERE ld a, TEXT_PEWTERCITY_SUPER_NERD1_ITS_RIGHT_HERE
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, $3c ld a, $3c
ldh [hSpriteScreenYCoord], a ldh [hSpriteScreenYCoord], a
@ -128,7 +128,7 @@ PewterCityYoungsterShowsPlayerGymScript:
ld hl, wMiscFlags ld hl, wMiscFlags
set BIT_NO_SPRITE_UPDATES, [hl] set BIT_NO_SPRITE_UPDATES, [hl]
ld a, TEXT_PEWTERCITY_YOUNGSTER_GO_TAKE_ON_BROCK ld a, TEXT_PEWTERCITY_YOUNGSTER_GO_TAKE_ON_BROCK
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, $3c ld a, $3c
ldh [hSpriteScreenYCoord], a ldh [hSpriteScreenYCoord], a

6
scripts/PewterGym.asm
View file

@ -45,20 +45,20 @@ PewterGymBrockPostBattle:
; fallthrough ; fallthrough
PewterGymScriptReceiveTM34: PewterGymScriptReceiveTM34:
ld a, TEXT_PEWTERGYM_BROCK_WAIT_TAKE_THIS ld a, TEXT_PEWTERGYM_BROCK_WAIT_TAKE_THIS
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_BEAT_BROCK SetEvent EVENT_BEAT_BROCK
lb bc, TM_BIDE, 1 lb bc, TM_BIDE, 1
call GiveItem call GiveItem
jr nc, .BagFull jr nc, .BagFull
ld a, TEXT_PEWTERGYM_RECEIVED_TM34 ld a, TEXT_PEWTERGYM_RECEIVED_TM34
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_GOT_TM34 SetEvent EVENT_GOT_TM34
jr .gymVictory jr .gymVictory
.BagFull .BagFull
ld a, TEXT_PEWTERGYM_TM34_NO_ROOM ld a, TEXT_PEWTERGYM_TM34_NO_ROOM
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
.gymVictory .gymVictory
ld hl, wObtainedBadges ld hl, wObtainedBadges

2
scripts/PokemonMansion1F.asm
View file

@ -52,7 +52,7 @@ Mansion1Script_Switches::
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a
ld a, TEXT_POKEMONMANSION1F_SWITCH ld a, TEXT_POKEMONMANSION1F_SWITCH
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp DisplayTextID jp DisplayTextID
PokemonMansion1F_ScriptPointers: PokemonMansion1F_ScriptPointers:

2
scripts/PokemonMansion2F.asm
View file

@ -48,7 +48,7 @@ Mansion2Script_Switches::
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a
ld a, TEXT_POKEMONMANSION2F_SWITCH ld a, TEXT_POKEMONMANSION2F_SWITCH
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp DisplayTextID jp DisplayTextID
PokemonMansion2F_ScriptPointers: PokemonMansion2F_ScriptPointers:

2
scripts/PokemonMansion3F.asm
View file

@ -80,7 +80,7 @@ Mansion3Script_Switches::
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a
ld a, TEXT_POKEMONMANSION3F_SWITCH ld a, TEXT_POKEMONMANSION3F_SWITCH
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp DisplayTextID jp DisplayTextID
PokemonMansion3F_TextPointers: PokemonMansion3F_TextPointers:

2
scripts/PokemonMansionB1F.asm
View file

@ -50,7 +50,7 @@ Mansion4Script_Switches::
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a
ld a, TEXT_POKEMONMANSIONB1F_SWITCH ld a, TEXT_POKEMONMANSIONB1F_SWITCH
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp DisplayTextID jp DisplayTextID
PokemonMansionB1F_ScriptPointers: PokemonMansionB1F_ScriptPointers:

4
scripts/PokemonTower2F.asm
View file

@ -51,7 +51,7 @@ ENDC
ldh [hSpriteFacingDirection], a ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
ld a, TEXT_POKEMONTOWER2F_RIVAL ld a, TEXT_POKEMONTOWER2F_RIVAL
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a
@ -71,7 +71,7 @@ PokemonTower2FDefeatedRivalScript:
ld [wJoyIgnore], a ld [wJoyIgnore], a
SetEvent EVENT_BEAT_POKEMON_TOWER_RIVAL SetEvent EVENT_BEAT_POKEMON_TOWER_RIVAL
ld a, TEXT_POKEMONTOWER2F_RIVAL ld a, TEXT_POKEMONTOWER2F_RIVAL
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld de, PokemonTower2FRivalDownThenRightMovement ld de, PokemonTower2FRivalDownThenRightMovement
CheckEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT CheckEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT

2
scripts/PokemonTower5F.asm
View file

@ -36,7 +36,7 @@ PokemonTower5FDefaultScript:
call Delay3 call Delay3
call GBFadeInFromWhite call GBFadeInFromWhite
ld a, TEXT_POKEMONTOWER5F_PURIFIEDZONE ld a, TEXT_POKEMONTOWER5F_PURIFIEDZONE
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a

4
scripts/PokemonTower6F.asm
View file

@ -31,7 +31,7 @@ PokemonTower6FDefaultScript:
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a
ld a, TEXT_POKEMONTOWER6F_BEGONE ld a, TEXT_POKEMONTOWER6F_BEGONE
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, RESTLESS_SOUL ld a, RESTLESS_SOUL
ld [wCurOpponent], a ld [wCurOpponent], a
@ -63,7 +63,7 @@ PokemonTower6FMarowakBattleScript:
jr nz, .did_not_defeat jr nz, .did_not_defeat
SetEvent EVENT_BEAT_GHOST_MAROWAK SetEvent EVENT_BEAT_GHOST_MAROWAK
ld a, TEXT_POKEMONTOWER6F_MAROWAK_DEPARTED ld a, TEXT_POKEMONTOWER6F_MAROWAK_DEPARTED
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a

2
scripts/PokemonTower7F.asm
View file

@ -32,7 +32,7 @@ PokemonTower7FEndBattleScript:
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, [wSpriteIndex] ld a, [wSpriteIndex]
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndex], a
call DisplayTextID call DisplayTextID
call PokemonTower7FRocketLeaveMovementScript call PokemonTower7FRocketLeaveMovementScript
ld a, SCRIPT_POKEMONTOWER7F_HIDE_NPC ld a, SCRIPT_POKEMONTOWER7F_HIDE_NPC

2
scripts/RocketHideoutB4F.asm
View file

@ -53,7 +53,7 @@ RocketHideoutB4FBeatGiovanniScript:
ld [wJoyIgnore], a ld [wJoyIgnore], a
SetEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI SetEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI
ld a, TEXT_ROCKETHIDEOUTB4F_GIOVANNI_HOPE_WE_MEET_AGAIN ld a, TEXT_ROCKETHIDEOUTB4F_GIOVANNI_HOPE_WE_MEET_AGAIN
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call GBFadeOutToBlack call GBFadeOutToBlack
ld a, HS_ROCKET_HIDEOUT_B4F_GIOVANNI ld a, HS_ROCKET_HIDEOUT_B4F_GIOVANNI

4
scripts/Route12.asm
View file

@ -28,7 +28,7 @@ Route12DefaultScript:
ResetEventReuseHL EVENT_FIGHT_ROUTE12_SNORLAX ResetEventReuseHL EVENT_FIGHT_ROUTE12_SNORLAX
jp z, CheckFightingMapTrainers jp z, CheckFightingMapTrainers
ld a, TEXT_ROUTE12_SNORLAX_WOKE_UP ld a, TEXT_ROUTE12_SNORLAX_WOKE_UP
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, SNORLAX ld a, SNORLAX
ld [wCurOpponent], a ld [wCurOpponent], a
@ -51,7 +51,7 @@ Route12SnorlaxPostBattleScript:
cp $2 cp $2
jr z, .caught_snorlax jr z, .caught_snorlax
ld a, TEXT_ROUTE12_SNORLAX_CALMED_DOWN ld a, TEXT_ROUTE12_SNORLAX_CALMED_DOWN
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
.caught_snorlax .caught_snorlax
SetEvent EVENT_BEAT_ROUTE12_SNORLAX SetEvent EVENT_BEAT_ROUTE12_SNORLAX

4
scripts/Route16.asm
View file

@ -28,7 +28,7 @@ Route16DefaultScript:
ResetEventReuseHL EVENT_FIGHT_ROUTE16_SNORLAX ResetEventReuseHL EVENT_FIGHT_ROUTE16_SNORLAX
jp z, CheckFightingMapTrainers jp z, CheckFightingMapTrainers
ld a, TEXT_ROUTE16_SNORLAX_WOKE_UP ld a, TEXT_ROUTE16_SNORLAX_WOKE_UP
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, SNORLAX ld a, SNORLAX
ld [wCurOpponent], a ld [wCurOpponent], a
@ -52,7 +52,7 @@ Route16SnorlaxPostBattleScript:
cp $2 cp $2
jr z, .caught jr z, .caught
ld a, TEXT_ROUTE16_SNORLAX_RETURNED_TO_MOUNTAINS ld a, TEXT_ROUTE16_SNORLAX_RETURNED_TO_MOUNTAINS
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
.caught .caught
SetEvent EVENT_BEAT_ROUTE16_SNORLAX SetEvent EVENT_BEAT_ROUTE16_SNORLAX

4
scripts/Route16Gate1F.asm
View file

@ -20,7 +20,7 @@ Route16Gate1FDefaultScript:
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
ret nc ret nc
ld a, TEXT_ROUTE16GATE1F_GUARD_WAIT_UP ld a, TEXT_ROUTE16GATE1F_GUARD_WAIT_UP
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a
@ -60,7 +60,7 @@ Route16Gate1FPlayerMovingUpScript:
Route16Gate1FGuardScript: Route16Gate1FGuardScript:
ld a, TEXT_ROUTE16GATE1F_GUARD ld a, TEXT_ROUTE16GATE1F_GUARD
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, $1 ld a, $1
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a

4
scripts/Route18Gate1F.asm
View file

@ -20,7 +20,7 @@ Route18Gate1FDefaultScript:
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
ret nc ret nc
ld a, TEXT_ROUTE18GATE1F_GUARD_EXCUSE_ME ld a, TEXT_ROUTE18GATE1F_GUARD_EXCUSE_ME
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a
@ -60,7 +60,7 @@ Route18Gate1FPlayerMovingUpScript:
Route18Gate1FGuardScript: Route18Gate1FGuardScript:
ld a, TEXT_ROUTE18GATE1F_GUARD ld a, TEXT_ROUTE18GATE1F_GUARD
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, $1 ld a, $1
ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesIndex], a

8
scripts/Route22.asm
View file

@ -124,7 +124,7 @@ Route22Rival1StartBattleScript:
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, TEXT_ROUTE22_RIVAL1 ld a, TEXT_ROUTE22_RIVAL1
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld hl, wStatusFlags3 ld hl, wStatusFlags3
set BIT_TALKED_TO_TRAINER, [hl] set BIT_TALKED_TO_TRAINER, [hl]
@ -166,7 +166,7 @@ Route22Rival1AfterBattleScript:
ld [wJoyIgnore], a ld [wJoyIgnore], a
SetEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE SetEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE
ld a, TEXT_ROUTE22_RIVAL1 ld a, TEXT_ROUTE22_RIVAL1
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, SFX_STOP_ALL_MUSIC ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a ld [wNewSoundID], a
@ -280,7 +280,7 @@ Route22Rival2StartBattleScript:
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, TEXT_ROUTE22_RIVAL2 ld a, TEXT_ROUTE22_RIVAL2
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld hl, wStatusFlags3 ld hl, wStatusFlags3
set BIT_TALKED_TO_TRAINER, [hl] set BIT_TALKED_TO_TRAINER, [hl]
@ -325,7 +325,7 @@ Route22Rival2AfterBattleScript:
ld [wJoyIgnore], a ld [wJoyIgnore], a
SetEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE SetEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE
ld a, TEXT_ROUTE22_RIVAL2 ld a, TEXT_ROUTE22_RIVAL2
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, SFX_STOP_ALL_MUSIC ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a ld [wNewSoundID], a

2
scripts/Route22Gate.asm
View file

@ -25,7 +25,7 @@ Route22GateDefaultScript:
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a
ld a, TEXT_ROUTE22GATE_GUARD ld a, TEXT_ROUTE22GATE_GUARD
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp DisplayTextID jp DisplayTextID
Route22GateScriptCoords: Route22GateScriptCoords:

2
scripts/Route23.asm
View file

@ -46,7 +46,7 @@ Route23DefaultScript:
ret nc ret nc
.not_past_victory_road .not_past_victory_road
ld a, e ld a, e
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndex], a
ld a, c ld a, c
ld [wWhichBadge], a ld [wWhichBadge], a
ld b, FLAG_TEST ld b, FLAG_TEST

6
scripts/Route24.asm
View file

@ -31,7 +31,7 @@ Route24DefaultScript:
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a
ld a, TEXT_ROUTE24_COOLTRAINER_M1 ld a, TEXT_ROUTE24_COOLTRAINER_M1
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
CheckAndResetEvent EVENT_NUGGET_REWARD_AVAILABLE CheckAndResetEvent EVENT_NUGGET_REWARD_AVAILABLE
ret z ret z
@ -68,7 +68,7 @@ Route24AfterRocketBattleScript:
ld [wJoyIgnore], a ld [wJoyIgnore], a
SetEvent EVENT_BEAT_ROUTE24_ROCKET SetEvent EVENT_BEAT_ROUTE24_ROCKET
ld a, TEXT_ROUTE24_COOLTRAINER_M1 ld a, TEXT_ROUTE24_COOLTRAINER_M1
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
@ -125,7 +125,7 @@ Route24CooltrainerM1Text:
ld hl, .DefeatedText ld hl, .DefeatedText
ld de, .DefeatedText ld de, .DefeatedText
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ldh a, [hSpriteIndexOrTextID] ldh a, [hSpriteIndex]
ld [wSpriteIndex], a ld [wSpriteIndex], a
call EngageMapTrainer call EngageMapTrainer
call InitBattleEnemyParameters call InitBattleEnemyParameters

4
scripts/Route5Gate.asm
View file

@ -32,7 +32,7 @@ Route5GateDefaultScript:
and a and a
jr nz, .have_drink jr nz, .have_drink
ld a, TEXT_ROUTE5GATE_GUARD_GEE_IM_THIRSTY ld a, TEXT_ROUTE5GATE_GUARD_GEE_IM_THIRSTY
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call Route5GateMovePlayerUpScript call Route5GateMovePlayerUpScript
ld a, SCRIPT_ROUTE5GATE_PLAYER_MOVING ld a, SCRIPT_ROUTE5GATE_PLAYER_MOVING
@ -40,7 +40,7 @@ Route5GateDefaultScript:
ret ret
.have_drink .have_drink
ld a, TEXT_ROUTE5GATE_GUARD_GIVE_DRINK ld a, TEXT_ROUTE5GATE_GUARD_GIVE_DRINK
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld hl, wStatusFlags1 ld hl, wStatusFlags1
set BIT_GAVE_SAFFRON_GUARDS_DRINK, [hl] set BIT_GAVE_SAFFRON_GUARDS_DRINK, [hl]

4
scripts/Route6Gate.asm
View file

@ -26,7 +26,7 @@ Route6GateDefaultScript:
and a and a
jr nz, .have_drink jr nz, .have_drink
ld a, TEXT_ROUTE6GATE_GUARD_GEE_IM_THIRSTY ld a, TEXT_ROUTE6GATE_GUARD_GEE_IM_THIRSTY
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call Route6GateMovePlayerDownScript call Route6GateMovePlayerDownScript
ld a, SCRIPT_ROUTE6GATE_PLAYER_MOVING ld a, SCRIPT_ROUTE6GATE_PLAYER_MOVING
@ -36,7 +36,7 @@ Route6GateDefaultScript:
ld hl, wStatusFlags1 ld hl, wStatusFlags1
set BIT_GAVE_SAFFRON_GUARDS_DRINK, [hl] set BIT_GAVE_SAFFRON_GUARDS_DRINK, [hl]
ld a, TEXT_ROUTE6GATE_GUARD_GIVE_DRINK ld a, TEXT_ROUTE6GATE_GUARD_GIVE_DRINK
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp DisplayTextID jp DisplayTextID
.PlayerInCoordsArray: .PlayerInCoordsArray:

4
scripts/Route7Gate.asm
View file

@ -38,7 +38,7 @@ Route7DefaultScript:
and a and a
jr nz, .have_drink jr nz, .have_drink
ld a, TEXT_ROUTE7GATE_GUARD_GEE_IM_THIRSTY ld a, TEXT_ROUTE7GATE_GUARD_GEE_IM_THIRSTY
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call Route7GateMovePlayerLeftScript call Route7GateMovePlayerLeftScript
ld a, SCRIPT_ROUTE7GATE_PLAYER_MOVING ld a, SCRIPT_ROUTE7GATE_PLAYER_MOVING
@ -46,7 +46,7 @@ Route7DefaultScript:
ret ret
.have_drink .have_drink
ld a, TEXT_ROUTE7GATE_GUARD_GIVE_DRINK ld a, TEXT_ROUTE7GATE_GUARD_GIVE_DRINK
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld hl, wStatusFlags1 ld hl, wStatusFlags1
set BIT_GAVE_SAFFRON_GUARDS_DRINK, [hl] set BIT_GAVE_SAFFRON_GUARDS_DRINK, [hl]

4
scripts/Route8Gate.asm
View file

@ -37,7 +37,7 @@ Route8GateDefaultScript:
and a and a
jr nz, .have_drink jr nz, .have_drink
ld a, TEXT_ROUTE8GATE_GUARD_GEE_IM_THIRSTY ld a, TEXT_ROUTE8GATE_GUARD_GEE_IM_THIRSTY
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call Route8GateMovePlayerRightScript call Route8GateMovePlayerRightScript
ld a, SCRIPT_ROUTE8GATE_PLAYER_MOVING ld a, SCRIPT_ROUTE8GATE_PLAYER_MOVING
@ -47,7 +47,7 @@ Route8GateDefaultScript:
ld hl, wStatusFlags1 ld hl, wStatusFlags1
set BIT_GAVE_SAFFRON_GUARDS_DRINK, [hl] set BIT_GAVE_SAFFRON_GUARDS_DRINK, [hl]
ld a, TEXT_ROUTE8GATE_GUARD_GIVE_DRINK ld a, TEXT_ROUTE8GATE_GUARD_GIVE_DRINK
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
jp DisplayTextID jp DisplayTextID
.PlayerInCoordsArray: .PlayerInCoordsArray:

4
scripts/SSAnne2F.asm
View file

@ -94,7 +94,7 @@ SSAnne2FRivalStartBattleScript:
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, TEXT_SSANNE2F_RIVAL ld a, TEXT_SSANNE2F_RIVAL
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call Delay3 call Delay3
ld a, OPP_RIVAL2 ld a, OPP_RIVAL2
@ -129,7 +129,7 @@ SSAnne2FRivalAfterBattleScript:
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, TEXT_SSANNE2F_RIVAL_CUT_MASTER ld a, TEXT_SSANNE2F_RIVAL_CUT_MASTER
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, SSANNE2F_RIVAL ld a, SSANNE2F_RIVAL
ldh [hSpriteIndex], a ldh [hSpriteIndex], a

8
scripts/SafariZoneGate.asm
View file

@ -20,7 +20,7 @@ SafariZoneGateDefaultScript:
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
ret nc ret nc
ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_1 ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_1
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a ld [wJoyIgnore], a
@ -58,7 +58,7 @@ SafariZoneGateWouldYouLikeToJoinScript:
ld [wJoyIgnore], a ld [wJoyIgnore], a
call UpdateSprites call UpdateSprites
ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_WOULD_YOU_LIKE_TO_JOIN ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_WOULD_YOU_LIKE_TO_JOIN
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a ld [wJoyIgnore], a
@ -83,7 +83,7 @@ SafariZoneGateLeavingSafariScript:
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_GOOD_HAUL_COME_AGAIN ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_GOOD_HAUL_COME_AGAIN
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [wNumSafariBalls], a ld [wNumSafariBalls], a
@ -95,7 +95,7 @@ SafariZoneGateLeavingSafariScript:
jr .return jr .return
.leaving_early .leaving_early
ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_LEAVING_EARLY ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_LEAVING_EARLY
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
.return .return
ret ret

6
scripts/SaffronGym.asm
View file

@ -45,20 +45,20 @@ SaffronGymSabrinaPostBattle:
SaffronGymSabrinaReceiveTM46Script: SaffronGymSabrinaReceiveTM46Script:
ld a, TEXT_SAFFRONGYM_SABRINA_MARSH_BADGE_INFO ld a, TEXT_SAFFRONGYM_SABRINA_MARSH_BADGE_INFO
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_BEAT_SABRINA SetEvent EVENT_BEAT_SABRINA
lb bc, TM_PSYWAVE, 1 lb bc, TM_PSYWAVE, 1
call GiveItem call GiveItem
jr nc, .BagFull jr nc, .BagFull
ld a, TEXT_SAFFRONGYM_SABRINA_RECEIVED_TM46 ld a, TEXT_SAFFRONGYM_SABRINA_RECEIVED_TM46
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_GOT_TM46 SetEvent EVENT_GOT_TM46
jr .gymVictory jr .gymVictory
.BagFull .BagFull
ld a, TEXT_SAFFRONGYM_SABRINA_TM46_NO_ROOM ld a, TEXT_SAFFRONGYM_SABRINA_TM46_NO_ROOM
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
.gymVictory .gymVictory
ld hl, wObtainedBadges ld hl, wObtainedBadges

4
scripts/SilphCo11F.asm
View file

@ -176,7 +176,7 @@ SilphCo11FDefaultScript:
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, TEXT_SILPHCO11F_GIOVANNI ld a, TEXT_SILPHCO11F_GIOVANNI
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, SILPHCO11F_GIOVANNI ld a, SILPHCO11F_GIOVANNI
ldh [hSpriteIndex], a ldh [hSpriteIndex], a
@ -223,7 +223,7 @@ SilphCo11FGiovanniAfterBattleScript:
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, TEXT_SILPHCO11F_GIOVANNI_YOU_RUINED_OUR_PLANS ld a, TEXT_SILPHCO11F_GIOVANNI_YOU_RUINED_OUR_PLANS
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call GBFadeOutToBlack call GBFadeOutToBlack
call SilphCo11FTeamRocketLeavesScript call SilphCo11FTeamRocketLeavesScript

6
scripts/SilphCo7F.asm
View file

@ -138,7 +138,7 @@ SilphCo7FDefaultScript:
ld a, MUSIC_MEET_RIVAL ld a, MUSIC_MEET_RIVAL
call PlayMusic call PlayMusic
ld a, TEXT_SILPHCO7F_RIVAL ld a, TEXT_SILPHCO7F_RIVAL
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, SILPHCO7F_RIVAL ld a, SILPHCO7F_RIVAL
ldh [hSpriteIndex], a ldh [hSpriteIndex], a
@ -175,7 +175,7 @@ SilphCo7FRivalStartBattleScript:
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, TEXT_SILPHCO7F_RIVAL_WAITED_HERE ld a, TEXT_SILPHCO7F_RIVAL_WAITED_HERE
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
call Delay3 call Delay3
ld hl, wStatusFlags3 ld hl, wStatusFlags3
@ -218,7 +218,7 @@ SilphCo7FRivalAfterBattleScript:
ldh [hSpriteFacingDirection], a ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay call SetSpriteFacingDirectionAndDelay
ld a, TEXT_SILPHCO7F_RIVAL_GOOD_LUCK_TO_YOU ld a, TEXT_SILPHCO7F_RIVAL_GOOD_LUCK_TO_YOU
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld a, SFX_STOP_ALL_MUSIC ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a ld [wNewSoundID], a

2
scripts/VermilionCity.asm
View file

@ -49,7 +49,7 @@ VermilionCityDefaultScript:
ldh [hJoyHeld], a ldh [hJoyHeld], a
ld [wSavedCoordIndex], a ; unnecessary ld [wSavedCoordIndex], a ; unnecessary
ld a, TEXT_VERMILIONCITY_SAILOR1 ld a, TEXT_VERMILIONCITY_SAILOR1
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
CheckEvent EVENT_SS_ANNE_LEFT CheckEvent EVENT_SS_ANNE_LEFT
jr nz, .ship_departed jr nz, .ship_departed

6
scripts/VermilionGym.asm
View file

@ -64,20 +64,20 @@ VermilionGymLTSurgeAfterBattleScript:
VermilionGymLTSurgeReceiveTM24Script: VermilionGymLTSurgeReceiveTM24Script:
ld a, TEXT_VERMILIONGYM_LT_SURGE_THUNDER_BADGE_INFO ld a, TEXT_VERMILIONGYM_LT_SURGE_THUNDER_BADGE_INFO
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_BEAT_LT_SURGE SetEvent EVENT_BEAT_LT_SURGE
lb bc, TM_THUNDERBOLT, 1 lb bc, TM_THUNDERBOLT, 1
call GiveItem call GiveItem
jr nc, .bag_full jr nc, .bag_full
ld a, TEXT_VERMILIONGYM_LT_SURGE_RECEIVED_TM24 ld a, TEXT_VERMILIONGYM_LT_SURGE_RECEIVED_TM24
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_GOT_TM24 SetEvent EVENT_GOT_TM24
jr .gym_victory jr .gym_victory
.bag_full .bag_full
ld a, TEXT_VERMILIONGYM_LT_SURGE_TM24_NO_ROOM ld a, TEXT_VERMILIONGYM_LT_SURGE_TM24_NO_ROOM
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
.gym_victory .gym_victory
ld hl, wObtainedBadges ld hl, wObtainedBadges

6
scripts/ViridianCity.asm
View file

@ -31,7 +31,7 @@ ViridianCityCheckGymOpenScript:
cp 32 cp 32
ret nz ret nz
ld a, TEXT_VIRIDIANCITY_GYM_LOCKED ld a, TEXT_VIRIDIANCITY_GYM_LOCKED
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a
@ -50,7 +50,7 @@ ViridianCityCheckGotPokedexScript:
cp 19 cp 19
ret nz ret nz
ld a, TEXT_VIRIDIANCITY_OLD_MAN_SLEEPY ld a, TEXT_VIRIDIANCITY_OLD_MAN_SLEEPY
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
xor a xor a
ldh [hJoyHeld], a ldh [hJoyHeld], a
@ -96,7 +96,7 @@ ViridianCityOldManEndCatchTrainingScript:
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, TEXT_VIRIDIANCITY_OLD_MAN_YOU_NEED_TO_WEAKEN_THE_TARGET ld a, TEXT_VIRIDIANCITY_OLD_MAN_YOU_NEED_TO_WEAKEN_THE_TARGET
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [wBattleType], a ld [wBattleType], a

6
scripts/ViridianGym.asm
View file

@ -137,20 +137,20 @@ ViridianGymGiovanniPostBattle:
; fallthrough ; fallthrough
ViridianGymReceiveTM27: ViridianGymReceiveTM27:
ld a, TEXT_VIRIDIANGYM_GIOVANNI_EARTH_BADGE_INFO ld a, TEXT_VIRIDIANGYM_GIOVANNI_EARTH_BADGE_INFO
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI SetEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
lb bc, TM_FISSURE, 1 lb bc, TM_FISSURE, 1
call GiveItem call GiveItem
jr nc, .bag_full jr nc, .bag_full
ld a, TEXT_VIRIDIANGYM_GIOVANNI_RECEIVED_TM27 ld a, TEXT_VIRIDIANGYM_GIOVANNI_RECEIVED_TM27
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
SetEvent EVENT_GOT_TM27 SetEvent EVENT_GOT_TM27
jr .gym_victory jr .gym_victory
.bag_full .bag_full
ld a, TEXT_VIRIDIANGYM_GIOVANNI_TM27_NO_ROOM ld a, TEXT_VIRIDIANGYM_GIOVANNI_TM27_NO_ROOM
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
.gym_victory .gym_victory
ld hl, wObtainedBadges ld hl, wObtainedBadges

4
scripts/ViridianMart.asm
View file

@ -28,7 +28,7 @@ ViridianMart_ScriptPointers:
ViridianMartDefaultScript: ViridianMartDefaultScript:
call UpdateSprites call UpdateSprites
ld a, TEXT_VIRIDIANMART_CLERK_YOU_CAME_FROM_PALLET_TOWN ld a, TEXT_VIRIDIANMART_CLERK_YOU_CAME_FROM_PALLET_TOWN
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
ld hl, wSimulatedJoypadStatesEnd ld hl, wSimulatedJoypadStatesEnd
ld de, .PlayerMovement ld de, .PlayerMovement
@ -51,7 +51,7 @@ ViridianMartOaksParcelScript:
ret nz ret nz
call Delay3 call Delay3
ld a, TEXT_VIRIDIANMART_CLERK_PARCEL_QUEST ld a, TEXT_VIRIDIANMART_CLERK_PARCEL_QUEST
ldh [hSpriteIndexOrTextID], a ldh [hTextID], a
call DisplayTextID call DisplayTextID
lb bc, OAKS_PARCEL, 1 lb bc, OAKS_PARCEL, 1
call GiveItem call GiveItem

2
scripts/WardensHouse.asm
View file

@ -95,7 +95,7 @@ WardensHouseWardenText:
WardensHouseDisplayText: WardensHouseDisplayText:
text_asm text_asm
ldh a, [hSpriteIndexOrTextID] ldh a, [hTextID]
cp TEXT_WARDENSHOUSE_DISPLAY_LEFT cp TEXT_WARDENSHOUSE_DISPLAY_LEFT
ld hl, .MerchandiseText ld hl, .MerchandiseText
jr nz, .print_text jr nz, .print_text