summaryrefslogtreecommitdiff
path: root/home
diff options
context:
space:
mode:
Diffstat (limited to 'home')
-rw-r--r--home/battle.asm4
-rw-r--r--home/copy.asm8
-rw-r--r--home/flag.asm2
-rw-r--r--home/init.asm4
-rw-r--r--home/item.asm4
-rw-r--r--home/joypad.asm4
-rw-r--r--home/map.asm62
-rw-r--r--home/map_objects.asm14
-rw-r--r--home/math.asm2
-rw-r--r--home/rtc.asm4
-rw-r--r--home/serial.asm4
-rw-r--r--home/text.asm24
-rw-r--r--home/tilemap.asm10
-rw-r--r--home/time.asm4
-rw-r--r--home/window.asm2
15 files changed, 76 insertions, 76 deletions
diff --git a/home/battle.asm b/home/battle.asm
index d7d56dda..a29db60f 100644
--- a/home/battle.asm
+++ b/home/battle.asm
@@ -101,8 +101,8 @@ RefreshBattleHuds::
jp WaitBGMap
UpdateBattleHuds:: ; 3bf8 (0:3bf8)
- callba UpdatePlayerHUD
- callba UpdateEnemyHUD
+ farcall UpdatePlayerHUD
+ farcall UpdateEnemyHUD
ret
GetBattleVar::
diff --git a/home/copy.asm b/home/copy.asm
index a3017fd4..50f25e15 100644
--- a/home/copy.asm
+++ b/home/copy.asm
@@ -25,19 +25,19 @@ Functiond70:: ; d70 (0:0d70)
ret
ReplacePlayerSprite::
- callba Function1413c
+ farcall Function1413c
ret
Functiond9e::
- callba Functionf8000
+ farcall Functionf8000
ret
Functionda5::
- callba Functionf8032
+ farcall Functionf8032
ret
LoadFontsExtra::
- callba Functionf800c
+ farcall Functionf800c
ret
DecompressRequest2bpp::
diff --git a/home/flag.asm b/home/flag.asm
index 8f01d8ef..2b455439 100644
--- a/home/flag.asm
+++ b/home/flag.asm
@@ -99,7 +99,7 @@ FlagAction:: ; 2f36 (0:2f36)
CheckReceivedDex::
ld de, ENGINE_POKEDEX
ld b, CHECK_FLAG
- callba EngineFlagAction
+ farcall EngineFlagAction
ld a, c
and a
ret
diff --git a/home/init.asm b/home/init.asm
index cf5c18c9..aaf71bb1 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -101,14 +101,14 @@ Init:: ; 5d1 (0:05d1)
ld h, $9c
call BlankBGMap
- callab InitCGBPals
+ callfar InitCGBPals
ld a, $9c
ld [hBGMapAddress + 1], a
xor a
ld [hBGMapAddress], a
- callba StartClock
+ farcall StartClock
ld a, SRAM_ENABLE
ld [MBC3SRamEnable], a
diff --git a/home/item.asm b/home/item.asm
index bee5f678..abad27f2 100644
--- a/home/item.asm
+++ b/home/item.asm
@@ -1,12 +1,12 @@
DoItemEffect::
- callba DoItemEffect_
+ farcall DoItemEffect_
ret
CheckTossableItem::
push hl
push de
push bc
- callba CheckTossableItem_
+ farcall CheckTossableItem_
pop bc
pop de
pop hl
diff --git a/home/joypad.asm b/home/joypad.asm
index 3f3a0b43..4f629a9f 100644
--- a/home/joypad.asm
+++ b/home/joypad.asm
@@ -289,7 +289,7 @@ JoyWaitInput:: ; a77 (0:0a77)
ld a, [wInputType]
or a
jr z, .wait_loop
- callba DudeAutoInput_A
+ farcall DudeAutoInput_A
.wait_loop
call JoyBlinkCursor
@@ -318,7 +318,7 @@ JoyBlinkCursor:: ; aa6 (0:0aa6)
.cursor_off
ld a, "─"
.load_cursor_state
- Coorda 18, 17
+ ldcoord_a 18, 17
ret
BlinkCursor:: ; ab6 (0:0ab6)
diff --git a/home/map.asm b/home/map.asm
index ea4b5a26..f2d26b72 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -187,7 +187,7 @@ endr
ReturnToMapFromSubmenu::
ld a, $fa
ld [hMapEntryMethod], a
- callba RunMapSetupScript
+ farcall RunMapSetupScript
xor a
ld [hMapEntryMethod], a
ret
@@ -199,10 +199,10 @@ Function2086::
call GetCurrentMapTrigger
call ResetBikeFlags
ld a, $5
- call RunMapCallback
- callba Function97c2a
+ call RunMapfarcallck
+ farcall Function97c2a
ld a, $3
- call RunMapCallback
+ call RunMapfarcallck
call GetMapHeaderTimeOfDayNybble
ld [wMapTimeOfDay], a
ret
@@ -210,8 +210,8 @@ Function2086::
Function20ac::
ld a, $1
ld [wRTCEnabled], a
- callba Function8c3e9
- callba UpdateTimeOfDayPal
+ farcall Function8c3e9
+ farcall UpdateTimeOfDayPal
call OverworldTextModeSwitch
call Function20c7
call Function20e6
@@ -224,7 +224,7 @@ Function20c7:: ; 20c7 (0:20c7)
ld [wd05b], a
ld [hSCY], a
ld [hSCX], a
- callba ApplyBGMapAnchorToObjects
+ farcall ApplyBGMapAnchorToObjects
ld a, $60
ld bc, $400
ld hl, $9800
@@ -268,7 +268,7 @@ Function2112::
ld [hMapAnims], a
xor a
ld [hTileAnimFrame], a
- callba Function1416d
+ farcall Function1416d
call LoadFontsExtra
ret
@@ -280,8 +280,8 @@ Function212d::
call ClearSprites
call ResetBGWindow
call GetMovementPermissions
- callba Function5730
- callba Function15612
+ farcall Function5730
+ farcall Function15612
ld hl, wd182
bit 6, [hl]
jr nz, .asm_2151
@@ -484,7 +484,7 @@ Function2293::
call Function22ad
ret nc
push bc
- callba Function14a2d
+ farcall Function14a2d
pop bc
ret nc
call Function2302
@@ -498,7 +498,7 @@ Function22a5::
ret
Function22ad:: ; 22ad (0:22ad)
- callba Function14a18
+ farcall Function14a18
ret nc
ld a, [hROMBank]
push af
@@ -742,7 +742,7 @@ ReadMapScripts:: ; 242e (0:242e)
ld h, [hl]
ld l, a
call ReadMapTriggers
- call ReadMapCallbacks
+ call ReadMapfarcallcks
ret
CopySecondMapHeader:: ; 243b (0:243b)
@@ -811,7 +811,7 @@ ReadMapTriggers:: ; 248b (0:248b)
call AddNTimes
ret
-ReadMapCallbacks:: ; 24a2 (0:24a2)
+ReadMapfarcallcks:: ; 24a2 (0:24a2)
ld a, [hli]
ld c, a
ld [wd954], a
@@ -1035,7 +1035,7 @@ LoadBlockData::
call ChangeMap
call FillMapConnections
ld a, $1
- call RunMapCallback
+ call RunMapfarcallck
ret
ChangeMap:: ; 260d (0:260d)
@@ -1256,24 +1256,24 @@ CallMapScript::
call GetMapScriptHeaderBank
jr CallScript
-RunMapCallback:: ; 2764 (0:2764)
+RunMapfarcallck:: ; 2764 (0:2764)
ld b, a
ld a, [hROMBank]
push af
call SwitchToMapScriptHeaderBank
- call FindCallback
+ call Findfarcallck
jr nc, .asm_2779
call GetMapScriptHeaderBank
ld b, a
ld d, h
ld e, l
- call ExecuteCallbackScript
+ call ExecutefarcallckScript
.asm_2779
pop af
rst Bankswitch
ret
-FindCallback:: ; 277c (0:277c)
+Findfarcallck:: ; 277c (0:277c)
ld a, [wd954]
ld c, a
and a
@@ -1303,16 +1303,16 @@ FindCallback:: ; 277c (0:277c)
scf
ret
-ExecuteCallbackScript:: ; 279d (0:279d)
- callba CallCallback
+ExecutefarcallckScript:: ; 279d (0:279d)
+ farcall Callfarcallck
ld a, [wd15e]
push af
ld hl, wd15b
ld a, [hl]
push af
set 1, [hl]
- callba EnableScriptMode
- callba ScriptEvents
+ farcall EnableScriptMode
+ farcall ScriptEvents
pop af
ld [wd15b], a
pop af
@@ -1389,21 +1389,21 @@ ObjectEvent::
jumptextfaceplayer ObjectEventText
ObjectEventText::
- text_jump _ObjectEventText
+ text_far _ObjectEventText
db "@"
BGEvent::
jumptext BGEventText
BGEventText::
- text_jump BGEventText_
+ text_far BGEventText_
db "@"
CoordinatesEvent::
jumptext CoordinatesEventText
CoordinatesEventText::
- text_jump CoordinatesEventText_
+ text_far CoordinatesEventText_
db "@"
CheckObjectMask::
@@ -1616,7 +1616,7 @@ LoadTileset:: ; 2944 (0:2944)
jr .asm_2966
.asm_2960
- callba LoadMapGroupRoof
+ farcall LoadMapGroupRoof
.asm_2966
xor a
ld [hTileAnimFrame], a
@@ -2098,7 +2098,7 @@ FadeToMenu::
xor a
ld [hBGMapMode], a
call LoadStandardMenuDataHeader
- callba FadeOutPalettes
+ farcall FadeOutPalettes
call ClearSprites
call DisableSpriteUpdates
ret
@@ -2121,7 +2121,7 @@ FinishExitMenu::
ld b, $9
call GetSGBLayout
call Function3456
- callba FadeInPalettes
+ farcall FadeInPalettes
call EnableSpriteUpdates
ret
@@ -2151,7 +2151,7 @@ ReturnToMapWithSpeechTextbox::
ReloadTilesetAndPalettes:: ; 2c87 (0:2c87)
call DisableLCD
call ClearSprites
- callba RefreshSprites
+ farcall RefreshSprites
call Functiond9e
call LoadFontsExtra
ld a, [hROMBank]
@@ -2161,7 +2161,7 @@ ReloadTilesetAndPalettes:: ; 2c87 (0:2c87)
ld a, [wMapNumber]
ld c, a
call SwitchToAnyMapBank
- callba UpdateTimeOfDayPal
+ farcall UpdateTimeOfDayPal
call OverworldTextModeSwitch
call LoadTileset
ld a, $8
diff --git a/home/map_objects.asm b/home/map_objects.asm
index 94fe60f4..8742ed5e 100644
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -3,7 +3,7 @@ GetSpritePalette:: ; 169c
push de
push bc
ld c, a
- callba GetSpritePalette_
+ farcall GetSpritePalette_
ld a, c
pop bc
pop de
@@ -292,7 +292,7 @@ CopyObjectStruct::
call UnmaskObject
ld a, [hConnectionStripLength]
call GetMapObject
- callba CopyObjectStruct_
+ farcall CopyObjectStruct_
ret
ApplyDeletionToMapObject:: ; 1804 (0:1804)
@@ -308,7 +308,7 @@ ApplyDeletionToMapObject:: ; 1804 (0:1804)
call DeleteOject_CheckStopFollow
pop af
call GetObjectStruct
- callba DeleteMapObject
+ farcall DeleteMapObject
ret
DeleteOject_CheckStopFollow:: ; 1822 (0:1822)
@@ -319,7 +319,7 @@ DeleteOject_CheckStopFollow:: ; 1822 (0:1822)
cp [hl]
ret nz
.asm_182d
- callba StopFollow
+ farcall StopFollow
ld a, $ff
ld [wObjectFollow_Leader], a
ld [wObjectFollow_Follower], a
@@ -368,7 +368,7 @@ Function1855::
.asm_187b
ld a, b
call GetObjectStruct
- callba DeleteMapObject
+ farcall DeleteMapObject
ret
LoadMovementDataPointer::
@@ -556,8 +556,8 @@ UpdateSprites:: ; 196f (0:196f)
ld a, [wVramState]
bit 0, a
ret z
- callba Function557f
- callba UpdateSprites_
+ farcall Function557f
+ farcall UpdateSprites_
ret
GetObjectStruct:: ; 1982 (0:1982)
diff --git a/home/math.asm b/home/math.asm
index 1be69c33..ffa3c282 100644
--- a/home/math.asm
+++ b/home/math.asm
@@ -44,7 +44,7 @@ Multiply::
push hl
push bc
- callab Multiply_ ; 1:67bd
+ callfar Multiply_ ; 1:67bd
pop bc
pop hl
diff --git a/home/rtc.asm b/home/rtc.asm
index ca014e46..afe9028e 100644
--- a/home/rtc.asm
+++ b/home/rtc.asm
@@ -14,9 +14,9 @@ RTC:: ; 343
ret z
TimeOfDayPals:: ; 352
- callab _TimeOfDayPals
+ callfar _TimeOfDayPals
ret
UpdateTimePals:: ; 359
- callab _UpdateTimePals
+ callfar _UpdateTimePals
ret
diff --git a/home/serial.asm b/home/serial.asm
index 645f531f..c57d77ee 100644
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -256,13 +256,13 @@ Function7ec:: ; 7ec
Function813:: ; 813
call BackUpTilesToBuffer
- callab PlaceWaitingText
+ callfar PlaceWaitingText
call WaitLinkTransfer
jp ReloadTilesFromBuffer
Function822:: ; 822
call BackUpTilesToBuffer
- callab PlaceWaitingText
+ callfar PlaceWaitingText
jp WaitLinkTransfer
; One "giant" leap for machinekind
diff --git a/home/text.asm b/home/text.asm
index 994cc7e5..85bda81a 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -315,7 +315,7 @@ PlaceEnemysName:: ; 10fb (0:10fb)
call PlaceString
push bc
- callab Battle_GetTrainerName
+ callfar Battle_GetTrainerName
pop hl
ld de, wStringBuffer1
@@ -483,7 +483,7 @@ NullChar:: ; 120c (0:120c)
ret
.ErrorText
- deciram hObjectStructIndexBuffer, 1, 2
+ text_decimal hObjectStructIndexBuffer, 1, 2
text "エラー"
done
@@ -525,12 +525,12 @@ Diacritic:: ; 124a (0:124a)
LoadBlinkingCursor:: ; 1255 (0:1255)
ld a, "▼"
- Coorda 18, 17
+ ldcoord_a 18, 17
ret
UnloadBlinkingCursor:: ; 125b (0:125b)
ld a, "─"
- Coorda 18, 17
+ ldcoord_a 18, 17
ret
FarString::
@@ -802,14 +802,14 @@ Text_TX_CRY
pop bc
ret
-TextSFX:: ; 13ad (0:13ad)
- dbw TX_SOUND_0B, SFX_DEX_FANFARE_50_79
- dbw TX_SOUND_12, SFX_FANFARE
- dbw TX_SOUND_0E, SFX_DEX_FANFARE_20_49
- dbw TX_SOUND_0F, SFX_ITEM
- dbw TX_SOUND_10, SFX_CAUGHT_MON
- dbw TX_SOUND_11, SFX_DEX_FANFARE_80_109
- dbw TX_SOUND_13, SFX_SLOT_MACHINE_START
+TextSFX::
+ dbw TX_SOUND_DEX_FANFARE_50_79, SFX_DEX_FANFARE_50_79
+ dbw TX_SOUND_FANFARE, SFX_FANFARE
+ dbw TX_SOUND_DEX_FANFARE_20_49, SFX_DEX_FANFARE_20_49
+ dbw TX_SOUND_ITEM, SFX_ITEM
+ dbw TX_SOUND_CAUGHT_MON, SFX_CAUGHT_MON
+ dbw TX_SOUND_DEX_FANFARE_80_109, SFX_DEX_FANFARE_80_109
+ dbw TX_SOUND_SLOT_MACHINE_START, SFX_SLOT_MACHINE_START
db -1
Text_TX_DOTS:: ; 13c3 (0:13c3)
diff --git a/home/tilemap.asm b/home/tilemap.asm
index 9b2a41da..569cf08a 100644
--- a/home/tilemap.asm
+++ b/home/tilemap.asm
@@ -21,12 +21,12 @@ SetMenuAttributes:: ; 1a4e
ret
StaticMenuJoypad:: ; 1a66 (0:1a66)
- callab StaticMenuJoypad_
+ callfar StaticMenuJoypad_
call GetMenuJoypad
ret
ScrollingMenuJoypad:: ; 1a70 (0:1a70)
- callab ScrollingMenuJoypad_
+ callfar ScrollingMenuJoypad_
call GetMenuJoypad
ret
@@ -62,17 +62,17 @@ HideCursor::
ret
PushWindow:: ; 1a9d (0:1a9d)
- callab PushWindow_
+ callfar PushWindow_
ret
ExitMenu:: ; 1aa4 (0:1aa4)
push af
- callab ExitMenu_
+ callfar ExitMenu_
pop af
ret
InitVerticalMenuCursor:: ; 1aad (0:1aad)
- callab InitVerticalMenuCursor_
+ callfar InitVerticalMenuCursor_
ret
CloseWindow:: ; 1ab4 (0:1ab4)
diff --git a/home/time.asm b/home/time.asm
index fc5cf13d..8acc72d9 100644
--- a/home/time.asm
+++ b/home/time.asm
@@ -12,7 +12,7 @@ UpdateTime:: ; 467 (0:0467)
call GetClock
call FixDays
call FixTime
- callba Function14032
+ farcall Function14032
ret
GetClock:: ; 477 (0:0477)
@@ -136,7 +136,7 @@ SetDayOfWeek::
jr InitTime
InitTime::
- callba Function140ff
+ farcall Function140ff
ret
PanicResetClock::
diff --git a/home/window.asm b/home/window.asm
index d7f1d9df..e4a1e989 100644
--- a/home/window.asm
+++ b/home/window.asm
@@ -32,7 +32,7 @@ CloseText
call SafeUpdateSprites
ld a, $90
ld [hWY], a
- callba Function1415c
+ farcall Function1415c
call ReplacePlayerSprite
ld hl, wd565
res 7, [hl]
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-13 03:02:41 +0000