Skip to content

Rename .asm_39c46 to .loopSkipTrainer #122

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

Merged
Rangi42 merged 5 commits into from
Jul 24, 2025
Merged

Rename .asm_39c46 to .loopSkipTrainer #122

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3049857
Rename jump address
PokefanMarcel Dec 1, 2024
8195072
Update .gitignore
PokefanMarcel Feb 2, 2025
5d618cf
Update read_trainer_party.asm
PokefanMarcel Feb 2, 2025
1a64de9
Apply suggestions from code review
Rangi42 Jul 24, 2025
a521a6b
Update engine/battle/read_trainer_party.asm
Rangi42 Jul 24, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@
*.sn*
*.sa*
*.sg1
.DS_Store
15 changes: 8 additions & 7 deletions engine/battle/read_trainer_party.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ ReadTrainer:
ld a, [hli]
cp $ff
jr z, .FinishUp
cp b
jr nz, .asm_39c46
cp b ; is it the correct Trainer Class?
jr nz, .loopSkipTrainer
ld a, [hli]
cp c
jr nz, .asm_39c46
cp c ; is it the correct Trainer No?
jr nz, .loopSkipTrainer
ld d, h
ld e, l
.writeAdditionalMoveDataLoop
Expand All @@ -115,10 +115,11 @@ ReadTrainer:
inc de
ld [hl], a
jr .writeAdditionalMoveDataLoop
.asm_39c46
.loopSkipTrainer
; skip current trainer entry
ld a, [hli]
and a
jr nz, .asm_39c46
and a ; trainer entry terminator is 0, so putting NO_MOVE in SpecialTrainerMoves causes issues
jr nz, .loopSkipTrainer
jr .loopAdditionalMoveData
.FinishUp
; clear wAmountMoneyWon addresses
Expand Down