thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sync coordinate macros with pokecrystal

Browse source
This commit is contained in:
Rangi 2020-07-07 11:30:10 -04:00
parent 45ed05decf
commit 13129459f1
75 changed files with 675 additions and 661 deletions
Download patch file Download diff file Expand all files Collapse all files

40
engine/pokemon/bills_pc.asm
View file

@ -10,17 +10,17 @@ DisplayPCMainMenu::
ld a, [wNumHoFTeams]
and a
jr nz, .leaguePCAvailable
coord hl, 0, 0
hlcoord 0, 0
ld b, 8
ld c, 14
jr .next
.noOaksPC
coord hl, 0, 0
hlcoord 0, 0
ld b, 6
ld c, 14
jr .next
.leaguePCAvailable
coord hl, 0, 0
hlcoord 0, 0
ld b, 10
ld c, 14
.next
@ -30,15 +30,15 @@ DisplayPCMainMenu::
ld [wMaxMenuItem], a
CheckEvent EVENT_MET_BILL
jr nz, .metBill
coord hl, 2, 2
hlcoord 2, 2
ld de, SomeonesPCText
jr .next2
.metBill
coord hl, 2, 2
hlcoord 2, 2
ld de, BillsPCText
.next2
call PlaceString
coord hl, 2, 4
hlcoord 2, 4
ld de, wPlayerName
call PlaceString
ld l, c
@ -47,7 +47,7 @@ DisplayPCMainMenu::
call PlaceString
CheckEvent EVENT_GOT_POKEDEX
jr z, .noOaksPC2
coord hl, 2, 6
hlcoord 2, 6
ld de, OaksPCText
call PlaceString
ld a, [wNumHoFTeams]
@ -55,20 +55,20 @@ DisplayPCMainMenu::
jr z, .noLeaguePC
ld a, 4
ld [wMaxMenuItem], a
coord hl, 2, 8
hlcoord 2, 8
ld de, PKMNLeaguePCText
call PlaceString
coord hl, 2, 10
hlcoord 2, 10
ld de, LogOffPCText
jr .next3
.noLeaguePC
coord hl, 2, 8
hlcoord 2, 8
ld de, LogOffPCText
jr .next3
.noOaksPC2
ld a, $2
ld [wMaxMenuItem], a
coord hl, 2, 6
hlcoord 2, 6
ld de, LogOffPCText
.next3
call PlaceString
@ -119,11 +119,11 @@ BillsPCMenu:
lb bc, BANK(PokeballTileGraphics), $01
call CopyVideoData
call LoadScreenTilesFromBuffer2DisableBGTransfer
coord hl, 0, 0
hlcoord 0, 0
ld b, 10
ld c, 12
call TextBoxBorder
coord hl, 2, 2
hlcoord 2, 2
ld de, BillsPCMenuText
call PlaceString
ld hl, wTopMenuItemY
@ -146,7 +146,7 @@ BillsPCMenu:
ld [wPlayerMonNumber], a
ld hl, WhatText
call PrintText
coord hl, 9, 14
hlcoord 9, 14
ld b, 2
ld c, 9
call TextBoxBorder
@ -156,15 +156,15 @@ BillsPCMenu:
jr c, .singleDigitBoxNum
; two digit box num
sub 9
coord hl, 17, 16
hlcoord 17, 16
ld [hl], "1"
add "0"
jr .next
.singleDigitBoxNum
add "1"
.next
Coorda 18, 16
coord hl, 10, 16
ldcoord_a 18, 16
hlcoord 10, 16
ld de, BoxNoPCText
call PlaceString
ld a, 1
@ -380,7 +380,7 @@ HMMoveArray:
INCLUDE "data/moves/hm_moves.asm"
DisplayDepositWithdrawMenu:
coord hl, 9, 10
hlcoord 9, 10
ld b, 6
ld c, 9
call TextBoxBorder
@ -390,9 +390,9 @@ DisplayDepositWithdrawMenu:
jr nz, .next
ld de, WithdrawPCText
.next
coord hl, 11, 12
hlcoord 11, 12
call PlaceString
coord hl, 11, 14
hlcoord 11, 14
ld de, StatsCancelPCText
call PlaceString
ld hl, wTopMenuItemY

2
engine/pokemon/evos_moves.asm
View file

@ -121,7 +121,7 @@ Evolution_PartyMonLoop: ; loop over party mons
call DelayFrames
xor a
ldh [hAutoBGTransferEnabled], a
coord hl, 0, 0
hlcoord 0, 0
lb bc, 12, 20
call ClearScreenArea
ld a, $1

8
engine/pokemon/learn_move.asm
View file

@ -76,7 +76,7 @@ DontAbandonLearning:
AbandonLearning:
ld hl, AbandonLearningText
call PrintText
coord hl, 14, 7
hlcoord 14, 7
lb bc, 8, 15
ld a, TWO_OPTION_MENU
ld [wTextBoxID], a
@ -99,7 +99,7 @@ TryingToLearn:
push hl
ld hl, TryingToLearnText
call PrintText
coord hl, 14, 7
hlcoord 14, 7
lb bc, 8, 15
ld a, TWO_OPTION_MENU
ld [wTextBoxID], a
@ -120,11 +120,11 @@ TryingToLearn:
push hl
ld hl, WhichMoveToForgetText
call PrintText
coord hl, 4, 7
hlcoord 4, 7
ld b, 4
ld c, 14
call TextBoxBorder
coord hl, 6, 8
hlcoord 6, 8
ld de, wMovesString
ldh a, [hFlagsFFF6]
set 2, a

62
engine/pokemon/status_screen.asm
View file

@ -105,7 +105,7 @@ StatusScreen:
push af
xor a
ldh [hTilesetType], a
coord hl, 19, 1
hlcoord 19, 1
lb bc, 6, 10
call DrawLineBox ; Draws the box around name, HP and status
ld de, -6
@ -113,54 +113,54 @@ StatusScreen:
ld [hl], "<DOT>"
dec hl
ld [hl], "№"
coord hl, 19, 9
hlcoord 19, 9
lb bc, 8, 6
call DrawLineBox ; Draws the box around types, ID No. and OT
coord hl, 10, 9
hlcoord 10, 9
ld de, Type1Text
call PlaceString ; "TYPE1/"
coord hl, 11, 3
hlcoord 11, 3
predef DrawHP
ld hl, wStatusScreenHPBarColor
call GetHealthBarColor
ld b, SET_PAL_STATUS_SCREEN
call RunPaletteCommand
coord hl, 16, 6
hlcoord 16, 6
ld de, wLoadedMonStatus
call PrintStatusCondition
jr nz, .StatusWritten
coord hl, 16, 6
hlcoord 16, 6
ld de, OKText
call PlaceString ; "OK"
.StatusWritten
coord hl, 9, 6
hlcoord 9, 6
ld de, StatusText
call PlaceString ; "STATUS/"
coord hl, 14, 2
hlcoord 14, 2
call PrintLevel ; Pokémon level
ld a, [wMonHIndex]
ld [wd11e], a
ld [wd0b5], a
predef IndexToPokedex
coord hl, 3, 7
hlcoord 3, 7
ld de, wd11e
lb bc, LEADING_ZEROES | 1, 3
call PrintNumber ; Pokémon no.
coord hl, 11, 10
hlcoord 11, 10
predef PrintMonType
ld hl, NamePointers2
call .GetStringPointer
ld d, h
ld e, l
coord hl, 9, 1
hlcoord 9, 1
call PlaceString ; Pokémon name
ld hl, OTPointers
call .GetStringPointer
ld d, h
ld e, l
coord hl, 12, 16
hlcoord 12, 16
call PlaceString ; OT
coord hl, 12, 14
hlcoord 12, 14
ld de, wLoadedMonOTID
lb bc, LEADING_ZEROES | 2, 5
call PrintNumber ; ID Number
@ -168,7 +168,7 @@ StatusScreen:
call PrintStatsBox
call Delay3
call GBPalNormal
coord hl, 1, 0
hlcoord 1, 0
call LoadFlippedFrontSpriteByMonIndex ; draw Pokémon picture
ld a, [wcf91]
call PlayCry ; play Pokémon cry
@ -252,19 +252,19 @@ PrintStatsBox:
ld a, d
and a ; a is 0 from the status screen
jr nz, .DifferentBox
coord hl, 0, 8
hlcoord 0, 8
ld b, 8
ld c, 8
call TextBoxBorder ; Draws the box
coord hl, 1, 9 ; Start printing stats from here
hlcoord 1, 9 ; Start printing stats from here
ld bc, $19 ; Number offset
jr .PrintStats
.DifferentBox
coord hl, 9, 2
hlcoord 9, 2
ld b, 8
ld c, 9
call TextBoxBorder
coord hl, 11, 3
hlcoord 11, 3
ld bc, $18
.PrintStats
push bc
@ -311,16 +311,16 @@ StatusScreen2:
ld bc, NUM_MOVES
call CopyData
callfar FormatMovesString
coord hl, 9, 2
hlcoord 9, 2
lb bc, 5, 10
call ClearScreenArea ; Clear under name
coord hl, 19, 3
hlcoord 19, 3
ld [hl], $78
coord hl, 0, 8
hlcoord 0, 8
ld b, 8
ld c, 18
call TextBoxBorder ; Draw move container
coord hl, 2, 9
hlcoord 2, 9
ld de, wMovesString
call PlaceString ; Print moves
ld a, [wNumMovesMinusOne]
@ -329,7 +329,7 @@ StatusScreen2:
ld a, $4
sub c
ld b, a ; Number of moves ?
coord hl, 11, 10
hlcoord 11, 10
ld de, SCREEN_WIDTH * 2
ld a, "<BOLD_P>"
call StatusScreen_PrintPP ; Print "PP"
@ -341,7 +341,7 @@ StatusScreen2:
call StatusScreen_PrintPP ; Fill the rest with --
.InitPP
ld hl, wLoadedMonMoves
coord de, 14, 10
decoord 14, 10
ld b, 0
.PrintPP
ld a, [hli]
@ -391,7 +391,7 @@ StatusScreen2:
cp $4
jr nz, .PrintPP
.PPDone
coord hl, 9, 3
hlcoord 9, 3
ld de, StatusScreenExpText
call PlaceString
ld a, [wLoadedMonLevel]
@ -401,7 +401,7 @@ StatusScreen2:
inc a
ld [wLoadedMonLevel], a ; Increase temporarily if not 100
.Level100
coord hl, 14, 6
hlcoord 14, 6
ld [hl], "<to>"
inc hl
inc hl
@ -409,22 +409,22 @@ StatusScreen2:
pop af
ld [wLoadedMonLevel], a
ld de, wLoadedMonExp
coord hl, 12, 4
hlcoord 12, 4
lb bc, 3, 7
call PrintNumber ; exp
call CalcExpToLevelUp
ld de, wLoadedMonExp
coord hl, 7, 6
hlcoord 7, 6
lb bc, 3, 7
call PrintNumber ; exp needed to level up
coord hl, 9, 0
hlcoord 9, 0
call StatusScreen_ClearName
coord hl, 9, 1
hlcoord 9, 1
call StatusScreen_ClearName
ld a, [wMonHIndex]
ld [wd11e], a
call GetMonName
coord hl, 9, 1
hlcoord 9, 1
call PlaceString
ld a, $1
ldh [hAutoBGTransferEnabled], a