Skip to content

Add some comments/constants to core.asm and intro_menu.asm #145

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

Open
Narishma-gb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add some comments/constants to core.asm and intro_menu.asm #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions engine/battle/core.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4629,7 +4629,9 @@ UpdateHPPal:
jp FinishBattleAnim

Battle_DummyFunction:
; called before placing either battler's nickname in the HUD
; Called before placing either battler's nickname in the HUD.
; This was CenterMonName in Gen 1.
; In Gen 2, pokemon nicknames are always left-aligned on the HUD.
ret

BattleMenu:
Expand Down Expand Up @@ -7806,7 +7808,7 @@ StartBattle:
lb bc, 4, 10
call ClearBox
call ClearSprites
ld a, [wEnemyMonEnd]
ld a, [wBattleMode]
cp WILD_BATTLE
call z, UpdateEnemyHUD
ld a, $1
Expand Down Expand Up @@ -8135,7 +8137,7 @@ ReadAndPrintLinkBattleRecord:
pop hl
call PlaceString
pop hl
ld de, 26
ld de, SCREEN_WIDTH + 6
add hl, de
push hl
ld de, wLinkBattleRecordWins
Expand Down
8 changes: 2 additions & 6 deletions engine/menus/intro_menu.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ SetDefaultBoxNames:
ld [hli], a
ld [hl], '@'
pop hl
ld de, 9
ld de, BOX_NAME_LENGTH
add hl, de
inc c
ld a, c
Expand Down Expand Up @@ -474,11 +474,7 @@ Continue_DisplayPokedexNumCaught:
ret z
push hl
ld hl, wPokedexCaught
if NUM_POKEMON % 8
ld b, NUM_POKEMON / 8 + 1
else
ld b, NUM_POKEMON / 8
endc
ld b, (NUM_POKEMON + 7) / 8
call CountSetBits
pop hl
ld de, wNumSetBits
Expand Down
Loading