pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Local labels starting with lowercase letters are no longer decorated with a trailing colon

Browse Source
This commit is contained in:
pikalaxalt
2016-04-10 15:01:49 -04:00
parent bf73772a56
commit 6be4cd4da9
99 changed files with 470 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
misc/battle_tower_5c.asm
View File

@@ -212,7 +212,7 @@ _BattleTowerBattle: ; 17022c
ret
; 17023a
.do_dw: ; 17023a
.do_dw ; 17023a
ld a, [wBattleTowerBattleEnded]
ld e, a
ld d, 0
@@ -226,7 +226,7 @@ endr
jp [hl]
; 170249
.dw: ; 170249
.dw ; 170249
dw RunBattleTowerTrainer
dw SkipBattleTowerTrainer
; 17024d
@@ -699,7 +699,7 @@ endr
jp [hl]
; 17051f
.dw: ; 17051f
.dw ; 17051f
dw .Jumptable_0
dw .Jumptable_1
dw .Jumptable_2
@@ -957,7 +957,7 @@ endr
; 170696
.dw: ; 170696 (5c:4696)
.dw ; 170696 (5c:4696)
dw Function17075f ; 0x00
dw Function170788 ; 0x01
dw Function170778 ; 0x02

106
misc/fixed_words.asm
View File

@@ -2523,21 +2523,21 @@ Function11d0b6: ; 11d0b6 (47:50b6)
dw .ten
.zero: ; 11d0dd (47:50dd)
.zero ; 11d0dd (47:50dd)
ld a, [wcd20] ; wcd20 (aliases: CreditsPos)
sla a
ld hl, Unknown_11d208
ld e, $1
jr .load
.one: ; 11d0e9 (47:50e9)
.one ; 11d0e9 (47:50e9)
ld a, [wcd21]
sla a
ld hl, Unknown_11d21a
ld e, $2
jr .load
.two: ; 11d0f5 (47:50f5)
.two ; 11d0f5 (47:50f5)
ld hl, Unknown_11d2be
ld a, [wcd22]
ld e, a
@@ -2551,14 +2551,14 @@ Function11d0b6: ; 11d0b6 (47:50b6)
ld e, $4
jr .load
.three: ; 11d10f (47:510f)
.three ; 11d10f (47:510f)
ld a, SPRITE_ANIM_FRAMESET_27
call ReinitSpriteAnimFrame
ld a, [wcd25]
sla a
ld hl, Unknown_11d29e
ld e, $8
.load: ; 11d11e (47:511e)
.load ; 11d11e (47:511e)
push de
ld e, a
ld d, $0
@@ -2577,7 +2577,7 @@ Function11d0b6: ; 11d0b6 (47:50b6)
call Function11d2ee
ret
.four: ; 11d134 (47:5134)
.four ; 11d134 (47:5134)
ld a, SPRITE_ANIM_FRAMESET_27
call ReinitSpriteAnimFrame
ld a, [wcd2a]
@@ -2586,7 +2586,7 @@ Function11d0b6: ; 11d0b6 (47:50b6)
ld e, $10
jr .load
.five: ; 11d145 (47:5145)
.five ; 11d145 (47:5145)
ld a, SPRITE_ANIM_FRAMESET_27
call ReinitSpriteAnimFrame
ld a, [wcd2c]
@@ -2595,7 +2595,7 @@ Function11d0b6: ; 11d0b6 (47:50b6)
ld e, $20
jr .load
.six: ; 11d156 (47:5156)
.six ; 11d156 (47:5156)
ld a, SPRITE_ANIM_FRAMESET_2A
call ReinitSpriteAnimFrame
ld a, [wcd4a]
@@ -2613,7 +2613,7 @@ Function11d0b6: ; 11d0b6 (47:50b6)
call Function11d2ee
ret
.seven: ; 11d175 (47:5175)
.seven ; 11d175 (47:5175)
ld a, [wcd4d]
cp $4
jr z, .asm_11d180
@@ -2666,15 +2666,15 @@ Function11d0b6: ; 11d0b6 (47:50b6)
call Function11d2ee
ret
.nine: ; 11d1d1 (47:51d1)
.nine ; 11d1d1 (47:51d1)
ld d, -13 * 8
ld a, SPRITE_ANIM_FRAMESET_2C
jr .eight_nine_load
.eight: ; 11d1d7 (47:51d7)
.eight ; 11d1d7 (47:51d7)
ld d, 2 * 8
ld a, SPRITE_ANIM_FRAMESET_2B
.eight_nine_load: ; 11d1db (47:51db)
.eight_nine_load ; 11d1db (47:51db)
push de
call ReinitSpriteAnimFrame
ld a, [wcd4a]
@@ -2695,7 +2695,7 @@ Function11d0b6: ; 11d0b6 (47:50b6)
call Function11d2ee
ret
.ten: ; 11d1fc (47:51fc)
.ten ; 11d1fc (47:51fc)
ld a, SPRITE_ANIM_FRAMESET_26
call ReinitSpriteAnimFrame
ld a, $8
@@ -3289,84 +3289,84 @@ SortedPokemon:
db -1
.o: db FERALIGATR, FURRET, OCTILLERY, PRIMEAPE, SENTRET, STANTLER, SPEAROW, FEAROW, OMASTAR, OMANYTE
db -1
.ka_ga: db GROWLITHE, MACHAMP, DRAGONITE, PINSIR, SNORLAX, KABUTO, KABUTOPS, HITMONTOP, WARTORTLE, BLASTOISE, FARFETCH_D, CUBONE, MAROWAK, KANGASKHAN
.ka_ga db GROWLITHE, MACHAMP, DRAGONITE, PINSIR, SNORLAX, KABUTO, KABUTOPS, HITMONTOP, WARTORTLE, BLASTOISE, FARFETCH_D, CUBONE, MAROWAK, KANGASKHAN
db -1
.ki_gi: db SUNFLORA, CATERPIE, GYARADOS, RAPIDASH, NINETALES, GIRAFARIG, BELLOSSOM, KINGDRA, KINGLER
.ki_gi db SUNFLORA, CATERPIE, GYARADOS, RAPIDASH, NINETALES, GIRAFARIG, BELLOSSOM, KINGDRA, KINGLER
db -1
.ku_gu: db GLOOM, PINECO, GLIGAR, KRABBY, GRANBULL, CROBAT
.ku_gu db GLOOM, PINECO, GLIGAR, KRABBY, GRANBULL, CROBAT
db -1
.ke_ge: db ABRA, GENGAR, TAUROS
.ke_ge db ABRA, GENGAR, TAUROS
db -1
.ko_go: db MAGIKARP, MAGNEMITE, GASTLY, HAUNTER, MACHOKE, KAKUNA, PSYDUCK, PHANPY, RATTATA, GOLDUCK, GOLBAT, GOLEM, GRAVELER, VENONAT
.ko_go db MAGIKARP, MAGNEMITE, GASTLY, HAUNTER, MACHOKE, KAKUNA, PSYDUCK, PHANPY, RATTATA, GOLDUCK, GOLBAT, GOLEM, GRAVELER, VENONAT
db -1
.sa_za: db RHYHORN, PUPITAR, CORSOLA, HITMONLEE, ZAPDOS, JOLTEON, SANDSHREW, SANDSLASH ; RHYDON should lead this list
.sa_za db RHYHORN, PUPITAR, CORSOLA, HITMONLEE, ZAPDOS, JOLTEON, SANDSHREW, SANDSLASH ; RHYDON should lead this list
db -1
.shi_ji: db SEADRA, SHELLDER, VAPOREON, DEWGONG
.shi_ji db SEADRA, SHELLDER, VAPOREON, DEWGONG
db -1
.su_zu: db SUICUNE, STARMIE, SCYTHER, ZUBAT, BEEDRILL, HYPNO, DROWZEE
.su_zu db SUICUNE, STARMIE, SCYTHER, ZUBAT, BEEDRILL, HYPNO, DROWZEE
db -1
.se_ze: db SQUIRTLE, CELEBI
.se_ze db SQUIRTLE, CELEBI
db -1
.so_zo: db WOBBUFFET
.so_zo db WOBBUFFET
db -1
.ta_da: db DUGTRIO, HORSEA, EXEGGCUTE
.ta_da db DUGTRIO, HORSEA, EXEGGCUTE
db -1
.chi_dhi: db CHIKORITA, CHINCHOU
.chi_dhi db CHIKORITA, CHINCHOU
db -1
.tsu_du: db SHUCKLE
.tsu_du db SHUCKLE
db -1
.te_de: db DIGLETT, REMORAID, DELIBIRD, HOUNDOUR, AMPHAROS
.te_de db DIGLETT, REMORAID, DELIBIRD, HOUNDOUR, AMPHAROS
db -1
.to_do: db DODUO, DODRIO, SMEARGLE, KOFFING, TENTACRUEL, TOGETIC, TOGEPI, GOLDEEN, METAPOD, DONPHAN
.to_do db DODUO, DODRIO, SMEARGLE, KOFFING, TENTACRUEL, TOGETIC, TOGEPI, GOLDEEN, METAPOD, DONPHAN
db -1
.na: db ODDISH, EXEGGUTOR
.na db ODDISH, EXEGGUTOR
db -1
.ni: db NIDOKING, NIDOQUEEN, NIDORAN_M, NIDORAN_F, NIDORINA, NIDORINO, MEOWTH, SNEASEL, POLIWHIRL, POLITOED, POLIWRATH, POLIWAG
.ni db NIDOKING, NIDOQUEEN, NIDORAN_M, NIDORAN_F, NIDORINA, NIDORINO, MEOWTH, SNEASEL, POLIWHIRL, POLITOED, POLIWRATH, POLIWAG
db -1
.nu: db QUAGSIRE
.nu db QUAGSIRE
db -1
.ne: db NATU, XATU
.ne db NATU, XATU
db -1
.no: db DUNSPARCE
.no db DUNSPARCE
db -1
.ha_ba_pa: db SEEL, STEELIX, TYPHLOSION, DRAGONAIR, BUTTERFREE, SCIZOR, HOPPIP, BLISSEY, PARAS, PARASECT, QWILFISH, MR__MIME, TYROGUE, CLOYSTER, TYRANITAR
.ha_ba_pa db SEEL, STEELIX, TYPHLOSION, DRAGONAIR, BUTTERFREE, SCIZOR, HOPPIP, BLISSEY, PARAS, PARASECT, QWILFISH, MR__MIME, TYROGUE, CLOYSTER, TYRANITAR
db -1
.hi_bi_pi: db CLEFFA, WEEDLE, PIKACHU, CLEFABLE, PIDGEOT, PIDGEOTTO, PICHU, CLEFAIRY, CHARMANDER, STARYU, CYNDAQUIL, SUNKERN, TEDDIURSA, VOLTORB
.hi_bi_pi db CLEFFA, WEEDLE, PIKACHU, CLEFABLE, PIDGEOT, PIDGEOTTO, PICHU, CLEFAIRY, CHARMANDER, STARYU, CYNDAQUIL, SUNKERN, TEDDIURSA, VOLTORB
db -1
.fu_bu_pu: db MOLTRES, FLAREON, ALAKAZAM, MAGMAR, FORRETRESS, WIGGLYTUFF, IVYSAUR, BULBASAUR, VENUSAUR, AERODACTYL, MAGBY, IGGLYBUFF, UMBREON, ARTICUNO, JIGGLYPUFF, SNUBBULL
.fu_bu_pu db MOLTRES, FLAREON, ALAKAZAM, MAGMAR, FORRETRESS, WIGGLYTUFF, IVYSAUR, BULBASAUR, VENUSAUR, AERODACTYL, MAGBY, IGGLYBUFF, UMBREON, ARTICUNO, JIGGLYPUFF, SNUBBULL
db -1
.he_be_pe: db BAYLEEF, GRIMER, MUK, HERACROSS, HOUNDOOM, PERSIAN, LICKITUNG
.he_be_pe db BAYLEEF, GRIMER, MUK, HERACROSS, HOUNDOOM, PERSIAN, LICKITUNG
db -1
.ho_bo_po: db HO_OH, HOOTHOOT, PIDGEY, PONYTA, SKIPLOOM, PORYGON, PORYGON2
.ho_bo_po db HO_OH, HOOTHOOT, PIDGEY, PONYTA, SKIPLOOM, PORYGON, PORYGON2
db -1
.ma: db MAGCARGO, SLUGMA, QUILAVA, BELLSPROUT, WEEZING, MARILL, AZUMARILL, ELECTRODE, MANKEY, MANTINE
.ma db MAGCARGO, SLUGMA, QUILAVA, BELLSPROUT, WEEZING, MARILL, AZUMARILL, ELECTRODE, MANKEY, MANTINE
db -1
.mi: db DRATINI, MEW, MEWTWO, MILTANK
.mi db DRATINI, MEW, MEWTWO, MILTANK
db -1
.mu: db MISDREAVUS, SMOOCHUM
.mu db MISDREAVUS, SMOOCHUM
db -1
.me: db MEGANIUM, DITTO, TENTACOOL, MAREEP
.me db MEGANIUM, DITTO, TENTACOOL, MAREEP
db -1
.mo: db FLAAFFY, VENOMOTH, TANGELA
.mo db FLAAFFY, VENOMOTH, TANGELA
db -1
.ya: db SLOWKING, SLOWBRO, SLOWPOKE, MURKROW, YANMA
.ya db SLOWKING, SLOWBRO, SLOWPOKE, MURKROW, YANMA
db -1
.yu: db KADABRA
.yu db KADABRA
db -1
.yo: db LARVITAR, NOCTOWL
.yo db LARVITAR, NOCTOWL
db -1
.ra: db RAIKOU, RAICHU, CHANSEY, RATICATE, LAPRAS, VILEPLUME, LANTURN
.ra db RAIKOU, RAICHU, CHANSEY, RATICATE, LAPRAS, VILEPLUME, LANTURN
db -1
.ri: db CHARMELEON, CHARIZARD, URSARING
.ri db CHARMELEON, CHARIZARD, URSARING
db -1
.ru: db JYNX, LUGIA
.ru db JYNX, LUGIA
db -1
.re: db MAGNETON, LEDIAN, LEDYBA
.re db MAGNETON, LEDIAN, LEDYBA
db -1
.ro: db VULPIX
.ro db VULPIX
db -1
.wa: db JUMPLUFF, TOTODILE, MACHOP
.end: db -1
.wa db JUMPLUFF, TOTODILE, MACHOP
.end db -1
; 11d67e
GFX_11d67e:

2
misc/gfx_41.asm
View File

@@ -500,7 +500,7 @@ _Get1bpp:: ; 1042b2
jr .loop
; 1042d6
.bankswitch: ; 1042d6
.bankswitch ; 1042d6
ld a, [rSVBK]
push af
ld a, $6

8
misc/mobile_22_2.asm
View File

@@ -19,21 +19,21 @@ Function8b342:: ; 8b342
ret
; 8b354
.dw: ; 8b354
.dw ; 8b354
dw .zero
dw .one
dw .two
; 8b35a
.zero: ; 8b35a
.zero ; 8b35a
mobile
; 8b35b
.one: ; 8b35b
.one ; 8b35b
mobile
; 8b35c
.two: ; 8b35c
.two ; 8b35c
mobile
; 8b35d

4
misc/mobile_40.asm
View File

@@ -1998,7 +1998,7 @@ Function100c98: ; 100c98
ret
; 100cad
.attrs: ; 100cad
.attrs ; 100cad
db 10, 1
db 255, 1
db $a0, $00
@@ -6880,7 +6880,7 @@ Function102e07: ; 102e07
ret
; 102e32
.waiting: ; 102e32
.waiting ; 102e32
db "Waiting...!@"
; 102e3e

2
misc/mobile_41.asm
View File

@@ -1095,5 +1095,5 @@ LoadOverworldFont:: ; 106594
ret
; 1065ad
.bgfont:
.bgfont
INCBIN "gfx/unknown/1065ad.2bpp"

4
misc/mobile_5f.asm
View File

@@ -4869,7 +4869,7 @@ Function17f6b7: ; 17f6b7
ret
; 17f6cd
.bcd_two_digits: ; 17f6cd
.bcd_two_digits ; 17f6cd
ld c, a
and $f0
swap a
@@ -4877,7 +4877,7 @@ Function17f6b7: ; 17f6b7
ld a, c
and $f
.bcd_digit: ; 17f6d8
.bcd_digit ; 17f6d8
add "0"
ld [hli], a
ret