pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Identify some more labels

Browse Source
This commit is contained in:
Rangi 2021-02-05 12:44:21 -05:00
parent 7d3ea88611
commit 4264d53eb6
17 changed files with 197 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
data/text/common_1.asm
View File

@ -215,32 +215,32 @@ _OakTimeIsItText::
; Mobile Adapter ; Mobile Adapter
UnknownText_0x1bc384:: ; unreferenced _ThereIsNothingConnectedText:: ; unreferenced
text "There is nothing" text "There is nothing"
line "connected." line "connected."
done done
UnknownText_0x1bc3a1:: ; unreferenced _CheckCellPhoneAdapterText:: ; unreferenced
text "Check cell phone" text "Check cell phone"
line "adapter." line "adapter."
done done
UnknownText_0x1bc3bc:: ; unreferenced _CheckCDMAAdapterText:: ; unreferenced
text "Check CDMA" text "Check CDMA"
line "adapter." line "adapter."
done done
UnknownText_0x1bc3d1:: ; unreferenced _CheckDOCOMOPHSAdapterText:: ; unreferenced
text "Check DOCOMO PHS" text "Check DOCOMO PHS"
line "adapter." line "adapter."
done done
UnknownText_0x1bc3ec:: ; unreferenced _CheckDDIPHSAdapterText:: ; unreferenced
text "Check DDI PHS" text "Check DDI PHS"
line "adapter." line "adapter."
done done
UnknownText_0x1bc404:: ; unreferenced _CheckMobileAdapterText:: ; unreferenced
text "Check unlimited" text "Check unlimited"
line "battle mobile" line "battle mobile"
cont "adapter." cont "adapter."
@ -1225,19 +1225,19 @@ _TheBoxIsFullText:: ; unreferenced
; Mobile Adapter ; Mobile Adapter
UnknownText_0x1bd19a:: _NewCardArrivedText::
text "A new CARD arrived" text "A new CARD arrived"
line "from @" line "from @"
text_ram wStringBuffer2 text_ram wStringBuffer2
text "." text "."
done done
UnknownText_0x1bd1ba:: _PutCardInCardFolderText::
text "Put this CARD in" text "Put this CARD in"
line "the CARD FOLDER?" line "the CARD FOLDER?"
done done
UnknownText_0x1bd1dd:: _CardWasListedText::
text_ram wStringBuffer2 text_ram wStringBuffer2
text "'s CARD was" text "'s CARD was"
line "listed as no.@" line "listed as no.@"
@ -1245,34 +1245,34 @@ UnknownText_0x1bd1dd::
text "." text "."
prompt prompt
UnknownText_0x1bd201:: _StartingLinkText::
text "Starting link." text "Starting link."
done done
UnknownText_0x1bd211:: _LinkTerminatedText::
text "Link terminated." text "Link terminated."
done done
UnknownText_0x1bd223:: _ClosingLinkText::
text "Closing link." text "Closing link."
done done
UnknownText_0x1bd232:: ; unreferenced _ClearTimeLimitText:: ; unreferenced
text "Clear the time" text "Clear the time"
line "limit?" line "limit?"
done done
UnknownText_0x1bd249:: ; unreferenced _TimeLimitWasClearedText:: ; unreferenced
text "The time limit was" text "The time limit was"
line "cleared." line "cleared."
done done
UnknownText_0x1bd266:: ; unreferenced _PickErrorPacketText:: ; unreferenced
text "Pick which packet" text "Pick which packet"
line "as an error?" line "as an error?"
done done
UnknownText_0x1bd286:: _TradingMonForOTMonText::
text "Trading @" text "Trading @"
text_ram wStringBuffer2 text_ram wStringBuffer2
text_start text_start

22
data/text/common_3.asm
View File

@ -79,7 +79,7 @@ _LinkAskTradeForText::
text "?" text "?"
done done
UnknownText_0x1c422a:: _MobileBattleMustPickThreeMonText::
text "To enter a mobile" text "To enter a mobile"
line "battle, you must" line "battle, you must"
@ -89,12 +89,12 @@ UnknownText_0x1c422a::
para "Is that OK?" para "Is that OK?"
done done
UnknownText_0x1c4275:: _MobileBattleMoreInfoText::
text "Need more info on" text "Need more info on"
line "mobile battles?" line "mobile battles?"
done done
UnknownText_0x1c4298:: _MobileBattleRulesText::
text "For a mobile" text "For a mobile"
line "battle, choose" line "battle, choose"
cont "three #MON." cont "three #MON."
@ -121,7 +121,7 @@ UnknownText_0x1c4298::
line "wins." line "wins."
done done
UnknownText_0x1c439c:: _WouldYouLikeToMobileBattleText::
text "Today's remaining" text "Today's remaining"
line "time is @" line "time is @"
text_decimal wStringBuffer2, 1, 2 text_decimal wStringBuffer2, 1, 2
@ -131,7 +131,7 @@ UnknownText_0x1c439c::
line "battle?" line "battle?"
done done
UnknownText_0x1c43dc:: _WantAQuickMobileBattleText::
text "There are only @" text "There are only @"
text_decimal wStringBuffer2, 1, 2 text_decimal wStringBuffer2, 1, 2
text_start text_start
@ -141,7 +141,7 @@ UnknownText_0x1c43dc::
line "battle?" line "battle?"
done done
UnknownText_0x1c4419:: _WantToRushThroughAMobileBattleText::
text "There is only" text "There is only"
line "1 min. left today!" line "1 min. left today!"
@ -149,7 +149,7 @@ UnknownText_0x1c4419::
line "through a battle?" line "through a battle?"
done done
UnknownText_0x1c445a:: _PleaseTryAgainTomorrowText::
text "There is less than" text "There is less than"
line "1 min. left today!" line "1 min. left today!"
@ -157,7 +157,7 @@ UnknownText_0x1c445a::
line "tomorrow." line "tomorrow."
done done
UnknownText_0x1c449c:: _TryAgainUsingSameSettingsText::
text "Try again using" text "Try again using"
line "the same settings?" line "the same settings?"
done done
@ -172,12 +172,12 @@ _MobileBattleNoTimeLeftForLinkingText::
line "linking today." line "linking today."
done done
UnknownText_0x1c4508:: _PickThreeMonForMobileBattleText::
text "Pick three #MON" text "Pick three #MON"
line "for battle." line "for battle."
done done
UnknownText_0x1c4525:: _MobileBattleRemainingTimeText::
text "Today's remaining" text "Today's remaining"
line "time is @" line "time is @"
text_decimal wStringBuffer2, 1, 2 text_decimal wStringBuffer2, 1, 2
@ -753,7 +753,7 @@ _DeletedTheLoginPasswordText::
line "PASSWORD." line "PASSWORD."
done done
_MobilePickThreeMonForBattle:: _MobilePickThreeMonForBattleText::
text "Pick three #MON" text "Pick three #MON"
line "for battle." line "for battle."
prompt prompt

8
engine/battle/core.asm
View File

@ -158,7 +158,7 @@ WildFled_EnemyFled_LinkBattleCanceled:
BattleTurn: BattleTurn:
.loop .loop
call Stubbed_Function3c1bf call Stubbed_Increments5_a89a
call CheckContestBattleOver call CheckContestBattleOver
jp c, .quit jp c, .quit
@ -228,11 +228,11 @@ BattleTurn:
.quit .quit
ret ret
Stubbed_Function3c1bf: Stubbed_Increments5_a89a:
ret ret
ld a, BANK(s5_a89b) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 ld a, BANK(s5_a89a) ; MBC30 bank used by JP Crystal; inaccessible by MBC3
call OpenSRAM call OpenSRAM
ld hl, s5_a89b ; address of MBC30 bank ld hl, s5_a89a + 1 ; address of MBC30 bank
inc [hl] inc [hl]
jr nz, .finish jr nz, .finish
dec hl dec hl

6
engine/battle_anims/anim_commands.asm
View File

@ -26,11 +26,11 @@ _PlayBattleAnim:
ld c, 1 ld c, 1
ldh a, [rKEY1] ldh a, [rKEY1]
bit 7, a bit 7, a ; check CGB double speed mode
jr nz, .asm_cc0ff jr nz, .got_speed
ld c, 3 ld c, 3
.asm_cc0ff .got_speed
ld hl, hVBlank ld hl, hVBlank
ld a, [hl] ld a, [hl]
push af push af

5
engine/events/battle_tower/battle_tower.asm
View File

@ -5,6 +5,7 @@ BattleTowerRoomMenu:
ret ret
Function1700ba: Function1700ba:
; special
call InitBattleTowerChallengeRAM call InitBattleTowerChallengeRAM
farcall Function11811a farcall Function11811a
ret ret
@ -136,7 +137,7 @@ Function170139: ; unreferenced
ld l, a ld l, a
ld a, [wcd4c] ld a, [wcd4c]
ld h, a ld h, a
ld bc, $0006 ld bc, 6
call CopyBytes call CopyBytes
ld a, l ld a, l
ld [wcd4b], a ld [wcd4b], a
@ -156,7 +157,7 @@ Function170139: ; unreferenced
ld a, BANK(s5_a894) ; aka BANK(s5_a948) ld a, BANK(s5_a894) ; aka BANK(s5_a948)
call OpenSRAM call OpenSRAM
ld hl, s5_a894 ld hl, s5_a894
ld bc, NAME_LENGTH_JAPANESE ld bc, 6
call CopyBytes call CopyBytes
ld hl, wc608 ld hl, wc608
ld de, s5_a948 ld de, s5_a948

12
engine/movie/intro.asm
View File

@ -693,30 +693,30 @@ IntroScene14:
jr z, .done jr z, .done
cp $60 cp $60
jr z, .jump jr z, .jump
jr nc, .asm_e4e1a jr nc, .run_after_jump
cp $40 cp $40
jr nc, .asm_e4e33 jr nc, .run
ret ret
.jump .jump
ld de, SFX_INTRO_SUICUNE_4 ld de, SFX_INTRO_SUICUNE_4
call PlaySFX call PlaySFX
.asm_e4e1a .run_after_jump
ld a, $1 ld a, $1
ld [wIntroSceneTimer], a ld [wIntroSceneTimer], a
ld a, [wGlobalAnimXOffset] ld a, [wGlobalAnimXOffset]
cp $88 cp $88
jr c, .asm_e4e2c jr c, .disappear
sub $8 sub $8
ld [wGlobalAnimXOffset], a ld [wGlobalAnimXOffset], a
ret ret
.asm_e4e2c .disappear
farcall DeinitializeAllSprites farcall DeinitializeAllSprites
ret ret
.asm_e4e33 .run
ld a, [wGlobalAnimXOffset] ld a, [wGlobalAnimXOffset]
sub $2 sub $2
ld [wGlobalAnimXOffset], a ld [wGlobalAnimXOffset], a

5
engine/printer/print_party.asm
View File

@ -217,10 +217,9 @@ PrintPartyMonPage1:
ld [hl], a ld [hl], a
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
cp UNOWN cp UNOWN
jr z, .asm_1dc469 jr z, .got_alignment
inc [hl] inc [hl]
.got_alignment
.asm_1dc469
hlcoord 0, 0 hlcoord 0, 0
call _PrepMonFrontpic call _PrepMonFrontpic
call WaitBGMap call WaitBGMap

36
engine/tilesets/tileset_anims.asm
View File

@ -477,11 +477,11 @@ ForestTreeLeftAnimation:
; Only during the Celebi event. ; Only during the Celebi event.
ld a, [wCelebiEvent] ld a, [wCelebiEvent]
bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a
jr nz, .asm_fc46c jr nz, .do_animation
ld hl, ForestTreeLeftFrames ld hl, ForestTreeLeftFrames
jr .asm_fc47d jr .got_frames
.asm_fc46c .do_animation
ld a, [wTileAnimationTimer] ld a, [wTileAnimationTimer]
call GetForestTreeFrame call GetForestTreeFrame
add a add a
@ -493,7 +493,7 @@ ForestTreeLeftAnimation:
adc HIGH(ForestTreeLeftFrames) adc HIGH(ForestTreeLeftFrames)
ld h, a ld h, a
.asm_fc47d .got_frames
ld sp, hl ld sp, hl
ld hl, vTiles2 tile $0c ld hl, vTiles2 tile $0c
jp WriteTile jp WriteTile
@ -514,11 +514,11 @@ ForestTreeRightAnimation:
; Only during the Celebi event. ; Only during the Celebi event.
ld a, [wCelebiEvent] ld a, [wCelebiEvent]
bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a
jr nz, .asm_fc4d4 jr nz, .do_animation
ld hl, ForestTreeRightFrames ld hl, ForestTreeRightFrames
jr .asm_fc4eb jr .got_frames
.asm_fc4d4 .do_animation
ld a, [wTileAnimationTimer] ld a, [wTileAnimationTimer]
call GetForestTreeFrame call GetForestTreeFrame
add a add a
@ -534,7 +534,7 @@ ForestTreeRightAnimation:
add hl, bc add hl, bc
pop bc pop bc
.asm_fc4eb .got_frames
ld sp, hl ld sp, hl
ld hl, vTiles2 tile $0f ld hl, vTiles2 tile $0f
jp WriteTile jp WriteTile
@ -547,14 +547,14 @@ ForestTreeLeftAnimation2:
; Only during the Celebi event. ; Only during the Celebi event.
ld a, [wCelebiEvent] ld a, [wCelebiEvent]
bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a
jr nz, .asm_fc502 jr nz, .do_animation
ld hl, ForestTreeLeftFrames ld hl, ForestTreeLeftFrames
jr .asm_fc515 jr .got_frames
.asm_fc502 .do_animation
ld a, [wTileAnimationTimer] ld a, [wTileAnimationTimer]
call GetForestTreeFrame call GetForestTreeFrame
xor 2 xor %10
add a add a
add a add a
add a add a
@ -564,7 +564,7 @@ ForestTreeLeftAnimation2:
adc HIGH(ForestTreeLeftFrames) adc HIGH(ForestTreeLeftFrames)
ld h, a ld h, a
.asm_fc515 .got_frames
ld sp, hl ld sp, hl
ld hl, vTiles2 tile $0c ld hl, vTiles2 tile $0c
jp WriteTile jp WriteTile
@ -577,14 +577,14 @@ ForestTreeRightAnimation2:
; Only during the Celebi event. ; Only during the Celebi event.
ld a, [wCelebiEvent] ld a, [wCelebiEvent]
bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a bit CELEBIEVENT_FOREST_IS_RESTLESS_F, a
jr nz, .asm_fc52c jr nz, .do_animation
ld hl, ForestTreeRightFrames ld hl, ForestTreeRightFrames
jr .asm_fc545 jr .got_frames
.asm_fc52c .do_animation
ld a, [wTileAnimationTimer] ld a, [wTileAnimationTimer]
call GetForestTreeFrame call GetForestTreeFrame
xor 2 xor %10
add a add a
add a add a
add a add a
@ -598,7 +598,7 @@ ForestTreeRightAnimation2:
add hl, bc add hl, bc
pop bc pop bc
.asm_fc545 .got_frames
ld sp, hl ld sp, hl
ld hl, vTiles2 tile $0f ld hl, vTiles2 tile $0f
jp WriteTile jp WriteTile

22
maps/EcruteakTinTowerEntrance.asm
View File

@ -41,27 +41,27 @@ EcruteakTinTowerEntrance_MapScripts:
clearevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE clearevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
endcallback endcallback
EcruteakTinTowerEntrance_CoordEvent1: EcruteakTinTowerEntranceSageBlocksLeft:
checkevent EVENT_RANG_CLEAR_BELL_2 checkevent EVENT_RANG_CLEAR_BELL_2
iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove iftrue EcruteakTinTowerEntranceAlreadyBlocked
applymovement ECRUTEAKTINTOWERENTRANCE_SAGE2, MovementData_0x980c7 applymovement ECRUTEAKTINTOWERENTRANCE_SAGE2, EcruteakTinTowerEntranceSageBlocksLeftMovement
moveobject ECRUTEAKTINTOWERENTRANCE_SAGE1, 4, 6 moveobject ECRUTEAKTINTOWERENTRANCE_SAGE1, 4, 6
appear ECRUTEAKTINTOWERENTRANCE_SAGE1 appear ECRUTEAKTINTOWERENTRANCE_SAGE1
pause 5 pause 5
disappear ECRUTEAKTINTOWERENTRANCE_SAGE2 disappear ECRUTEAKTINTOWERENTRANCE_SAGE2
end end
EcruteakTinTowerEntrance_CoordEvent2: EcruteakTinTowerEntranceSageBlocksRight:
checkevent EVENT_RANG_CLEAR_BELL_1 checkevent EVENT_RANG_CLEAR_BELL_1
iftrue EcruteakTinTowerEntrance_CoordEvent_DontMove iftrue EcruteakTinTowerEntranceAlreadyBlocked
applymovement ECRUTEAKTINTOWERENTRANCE_SAGE1, MovementData_0x980cc applymovement ECRUTEAKTINTOWERENTRANCE_SAGE1, EcruteakTinTowerEntranceSageBlocksRightMovement
moveobject ECRUTEAKTINTOWERENTRANCE_SAGE2, 5, 6 moveobject ECRUTEAKTINTOWERENTRANCE_SAGE2, 5, 6
appear ECRUTEAKTINTOWERENTRANCE_SAGE2 appear ECRUTEAKTINTOWERENTRANCE_SAGE2
pause 5 pause 5
disappear ECRUTEAKTINTOWERENTRANCE_SAGE1 disappear ECRUTEAKTINTOWERENTRANCE_SAGE1
end end
EcruteakTinTowerEntrance_CoordEvent_DontMove: EcruteakTinTowerEntranceAlreadyBlocked:
end end
EcruteakTinTowerEntranceSageScript: EcruteakTinTowerEntranceSageScript:
@ -135,14 +135,14 @@ EcruteakTinTowerEntranceWanderingSageScript:
EcruteakTinTowerEntranceGrampsScript: EcruteakTinTowerEntranceGrampsScript:
jumptextfaceplayer EcruteakTinTowerEntranceGrampsText jumptextfaceplayer EcruteakTinTowerEntranceGrampsText
MovementData_0x980c7: EcruteakTinTowerEntranceSageBlocksLeftMovement:
fix_facing fix_facing
big_step LEFT big_step LEFT
remove_fixed_facing remove_fixed_facing
turn_head DOWN turn_head DOWN
step_end step_end
MovementData_0x980cc: EcruteakTinTowerEntranceSageBlocksRightMovement:
fix_facing fix_facing
big_step RIGHT big_step RIGHT
remove_fixed_facing remove_fixed_facing
@ -286,8 +286,8 @@ EcruteakTinTowerEntrance_MapEvents:
warp_event 17, 3, WISE_TRIOS_ROOM, 3 warp_event 17, 3, WISE_TRIOS_ROOM, 3
def_coord_events def_coord_events
coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1 coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntranceSageBlocksLeft
coord_event 5, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent2 coord_event 5, 7, SCENE_DEFAULT, EcruteakTinTowerEntranceSageBlocksRight
def_bg_events def_bg_events

12
maps/IlexForest.asm
View File

@ -457,7 +457,7 @@ IlexForestShrineScript:
pause 20 pause 20
showemote EMOTE_SHOCK, PLAYER, 20 showemote EMOTE_SHOCK, PLAYER, 20
special FadeOutMusic special FadeOutMusic
applymovement PLAYER, MovementData_0x6ef58 applymovement PLAYER, IlexForestPlayerStepsDownMovement
pause 30 pause 30
turnobject PLAYER, DOWN turnobject PLAYER, DOWN
pause 20 pause 20
@ -470,12 +470,12 @@ IlexForestShrineScript:
special CheckCaughtCelebi special CheckCaughtCelebi
iffalse .DidntCatchCelebi iffalse .DidntCatchCelebi
appear ILEXFOREST_KURT appear ILEXFOREST_KURT
applymovement ILEXFOREST_KURT, MovementData_0x6ef4e applymovement ILEXFOREST_KURT, IlexForestKurtStepsUpMovement
opentext opentext
writetext Text_KurtCaughtCelebi writetext Text_KurtCaughtCelebi
waitbutton waitbutton
closetext closetext
applymovement ILEXFOREST_KURT, MovementData_0x6ef53 applymovement ILEXFOREST_KURT, IlexFOrestKurtStepsDownMovement
disappear ILEXFOREST_KURT disappear ILEXFOREST_KURT
.DidntCatchCelebi: .DidntCatchCelebi:
end end
@ -715,21 +715,21 @@ MovementData_Farfetched_Pos9_Pos8_Down:
big_step UP big_step UP
step_end step_end
MovementData_0x6ef4e: IlexForestKurtStepsUpMovement:
step UP step UP
step UP step UP
step UP step UP
step UP step UP
step_end step_end
MovementData_0x6ef53: IlexFOrestKurtStepsDownMovement:
step DOWN step DOWN
step DOWN step DOWN
step DOWN step DOWN
step DOWN step DOWN
step_end step_end
MovementData_0x6ef58: IlexForestPlayerStepsDownMovement:
fix_facing fix_facing
slow_step DOWN slow_step DOWN
remove_fixed_facing remove_fixed_facing

8
maps/Route34IlexForestGate.asm
View File

@ -29,14 +29,14 @@ Route34IlexForestGateCelebiEvent:
turnobject ROUTE34ILEXFORESTGATE_TEACHER2, LEFT turnobject ROUTE34ILEXFORESTGATE_TEACHER2, LEFT
turnobject PLAYER, RIGHT turnobject PLAYER, RIGHT
follow PLAYER, ROUTE34ILEXFORESTGATE_TEACHER2 follow PLAYER, ROUTE34ILEXFORESTGATE_TEACHER2
applymovement PLAYER, MovementData_0x62d97 applymovement PLAYER, Route34IlexForestGateTeacherBlocksPlayerMovement
stopfollow stopfollow
turnobject PLAYER, DOWN turnobject PLAYER, DOWN
opentext opentext
writetext Route34IlexForestGateTeacher_ForestIsRestless writetext Route34IlexForestGateTeacher_ForestIsRestless
waitbutton waitbutton
closetext closetext
applymovement ROUTE34ILEXFORESTGATE_TEACHER2, MovementData_0x62d9a applymovement ROUTE34ILEXFORESTGATE_TEACHER2, Route34IlexForestGateTeacherReturnsMovement
.skip: .skip:
end end
@ -76,12 +76,12 @@ Route34IlexForestGateButterfreeScript:
Route34IlexForestGateLassScript: Route34IlexForestGateLassScript:
jumptextfaceplayer Route34IlexForestGateLassText jumptextfaceplayer Route34IlexForestGateLassText
MovementData_0x62d97: Route34IlexForestGateTeacherBlocksPlayerMovement:
step UP step UP
step UP step UP
step_end step_end
MovementData_0x62d9a: Route34IlexForestGateTeacherReturnsMovement:
step DOWN step DOWN
step RIGHT step RIGHT
step_end step_end

60
maps/TinTower1F.asm
View File

@ -82,17 +82,17 @@ TinTower1F_MapScripts:
endcallback endcallback
.SuicuneBattle: .SuicuneBattle:
applymovement PLAYER, TinTowerPlayerMovement1 applymovement PLAYER, TinTower1FPlayerEntersMovement
pause 15 pause 15
setval RAIKOU setval RAIKOU
special MonCheck special MonCheck
iftrue .Next1 ; if player caught Raikou, it doesn't appear in Tin Tower iftrue .Next1 ; if player caught Raikou, it doesn't appear in Tin Tower
applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1 applymovement TINTOWER1F_RAIKOU, TinTower1FRaikouApproachesMovement
turnobject PLAYER, LEFT turnobject PLAYER, LEFT
cry RAIKOU cry RAIKOU
pause 10 pause 10
playsound SFX_WARP_FROM playsound SFX_WARP_FROM
applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement2 applymovement TINTOWER1F_RAIKOU, TinTower1FRaikouLeavesMovement
disappear TINTOWER1F_RAIKOU disappear TINTOWER1F_RAIKOU
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
waitsfx waitsfx
@ -100,20 +100,20 @@ TinTower1F_MapScripts:
setval ENTEI setval ENTEI
special MonCheck special MonCheck
iftrue .Next2 ; if player caught Entei, it doesn't appear in Tin Tower iftrue .Next2 ; if player caught Entei, it doesn't appear in Tin Tower
applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1 applymovement TINTOWER1F_ENTEI, TinTower1FEnteiApproachesMovement
turnobject PLAYER, RIGHT turnobject PLAYER, RIGHT
cry ENTEI cry ENTEI
pause 10 pause 10
playsound SFX_WARP_FROM playsound SFX_WARP_FROM
applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement2 applymovement TINTOWER1F_ENTEI, TinTower1FEnteiLeavesMovement
disappear TINTOWER1F_ENTEI disappear TINTOWER1F_ENTEI
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
waitsfx waitsfx
.Next2: .Next2:
turnobject PLAYER, UP turnobject PLAYER, UP
pause 10 pause 10
applymovement PLAYER, TinTowerPlayerMovement2 applymovement PLAYER, TinTower1FPlayerBacksUpMovement
applymovement TINTOWER1F_SUICUNE, TinTowerSuicuneMovement applymovement TINTOWER1F_SUICUNE, TinTower1FSuicuneApproachesMovement
cry SUICUNE cry SUICUNE
pause 20 pause 20
loadwildmon SUICUNE, 40 loadwildmon SUICUNE, 40
@ -137,28 +137,28 @@ TinTower1F_MapScripts:
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
moveobject TINTOWER1F_EUSINE, 10, 15 moveobject TINTOWER1F_EUSINE, 10, 15
appear TINTOWER1F_EUSINE appear TINTOWER1F_EUSINE
applymovement TINTOWER1F_EUSINE, MovementData_0x1851ec applymovement TINTOWER1F_EUSINE, TinTower1FEusineEntersMovement
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
moveobject TINTOWER1F_SAGE1, 9, 15 moveobject TINTOWER1F_SAGE1, 9, 15
appear TINTOWER1F_SAGE1 appear TINTOWER1F_SAGE1
applymovement TINTOWER1F_SAGE1, MovementData_0x1851f5 applymovement TINTOWER1F_SAGE1, TinTower1FSage1EntersMovement
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
moveobject TINTOWER1F_SAGE2, 9, 15 moveobject TINTOWER1F_SAGE2, 9, 15
appear TINTOWER1F_SAGE2 appear TINTOWER1F_SAGE2
applymovement TINTOWER1F_SAGE2, MovementData_0x1851fb applymovement TINTOWER1F_SAGE2, TinTower1FSage2EntersMovement
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
moveobject TINTOWER1F_SAGE3, 9, 15 moveobject TINTOWER1F_SAGE3, 9, 15
appear TINTOWER1F_SAGE3 appear TINTOWER1F_SAGE3
applymovement TINTOWER1F_SAGE3, MovementData_0x1851fe applymovement TINTOWER1F_SAGE3, TinTower1FSage3EntersMovement
moveobject TINTOWER1F_SAGE1, 7, 13 moveobject TINTOWER1F_SAGE1, 7, 13
moveobject TINTOWER1F_SAGE2, 9, 13 moveobject TINTOWER1F_SAGE2, 9, 13
moveobject TINTOWER1F_SAGE3, 11, 13 moveobject TINTOWER1F_SAGE3, 11, 13
turnobject PLAYER, RIGHT turnobject PLAYER, RIGHT
opentext opentext
writetext TinTowerEusineSuicuneText writetext TinTower1FEusineSuicuneText
waitbutton waitbutton
closetext closetext
applymovement TINTOWER1F_EUSINE, MovementData_0x1851f1 applymovement TINTOWER1F_EUSINE, TinTower1FEusineLeavesMovement
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
disappear TINTOWER1F_EUSINE disappear TINTOWER1F_EUSINE
waitsfx waitsfx
@ -224,23 +224,23 @@ TinTower1FSage6Script:
.FoughtHoOh: .FoughtHoOh:
jumptextfaceplayer TinTower1FSage6Text2 jumptextfaceplayer TinTower1FSage6Text2
TinTowerEusine: TinTower1FEusine:
jumptextfaceplayer TinTowerEusineHoOhText jumptextfaceplayer TinTower1FEusineHoOhText
TinTowerPlayerMovement1: TinTower1FPlayerEntersMovement:
slow_step UP slow_step UP
slow_step UP slow_step UP
slow_step UP slow_step UP
slow_step UP slow_step UP
step_end step_end
TinTowerRaikouMovement1: TinTower1FRaikouApproachesMovement:
set_sliding set_sliding
fast_jump_step DOWN fast_jump_step DOWN
remove_sliding remove_sliding
step_end step_end
TinTowerRaikouMovement2: TinTower1FRaikouLeavesMovement:
set_sliding set_sliding
fast_jump_step DOWN fast_jump_step DOWN
fast_jump_step RIGHT fast_jump_step RIGHT
@ -248,13 +248,13 @@ TinTowerRaikouMovement2:
remove_sliding remove_sliding
step_end step_end
TinTowerEnteiMovement1: TinTower1FEnteiApproachesMovement:
set_sliding set_sliding
fast_jump_step DOWN fast_jump_step DOWN
remove_sliding remove_sliding
step_end step_end
TinTowerEnteiMovement2: TinTower1FEnteiLeavesMovement:
set_sliding set_sliding
fast_jump_step DOWN fast_jump_step DOWN
fast_jump_step LEFT fast_jump_step LEFT
@ -262,32 +262,32 @@ TinTowerEnteiMovement2:
remove_sliding remove_sliding
step_end step_end
TinTowerSuicuneMovement: TinTower1FSuicuneApproachesMovement:
set_sliding set_sliding
fast_jump_step DOWN fast_jump_step DOWN
remove_sliding remove_sliding
step_end step_end
TinTowerPlayerMovement2: TinTower1FPlayerBacksUpMovement:
fix_facing fix_facing
big_step DOWN big_step DOWN
remove_fixed_facing remove_fixed_facing
step_end step_end
MovementData_0x1851ec: TinTower1FEusineEntersMovement:
step UP step UP
step UP step UP
step UP step UP
turn_head LEFT turn_head LEFT
step_end step_end
MovementData_0x1851f1: TinTower1FEusineLeavesMovement:
step DOWN step DOWN
step DOWN step DOWN
step DOWN step DOWN
step_end step_end
MovementData_0x1851f5: TinTower1FSage1EntersMovement:
step UP step UP
step UP step UP
step LEFT step LEFT
@ -295,19 +295,19 @@ MovementData_0x1851f5:
turn_head UP turn_head UP
step_end step_end
MovementData_0x1851fb: TinTower1FSage2EntersMovement:
step UP step UP
step UP step UP
step_end step_end
MovementData_0x1851fe: TinTower1FSage3EntersMovement:
step UP step UP
step RIGHT step RIGHT
step RIGHT step RIGHT
step UP step UP
step_end step_end
TinTowerEusineSuicuneText: TinTower1FEusineSuicuneText:
text "EUSINE: Awesome!" text "EUSINE: Awesome!"
line "Too awesome, even!" line "Too awesome, even!"
@ -440,7 +440,7 @@ TinTower1FSage6Text1:
cont "and advance." cont "and advance."
done done
TinTowerEusineHoOhText: TinTower1FEusineHoOhText:
text "I knew it." text "I knew it."
para "I knew you'd get" para "I knew you'd get"
@ -536,7 +536,7 @@ TinTower1F_MapEvents:
object_event 9, 9, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE object_event 9, 9, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE
object_event 7, 9, SPRITE_RAIKOU, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU object_event 7, 9, SPRITE_RAIKOU, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU
object_event 12, 9, SPRITE_ENTEI, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI object_event 12, 9, SPRITE_ENTEI, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI
object_event 8, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE object_event 8, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TinTower1FEusine, EVENT_TIN_TOWER_1F_EUSINE
object_event 5, 9, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 object_event 5, 9, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage1Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage2Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage2Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1
object_event 14, 6, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1 object_event 14, 6, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TinTower1FSage3Script, EVENT_TIN_TOWER_1F_WISE_TRIO_1

12
maps/WiseTriosRoom.asm
View File

@ -55,14 +55,14 @@ WiseTriosRoom_CannotEnterTinTowerScript:
turnobject PLAYER, DOWN turnobject PLAYER, DOWN
showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE3, 20 showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE3, 20
follow PLAYER, WISETRIOSROOM_SAGE3 follow PLAYER, WISETRIOSROOM_SAGE3
applymovement PLAYER, MovementData_0x98622 applymovement PLAYER, WiseTriosRoomSageBlocksPlayerMovement
stopfollow stopfollow
turnobject PLAYER, RIGHT turnobject PLAYER, RIGHT
opentext opentext
writetext WiseTriosRoomSage3BlocksExitText writetext WiseTriosRoomSage3BlocksExitText
waitbutton waitbutton
closetext closetext
applymovement WISETRIOSROOM_SAGE3, MovementData_0x98625 applymovement WISETRIOSROOM_SAGE3, WiseTriosRoomSageReturnsMovement
turnobject WISETRIOSROOM_SAGE3, LEFT turnobject WISETRIOSROOM_SAGE3, LEFT
end end
@ -100,7 +100,7 @@ TrainerSageKoji:
writetext SageKojiAfterBattleSpeechText writetext SageKojiAfterBattleSpeechText
waitbutton waitbutton
closetext closetext
applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628 applymovement WISETRIOSROOM_SAGE6, WiseTriosRoomSageAllowsPassageMovement
turnobject WISETRIOSROOM_SAGE6, UP turnobject WISETRIOSROOM_SAGE6, UP
setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
setscene SCENE_FINISHED setscene SCENE_FINISHED
@ -113,17 +113,17 @@ TrainerSageKoji:
closetext closetext
end end
MovementData_0x98622: WiseTriosRoomSageBlocksPlayerMovement:
step LEFT step LEFT
step LEFT step LEFT
step_end step_end
MovementData_0x98625: WiseTriosRoomSageReturnsMovement:
step RIGHT step RIGHT
step DOWN step DOWN
step_end step_end
MovementData_0x98628: WiseTriosRoomSageAllowsPassageMovement:
step RIGHT step RIGHT
step DOWN step DOWN
step_end step_end

6
mobile/mobile_12_2.asm
View File

@ -235,12 +235,12 @@ Function4a94e:
.asm_4a9b0 .asm_4a9b0
ld de, SFX_WRONG ld de, SFX_WRONG
call PlaySFX call PlaySFX
ld hl, MobilePickThreeMonForBattle ld hl, MobilePickThreeMonForBattleText
call PrintText call PrintText
jr .asm_4a974 jr .asm_4a974
MobilePickThreeMonForBattle: MobilePickThreeMonForBattleText:
text_far _MobilePickThreeMonForBattle text_far _MobilePickThreeMonForBattleText
text_end text_end
Function4a9c3: Function4a9c3:

127
mobile/mobile_40.asm
View File

@ -2712,7 +2712,7 @@ Jumptable_101247:
Function101251: Function101251:
call UpdateSprites call UpdateSprites
call RefreshScreen call RefreshScreen
ld hl, UnknownText_0x1021f4 ld hl, ClosingLinkText
call Function1021e0 call Function1021e0
call Function1020ea call Function1020ea
ret c ret c
@ -2720,14 +2720,14 @@ Function101251:
ret ret
Function101265: Function101265:
ld hl, UnknownText_0x1021ef ld hl, LinkTerminatedText
call Function1021e0 call Function1021e0
ret ret
Function10126c: Function10126c:
call UpdateSprites call UpdateSprites
farcall Script_reloadmappart farcall Script_reloadmappart
ld hl, UnknownText_0x1021f4 ld hl, ClosingLinkText
call Function1021e0 call Function1021e0
ret ret
@ -4733,14 +4733,14 @@ Function102112:
Function102142: Function102142:
call Function10218d call Function10218d
call Function102180 call Function102180
ld hl, UnknownText_0x1021d1 ld hl, NewCardArrivedText
call MenuTextbox call MenuTextbox
ld de, SFX_LEVEL_UP ld de, SFX_LEVEL_UP
call PlaySFX call PlaySFX
call JoyWaitAorB call JoyWaitAorB
call ExitMenu call ExitMenu
call Function10219f call Function10219f
ld hl, UnknownText_0x1021d6 ld hl, PutCardInCardFolderText
call MenuTextbox call MenuTextbox
call YesNoBox call YesNoBox
call ExitMenu call ExitMenu
@ -4749,7 +4749,7 @@ Function102142:
jr c, .asm_10217c jr c, .asm_10217c
call Function10218d call Function10218d
call Function102180 call Function102180
ld hl, UnknownText_0x1021db ld hl, CardWasListedText
call PrintText call PrintText
.asm_10217c .asm_10217c
@ -4794,16 +4794,16 @@ Function1021b8:
pop af pop af
ret ret
UnknownText_0x1021d1: NewCardArrivedText:
text_far UnknownText_0x1bd19a text_far _NewCardArrivedText
text_end text_end
UnknownText_0x1021d6: PutCardInCardFolderText:
text_far UnknownText_0x1bd1ba text_far _PutCardInCardFolderText
text_end text_end
UnknownText_0x1021db: CardWasListedText:
text_far UnknownText_0x1bd1dd text_far _CardWasListedText
text_end text_end
Function1021e0: Function1021e0:
@ -4812,16 +4812,16 @@ Function1021e0:
call ExitMenu call ExitMenu
ret ret
UnknownText_0x1021ea: ; unreferenced StartingLinkText: ; unreferenced
text_far UnknownText_0x1bd201 text_far _StartingLinkText
text_end text_end
UnknownText_0x1021ef: LinkTerminatedText:
text_far UnknownText_0x1bd211 text_far _LinkTerminatedText
text_end text_end
UnknownText_0x1021f4: ClosingLinkText:
text_far UnknownText_0x1bd223 text_far _ClosingLinkText
text_end text_end
Function1021f9: Function1021f9:
@ -6565,12 +6565,12 @@ Function102ea8:
ld a, [hl] ld a, [hl]
ld [wNamedObjectIndex], a ld [wNamedObjectIndex], a
call GetPokemonName call GetPokemonName
ld hl, UnknownText_0x102ee2 ld hl, TradingMonForOTMonText
call PrintTextboxText call PrintTextboxText
ret ret
UnknownText_0x102ee2: TradingMonForOTMonText:
text_far UnknownText_0x1bd286 text_far _TradingMonForOTMonText
text_end text_end
Function102ee7: Function102ee7:
@ -7339,7 +7339,7 @@ Mobile_SelectThreeMons:
farcall Mobile_AlwaysReturnNotCarry farcall Mobile_AlwaysReturnNotCarry
bit 7, c bit 7, c
jr z, .asm_10369b jr z, .asm_10369b
ld hl, UnknownText_0x10375d ld hl, MobileBattleMustPickThreeMonText
call PrintText call PrintText
call YesNoBox call YesNoBox
jr c, .asm_103696 jr c, .asm_103696
@ -7363,7 +7363,7 @@ Mobile_SelectThreeMons:
bit 7, [hl] bit 7, [hl]
set 7, [hl] set 7, [hl]
jr nz, .asm_1036b5 jr nz, .asm_1036b5
ld hl, UnknownText_0x103762 ld hl, MobileBattleMoreInfoText
call PrintText call PrintText
call YesNoBox call YesNoBox
jr c, .asm_1036b5 jr c, .asm_1036b5
@ -7409,49 +7409,48 @@ Mobile_SelectThreeMons:
ret ret
Function1036f9: Function1036f9:
ld hl, UnknownText_0x103767 ld hl, MobileBattleRulesText
call PrintText call PrintText
ret ret
Function103700: Function103700:
ld c, $0a ld c, 10
ld hl, wSwarmFlags ld hl, wSwarmFlags
bit SWARMFLAGS_MOBILE_4_F, [hl] bit SWARMFLAGS_MOBILE_4_F, [hl]
jr z, .asm_10370f jr z, .asm_10370f
farcall MobileBattleGetRemainingTime farcall MobileBattleGetRemainingTime
.asm_10370f .asm_10370f
ld a, c ld a, c
ld [wStringBuffer2], a ld [wStringBuffer2], a
ld a, [wStringBuffer2] ld a, [wStringBuffer2]
cp $05 cp 5
jr nc, .asm_103724 jr nc, .five_or_more_mins
cp $02 cp 2
jr nc, .asm_10372c jr nc, .two_to_five_mins
cp $01 cp 1
jr nc, .asm_103734 jr nc, .one_min
jr .asm_10373c jr .times_up
.asm_103724 .five_or_more_mins
ld hl, UnknownText_0x10376c ld hl, WouldYouLikeToMobileBattleText
call PrintText call PrintText
and a and a
ret ret
.asm_10372c .two_to_five_mins
ld hl, UnknownText_0x103771 ld hl, WantAQuickMobileBattleText
call PrintText call PrintText
and a and a
ret ret
.asm_103734 .one_min
ld hl, UnknownText_0x103776 ld hl, WantToRushThroughAMobileBattleText
call PrintText call PrintText
and a and a
ret ret
.asm_10373c .times_up
ld hl, UnknownText_0x10377b ld hl, PleaseTryAgainTomorrowText
call PrintText call PrintText
call JoyWaitAorB call JoyWaitAorB
scf scf
@ -7470,32 +7469,32 @@ MenuData_10374f:
db "やめる@" db "やめる@"
db "せつめい@" db "せつめい@"
UnknownText_0x10375d: MobileBattleMustPickThreeMonText:
text_far UnknownText_0x1c422a text_far _MobileBattleMustPickThreeMonText
text_end text_end
UnknownText_0x103762: MobileBattleMoreInfoText:
text_far UnknownText_0x1c4275 text_far _MobileBattleMoreInfoText
text_end text_end
UnknownText_0x103767: MobileBattleRulesText:
text_far UnknownText_0x1c4298 text_far _MobileBattleRulesText
text_end text_end
UnknownText_0x10376c: WouldYouLikeToMobileBattleText:
text_far UnknownText_0x1c439c text_far _WouldYouLikeToMobileBattleText
text_end text_end
UnknownText_0x103771: WantAQuickMobileBattleText:
text_far UnknownText_0x1c43dc text_far _WantAQuickMobileBattleText
text_end text_end
UnknownText_0x103776: WantToRushThroughAMobileBattleText:
text_far UnknownText_0x1c4419 text_far _WantToRushThroughAMobileBattleText
text_end text_end
UnknownText_0x10377b: PleaseTryAgainTomorrowText:
text_far UnknownText_0x1c445a text_far _PleaseTryAgainTomorrowText
text_end text_end
Function103780: Function103780:
@ -7544,7 +7543,7 @@ Function1037c2:
ld a, [wdc5f] ld a, [wdc5f]
and a and a
jr z, .nope jr z, .nope
ld hl, UnknownText_0x1037e6 ld hl, TryAgainUsingSameSettingsText
call PrintText call PrintText
call YesNoBox call YesNoBox
jr c, .nope jr c, .nope
@ -7558,8 +7557,8 @@ Function1037c2:
ld [wScriptVar], a ld [wScriptVar], a
ret ret
UnknownText_0x1037e6: TryAgainUsingSameSettingsText:
text_far UnknownText_0x1c449c text_far _TryAgainUsingSameSettingsText
text_end text_end
Function1037eb: Function1037eb:
@ -7622,7 +7621,7 @@ Function10383c:
ld [hli], a ld [hli], a
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
ld hl, UnknownText_0x103876 ld hl, PickThreeMonForMobileBattleText
call PrintText call PrintText
call JoyWaitAorB call JoyWaitAorB
farcall Script_reloadmappart farcall Script_reloadmappart
@ -7641,8 +7640,8 @@ Function10383c:
ld [wScriptVar], a ld [wScriptVar], a
ret ret
UnknownText_0x103876: PickThreeMonForMobileBattleText:
text_far UnknownText_0x1c4508 text_far _PickThreeMonForMobileBattleText
text_end text_end
Function10387b: Function10387b:
@ -7652,11 +7651,11 @@ Function10387b:
farcall MobileBattleGetRemainingTime farcall MobileBattleGetRemainingTime
ld a, c ld a, c
ld [wStringBuffer2], a ld [wStringBuffer2], a
ld hl, UnknownText_0x103898 ld hl, MobileBattleRemainingTimeText
call PrintText call PrintText
call JoyWaitAorB call JoyWaitAorB
ret ret
UnknownText_0x103898: MobileBattleRemainingTimeText:
text_far UnknownText_0x1c4525 text_far _MobileBattleRemainingTimeText
text_end text_end

18
mobile/mobile_5c.asm
View File

@ -74,19 +74,19 @@ Function17005a:
INCLUDE "engine/events/battle_tower/battle_tower.asm" INCLUDE "engine/events/battle_tower/battle_tower.asm"
Function170be4: Function170be4:
ld a, $5 ld a, BANK(s5_a894)
call OpenSRAM call OpenSRAM
xor a xor a
ld hl, $a894 ld hl, s5_a894
ld bc, $0008 ld bc, 6 + 2
call ByteFill call ByteFill
call CloseSRAM call CloseSRAM
ret ret
Clears5_a89a: Clears5_a89a:
ld a, $5 ld a, BANK(s5_a89a)
call OpenSRAM call OpenSRAM
ld hl, $a89a ld hl, s5_a89a
xor a xor a
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
@ -94,9 +94,9 @@ Clears5_a89a:
ret ret
Function170c06: ; unreferenced Function170c06: ; unreferenced
ld a, $5 ld a, BANK(s5_a894)
call OpenSRAM call OpenSRAM
ld hl, $a894 ld hl, s5_a894
ld a, [wBattleResult] ld a, [wBattleResult]
and a ; WIN? and a ; WIN?
jr nz, .asm_170c15 jr nz, .asm_170c15
@ -105,10 +105,10 @@ Function170c06: ; unreferenced
.asm_170c15 .asm_170c15
inc hl inc hl
inc hl inc hl
ld a, [$a89b] ld a, [s5_a89a + 1]
add [hl] add [hl]
ld [hld], a ld [hld], a
ld a, [$a89a] ld a, [s5_a89a]
adc [hl] adc [hl]
ld [hli], a ld [hli], a
jr nc, .asm_170c27 jr nc, .asm_170c27

7
sram.asm
View File

@ -331,11 +331,8 @@ s5_a826:: db
ds $6d ds $6d
s5_a894:: ds NAME_LENGTH_JAPANESE s5_a894:: ds 6
s5_a89a:: dw
ds $1
s5_a89b:: ds 1
s5_a89c:: ds 22 s5_a89c:: ds 22
s5_a8b2:: ds 150 s5_a8b2:: ds 150