diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/battle.asm | 4 | ||||
| -rw-r--r-- | home/copy.asm | 12 | ||||
| -rw-r--r-- | home/flag.asm | 2 | ||||
| -rw-r--r-- | home/init.asm | 4 | ||||
| -rw-r--r-- | home/item.asm | 4 | ||||
| -rw-r--r-- | home/joypad.asm | 2 | ||||
| -rw-r--r-- | home/map.asm | 30 | ||||
| -rw-r--r-- | home/map_objects.asm | 14 | ||||
| -rw-r--r-- | home/math.asm | 2 | ||||
| -rw-r--r-- | home/menu.asm | 6 | ||||
| -rw-r--r-- | home/movement.asm | 4 | ||||
| -rw-r--r-- | home/names.asm | 2 | ||||
| -rw-r--r-- | home/rtc.asm | 4 | ||||
| -rw-r--r-- | home/serial.asm | 4 | ||||
| -rw-r--r-- | home/text.asm | 4 | ||||
| -rw-r--r-- | home/tilemap.asm | 6 | ||||
| -rw-r--r-- | home/time.asm | 4 | ||||
| -rw-r--r-- | home/window.asm | 6 |
18 files changed, 57 insertions, 57 deletions
diff --git a/home/battle.asm b/home/battle.asm index 3c2e4de43..30096fd4a 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -130,8 +130,8 @@ RefreshBattleHuds:: ; 39c9 ; 39d4 UpdateBattleHuds:: ; 39d4 - callba UpdatePlayerHUD - callba UpdateEnemyHUD + farcall UpdatePlayerHUD + farcall UpdateEnemyHUD ret ; 39e1 diff --git a/home/copy.asm b/home/copy.asm index 8a307b3df..8ee1c90f9 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -101,32 +101,32 @@ OldDMATransfer:: ; dfd ReplaceKrisSprite:: ; e4a - callba _ReplaceKrisSprite + farcall _ReplaceKrisSprite ret ; e51 LoadStandardFont:: ; e51 - callba _LoadStandardFont + farcall _LoadStandardFont ret ; e58 LoadFontsBattleExtra:: ; e58 - callba _LoadFontsBattleExtra + farcall _LoadFontsBattleExtra ret ; e5f LoadFontsExtra:: ; e5f - callba _LoadFontsExtra1 - callba _LoadFontsExtra2 + farcall _LoadFontsExtra1 + farcall _LoadFontsExtra2 ret ; e6c LoadFontsExtra2:: ; e6c - callba _LoadFontsExtra2 + farcall _LoadFontsExtra2 ret ; e73 diff --git a/home/flag.asm b/home/flag.asm index d2b70731a..ddd3eb235 100644 --- a/home/flag.asm +++ b/home/flag.asm @@ -105,7 +105,7 @@ FlagAction:: ; 0x2e76 CheckReceivedDex:: ; 2ead 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 087a26f12..630cfe622 100644 --- a/home/init.asm +++ b/home/init.asm @@ -139,14 +139,14 @@ Init:: ; 17d ld a, -1 ld [hLinkPlayerNumber], a - callba InitCGBPals + farcall InitCGBPals ld a, VBGMap1 / $100 ld [hBGMapAddress + 1], a xor a ; VBGMap1 % $100 ld [hBGMapAddress], a - callba StartClock + farcall StartClock xor a ld [MBC3LatchClock], a diff --git a/home/item.asm b/home/item.asm index 92d74c350..2f550a200 100644 --- a/home/item.asm +++ b/home/item.asm @@ -1,5 +1,5 @@ DoItemEffect:: ; 2f3f - callba _DoItemEffect + farcall _DoItemEffect ret ; 2f46 @@ -7,7 +7,7 @@ CheckTossableItem:: ; 2f46 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 0f5060c63..3d5f0aed5 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -414,7 +414,7 @@ ButtonSound:: ; aaf ld a, [InputType] or a jr z, .input_wait_loop - callba _DudeAutoInput_A + farcall _DudeAutoInput_A .input_wait_loop call .blink_cursor diff --git a/home/map.asm b/home/map.asm index 8b6d8f1e4..11f3fdf83 100644 --- a/home/map.asm +++ b/home/map.asm @@ -215,7 +215,7 @@ endr ReturnToMapFromSubmenu:: ; 222a ld a, MAPSETUP_SUBMENU ld [hMapEntryMethod], a - callba RunMapSetupScript + farcall RunMapSetupScript xor a ld [hMapEntryMethod], a ret @@ -226,7 +226,7 @@ CheckWarpTile:: ; 2238 ret nc push bc - callba CheckDirectionalWarp + farcall CheckDirectionalWarp pop bc ret nc @@ -243,7 +243,7 @@ WarpCheck:: ; 224a ; 2252 GetDestinationWarpNumber:: ; 2252 - callba CheckWarpCollision + farcall CheckWarpCollision ret nc ld a, [hROMBank] @@ -717,7 +717,7 @@ RestoreFacingAfterWarp:: ; 248a call .backup .skip - callba GetCoordOfUpperLeftCorner + farcall GetCoordOfUpperLeftCorner ret ; 24ba @@ -1050,15 +1050,15 @@ RunMapCallback:: ; 263b ExecuteCallbackScript:: ; 2674 ; Do map callback de and return to script bank b. - callba CallCallback + farcall CallCallback ld a, [ScriptMode] push af ld hl, ScriptFlags ld a, [hl] push af set 1, [hl] - callba EnableScriptMode - callba ScriptEvents + farcall EnableScriptMode + farcall ScriptEvents pop af ld [ScriptFlags], a pop af @@ -1439,7 +1439,7 @@ LoadTileset:: ; 2821 jr .skip_roof .load_roof - callba LoadMapGroupRoof + farcall LoadMapGroupRoof .skip_roof xor a @@ -1983,7 +1983,7 @@ FadeToMenu:: ; 2b29 xor a ld [hBGMapMode], a call LoadStandardMenuDataHeader - callba FadeOutPalettes + farcall FadeOutPalettes call ClearSprites call DisableSpriteUpdates ret @@ -2007,9 +2007,9 @@ ExitAllMenus:: ; 2b4d FinishExitMenu:: ; 2b5c ld b, SCGB_MAPPALS call GetSGBLayout - callba LoadOW_BGPal7 + farcall LoadOW_BGPal7 call WaitBGMap2 - callba FadeInPalettes + farcall FadeInPalettes call EnableSpriteUpdates ret ; 2b74 @@ -2030,7 +2030,7 @@ ReturnToMapWithSpeechTextbox:: ; 0x2b74 call WaitBGMap2 ld b, SCGB_MAPPALS call GetSGBLayout - callba LoadOW_BGPal7 + farcall LoadOW_BGPal7 call UpdateTimePals call DelayFrame ld a, $1 @@ -2042,7 +2042,7 @@ ReturnToMapWithSpeechTextbox:: ; 0x2b74 ReloadTilesetAndPalettes:: ; 2bae call DisableLCD call ClearSprites - callba RefreshSprites + farcall RefreshSprites call LoadStandardFont call LoadFontsExtra ld a, [hROMBank] @@ -2052,7 +2052,7 @@ ReloadTilesetAndPalettes:: ; 2bae ld a, [MapNumber] ld c, a call SwitchToAnyMapBank - callba UpdateTimeOfDayPal + farcall UpdateTimeOfDayPal call OverworldTextModeSwitch call LoadTileset ld a, 9 @@ -2296,7 +2296,7 @@ GetMapHeaderMusic:: ; 2cbd jr z, .mahoganymart bit RADIO_TOWER_MUSIC_F, c jr nz, .radiotower - callba Function8b342 + farcall Function8b342 ld e, c ld d, 0 .done diff --git a/home/map_objects.asm b/home/map_objects.asm index 2285c8c76..4e88a050a 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -6,7 +6,7 @@ GetSpritePalette:: ; 17ff push bc ld c, a - callba _GetSpritePalette + farcall _GetSpritePalette ld a, c pop bc @@ -328,7 +328,7 @@ _CopyObjectStruct:: ; 1956 call UnmaskObject ld a, [hMapObjectIndexBuffer] call GetMapObject - callba CopyObjectStruct + farcall CopyObjectStruct ret ; 1967 @@ -345,7 +345,7 @@ ApplyDeletionToMapObject:: ; 1967 call .CheckStopFollow pop af call GetObjectStruct - callba DeleteMapObject + farcall DeleteMapObject ret .CheckStopFollow: @@ -356,7 +356,7 @@ ApplyDeletionToMapObject:: ; 1967 cp [hl] ret nz .ok - callba StopFollow + farcall StopFollow ld a, -1 ld [wObjectFollow_Leader], a ld [wObjectFollow_Follower], a @@ -409,7 +409,7 @@ CopyPlayerObjectTemplate:: ; 19a6 .ok ld a, b call GetObjectStruct - callba DeleteMapObject + farcall DeleteMapObject ret ; 19e9 @@ -620,8 +620,8 @@ UpdateSprites:: ; 1ad2 bit 0, a ret z - callba Function55e0 - callba _UpdateSprites + farcall Function55e0 + farcall _UpdateSprites ret ; 1ae5 diff --git a/home/math.asm b/home/math.asm index 01aea6b72..6a779e378 100644 --- a/home/math.asm +++ b/home/math.asm @@ -45,7 +45,7 @@ Multiply:: ; 3119 push hl push bc - callab _Multiply + callfar _Multiply pop bc pop hl diff --git a/home/menu.asm b/home/menu.asm index 53e4457e3..ba1b568c1 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -569,7 +569,7 @@ Place2DMenuItemName:: ; 201c _2DMenu:: ; 202a ld a, [hROMBank] ld [wMenuData2_2DMenuItemStringsBank], a - callba _2DMenu_ + farcall _2DMenu_ ld a, [wMenuCursorBuffer] ret ; 2039 @@ -577,7 +577,7 @@ _2DMenu:: ; 202a InterpretBattleMenu:: ; 2039 ld a, [hROMBank] ld [wMenuData2_2DMenuItemStringsBank], a - callba _InterpretBattleMenu + farcall _InterpretBattleMenu ld a, [wMenuCursorBuffer] ret ; 2048 @@ -585,7 +585,7 @@ InterpretBattleMenu:: ; 2039 InterpretMobileMenu:: ; 2048 ld a, [hROMBank] ld [wMenuData2_2DMenuItemStringsBank], a - callba _InterpretMobileMenu + farcall _InterpretMobileMenu ld a, [wMenuCursorBuffer] ret ; 2057 diff --git a/home/movement.asm b/home/movement.asm index 781a368a9..f006916a4 100644 --- a/home/movement.asm +++ b/home/movement.asm @@ -159,13 +159,13 @@ SetMenuAttributes:: ; 1bb1 ; 1bc9 StaticMenuJoypad:: ; 1bc9 - callab _StaticMenuJoypad + callfar _StaticMenuJoypad call GetMenuJoypad ret ; 1bd3 ScrollingMenuJoypad:: ; 1bd3 - callab _ScrollingMenuJoypad + callfar _ScrollingMenuJoypad call GetMenuJoypad ret ; 1bdd diff --git a/home/names.asm b/home/names.asm index bd90f7828..c8f873c3f 100644 --- a/home/names.asm +++ b/home/names.asm @@ -206,7 +206,7 @@ GetTMHMName:: ; 3487 push de ld a, [wd265] ld c, a - callab GetTMHMNumber + callfar GetTMHMNumber pop de ; HM numbers start from 51, not 1 diff --git a/home/rtc.asm b/home/rtc.asm index d343d118d..5b83f1079 100644 --- a/home/rtc.asm +++ b/home/rtc.asm @@ -14,11 +14,11 @@ RTC:: ; 46f ret z TimeOfDayPals:: ; 47e - callab _TimeOfDayPals + callfar _TimeOfDayPals ret ; 485 UpdateTimePals:: ; 485 - callab _UpdateTimePals + callfar _UpdateTimePals ret ; 48c diff --git a/home/serial.asm b/home/serial.asm index e60704f3d..b0151eae2 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -277,7 +277,7 @@ Function83b:: ; 83b Function862:: ; 862 call LoadTileMapToTempTileMap - callab PlaceWaitingText + callfar PlaceWaitingText call WaitLinkTransfer jp Call_LoadTempTileMapToTileMap ; 871 @@ -285,7 +285,7 @@ Function862:: ; 862 Function871:: ; 871 call LoadTileMapToTempTileMap - callab PlaceWaitingText + callfar PlaceWaitingText jp WaitLinkTransfer ; 87d diff --git a/home/text.asm b/home/text.asm index 3401eba50..4b0d0d5df 100644 --- a/home/text.asm +++ b/home/text.asm @@ -315,7 +315,7 @@ endm Char15:: ; 117b ld c, l ld b, h - callba Function17f036 + farcall Function17f036 jp PlaceNextChar ; 1186 @@ -391,7 +391,7 @@ PlaceEnemysName:: ; 121b ld de, String12a2 call PlaceString push bc - callab Battle_GetTrainerName + callfar Battle_GetTrainerName pop hl ld de, StringBuffer1 jr PlaceCommandCharacter diff --git a/home/tilemap.asm b/home/tilemap.asm index 1d7998130..9e15ed85b 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -1,16 +1,16 @@ PushWindow:: ; 1c00 - callab _PushWindow + callfar _PushWindow ret ; 1c07 ExitMenu:: ; 0x1c07 push af - callab _ExitMenu + callfar _ExitMenu pop af ret InitVerticalMenuCursor:: ; 0x1c10 - callab _InitVerticalMenuCursor + callfar _InitVerticalMenuCursor ret CloseWindow:: ; 0x1c17 diff --git a/home/time.asm b/home/time.asm index abdd34fe2..9ed703686 100644 --- a/home/time.asm +++ b/home/time.asm @@ -28,7 +28,7 @@ UpdateTime:: ; 5a7 call GetClock call FixDays call FixTime - callba GetTimeOfDay + farcall GetTimeOfDay ret ; 5b7 @@ -205,7 +205,7 @@ SetDayOfWeek:: ; 663 jr InitTime ; useless InitTime:: ; 677 - callba _InitTime + farcall _InitTime ret ; 67e diff --git a/home/window.asm b/home/window.asm index ff7d766e2..0570bbb01 100644 --- a/home/window.asm +++ b/home/window.asm @@ -43,8 +43,8 @@ CloseText:: ; 2dcf ld a, $90 ld [hWY], a call ReplaceKrisSprite - callba ReturnFromMapSetupScript - callba LoadOverworldFont + farcall ReturnFromMapSetupScript + farcall LoadOverworldFont ret ; 2e08 @@ -71,7 +71,7 @@ _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: ; 2e20 ld a, $1 ld [hOAMUpdate], a - callba OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall OpenAndCloseMenu_HDMATransferTileMapAndAttrMap pop af ld [hOAMUpdate], a |