mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
Merge pull request #31 from kanzure/formatting-fixes
This cleans up some whitespace that has been accumulating in main.asm lately.
This commit is contained in:
commit
667e0bf935
156
main.asm
156
main.asm
@ -1,53 +1,53 @@
|
|||||||
SECTION "bank0",HOME
|
SECTION "bank0",HOME
|
||||||
SECTION "rst0",HOME[$0]
|
SECTION "rst0",HOME[$0]
|
||||||
di
|
di
|
||||||
jp Start
|
jp Start
|
||||||
|
|
||||||
SECTION "rst8",HOME[$8]
|
SECTION "rst8",HOME[$8]
|
||||||
jp $2d63
|
jp $2d63
|
||||||
|
|
||||||
SECTION "rst10",HOME[$10] ; Bankswitch
|
SECTION "rst10",HOME[$10] ; Bankswitch
|
||||||
ld [$ff9d], a
|
ld [$ff9d], a
|
||||||
ld [$2000], a
|
ld [$2000], a
|
||||||
ret
|
ret
|
||||||
|
|
||||||
SECTION "rst18",HOME[$18] ; Unused
|
SECTION "rst18",HOME[$18] ; Unused
|
||||||
rst $38
|
rst $38
|
||||||
|
|
||||||
SECTION "rst20",HOME[$20] ; Unused
|
SECTION "rst20",HOME[$20] ; Unused
|
||||||
rst $38
|
rst $38
|
||||||
|
|
||||||
SECTION "rst28",HOME[$28] ; Jump from pointer table
|
SECTION "rst28",HOME[$28] ; Jump from pointer table
|
||||||
push de
|
push de
|
||||||
ld e, a
|
ld e, a
|
||||||
ld d, 00
|
ld d, 00
|
||||||
add hl, de
|
add hl, de
|
||||||
add hl, de
|
add hl, de
|
||||||
ld a, [hli]
|
ld a, [hli]
|
||||||
ld h, [hl]
|
ld h, [hl]
|
||||||
ld l, a
|
ld l, a
|
||||||
pop de
|
pop de
|
||||||
jp [hl] ; (actually jp hl)
|
jp [hl] ; (actually jp hl)
|
||||||
|
|
||||||
; rst30 is midst rst28
|
; rst30 is midst rst28
|
||||||
|
|
||||||
SECTION "rst38",HOME[$38] ; Unused
|
SECTION "rst38",HOME[$38] ; Unused
|
||||||
rst $38
|
rst $38
|
||||||
|
|
||||||
SECTION "vblank",HOME[$40] ; vblank interrupt
|
SECTION "vblank",HOME[$40] ; vblank interrupt
|
||||||
jp $0283
|
jp $0283
|
||||||
|
|
||||||
SECTION "lcd",HOME[$48] ; lcd interrupt
|
SECTION "lcd",HOME[$48] ; lcd interrupt
|
||||||
jp $0552
|
jp $0552
|
||||||
|
|
||||||
SECTION "timer",HOME[$50] ; timer interrupt
|
SECTION "timer",HOME[$50] ; timer interrupt
|
||||||
jp $3e93
|
jp $3e93
|
||||||
|
|
||||||
SECTION "serial",HOME[$58] ; serial interrupt
|
SECTION "serial",HOME[$58] ; serial interrupt
|
||||||
jp $06ef
|
jp $06ef
|
||||||
|
|
||||||
SECTION "joypad",HOME[$60] ; joypad interrupt
|
SECTION "joypad",HOME[$60] ; joypad interrupt
|
||||||
jp $092e
|
jp $092e
|
||||||
|
|
||||||
SECTION "romheader",HOME[$100]
|
SECTION "romheader",HOME[$100]
|
||||||
Start:
|
Start:
|
||||||
@ -376,7 +376,7 @@ CheckDict:
|
|||||||
cp $51 ; Player name
|
cp $51 ; Player name
|
||||||
jp z, $12f2
|
jp z, $12f2
|
||||||
cp $49
|
cp $49
|
||||||
jp z, $1186
|
jp z, $1186
|
||||||
cp $52 ; Mother name
|
cp $52 ; Mother name
|
||||||
jp z, $118d
|
jp z, $118d
|
||||||
cp $53
|
cp $53
|
||||||
@ -1608,7 +1608,7 @@ INCBIN "baserom.gbc",$c5d2,$c644 - $c5d2
|
|||||||
PrintNumber_PrintLeadingZero: ; c644
|
PrintNumber_PrintLeadingZero: ; c644
|
||||||
; prints a leading zero unless they are turned off in the flags
|
; prints a leading zero unless they are turned off in the flags
|
||||||
bit 7, d ; print leading zeroes?
|
bit 7, d ; print leading zeroes?
|
||||||
ret z
|
ret z
|
||||||
ld [hl], "0"
|
ld [hl], "0"
|
||||||
ret
|
ret
|
||||||
|
|
||||||
@ -1714,31 +1714,31 @@ TechnicalMachines: ; 0x1167a
|
|||||||
INCBIN "baserom.gbc",$116b3,$11ce7 - $116b3
|
INCBIN "baserom.gbc",$116b3,$11ce7 - $116b3
|
||||||
|
|
||||||
NameInputLower:
|
NameInputLower:
|
||||||
db "a b c d e f g h i"
|
db "a b c d e f g h i"
|
||||||
db "j k l m n o p q r"
|
db "j k l m n o p q r"
|
||||||
db "s t u v w x y z "
|
db "s t u v w x y z "
|
||||||
db "× ( ) : ; [ ] ", $e1, " ", $e2
|
db "× ( ) : ; [ ] ", $e1, " ", $e2
|
||||||
db "UPPER DEL END "
|
db "UPPER DEL END "
|
||||||
BoxNameInputLower:
|
BoxNameInputLower:
|
||||||
db "a b c d e f g h i"
|
db "a b c d e f g h i"
|
||||||
db "j k l m n o p q r"
|
db "j k l m n o p q r"
|
||||||
db "s t u v w x y z "
|
db "s t u v w x y z "
|
||||||
db "é 'd 'l 'm 'r 's 't 'v 0"
|
db "é 'd 'l 'm 'r 's 't 'v 0"
|
||||||
db "1 2 3 4 5 6 7 8 9"
|
db "1 2 3 4 5 6 7 8 9"
|
||||||
db "UPPER DEL END "
|
db "UPPER DEL END "
|
||||||
NameInputUpper:
|
NameInputUpper:
|
||||||
db "A B C D E F G H I"
|
db "A B C D E F G H I"
|
||||||
db "J K L M N O P Q R"
|
db "J K L M N O P Q R"
|
||||||
db "S T U V W X Y Z "
|
db "S T U V W X Y Z "
|
||||||
db "- ? ! / . , "
|
db "- ? ! / . , "
|
||||||
db "lower DEL END "
|
db "lower DEL END "
|
||||||
BoxNameInputUpper:
|
BoxNameInputUpper:
|
||||||
db "A B C D E F G H I"
|
db "A B C D E F G H I"
|
||||||
db "J K L M N O P Q R"
|
db "J K L M N O P Q R"
|
||||||
db "S T U V W X Y Z "
|
db "S T U V W X Y Z "
|
||||||
db "× ( ) : ; [ ] ", $e1, " ", $e2
|
db "× ( ) : ; [ ] ", $e1, " ", $e2
|
||||||
db "- ? ! ♂ ♀ / . , &"
|
db "- ? ! ♂ ♀ / . , &"
|
||||||
db "lower DEL END "
|
db "lower DEL END "
|
||||||
|
|
||||||
|
|
||||||
INCBIN "baserom.gbc",$11e5d,$14000 - $11e5d
|
INCBIN "baserom.gbc",$11e5d,$14000 - $11e5d
|
||||||
@ -16407,43 +16407,43 @@ dw Normal, Normal, Normal, Normal, Normal, Normal, Normal, Normal, Normal
|
|||||||
dw UnknownType, Fire, Water, Grass, Electric, Psychic, Ice, Dragon, Dark
|
dw UnknownType, Fire, Water, Grass, Electric, Psychic, Ice, Dragon, Dark
|
||||||
|
|
||||||
Normal:
|
Normal:
|
||||||
db "NORMAL@"
|
db "NORMAL@"
|
||||||
Fighting:
|
Fighting:
|
||||||
db "FIGHTING@"
|
db "FIGHTING@"
|
||||||
Flying:
|
Flying:
|
||||||
db "FLYING@"
|
db "FLYING@"
|
||||||
Poison:
|
Poison:
|
||||||
db "POISON@"
|
db "POISON@"
|
||||||
UnknownType:
|
UnknownType:
|
||||||
db "???@"
|
db "???@"
|
||||||
Fire:
|
Fire:
|
||||||
db "FIRE@"
|
db "FIRE@"
|
||||||
Water:
|
Water:
|
||||||
db "WATER@"
|
db "WATER@"
|
||||||
Grass:
|
Grass:
|
||||||
db "GRASS@"
|
db "GRASS@"
|
||||||
Electric:
|
Electric:
|
||||||
db "ELECTRIC@"
|
db "ELECTRIC@"
|
||||||
Psychic:
|
Psychic:
|
||||||
db "PSYCHIC@"
|
db "PSYCHIC@"
|
||||||
Ice:
|
Ice:
|
||||||
db "ICE@"
|
db "ICE@"
|
||||||
Ground:
|
Ground:
|
||||||
db "GROUND@"
|
db "GROUND@"
|
||||||
Rock:
|
Rock:
|
||||||
db "ROCK@"
|
db "ROCK@"
|
||||||
Bird:
|
Bird:
|
||||||
db "BIRD@"
|
db "BIRD@"
|
||||||
Bug:
|
Bug:
|
||||||
db "BUG@"
|
db "BUG@"
|
||||||
Ghost:
|
Ghost:
|
||||||
db "GHOST@"
|
db "GHOST@"
|
||||||
Steel:
|
Steel:
|
||||||
db "STEEL@"
|
db "STEEL@"
|
||||||
Dragon:
|
Dragon:
|
||||||
db "DRAGON@"
|
db "DRAGON@"
|
||||||
Dark:
|
Dark:
|
||||||
db "DARK@"
|
db "DARK@"
|
||||||
|
|
||||||
INCBIN "baserom.gbc",$50A28,$53384 - $50A28
|
INCBIN "baserom.gbc",$50A28,$53384 - $50A28
|
||||||
|
|
||||||
@ -31503,7 +31503,7 @@ UnknownScript_0x6ac10: ; 0x6ac10
|
|||||||
|
|
||||||
UnknownScript_0x6ac41: ; 0x6ac41
|
UnknownScript_0x6ac41: ; 0x6ac41
|
||||||
checkcode $1
|
checkcode $1
|
||||||
if_greater_than $6, UnknownScript_0x6ac4d
|
if_greater_than $6, UnknownScript_0x6ac4d
|
||||||
checkcode $10
|
checkcode $10
|
||||||
if_equal $0, UnknownScript_0x6ac85
|
if_equal $0, UnknownScript_0x6ac85
|
||||||
UnknownScript_0x6ac4d: ; 0x6ac4d
|
UnknownScript_0x6ac4d: ; 0x6ac4d
|
||||||
@ -52892,19 +52892,19 @@ dw Saturday
|
|||||||
dw Sunday
|
dw Sunday
|
||||||
|
|
||||||
Sunday:
|
Sunday:
|
||||||
db " SUNDAY@"
|
db " SUNDAY@"
|
||||||
Monday:
|
Monday:
|
||||||
db " MONDAY@"
|
db " MONDAY@"
|
||||||
Tuesday:
|
Tuesday:
|
||||||
db " TUESDAY@"
|
db " TUESDAY@"
|
||||||
Wednesday:
|
Wednesday:
|
||||||
db "WEDNESDAY@"
|
db "WEDNESDAY@"
|
||||||
Thursday:
|
Thursday:
|
||||||
db "THURSDAY@"
|
db "THURSDAY@"
|
||||||
Friday:
|
Friday:
|
||||||
db " FRIDAY@"
|
db " FRIDAY@"
|
||||||
Saturday:
|
Saturday:
|
||||||
db "SATURDAY@"
|
db "SATURDAY@"
|
||||||
|
|
||||||
INCBIN "baserom.gbc",$90A3F,$94000-$90A3F
|
INCBIN "baserom.gbc",$90A3F,$94000-$90A3F
|
||||||
|
|
||||||
@ -74238,7 +74238,7 @@ INCBIN "baserom.gbc",$F8800,$3bfc-$800
|
|||||||
|
|
||||||
CalcMagikarpLength: ; fbbfc
|
CalcMagikarpLength: ; fbbfc
|
||||||
; Stores Magikarp's length at $d1ea-$d1eb in big endian
|
; Stores Magikarp's length at $d1ea-$d1eb in big endian
|
||||||
;
|
;
|
||||||
; input:
|
; input:
|
||||||
; de: EnemyMonDVs
|
; de: EnemyMonDVs
|
||||||
; bc: PlayerID
|
; bc: PlayerID
|
||||||
|
Loading…
Reference in New Issue
Block a user