callba/callab → farcall/callfar

This commit is contained in:
Remy Oukaour
2017-12-24 12:47:30 -05:00
parent d787c66374
commit c66d195089
170 changed files with 1751 additions and 1751 deletions

View File

@@ -1,13 +1,13 @@
BattleTowerRoomMenu: ; 1700b0
; special
call InitBattleTowerChallengeRAM
callba _BattleTowerRoomMenu
farcall _BattleTowerRoomMenu
ret
; 1700ba
Function1700ba: ; 1700ba
call InitBattleTowerChallengeRAM
callba Function11811a
farcall Function11811a
ret
; 1700c4
@@ -56,7 +56,7 @@ Function1700c4: ; 1700c4
Function170114: ; 170114
call InitBattleTowerChallengeRAM
call .Function170121
callba Function11805f
farcall Function11805f
ret
; 170121
@@ -111,7 +111,7 @@ Function170139: ; 170139
call CopyBytes
ld bc, PlayerID
ld de, PlayerGender
callba GetMobileOTTrainerClass
farcall GetMobileOTTrainerClass
ld de, wBT_OTTempPkmn1CaughtGender
ld a, c
ld [de], a
@@ -243,15 +243,15 @@ RunBattleTowerTrainer: ; 17024d
xor a
ld [wLinkMode], a
callba TrainerRankings_Healings
callba HealParty
farcall TrainerRankings_Healings
farcall HealParty
call ReadBTTrainerParty
call Clears5_a89a
predef StartBattle
callba LoadPokemonData
callba HealParty
farcall LoadPokemonData
farcall HealParty
ld a, [wBattleResult]
ld [ScriptVar], a
and a
@@ -286,7 +286,7 @@ ReadBTTrainerParty: ; 1702b7
; with their species names.
ld de, wBT_OTTempPkmn1Name ; $c643
ld c, PKMN_NAME_LENGTH
callba CheckStringForErrors
farcall CheckStringForErrors
jr nc, .skip_mon_1
ld a, [wBT_OTTempPkmn1]
@@ -301,7 +301,7 @@ ReadBTTrainerParty: ; 1702b7
.skip_mon_1
ld de, wBT_OTTempPkmn2Name ; $c67e
ld c, PKMN_NAME_LENGTH
callba CheckStringForErrors
farcall CheckStringForErrors
jr nc, .skip_mon_2
ld a, [wBT_OTTempPkmn2] ; [$c64e]
ld [wNamedObjectIndexBuffer], a
@@ -315,7 +315,7 @@ ReadBTTrainerParty: ; 1702b7
.skip_mon_2
ld de, wBT_OTTempPkmn3Name ; $c686 + 51 = $c6b9
ld c, PKMN_NAME_LENGTH
callba CheckStringForErrors
farcall CheckStringForErrors
jr nc, .skip_mon_3
ld a, [wBT_OTTempPkmn3] ; [$c689]
ld [wNamedObjectIndexBuffer], a
@@ -337,7 +337,7 @@ ReadBTTrainerParty: ; 1702b7
; Repair the trainer name if needed, then copy it to OTPlayerName
ld de, wBT_OTTempName
ld c, NAME_LENGTH - 1
callba CheckStringForErrors
farcall CheckStringForErrors
jr nc, .trainer_name_okay
ld hl, BT_ChrisName
jr .done_trainer_name
@@ -675,7 +675,7 @@ Function1704e1: ; 1704e1
bit 7, a
jr nz, .done
call .DoJumptable
callba ReloadMapPart
farcall ReloadMapPart
jr .loop
.done
@@ -1049,7 +1049,7 @@ Function170729: ; 170729 (5c:4729) BattleTowerAction $1d
ret
BattleTower_SaveOptions: ; 170737 (5c:4737) BattleTowerAction $1f
callba SaveOptions
farcall SaveOptions
ret
BattleTower_RandomlyChooseReward: ; 17073e (5c:473e) BattleTowerAction $1e
@@ -1256,7 +1256,7 @@ BattleTower_CheckSaveFileExistsAndIsYours: ; 17089a BattleTowerAction $09
ld a, [wSaveFileExists]
and a
jr z, .nope
callba CompareLoadedAndSavedPlayerID
farcall CompareLoadedAndSavedPlayerID
jr z, .yes
xor a
jr .nope
@@ -1486,8 +1486,8 @@ Jumptable_1709e7: ; 1709e7
ld a, [$a826]
ld [wcd31], a
call CloseSRAM
callba Function11b6b4
callba Function17d0f3
farcall Function11b6b4
farcall Function17d0f3
ld a, $1
ld [ScriptVar], a
ret
@@ -1611,7 +1611,7 @@ BattleTowerAction_LevelCheck: ; 170ae8 (5c:4ae8) BattleTowerAction $18
ld [wcd4f], a
xor a
ld [ScriptVar], a
callba BattleTower_LevelCheck ; level check
farcall BattleTower_LevelCheck ; level check
ret nc
ld a, $5
call GetSRAMBank
@@ -1631,7 +1631,7 @@ BattleTowerAction_UbersCheck: ; 170b16 (5c:4b16) BattleTowerAction $19
ld [wcd4f], a
xor a
ld [ScriptVar], a
callba BattleTower_UbersCheck
farcall BattleTower_UbersCheck
ret nc
ld a, $5
call GetSRAMBank
@@ -1641,7 +1641,7 @@ BattleTowerAction_UbersCheck: ; 170b16 (5c:4b16) BattleTowerAction $19
ret
Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44
callba Function_LoadOpponentTrainerAndPokemons
farcall Function_LoadOpponentTrainerAndPokemons
ld a, [rSVBK]
push af
ld a, $3
@@ -1681,7 +1681,7 @@ Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44
ld [hUsedSpriteIndex], a
ld a, [hl]
ld [hUsedSpriteTile], a
callba GetUsedSprite
farcall GetUsedSprite
ret
; 170b90
@@ -1758,7 +1758,7 @@ ret_170bd2: ; 170bd2
; 170bd3
SpecialCheckForBattleTowerRules: ; 170bd3
callba CheckForBattleTowerRules
farcall CheckForBattleTowerRules
jr c, .asm_170bde
xor a
jr .asm_170be0

View File

@@ -329,10 +329,10 @@ Function11c1b9: ; 11c1b9
ld de, VTiles0
call Decompress
call EnableLCD
callba ReloadMapPart
callba ClearSpriteAnims
callba LoadPokemonData
callba Pokedex_ABCMode
farcall ReloadMapPart
farcall ClearSpriteAnims
farcall LoadPokemonData
farcall Pokedex_ABCMode
ld a, [rSVBK]
push af
ld a, $5
@@ -385,12 +385,12 @@ EZChat_MasterLoop: ; 11c283
bit 7, a
jr nz, .exit
call .DoJumptableFunction
callba PlaySpriteAnimations
callba ReloadMapPart
farcall PlaySpriteAnimations
farcall ReloadMapPart
jr .loop
.exit
callba ClearSpriteAnims
farcall ClearSpriteAnims
call ClearSprites
ret
; 11c2ac
@@ -719,7 +719,7 @@ Function11c4be: ; 11c4be (47:44be)
hlcoord 0, 14, AttrMap
ld bc, $28
call ByteFill
callba ReloadMapPart
farcall ReloadMapPart
ret
; 11c4db (47:44db)
@@ -918,7 +918,7 @@ Function11c618: ; 11c618 (47:4618)
hlcoord 0, 6, AttrMap
ld bc, $c8
call ByteFill
callba ReloadMapPart
farcall ReloadMapPart
ret
; 11c62a (47:462a)
@@ -1372,7 +1372,7 @@ BCD2String: ; 11c8c7
xor a
ld [hDividend + 2], a
push hl
callba Function11a80c
farcall Function11a80c
pop hl
ld a, [wcd63]
add "0"
@@ -1530,7 +1530,7 @@ Function11c9ab: ; 11c9ab (47:49ab)
hlcoord 0, 6, AttrMap
ld bc, $c8
call ByteFill
callba ReloadMapPart
farcall ReloadMapPart
ret
Function11c9bd: ; 11c9bd (47:49bd)
@@ -1620,7 +1620,7 @@ Function11ca19: ; 11ca19 (47:4a19)
add hl, de
dec c
jr nz, .asm_11ca22
callba ReloadMapPart
farcall ReloadMapPart
ret
; 11ca38 (47:4a38)
@@ -2043,7 +2043,7 @@ Function11cdaa: ; 11cdaa (47:4daa)
hlcoord 0, 12, AttrMap
ld bc, 4 * SCREEN_WIDTH
call ByteFill
callba ReloadMapPart
farcall ReloadMapPart
ret
; 11cdc7 (47:4dc7)

View File

@@ -359,7 +359,7 @@ Function48304: ; 48304 (12:4304)
ld a, $29
.asm_4833f
ld [wMenuScrollPosition], a
callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
.asm_48348
call ScrollingMenu
ld de, $629
@@ -385,7 +385,7 @@ Function48304: ; 48304 (12:4304)
ld [wd003], a
.asm_48377
call Function48187
callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
jp Function4840c
Function48383: ; 48383 (12:4383)
@@ -1626,7 +1626,7 @@ Function48c8e: ; 48c8e
ld hl, $d02a
ld d, h
ld e, l
callba Function48c63
farcall Function48c63
hlcoord 10, 7
call PlaceString
call WaitBGMap

View File

@@ -311,17 +311,17 @@ Function4aa22: ; 4aa22
call ClearBGPalettes
Function4aa25: ; 4aa25
callba LoadPartyMenuGFX
callba InitPartyMenuWithCancel
farcall LoadPartyMenuGFX
farcall InitPartyMenuWithCancel
call Function4aad3
Function4aa34: ; 4aa34
ld a, PARTYMENUACTION_MOBILE
ld [PartyMenuActionText], a
callba WritePartyMenuTilemap
farcall WritePartyMenuTilemap
xor a
ld [PartyMenuActionText], a
callba PrintPartyMenuText
farcall PrintPartyMenuText
call Function4aab6
call WaitBGMap
call SetPalettes
@@ -443,7 +443,7 @@ Function4aad3: ; 4aad3
push bc
push hl
ld e, 0
callba LoadMenuMonIcon
farcall LoadMenuMonIcon
ld a, [hObjectStructIndexBuffer]
inc a
ld [hObjectStructIndexBuffer], a
@@ -453,7 +453,7 @@ Function4aad3: ; 4aad3
jr nz, .loop
call Function4aa7a
callba PlaySpriteAnimations
farcall PlaySpriteAnimations
ret
; 4aafb
@@ -683,7 +683,7 @@ Function4ac58: ; 4ac58
lb bc, 2, 18
hlcoord 1, 15
call ClearBox
callba FreezeMonIcons
farcall FreezeMonIcons
ld hl, MenuDataHeader_0x4aca2
call LoadMenuDataHeader
ld hl, wd019
@@ -823,13 +823,13 @@ UnknownText_0x4ad51: ; 0x4ad51
; 0x4ad56
Function4ad56: ; 4ad56
callba OpenPartyStats
farcall OpenPartyStats
call WaitBGMap2
ret
; 4ad60
Function4ad60: ; 4ad60
callba ManagePokemonMoves
farcall ManagePokemonMoves
ret
; 4ad67

View File

@@ -99,7 +99,7 @@ Function8919e: ; 8919e (22:519e)
Function891ab: ; 891ab
call Mobile22_SetBGMapMode1
callba ReloadMapPart
farcall ReloadMapPart
call Mobile22_SetBGMapMode0
ret
; 891b8
@@ -218,9 +218,9 @@ Mobile22_SetBGMapMode1: ; 89240
Function89245: ; 89245 (22:5245)
callba TryLoadSaveFile
farcall TryLoadSaveFile
ret c
callba _LoadData
farcall _LoadData
and a
ret
@@ -777,7 +777,7 @@ Function8956f: ; 8956f
add hl, bc
ld b, h
ld c, l
callba GetMobileOTTrainerClass
farcall GetMobileOTTrainerClass
ld a, c
ld [TrainerClass], a
ld a, [rSVBK]
@@ -1222,13 +1222,13 @@ Function897af: ; 897af
add hl, bc
ld b, h
ld c, l
callba GetMobileOTTrainerClass
farcall GetMobileOTTrainerClass
ld a, c
ld [TrainerClass], a
xor a
ld [CurPartySpecies], a
ld de, VTiles2 tile $37
callba GetTrainerPic
farcall GetTrainerPic
pop bc
ret
; 897d5
@@ -1616,7 +1616,7 @@ Function89a0c: ; 89a0c
jr c, .asm_89a1c
ld d, h
ld e, l
callba Function11c08f
farcall Function11c08f
ret
.asm_89a1c
@@ -1793,14 +1793,14 @@ Function89a57: ; 89a57
Function89b00: ; 89b00 (22:5b00)
callba MG_Mobile_Layout_LoadPals
farcall MG_Mobile_Layout_LoadPals
ret
; 89b07 (22:5b07)
Function89b07: ; 89b07
call Mobile22_SetBGMapMode0
call DelayFrame
callba Function4a3a7
farcall Function4a3a7
ret
; 89b14
@@ -1812,7 +1812,7 @@ Function89b14: ; 89b14
; 89b1e
Function89b1e: ; 89b1e (22:5b1e)
callba Function4a485
farcall Function4a485
call Function89b00
ret
@@ -1827,7 +1827,7 @@ Function89b28: ; 89b28 (22:5b28)
Function89b3b: ; 89b3b (22:5b3b)
call Mobile22_SetBGMapMode0
callba Function48cda
farcall Function48cda
ret
Function89b45: ; 89b45
@@ -2180,7 +2180,7 @@ Function89d0d: ; 89d0d (22:5d0d)
ld [rSVBK], a
call SetPalettes
callba PrintMail_
farcall PrintMail_
call Mobile22_SetBGMapMode1
ld c, 24
call DelayFrames
@@ -2218,7 +2218,7 @@ Function89d75: ; 89d75 (22:5d75)
push hl
call Mobile22_SetBGMapMode0
call _hl_
callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
pop hl
jr asm_89d90
@@ -2249,7 +2249,7 @@ asm_89d90: ; 89d90 (22:5d90)
Function89dab: ; 89dab (22:5dab)
call Mobile22_SetBGMapMode0
callba MobileMenuJoypad
farcall MobileMenuJoypad
call Mobile22_SetBGMapMode0
ld a, c
ld hl, wMenuJoypadFilter
@@ -2429,8 +2429,8 @@ Function89ee1: ; 89ee1 (22:5ee1)
call ClearBGPalettes
call Function893e2
call Mobile22_SetBGMapMode0
callba Function4a3a7
callba MG_Mobile_Layout_CreatePalBoxes
farcall Function4a3a7
farcall MG_Mobile_Layout_CreatePalBoxes
hlcoord 1, 0
call Function8a53d
ret
@@ -2958,8 +2958,8 @@ Function8a262: ; 8a262 (22:6262)
call ClearBGPalettes
call Function893e2
call Mobile22_SetBGMapMode0
callba Function4a3a7
callba MG_Mobile_Layout_CreatePalBoxes
farcall Function4a3a7
farcall MG_Mobile_Layout_CreatePalBoxes
hlcoord 1, 0
call Function8a53d
hlcoord 12, 4
@@ -3052,8 +3052,8 @@ Function8a313: ; 8a313 (22:6313)
Function8a31c: ; 8a31c (22:631c)
push bc
call Mobile22_SetBGMapMode0
callba Function4a3a7
callba MG_Mobile_Layout_CreatePalBoxes
farcall Function4a3a7
farcall MG_Mobile_Layout_CreatePalBoxes
hlcoord 1, 0
call Function8a53d
hlcoord 12, 4
@@ -3095,7 +3095,7 @@ Function8a31c: ; 8a31c (22:631c)
ret
Function8a383: ; 8a383 (22:6383)
callba MobileMenuJoypad
farcall MobileMenuJoypad
ld a, c
ld hl, wMenuJoypadFilter
and [hl]
@@ -3656,7 +3656,7 @@ Function8a78c: ; 8a78c (22:678c)
call Function891fe
ld de, wd002
ld b, $5
callba NamingScreen
farcall NamingScreen
call OpenSRAMBank4
call Function8931b
push bc
@@ -3685,7 +3685,7 @@ Function8a7cb: ; 8a7cb (22:67cb)
call Function891de
ld de, wd008
ld c, $0
callba Function17a68f
farcall Function17a68f
jr c, .asm_8a7f4
ld hl, wd008
ld a, $ff
@@ -4027,7 +4027,7 @@ Function8aa73: ; 8aa73 (22:6a73)
call Function891de
ld de, wd008
ld c, $0
callba Function17a68f
farcall Function17a68f
jr c, .asm_8aa9d
ld hl, wd008
ld a, $ff
@@ -4157,7 +4157,7 @@ Function8ab3b: ; 8ab3b (22:6b3b)
Function8ab93: ; 8ab93 (22:6b93)
call ClearBGPalettes
call LoadStandardMenuDataHeader
callba Function105688
farcall Function105688
call ClearSprites
call Function891fe
call Function89b28

View File

@@ -48,7 +48,7 @@ Function8b35d: ; 8b35d
Function8b363: ; 8b363
push bc
callba Mobile_AlwaysReturnNotCarry
farcall Mobile_AlwaysReturnNotCarry
pop bc
ret
; 8b36c

File diff suppressed because it is too large Load Diff

View File

@@ -1027,7 +1027,7 @@ Function106464:: ; 106464
ld hl, VTiles2 tile $6b
ld b, $f ; XXX no graphics at 0f:40b0
call Get2bpp
callba LoadFrame
farcall LoadFrame
ret
; 10649b

View File

@@ -175,7 +175,7 @@ Function1080b7: ; 1080b7
ld [hWX], a
ld a, $90
ld [hWY], a
callba ClearSpriteAnims
farcall ClearSpriteAnims
call DelayFrame
@@ -237,7 +237,7 @@ Function108157: ; 108157
ld [hWX], a
ld a, $90
ld [hWY], a
callba ClearSpriteAnims
farcall ClearSpriteAnims
xor a
ld hl, wSpriteAnimDict
ld [hli], a
@@ -361,8 +361,8 @@ MobileTradeAnim_JumptableLoop: ; 10824b
ld [hWY], a
call LoadStandardFont
call LoadFontsBattleExtra
callba MobileFunc_106462
callba Function106464
farcall MobileFunc_106462
farcall Function106464
scf
ret
; 10827b
@@ -433,7 +433,7 @@ EndMobileTradeAnim: ; 1082c6
WaitMobileTradeSpriteAnims: ; 1082cc
.loop
push bc
callba PlaySpriteAnimations
farcall PlaySpriteAnimations
pop bc
call DelayFrame
dec c
@@ -443,9 +443,9 @@ WaitMobileTradeSpriteAnims: ; 1082cc
Function1082db: ; 1082db
.loop
callba PlaySpriteAnimations
callba SetUpPokeAnim
callba HDMATransferTileMapToWRAMBank3
farcall PlaySpriteAnimations
farcall SetUpPokeAnim
farcall HDMATransferTileMapToWRAMBank3
jr nc, .loop
ret
; 1082f0
@@ -464,7 +464,7 @@ Function1082fa: ; 1082fa
call Function108b78
push hl
push bc
callba PlaySpriteAnimations
farcall PlaySpriteAnimations
pop bc
pop hl
call DelayFrame
@@ -552,7 +552,7 @@ MobileTradeAnim_ShowOTMonFromTrade: ; 10839b
ld de, VTiles2
call Function108201
call EnableLCD
callba DeinitializeAllSprites
farcall DeinitializeAllSprites
xor a
ld [hSCX], a
ld [hSCY], a
@@ -687,7 +687,7 @@ MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7
ld de, VTiles2
call Function108201
call EnableLCD
callba DeinitializeAllSprites
farcall DeinitializeAllSprites
call DelayFrame
ld de, TradeBallGFX
ld hl, VTiles0
@@ -756,7 +756,7 @@ MobileTradeAnim_GetOddEgg: ; 108589
ld de, VTiles2
call Function108201
call EnableLCD
callba DeinitializeAllSprites
farcall DeinitializeAllSprites
call DelayFrame
ld de, TradeBallGFX
ld hl, VTiles0
@@ -813,7 +813,7 @@ MobileTradeAnim_GetOddEgg: ; 108589
; 108638
MobileTradeAnim_02: ; 108638
callba DeinitializeAllSprites
farcall DeinitializeAllSprites
call ClearBGPalettes
call ClearSprites
call ClearTileMap
@@ -849,7 +849,7 @@ MobileTradeAnim_02: ; 108638
; 108689
MobileTradeAnim_10: ; 108689
callba DeinitializeAllSprites
farcall DeinitializeAllSprites
call ClearBGPalettes
call ClearSprites
call ClearTileMap
@@ -1097,7 +1097,7 @@ MobileTradeAnim_GetTrademon1: ; 108863
jr .loop
.done
callba DeinitializeAllSprites
farcall DeinitializeAllSprites
depixel 9, 10, 2, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_25
call _InitSpriteAnimStruct
@@ -1189,7 +1189,7 @@ MobileTradeAnim_GetTrademon3: ; 10890a
MobileTradeAnim_0f: ; 108919
ld c, 40
call WaitMobileTradeSpriteAnims
callba DeinitializeAllSprites
farcall DeinitializeAllSprites
call ClearBGPalettes
call ClearSprites
call ClearTileMap
@@ -1571,7 +1571,7 @@ Function108b98: ; 108b98
; 108bbd
MobileTradeAnim_DeleteSprites: ; 108bbd
callba DeinitializeAllSprites
farcall DeinitializeAllSprites
call ClearSprites
ret
; 108bc7
@@ -1590,7 +1590,7 @@ Function108bc7: ; 108bc7 (42:4bc7)
ret
.delete
callba DeinitializeSprite
farcall DeinitializeSprite
ret
Function108be0: ; 108be0 (42:4be0)

View File

@@ -6838,7 +6838,7 @@ Unknown_117356: ; 117356
SECTION "Mobile Stadium", ROMX
Special_GiveOddEgg: ; 117656
callba GiveOddEgg
farcall GiveOddEgg
ret
; 11765d
@@ -6898,9 +6898,9 @@ Function117699: ; 117699 (45:7699)
call ByteFill
call ClearBGPalettes
call ClearSprites
callba Function171c87
callba ReloadMapPart
callba ClearSpriteAnims
farcall Function171c87
farcall ReloadMapPart
farcall ClearSpriteAnims
ret
Function1176ee: ; 1176ee (45:76ee)
@@ -6910,12 +6910,12 @@ Function1176ee: ; 1176ee (45:76ee)
bit 7, a
jr nz, .quit
call Function117719
callba PlaySpriteAnimations
callba ReloadMapPart
farcall PlaySpriteAnimations
farcall ReloadMapPart
jr .loop
.quit
callba ClearSpriteAnims
farcall ClearSpriteAnims
call ClearBGPalettes
call ClearScreen
call ClearSprites
@@ -6945,7 +6945,7 @@ Jumptable_117728: ; 117728 (45:7728)
Function117738: ; 117738 (45:7738)
callba Function171ccd
farcall Function171ccd
depixel 6, 3
ld a, $1d
call _InitSpriteAnimStruct
@@ -7004,7 +7004,7 @@ Function117764: ; 117764 (45:7764)
ret
Function117764_select: ; 1177a5 (45:77a5)
callba Function171cf0
farcall Function171cf0
ret
Function117764_start: ; 1177ac (45:77ac)
@@ -7176,7 +7176,7 @@ Function1178aa: ; 1178aa (45:78aa)
call LoadMenuDataHeader
call MenuBox
call MenuBoxCoord2Tile
callba ReloadMapPart
farcall ReloadMapPart
hlcoord 16, 8
ld de, YessNoString_1179c5
call PlaceString
@@ -7278,7 +7278,7 @@ Function117984: ; 117984 (45:7984)
call LoadMenuDataHeader
call MenuBox
call MenuBoxCoord2Tile
callba ReloadMapPart
farcall ReloadMapPart
hlcoord 1, 14
ld de, NotAPokemonPasswordString
call PlaceString
@@ -7379,8 +7379,8 @@ Function117a94: ; 0x117a94
ld [wcf66], a
call ClearBGPalettes
call ClearSprites
callba Function172e78
callba HDMATransferAttrMapAndTileMapToWRAMBank3
farcall Function172e78
farcall HDMATransferAttrMapAndTileMapToWRAMBank3
ret
; 0x117ab4
@@ -7388,9 +7388,9 @@ Function117a94: ; 0x117a94
Function117ab4: ; 0x117ab4
call ClearBGPalettes
call ClearSprites
callba Function172e78
callba Function172eb9
callba ReloadMapPart
farcall Function172e78
farcall Function172eb9
farcall ReloadMapPart
ret
; 0x117acd
@@ -7401,7 +7401,7 @@ Function117acd: ; 0x117acd
bit 7, a
jr nz, .asm_117ae2
call Function117ae9
callba HDMATransferAttrMapAndTileMapToWRAMBank3
farcall HDMATransferAttrMapAndTileMapToWRAMBank3
jr Function117acd
.asm_117ae2
@@ -7431,7 +7431,7 @@ Function117ae9: ; 0x117ae9
dw Function117c4a
Function117b06:
callba Function172eb9
farcall Function172eb9
ld a, $10
ld [wcf64], a
jp MobileStudium_JumptableIncrement
@@ -7508,13 +7508,13 @@ Function117b4f:
jr nz, .b_button
call ExitMenu
call ExitMenu
callba ReloadMapPart
farcall ReloadMapPart
jp MobileStudium_JumptableIncrement
.b_button
call ExitMenu
call ExitMenu
callba ReloadMapPart
farcall ReloadMapPart
ld a, $80
ld [wJumptableIndex], a
ret
@@ -7523,7 +7523,7 @@ Function117bb6:
call Function117c89
ld a, $1
ld [hBGMapMode], a
callba Function118284
farcall Function118284
call ClearSprites
ld a, [wc300]
and a
@@ -7533,7 +7533,7 @@ Function117bb6:
.asm_117bd0
ld a, $2
ld [wc303], a
callba DisplayMobileError
farcall DisplayMobileError
ld a, $80
ld [wJumptableIndex], a
ret
@@ -7580,7 +7580,7 @@ Function117bb6:
.asm_117c20
pop af
ld [rSVBK], a
callba Function172eb9
farcall Function172eb9
ld a, [rSVBK]
push af
ld a, $3
@@ -7601,7 +7601,7 @@ Function117c4a:
call LoadMenuDataHeader
call MenuBox
call MenuBoxCoord2Tile
callba ReloadMapPart
farcall ReloadMapPart
ld hl, MobileStadiumSuccessText
call PrintText
ld a, [rSVBK]

View File

@@ -491,7 +491,7 @@ Function1161d5: ; 1161d5
pop af
ld [rSVBK], a
callba ReloadMapPart
farcall ReloadMapPart
ld a, $8
ld [MusicFade], a
ld de, MUSIC_MOBILE_ADAPTER
@@ -515,7 +515,7 @@ MenuDataHeader_11628c: ; 11628c
; 116294
Function116294: ; 116294
callba Function170d02
farcall Function170d02
ld a, [$c319]
inc a
ld [$c319], a
@@ -541,7 +541,7 @@ Function116294: ; 116294
; 1162cb
Function1162cb: ; 1162cb
callba Function170cc6
farcall Function170cc6
ld a, [$c319]
inc a
ld [$c319], a
@@ -676,7 +676,7 @@ Function11636e: ; 11636e
call UpdateSprites
pop af
ld [rSVBK], a
callba ReloadMapPart
farcall ReloadMapPart
ld a, $8
ld [MusicFade], a
ld a, [wMapMusic]
@@ -700,7 +700,7 @@ Function1163c0: ; 1163c0
ld bc, 16 * 4
call ByteFill
call DelayFrame
callba Function14146
farcall Function14146
ld b, SCGB_MAPPALS
call GetSGBLayout
ld a, [rSVBK]
@@ -718,10 +718,10 @@ Function1163c0: ; 1163c0
ld a, $90
ld [hWY], a
call UpdateSprites
callba Function14157
farcall Function14157
pop af
ld [rSVBK], a
callba ReloadMapPart
farcall ReloadMapPart
ld a, [wLinkMode]
cp $4
jr z, .asm_11642a
@@ -750,10 +750,10 @@ Function1163c0: ; 1163c0
; 116441
Function116441: ; 116441
callba Function17d405
farcall Function17d405
ld a, $90
ld [hWY], a
callba ReloadMapPart
farcall ReloadMapPart
ld a, $8
ld [MusicFade], a
ld a, [wMapMusic]

File diff suppressed because it is too large Load Diff

View File

@@ -15,10 +15,10 @@ Function16c000: ; 16c000
ld [wcfbe], a
; Do stuff
call MobileSystemSplashScreen_InitGFX ; Load GFX
callba SetRAMStateForMobile
callba EnableMobile
farcall SetRAMStateForMobile
farcall EnableMobile
call .RunJumptable
callba DisableMobile
farcall DisableMobile
; Prevent this routine from running again
; until the next time the syatem is turned on
xor a
@@ -37,7 +37,7 @@ Function16c000: ; 16c000
ld [wd003], a
.loop
call DelayFrame
callba Function10635c
farcall Function10635c
ld a, [wd002]
ld hl, .Jumptable
rst JumpTable
@@ -192,7 +192,7 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
ld bc, 8
ld a, $5
call FarCopyWRAM
callba ApplyPals
farcall ApplyPals
ret
; 16c145
@@ -331,7 +331,7 @@ Function16c943: ; 16c943
ld a, e
cp $8
jr nz, .asm_16c969
callba ApplyPals
farcall ApplyPals
call SetPalettes
ld a, [rSVBK]
push af
@@ -361,7 +361,7 @@ Function16ca11: ; 16ca11
ld a, [wd003]
and a
jr nz, .asm_16ca1d
callba ApplyPals
farcall ApplyPals
.asm_16ca1d
ld a, [rSVBK]
@@ -433,7 +433,7 @@ Function16ca11: ; 16ca11
ld a, e
cp $8
jr nz, .asm_16ca28
callba ApplyPals
farcall ApplyPals
call SetPalettes
ld a, [rSVBK]
push af
@@ -686,7 +686,7 @@ Function16cbd1: ; 16cbd1
ld bc, 2
ld a, $5
call FarCopyWRAM
callba ApplyPals
farcall ApplyPals
ld a, $1
ld [hCGBPalUpdate], a
ret

View File

@@ -24,7 +24,7 @@ Function170000: ; 170000
ld a, [hl]
ld [wPlayerTrademonID + 1], a
ld bc, $c633
callba GetCaughtGender
farcall GetCaughtGender
ld a, c
ld [wPlayerTrademonCaughtData], a
ld a, [wcd81]
@@ -65,7 +65,7 @@ Function17005a: ; 17005a
ld a, [hl]
ld [wOTTrademonID + 1], a
ld bc, $a82c
callba GetCaughtGender
farcall GetCaughtGender
ld a, c
ld [wOTTrademonCaughtData], a
ld a, [wcd81]
@@ -324,7 +324,7 @@ Function1719c8: ; 1719c8 (5c:59c8)
ret
Function1719d6: ; 1719d6 (5c:59d6)
callba BattleTowerRoomMenu_InitRAM
farcall BattleTowerRoomMenu_InitRAM
call Function1719ed
ld a, [rSVBK]
push af
@@ -343,9 +343,9 @@ Function1719ed: ; 1719ed (5c:59ed)
ld [wcd4b], a
call ClearBGPalettes
call ClearSprites
callba Function171d2b
callba ReloadMapPart
callba ClearSpriteAnims
farcall Function171d2b
farcall ReloadMapPart
farcall ClearSpriteAnims
ret
Function171a11: ; 171a11 (5c:5a11)
@@ -355,11 +355,11 @@ Function171a11: ; 171a11 (5c:5a11)
bit 7, a
jr nz, .done
call Function171a36
callba PlaySpriteAnimations
callba ReloadMapPart
farcall PlaySpriteAnimations
farcall ReloadMapPart
jr .loop
.done
callba ClearSpriteAnims
farcall ClearSpriteAnims
call ClearSprites
ret
@@ -412,7 +412,7 @@ Function171a5d: ; 171a5d (5c:5a5d)
push af
ld a, $1
ld [rSVBK], a
callba BattleTowerRoomMenu_Cleanup
farcall BattleTowerRoomMenu_Cleanup
pop af
ld [rSVBK], a
ld a, $a
@@ -420,7 +420,7 @@ Function171a5d: ; 171a5d (5c:5a5d)
ret
Function171a95: ; 171a95 (5c:5a95)
callba Function171ccd
farcall Function171ccd
hlcoord 2, 8
ld de, String_171aa7
call PlaceString
@@ -457,7 +457,7 @@ Function171aec: ; 171aec (5c:5aec)
push af
ld a, $1
ld [rSVBK], a
callba BattleTowerRoomMenu_Cleanup
farcall BattleTowerRoomMenu_Cleanup
pop af
ld [rSVBK], a
hlcoord 2, 6
@@ -619,7 +619,7 @@ Function171beb: ; 171beb (5c:5beb)
call LoadMenuDataHeader
call MenuBox
call MenuBoxCoord2Tile
callba ReloadMapPart
farcall ReloadMapPart
hlcoord 1, 14
ld de, String_171c73
call PlaceString
@@ -654,11 +654,11 @@ Function171c41: ; 171c41 (5c:5c41)
dec [hl]
ret nz
call ClearBGPalettes
callba MobileFunc_106462
callba Function106464
farcall MobileFunc_106462
farcall Function106464
ld a, $2
ld [wc303], a
callba DisplayMobileError
farcall DisplayMobileError
asm_171c60: ; 171c60 (5c:5c60)
ld a, $80
ld [wcd49], a

View File

@@ -39,12 +39,12 @@ Function17a6a8: ; 17a6a8 (5e:66a8)
pop de
call Function17a6f5
call Function17aba0
callba Function106464
farcall Function106464
call Function17ac0c
callba HDMATransferAttrMapAndTileMapToWRAMBank3
farcall HDMATransferAttrMapAndTileMapToWRAMBank3
call Function17abcf
callba LoadOW_BGPal7
callba Function49420
farcall LoadOW_BGPal7
farcall Function49420
call SetPalettes
call DelayFrame
ret
@@ -163,11 +163,11 @@ Function17a78f: ; 17a78f (5e:678f)
bit 7, [hl]
res 7, [hl]
jr nz, .asm_17a79f
callba HDMATransferTileMapToWRAMBank3
farcall HDMATransferTileMapToWRAMBank3
ret
.asm_17a79f
callba ReloadMapPart
farcall ReloadMapPart
ret
; 17a7a6 (5e:67a6)

View File

@@ -77,7 +77,7 @@ Function17c000: ; 17c000
ld [rVBK], a
call EnableLCD
callba ReloadMapPart
farcall ReloadMapPart
ret
; 17c083
@@ -290,21 +290,21 @@ Function17d0f3: ; 17d0f3
ld a, [hl]
ld [wOTTrademonDVs + 1], a
ld bc, $c608 + 5
callba GetCaughtGender
farcall GetCaughtGender
ld a, c
ld [wOTTrademonCaughtData], a
call SpeechTextBox
call FadeToMenu
callba Function10804d
callba Function17d1f1
farcall Function10804d
farcall Function17d1f1
ld a, $1
ld [wForceEvolution], a
ld a, $2
ld [wLinkMode], a
callba EvolvePokemon
farcall EvolvePokemon
xor a
ld [wLinkMode], a
callba SaveAfterLinkTrade
farcall SaveAfterLinkTrade
ld a, $5
call GetSRAMBank
ld a, $5
@@ -413,7 +413,7 @@ Function17d1f1: ; 17d1f1
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
predef GetUnownLetter
callab UpdateUnownDex
callfar UpdateUnownDex
ld a, [wFirstUnownSeen]
and a
jr nz, .asm_17d223
@@ -515,7 +515,7 @@ MenuData2_ChallengeExplanationCancel: ; 17d297
Function17d2b6: ; 17d2b6
call Function17d2c0
callba Function1181da
farcall Function1181da
ret
; 17d2c0
@@ -627,7 +627,7 @@ Function17d370: ; 17d370
call ClearBGPalettes
call ClearSprites
call ClearScreen
callba ReloadMapPart
farcall ReloadMapPart
call DisableLCD
ld hl, VTiles1 tile $6e
ld de, $c608
@@ -673,7 +673,7 @@ Function17d3f6: ; 17d3f6
call ClearBGPalettes
call ClearSprites
call ClearScreen
callba ReloadMapPart
farcall ReloadMapPart
Function17d405:
call DisableLCD
@@ -719,7 +719,7 @@ Function17d45a: ; 17d45a
bit 7, a
jr nz, .asm_17d46f
call Function17d474
callba ReloadMapPart
farcall ReloadMapPart
jr .asm_17d45a
.asm_17d46f
@@ -921,7 +921,7 @@ Function17d48d: ; 17d48d
call Function17e451
call Function17e55b
call Function17e5af
callba ReloadMapPart
farcall ReloadMapPart
jp Function17e438
; 17d5be
@@ -1330,7 +1330,7 @@ Function17d833: ; 17d833
add hl, de
ld e, l
ld d, h
callba Function11c08f
farcall Function11c08f
call Function17e349
ret
; 17d85d
@@ -1422,7 +1422,7 @@ Function17d85d: ; 17d85d
ld [wcd3b], a
xor a
ld [wcf66], a
callba Function118329
farcall Function118329
ld a, [wc300]
and a
jr z, .asm_17d8fe
@@ -1457,7 +1457,7 @@ Function17d902: ; 17d902
jr nz, .asm_17d918
xor a
ld [wcf66], a
callba Function11837a
farcall Function11837a
ld a, [wc300]
and a
jr z, .asm_17d936
@@ -1488,7 +1488,7 @@ Function17d93a: ; 17d93a
ld [CurPartySpecies], a
ld a, [$c70c]
ld e, a
callba LoadMonPaletteAsNthBGPal
farcall LoadMonPaletteAsNthBGPal
call SetPalettes
ld a, [$c708]
ld l, a
@@ -1500,7 +1500,7 @@ Function17d93a: ; 17d93a
add hl, de
ld e, l
ld d, h
callba HOF_AnimateFrontpic
farcall HOF_AnimateFrontpic
pop af
ld [rSVBK], a
call Function17e349
@@ -1524,7 +1524,7 @@ Function17d98b: ; 17d98b
ld [TrainerClass], a
ld a, [$c70b]
ld e, a
callba LoadTrainerClassPaletteAsNthBGPal
farcall LoadTrainerClassPaletteAsNthBGPal
call SetPalettes
ld a, [$c708]
ld e, a
@@ -1532,7 +1532,7 @@ Function17d98b: ; 17d98b
ld d, a
push de
ld de, VTiles2
callba GetTrainerPic
farcall GetTrainerPic
pop hl
decoord 0, 0
add hl, de
@@ -2340,7 +2340,7 @@ Function17ded9: ; 17ded9
push hl
push bc
predef TryAddMonToParty
callba SetCaughtData
farcall SetCaughtData
pop bc
pop hl
bit 1, b
@@ -2378,7 +2378,7 @@ Function17ded9: ; 17ded9
ld a, [hli]
ld b, a
push hl
callba SetGiftPartyMonCaughtData
farcall SetGiftPartyMonCaughtData
pop hl
pop bc
jr .asm_17df5e
@@ -2444,7 +2444,7 @@ Function17ded9: ; 17ded9
ld e, l
push hl
ld b, $0
callba CalcPkmnStats
farcall CalcPkmnStats
ld a, [PartyCount]
dec a
ld hl, PartyMon1HP
@@ -2532,9 +2532,9 @@ Function17e026: ; 17e026
jp z, .asm_17e0ea
push bc
push hl
callba LoadEnemyMon
callba SentPkmnIntoBox
callba SetBoxMonCaughtData
farcall LoadEnemyMon
farcall SentPkmnIntoBox
farcall SetBoxMonCaughtData
pop hl
pop bc
ld a, BANK(sBoxMonNicknames)
@@ -2563,7 +2563,7 @@ Function17e026: ; 17e026
ld b, a
push hl
call CloseSRAM
callba SetGiftBoxMonCaughtData
farcall SetGiftBoxMonCaughtData
ld a, $1
call GetSRAMBank
pop hl
@@ -2702,7 +2702,7 @@ Function17e133: ; 17e133
ld a, [hli]
ld [ScriptVar], a
push hl
callba MobileCheckOwnMonAnywhere
farcall MobileCheckOwnMonAnywhere
pop hl
jr c, .asm_17e159
inc hl
@@ -2950,7 +2950,7 @@ Function17e2a7: ; 17e2a7
call Function17e32b
xor a
ld [wcf66], a
callba Function118233
farcall Function118233
ld de, GFX_17eb7e
ld hl, VTiles2 tile $60
lb bc, BANK(GFX_17eb7e), 1
@@ -2999,7 +2999,7 @@ Function17e309: ; 17e309
call ClearScreen
call Function17e349
call Function17d5f6
callba DisplayMobileError
farcall DisplayMobileError
call Function17e349
call Function17dcaf
xor a
@@ -3042,7 +3042,7 @@ Function17e367: ; 17e367
push af
ld a, $1
ld [rSVBK], a
callba SaveGameData_
farcall SaveGameData_
pop af
ld [rSVBK], a
ret
@@ -3055,7 +3055,7 @@ Function17e37e: ; 17e37e
push af
ld a, $1
ld [rSVBK], a
callba SaveAfterLinkTrade
farcall SaveAfterLinkTrade
pop af
ld [rSVBK], a
ret
@@ -3068,7 +3068,7 @@ Function17e395: ; 17e395
push af
ld a, $1
ld [rSVBK], a
callba SaveBox
farcall SaveBox
pop af
ld [rSVBK], a
ret
@@ -3081,7 +3081,7 @@ Function17e3ac: ; 17e3ac
push af
ld a, $1
ld [rSVBK], a
callba SaveChecksum
farcall SaveChecksum
pop af
ld [rSVBK], a
ret
@@ -3094,8 +3094,8 @@ Function17e3c3: ; 17e3c3
push af
ld a, $1
ld [rSVBK], a
callba UpdateTrainerRankingsChecksum2
callba BackupMobileEventIndex
farcall UpdateTrainerRankingsChecksum2
farcall BackupMobileEventIndex
pop af
ld [rSVBK], a
ret
@@ -3947,7 +3947,7 @@ Function17f154: ; 17f154
ld c, l
ld b, h
pop de
callba Function11c08f
farcall Function11c08f
ld c, l
ld b, h
pop de
@@ -3995,7 +3995,7 @@ Function17f181: ; 17f181
ld a, [hl]
ld c, a
ld de, $c608
callba Function48c63
farcall Function48c63
pop hl
ld de, $c608
call PlaceString
@@ -4279,7 +4279,7 @@ Function17f334: ; 17f334
ld c, a
call CloseSRAM
ld de, $c608
callba Function48c63
farcall Function48c63
pop hl
ld de, $c608
call PlaceString
@@ -4346,7 +4346,7 @@ Function17f3c9: ; 17f3c9
call CopyBytes
pop de
ld c, $0
callba Function11c075
farcall Function11c075
push hl
ld hl, $c708
ld de, wcd36
@@ -4643,7 +4643,7 @@ DisplayMobileError: ; 17f555
ld a, [wc303]
bit 7, a
jr nz, .quit
callba HDMATransferAttrMapAndTileMapToWRAMBank3
farcall HDMATransferAttrMapAndTileMapToWRAMBank3
jr .loop
.quit
@@ -4704,7 +4704,7 @@ DisplayMobileError: ; 17f555
Function17f5c3: ; 17f5c3
call Function17f5e4
callba FinishExitMenu
farcall FinishExitMenu
ld a, $1
ld [wc303], a
ret
@@ -4712,7 +4712,7 @@ Function17f5c3: ; 17f5c3
Function17f5d2: ; 17f5d2
call Function17f5e4
callba HDMATransferAttrMapAndTileMapToWRAMBank3
farcall HDMATransferAttrMapAndTileMapToWRAMBank3
call SetPalettes
ld a, $1
ld [wc303], a

View File

@@ -172,7 +172,7 @@ Function4a098: ; 4a098 (12:6098)
call PlaceHollowCursor
call WaitBGMap
call LoadStandardMenuDataHeader
callba Function89de0
farcall Function89de0
call Call_ExitMenu
call MG_Mobile_Layout_LoadPals
call Function4a485
@@ -195,7 +195,7 @@ Function4a0c2: ; 4a0c2 (12:60c2)
ld bc, NAME_LENGTH_JAPANESE
call CopyBytes
call CloseSRAM
callba _LoadData
farcall _LoadData
ld c, 2
call DelayFrames
ld c, $1
@@ -205,7 +205,7 @@ Function4a0c2: ; 4a0c2 (12:60c2)
pop af
and a
jr nz, .skip_save
callba _SaveData
farcall _SaveData
.skip_save
ld c, 5
call DelayFrames
@@ -280,7 +280,7 @@ Function4a149: ; 4a149 (12:6149)
call ClearBox
hlcoord 1, 14
call PlaceString
callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
call SetPalettes
call StaticMenuJoypad
ld hl, wMenuCursorY
@@ -347,7 +347,7 @@ String_4a1ef: ; 4a1ef
Function4a20e: ; 4a20e (12:620e)
ld a, $1
call MenuClickSound
callba Function1719c8
farcall Function1719c8
call ClearBGPalettes
call DelayFrame
jr Function4a239
@@ -403,7 +403,7 @@ Function4a28a: ; 4a28a (12:628a)
hlcoord 14, 1
ld de, String_4a34b
call PlaceString
callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
call Function4a118
call ScrollingMenuJoypad
push af
@@ -417,7 +417,7 @@ Function4a28a: ; 4a28a (12:628a)
cp $3
jr z, .quit
.asm_4a2df
callba Function11765d
farcall Function11765d
call ClearBGPalettes
call Call_ExitMenu
call LoadFontsExtra
@@ -432,7 +432,7 @@ Function4a28a: ; 4a28a (12:628a)
ld b, 3
ld c, 4
call TextBox
callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
ld hl, DeletePassword_YesNo_MenuDataHeader
call LoadMenuDataHeader
call VerticalMenu
@@ -455,7 +455,7 @@ Function4a28a: ; 4a28a (12:628a)
call ExitMenu
.quit
call Call_ExitMenu
callba Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
xor a
ret
; 4a346 (12:6346)
@@ -649,7 +649,7 @@ MainMenu_MobileStudium: ; 4a496
ld e, a
push bc
push de
callba MobileStudium
farcall MobileStudium
call ClearBGPalettes
pop de
pop bc
@@ -847,7 +847,7 @@ Function4a6ab: ; 4a6ab (12:66ab)
call ClearBGPalettes
ld b, SCGB_DIPLOMA
call GetSGBLayout
callba Function11c1ab
farcall Function11c1ab
pop bc
call LoadFontsExtra
jp Function4a4c4

View File

@@ -20,7 +20,7 @@ Mobile_PrintOpponentBattleMessage: ; 4ea0a
ld bc, wMobileOpponentBattleMessage
decoord 1, 14
callba PrintEZChatBattleMessage
farcall PrintEZChatBattleMessage
pop af
ld [rSVBK], a