mirror of https://github.com/pret/pokecrystal.git
Merge pull request #194 from kanzure/fix-asm-whitespace
whitespace -> tabs in main.asm
This commit is contained in:
Bryan Bishop
commit
c9dba36d13
102
main.asm
102
main.asm
|
|
@ -27150,11 +27150,11 @@ OpenMartDialog: ; 15a45
|
|||
; 15a57
|
||||
|
||||
.dialogs
|
||||
dw MartDialog
|
||||
dw HerbShop
|
||||
dw BargainShop
|
||||
dw Pharmacist
|
||||
dw VendingMachine
|
||||
dw MartDialog
|
||||
dw HerbShop
|
||||
dw BargainShop
|
||||
dw Pharmacist
|
||||
dw VendingMachine
|
||||
; 15a61
|
||||
|
||||
MartDialog: ; 15a61
|
||||
|
|
@ -27282,12 +27282,12 @@ Function15b47: ; 15b47
|
|||
ret
|
||||
|
||||
.table_15b56
|
||||
dw Function15b62
|
||||
dw Function15b6e
|
||||
dw Function15b8d
|
||||
dw Function15b9a
|
||||
dw Function15ba3
|
||||
dw Function15baf
|
||||
dw Function15b62
|
||||
dw Function15b6e
|
||||
dw Function15b8d
|
||||
dw Function15b9a
|
||||
dw Function15ba3
|
||||
dw Function15baf
|
||||
; 15b62
|
||||
|
||||
Function15b62: ; 15b62
|
||||
|
|
@ -27524,11 +27524,11 @@ Function15ca3: ; 15ca3
|
|||
; 15cb0
|
||||
|
||||
.data_15cb0 ; 15cb0
|
||||
dwb $5cbf, 0
|
||||
dwb $5ccb, 0
|
||||
dwb $5cd7, 1
|
||||
dwb $5ce3, 0
|
||||
dwb $5cbf, 2
|
||||
dwb $5cbf, 0
|
||||
dwb $5ccb, 0
|
||||
dwb $5cd7, 1
|
||||
dwb $5ce3, 0
|
||||
dwb $5cbf, 2
|
||||
; 15cbf
|
||||
|
||||
INCBIN "baserom.gbc", $15cbf, $15cef - $15cbf
|
||||
|
|
@ -47178,14 +47178,14 @@ StatsScreenMain: ; 0x4dcd2
|
|||
INCBIN "baserom.gbc", $4dcf7, $4dd2a - $4dcf7
|
||||
|
||||
StatsScreenPointerTable: ; 4dd2a
|
||||
dw $5d72 ; regular pokémon
|
||||
dw EggStatsInit ; egg
|
||||
dw $5de6
|
||||
dw $5dac
|
||||
dw $5dc6
|
||||
dw $5de6
|
||||
dw $5dd6
|
||||
dw $5d6c
|
||||
dw $5d72 ; regular pokémon
|
||||
dw EggStatsInit ; egg
|
||||
dw $5de6
|
||||
dw $5dac
|
||||
dw $5dc6
|
||||
dw $5de6
|
||||
dw $5dd6
|
||||
dw $5d6c
|
||||
|
||||
; 4dd3a
|
||||
|
||||
|
|
@ -47202,10 +47202,10 @@ EggStatsInit: ; 4dda1
|
|||
INCBIN "baserom.gbc", $4ddac, $4e21e - $4ddac
|
||||
|
||||
IDNoString: ; 4e21e
|
||||
db $73, "№.@"
|
||||
db $73, "№.@"
|
||||
|
||||
OTString: ; 4e222
|
||||
db "OT/@"
|
||||
db "OT/@"
|
||||
; 4e226
|
||||
|
||||
INCBIN "baserom.gbc", $4e226, $4e33a - $4e226
|
||||
|
|
@ -47267,22 +47267,22 @@ EggStatsScreen: ; 4e33a
|
|||
; 0x4e3c0
|
||||
|
||||
EggString: ; 4e3c0
|
||||
db "EGG@"
|
||||
db "EGG@"
|
||||
|
||||
FiveQMarkString: ; 4e3c4
|
||||
db "?????@"
|
||||
db "?????@"
|
||||
|
||||
EggSoonString: ; 0x4e3ca
|
||||
db "It's making sounds", $4e, "inside. It's going", $4e, "to hatch soon!@"
|
||||
db "It's making sounds", $4e, "inside. It's going", $4e, "to hatch soon!@"
|
||||
|
||||
EggCloseString: ; 0x4e3fd
|
||||
db "It moves around", $4e, "inside sometimes.", $4e, "It must be close", $4e, "to hatching.@"
|
||||
db "It moves around", $4e, "inside sometimes.", $4e, "It must be close", $4e, "to hatching.@"
|
||||
|
||||
EggMoreTimeString: ; 0x4e43d
|
||||
db "Wonder what's", $4e, "inside? It needs", $4e, "more time, though.@"
|
||||
db "Wonder what's", $4e, "inside? It needs", $4e, "more time, though.@"
|
||||
|
||||
EggALotMoreTimeString: ; 0x4e46e
|
||||
db "This EGG needs a", $4e, "lot more time to", $4e, "hatch.@"
|
||||
db "This EGG needs a", $4e, "lot more time to", $4e, "hatch.@"
|
||||
|
||||
; 0x4e497
|
||||
|
||||
|
|
@ -48849,35 +48849,35 @@ PrintPartyMenuText: ; 5049a
|
|||
; 0x504d2
|
||||
|
||||
PartyMenuStrings: ; 0x504d2
|
||||
dw ChooseAMonString
|
||||
dw UseOnWhichPKMNString
|
||||
dw WhichPKMNString
|
||||
dw TeachWhichPKMNString
|
||||
dw MoveToWhereString
|
||||
dw UseOnWhichPKMNString
|
||||
dw ChooseAMonString ; Probably used to be ChooseAFemalePKMNString
|
||||
dw ChooseAMonString ; Probably used to be ChooseAMalePKMNString
|
||||
dw ToWhichPKMNString
|
||||
dw ChooseAMonString
|
||||
dw UseOnWhichPKMNString
|
||||
dw WhichPKMNString
|
||||
dw TeachWhichPKMNString
|
||||
dw MoveToWhereString
|
||||
dw UseOnWhichPKMNString
|
||||
dw ChooseAMonString ; Probably used to be ChooseAFemalePKMNString
|
||||
dw ChooseAMonString ; Probably used to be ChooseAMalePKMNString
|
||||
dw ToWhichPKMNString
|
||||
|
||||
ChooseAMonString: ; 0x504e4
|
||||
db "Choose a #MON.@"
|
||||
db "Choose a #MON.@"
|
||||
UseOnWhichPKMNString: ; 0x504f3
|
||||
db "Use on which ", $e1, $e2, "?@"
|
||||
db "Use on which ", $e1, $e2, "?@"
|
||||
WhichPKMNString: ; 0x50504
|
||||
db "Which ", $e1, $e2, "?@"
|
||||
db "Which ", $e1, $e2, "?@"
|
||||
TeachWhichPKMNString: ; 0x5050e
|
||||
db "Teach which ", $e1, $e2, "?@"
|
||||
db "Teach which ", $e1, $e2, "?@"
|
||||
MoveToWhereString: ; 0x5051e
|
||||
db "Move to where?@"
|
||||
db "Move to where?@"
|
||||
ChooseAFemalePKMNString: ; 0x5052d ; UNUSED
|
||||
db "Choose a ♀", $e1, $e2, ".@"
|
||||
db "Choose a ♀", $e1, $e2, ".@"
|
||||
ChooseAMalePKMNString: ; 0x5053b ; UNUSED
|
||||
db "Choose a ♂", $e1, $e2, ".@"
|
||||
db "Choose a ♂", $e1, $e2, ".@"
|
||||
ToWhichPKMNString: ; 0x50549
|
||||
db "To which ", $e1, $e2, "?@"
|
||||
db "To which ", $e1, $e2, "?@"
|
||||
|
||||
YouHaveNoPKMNString: ; 0x50556
|
||||
db "You have no ", $e1, $e2, "!@"
|
||||
db "You have no ", $e1, $e2, "!@"
|
||||
|
||||
|
||||
Function50566: ; 50566
|
||||
|
|
@ -72446,7 +72446,7 @@ RegionCheck: ; 0x1caea1
|
|||
|
||||
SECTION "bank73",ROMX,BANK[$73]
|
||||
|
||||
; Pokedex entries III
|
||||
; Pokedex entries III
|
||||
; 129-192
|
||||
PokedexEntries3:
|
||||
INCLUDE "stats/pokedex/entries_3.asm"
|
||||
|
|
|
|||
Loading…
Reference in New Issue