diff options
author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-16 14:30:10 -0500 |
---|---|---|
committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-16 14:39:28 -0500 |
commit | 80480821142d7a7b16dd2b1a98a213e7b389af0f (patch) | |
tree | 1e44bf0ba8f410e4debe309295dd389e3f418d8e /engine/routines | |
parent | 2b823389208c7c3691109ad751ccc39aa2408387 (diff) |
Remove Predef_ prefix from routines listed in PredefPointers
Diffstat (limited to 'engine/routines')
-rw-r--r-- | engine/routines/correcterrorsinplayerparty.asm | 2 | ||||
-rw-r--r-- | engine/routines/flagpredef.asm | 2 | ||||
-rw-r--r-- | engine/routines/newpokedexentry.asm | 2 | ||||
-rw-r--r-- | engine/routines/placegraphic.asm | 3 | ||||
-rw-r--r-- | engine/routines/placewaitingtext.asm | 2 | ||||
-rw-r--r-- | engine/routines/printitemdescription.asm | 2 | ||||
-rw-r--r-- | engine/routines/trademonfrontpic.asm | 6 |
7 files changed, 9 insertions, 10 deletions
diff --git a/engine/routines/correcterrorsinplayerparty.asm b/engine/routines/correcterrorsinplayerparty.asm index fcc2f36af..639e5c544 100644 --- a/engine/routines/correcterrorsinplayerparty.asm +++ b/engine/routines/correcterrorsinplayerparty.asm @@ -90,7 +90,7 @@ Unreferenced_CorrectErrorsInPlayerParty: ld hl, MON_STAT_EXP - 1 add hl, bc ld b, $1 - predef Predef_CalcPkmnStats + predef CalcPkmnStats pop hl ld bc, PARTYMON_STRUCT_LENGTH add hl, bc diff --git a/engine/routines/flagpredef.asm b/engine/routines/flagpredef.asm index 676960c31..2a6d91ee1 100644 --- a/engine/routines/flagpredef.asm +++ b/engine/routines/flagpredef.asm @@ -1,4 +1,4 @@ -Predef_SmallFarFlagAction: ; 4d7c1 +SmallFarFlagAction: ; 4d7c1 ; Perform action b on bit c in flag array hl. ; If checking a flag, check flag array d:hl unless d is 0. diff --git a/engine/routines/newpokedexentry.asm b/engine/routines/newpokedexentry.asm index c52188f6e..acf9fca7b 100644 --- a/engine/routines/newpokedexentry.asm +++ b/engine/routines/newpokedexentry.asm @@ -1,4 +1,4 @@ -Predef_NewPokedexEntry: ; fb877 +NewPokedexEntry: ; fb877 ld a, [hMapAnims] push af xor a diff --git a/engine/routines/placegraphic.asm b/engine/routines/placegraphic.asm index 28b69fc23..21b914950 100644 --- a/engine/routines/placegraphic.asm +++ b/engine/routines/placegraphic.asm @@ -1,7 +1,6 @@ -Predef_PlaceGraphic: ; 2ef6e +PlaceGraphic: ; 2ef6e ; Fill wBoxAlignment-aligned box width b height c ; with iterating tile starting from hGraphicStartTile at hl. -; Predef $13 ld de, SCREEN_WIDTH diff --git a/engine/routines/placewaitingtext.asm b/engine/routines/placewaitingtext.asm index 37fc2a056..9b2260722 100644 --- a/engine/routines/placewaitingtext.asm +++ b/engine/routines/placewaitingtext.asm @@ -11,7 +11,7 @@ PlaceWaitingText:: ; 4000 jr .proceed .notinbattle - predef Predef_LinkTextbox + predef LinkTextboxAtHL .proceed hlcoord 4, 11 diff --git a/engine/routines/printitemdescription.asm b/engine/routines/printitemdescription.asm index 4da061fda..e6d087dae 100644 --- a/engine/routines/printitemdescription.asm +++ b/engine/routines/printitemdescription.asm @@ -11,7 +11,7 @@ PrintItemDescription: ; 0x1c8955 pop hl ld a, [wd265] ld [CurSpecies], a - predef Predef_PrintMoveDesc + predef PrintMoveDesc ret .not_a_tm diff --git a/engine/routines/trademonfrontpic.asm b/engine/routines/trademonfrontpic.asm index 2d05a1c04..e9611553b 100644 --- a/engine/routines/trademonfrontpic.asm +++ b/engine/routines/trademonfrontpic.asm @@ -4,13 +4,13 @@ GetTrademonFrontpic: ; 4d7fd ld de, vTiles2 push de push af - predef Predef_GetUnownLetter + predef GetUnownLetter pop af ld [CurPartySpecies], a ld [CurSpecies], a call GetBaseData pop de - predef Predef_GetAnimatedFrontpic + predef GetAnimatedFrontpic ret AnimateTrademonFrontpic: ; 4d81e @@ -34,5 +34,5 @@ AnimateTrademonFrontpic: ; 4d81e hlcoord 7, 2 ld d, $0 ld e, ANIM_MON_TRADE - predef Predef_AnimateFrontpic + predef AnimateFrontpic ret |