Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding bank14, good chunk of text transcribed and labelled in bank0d, renaming farcall to callab, and much more #112

Merged
merged 13 commits into from
Jan 16, 2025
Merged

Adding bank14, good chunk of text transcribed and labelled in bank0d, renaming farcall to callab, and much more #112

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6684276
Sporadic constantifying and function naming
DrippingYellow Dec 15, 2024
fbb1ad2
Merge pull request #1 from DrippingYellow/main
DrippingYellow Dec 15, 2024
38545c0
Added bank 14
DrippingYellow Jan 11, 2025
15d2c3d
Merge branch 'pret:master' into master
DrippingYellow Jan 11, 2025
3f74de4
Delete .DS_Store files
vulcandth Jan 11, 2025
d75c729
Delete EOL whitespace
vulcandth Jan 11, 2025
eaf9c94
Use Tab indents instead of four spaces
vulcandth Jan 11, 2025
5bd2610
Identify some routines
vulcandth Jan 11, 2025
db4086f
Merge branch 'master' into pr/112
vulcandth Jan 11, 2025
939affd
Identify more stuff
vulcandth Jan 12, 2025
630163f
Identified party and box structs
DrippingYellow Jan 13, 2025
a2ce32b
Identified wBattleMon and wEnemyMon structs
DrippingYellow Jan 15, 2025
ba9d382
Macro'd landmarks, cleaned up comments
DrippingYellow Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Identify some routines
  • Loading branch information
@vulcandth
vulcandth committed Jan 11, 2025
commit 5bd2610a6c1ce7a21dcc88815192c43dfada7cb3
2 changes: 1 addition & 1 deletion constants/text_constants.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ DEF NAME_LENGTH EQU 11 ; English
DEF PLAYER_NAME_LENGTH EQU 6 ; Japanese
DEF BOX_NAME_LENGTH EQU 9 ; English
DEF MON_NAME_LENGTH EQU 6
DEF MOVE_NAME_LENGTH EQU 13 ; English
DEF MOVE_NAME_LENGTH EQU 5
DEF ITEM_NAME_LENGTH EQU 11
DEF TRAINER_CLASS_NAME_LENGTH EQU 13 ; English

Expand Down
14 changes: 7 additions & 7 deletions data/predef_pointers.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ GiveItemPredef::
add_predef PartyMenuInBattle_Setup
add_predef PartyMenuInBattle
add_predef Function5081f ; 38
add_predef Function506d4
add_predef Function5069e
add_predef ListMovePP
add_predef GetGender
add_predef Function502b5
add_predef Function50244
add_predef Function50244.asm_50248
add_predef Function500c6
add_predef Function500a0
add_predef Function50073 ; 40
add_predef DrawPlayerHP
add_predef DrawEnemyHP
add_predef GetTypeName
add_predef PrintMoveType
add_predef PrintMonTypes ; 40
add_predef Function50ed9
add_predef Functioncb6ff
add_predef Functioncb710
Expand Down
2 changes: 1 addition & 1 deletion engine/debug/field/vram_viewer.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ FieldDebug_DoVRAMViewer:
ld a, 3
ld [wce37], a
ld [wMonDexIndex], a
call GetMonHeader
call GetBaseData
call LoadMonFrontSprite
ret

Expand Down
93 changes: 52 additions & 41 deletions engine/dumps/bank03.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ Functiond8b6:
push hl
ld a, [wMonDexIndex]
ld [wCurSpecies], a
call GetMonHeader
call GetBaseData
ld a, [wMonHeader]
ld [de], a
inc de
Expand Down Expand Up @@ -901,8 +901,8 @@ Functiond8b6:
push de
ld a, [wCurPartyLevel]
ld d, a
ld hl, Function50cd1
ld a, BANK(Function50cd1)
ld hl, CalcExpAtLevel
ld a, BANK(CalcExpAtLevel)
call FarCall_hl
pop de
ldh a, [hMultiplicand]
Expand Down Expand Up @@ -1387,7 +1387,7 @@ Functiondc16:
pop hl
ld bc, $0020
call CopyBytes
call GetMonHeader
call GetBaseData
ld h, d
ld l, e
dec hl
Expand Down Expand Up @@ -1506,7 +1506,7 @@ Functiondd5c:
ld [de], a
cp $ff
jr nz, .sub_dd6c
call GetMonHeader
call GetBaseData
ld hl, wBoxMonOT
ld bc, $0006
ld a, [wBoxListLength]
Expand Down Expand Up @@ -1622,8 +1622,8 @@ Functiondd5c:
push de
ld a, [wCurPartyLevel]
ld d, a
ld hl, Function50cd1
ld a, BANK(Function50cd1)
ld hl, CalcExpAtLevel
ld a, BANK(CalcExpAtLevel)
call FarCall_hl
pop de
ldh a, [hMultiplicand]
Expand Down Expand Up @@ -3470,7 +3470,7 @@ Functioned37:
add hl, bc
ld a, [hl]
ld [wCurPartyLevel], a
call GetMonHeader
call GetBaseData
ld a, [wWhichPokemon]
ld hl, wPartyMonNicknames
call GetNick
Expand Down Expand Up @@ -3604,7 +3604,7 @@ Functionee42:
add hl, bc
ld a, [hl]
ld [wCurPartyLevel], a
call GetMonHeader
call GetBaseData
ld a, [wWhichPokemon]
ld hl, wPartyMonNicknames
call GetNick
Expand All @@ -3620,8 +3620,8 @@ Functionee42:
ld [wCurPartyLevel], a
push de
ld d, a
ld hl, Function50cd1
ld a, BANK(Function50cd1)
ld hl, CalcExpAtLevel
ld a, BANK(CalcExpAtLevel)
call FarCall_hl
pop de
pop hl
Expand Down Expand Up @@ -4544,7 +4544,7 @@ Functionf4d1:
jr nz, .sub_f4d7
ld hl, wPartyMon1Moves
ld bc, $0030
call Functionf9c9
call GetMthMoveOfNthPartymon
push hl
ld a, [hl]
ld [wce37], a
Expand Down Expand Up @@ -4607,10 +4607,10 @@ Functionf580:
Functionf588:
xor a
ld [wMonType], a
call Functionf960
call GetMaxPPOfMove
ld hl, wPartyMon1Moves
ld bc, $0030
call Functionf9c9
call GetMthMoveOfNthPartymon
ld bc, $0015
add hl, bc
ld a, [wce37]
Expand Down Expand Up @@ -4651,7 +4651,7 @@ Functionf5bd:
push bc
ld hl, wPartyMon1Moves
ld bc, $0030
call Functionf9c9
call GetMthMoveOfNthPartymon
ld a, [hl]
and a
jr z, .sub_f5e1
Expand Down Expand Up @@ -4969,33 +4969,42 @@ Textf8ea:
text "から　おりた"
prompt

SECTION "engine/dumps/bank03.asm@Functionf960", ROMX
SECTION "engine/dumps/bank03.asm@GetMaxPPOfMove", ROMX

Functionf960:
GetMaxPPOfMove:
ld a, [wMonType]
and a

ld hl, wPartyMon1Moves
ld bc, $0030
jr z, .sub_f989
ld bc, PARTYMON_STRUCT_LENGTH
jr z, .got_partymon ; PARTYMON

ld hl, wd91d
dec a
jr z, .sub_f989
jr z, .got_partymon ; OTPARTYMON

ld hl, wdaa5
ld bc, $0020
ld bc, BOXMON_STRUCT_LENGTH
dec a
jr z, .sub_f989
jr z, .got_partymon ; BOXMON

ld hl, wd884
dec a
jr z, .sub_f984
ld hl, wca04
.sub_f984
call Functionf9cf
jr .sub_f98c
.sub_f989
call Functionf9c9
.sub_f98c
jr z, .got_nonpartymon ; TEMPMON

ld hl, wca04 ; WILDMON

.got_nonpartymon ; TEMPMON, WILDMON
call GetMthMoveOfCurrentMon
jr .gotdatmove

.got_partymon ; PARTYMON, OTPARTYMON, BOXMON
call GetMthMoveOfNthPartymon

.gotdatmove
ld a, [hl]
dec a

push hl
ld hl, Moves + MOVE_PP
ld bc, MOVE_LENGTH
Expand All @@ -5006,33 +5015,35 @@ Functionf960:
ld de, wStringBuffer1
ld [de], a
pop hl

push bc
ld bc, $0015
ld bc, MON_PP - MON_MOVES
ld a, [wMonType]
cp $04
jr nz, .sub_f9b1
cp WILDMON
jr nz, .notwild
ld bc, $0006
.sub_f9b1
.notwild
add hl, bc
ld a, [hl]
and $c0
and PP_UP_MASK
pop bc

or b
ld hl, wcd27
ld hl, wStringBuffer1 + 1
ld [hl], a
xor a
ld [wce37], a
call ComputeMaxPP
ld a, [hl]
and $3f
and PP_MASK
ld [wce37], a
ret

Functionf9c9:
GetMthMoveOfNthPartymon:
ld a, [wWhichPokemon]
call AddNTimes

Functionf9cf:
GetMthMoveOfCurrentMon:
ld a, [w2DMenuDataEnd]
ld c, a
ld b, $00
Expand Down Expand Up @@ -5218,10 +5229,10 @@ Functionfaba:
jp c, Functionfbde
ld a, [wMonDexIndex]
ld [wCurSpecies], a
call GetMonHeader
call GetBaseData
xor a
ld [wMonType], a
predef Function5069e
predef GetGender
ld a, [wd8fd]
rla
ld [wd8fd], a
Expand Down
4 changes: 2 additions & 2 deletions engine/dumps/bank09.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ Pokepic:
ldh [hBGMapMode], a
ld a, [wMonDexIndex]
ld [wCurSpecies], a
call GetMonHeader
call GetBaseData
ld de, vFont
call LoadMonFrontSprite
ld a, [wMenuBorderTopCoord]
Expand Down Expand Up @@ -1241,7 +1241,7 @@ asm_247d8:
ld de, 3
add hl, de
push hl
callfar Function5069e
callfar GetGender
ld a, $ef
jr c, .asm_2482e
ld a, $f5
Expand Down
14 changes: 7 additions & 7 deletions engine/dumps/bank0d.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2583,7 +2583,7 @@ asm_34e03:

asm_34e12:
ld [wCurSpecies], a
call GetMonHeader
call GetBaseData
ld c, 6
ld hl, wPlayerMoveStructPower
ld de, wca3e
Expand Down Expand Up @@ -4389,7 +4389,7 @@ asm_35976:
ld [wCurPartyLevel], a
ld a, [wcdd9]
ld [wCurSpecies], a
call GetMonHeader
call GetBaseData
ld hl, wcddf
ld de, wcd94
ld a, [hli]
Expand Down Expand Up @@ -5008,7 +5008,7 @@ asm_35d09:
ld [hld], a
ld [hl], a
ld [wNumSetBits], a
predef Function500c6
predef GetTypeName
ld hl, text_35d19
jp PrintText

Expand Down Expand Up @@ -10100,17 +10100,17 @@ asm_379a4:
asm_379a8:
ld a, [wca02]
ld [wCurSpecies], a
call GetMonHeader
call GetBaseData
xor a
ld [wMonType], a
callfar Function5069e
callfar GetGender
push af
ld a, [wcdd9]
ld [wCurSpecies], a
call GetMonHeader
call GetBaseData
ld a, 3
ld [wMonType], a
callfar Function5069e
callfar GetGender
push af
pop bc
ld a, c
Expand Down
Loading