Merge pull request #96 from dannye/master

wram comments, EOLs, EOFs, and UTF-8
This commit is contained in:
Daniel Harding 2015-06-04 23:02:28 -05:00
commit c43c338a5f
346 changed files with 1005 additions and 1002 deletions

2
engine/battle/bank_e_misc.asm Normal file → Executable file
View file

@ -119,4 +119,4 @@ GetMonSpecies: ; 39c37 (e:5c37)
add hl, de
ld a, [hl]
ld [wcf91], a
ret
ret

2
engine/battle/end_of_battle.asm Normal file → Executable file
View file

@ -85,4 +85,4 @@ DrawText: ; 13864 (4:7864)
PickUpPayDayMoneyText: ; 1386b (4:786b)
TX_FAR _PickUpPayDayMoneyText
db "@"
db "@"

2
engine/battle/read_trainer_party.asm Normal file → Executable file
View file

@ -163,4 +163,4 @@ ReadTrainer: ; 39c53 (e:5c53)
inc de
dec b
jr nz,.LastLoop ; repeat W_CURENEMYLVL times
ret
ret

2
engine/battle/trainer_pic_money_pointers.asm Normal file → Executable file
View file

@ -140,4 +140,4 @@ TrainerPicAndMoneyPointers: ; 39914 (e:5914)
money 9900
dw LancePic
money 9900
money 9900

View file

@ -23,7 +23,7 @@ TryDoWildEncounter: ; 13870 (4:7870)
jr z, .lastRepelStep
ld [wRepelRemainingSteps], a
.asm_1389e
; determine if wild pokémon can appear in the half-block were standing in
; determine if wild pokemon can appear in the half-block we're standing in
; is the bottom right tile (9,9) of the half-block we're standing in a grass/water tile?
hlCoord 9, 9
ld c, [hl]
@ -35,9 +35,9 @@ TryDoWildEncounter: ; 13870 (4:7870)
cp c
ld a, [W_WATERRATE]
jr z, .CanEncounter
; even if not in grass/water, standing anywhere we can encounter pokémon
; so long as the map is “indoor” and has wild pokémon defined.
; …as long as its not Viridian Forest or Safari Zone.
; even if not in grass/water, standing anywhere we can encounter pokemon
; so long as the map is "indoor" and has wild pokemon defined.
; ...as long as it's not Viridian Forest or Safari Zone.
ld a, [W_CURMAP]
cp REDS_HOUSE_1F ; is this an indoor map?
jr c, .CantEncounter2
@ -61,7 +61,7 @@ TryDoWildEncounter: ; 13870 (4:7870)
inc hl
jr .determineEncounterSlot
.gotEncounterSlot
; determine which wild pokémon (grass or water) can appear in the half-block were standing in
; determine which wild pokemon (grass or water) can appear in the half-block we're standing in
ld c, [hl]
ld hl, W_GRASSMONS
aCoord 8, 9