diff options
| -rw-r--r-- | charmap.asm | 1 | ||||
| -rwxr-xr-x | engine/HoF_room_pc.asm | 6 | ||||
| -rwxr-xr-x | engine/hall_of_fame.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/league_pc.asm | 2 | ||||
| -rwxr-xr-x | engine/save.asm | 14 | ||||
| -rwxr-xr-x | engine/status_ailments.asm | 12 | ||||
| -rwxr-xr-x | engine/town_map.asm | 6 | ||||
| -rw-r--r-- | gfx/tilesets/overworld.t2.png | bin | 1309 -> 1309 bytes | |||
| -rw-r--r-- | home.asm | 8 | ||||
| -rwxr-xr-x | main.asm | 3 | ||||
| -rw-r--r-- | text.asm | 4 | ||||
| -rwxr-xr-x | wram.asm | 11 |
12 files changed, 38 insertions, 31 deletions
diff --git a/charmap.asm b/charmap.asm index e9b354ff..e7cac936 100644 --- a/charmap.asm +++ b/charmap.asm @@ -155,6 +155,7 @@ charmap "#", $54 ;charmap "POKé", $54 charmap "<TARGET>", $59 charmap "<USER>", $5A +charmap "‘", $70 charmap "′", $71 charmap "″", $73 charmap "№", $74 diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index d91c983b..a39daf06 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -246,12 +246,12 @@ Credits: pop de ld de, TheEndGfx ld hl, vChars2 + $600 - lb bc, BANK(TheEndGfx), (TheEndGfxEnd - TheEndGfx) / $10 + lb bc, BANK(TheEndGfx), (TheEndGfxEnd - TheEndGfx) / $0C call CopyVideoData - coord hl, 4, 8 + coord hl, 7, 8 ld de, TheEndTextString call PlaceString - coord hl, 4, 9 + coord hl, 7, 9 inc de call PlaceString jp FadeInCreditsText diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 10b73bb0..13c6f4dc 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -237,7 +237,7 @@ HoFDisplayPlayerStats: call PlaceString coord hl, 4, 10 ld de, wPlayerMoney - ld c, $a3 + ld c, $83 call PrintBCDNumber ld [hl], $F0 ld hl, DexSeenOwnedText diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index 826d9512..eb561caf 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -106,7 +106,7 @@ LeaguePCShowMon: coord hl, 1, 15 ld de, HallOfFameNoText call PlaceString - coord hl, 16, 15 + coord hl, 15, 15 ld de, wHoFTeamNo lb bc, 1, 3 call PrintNumber diff --git a/engine/save.asm b/engine/save.asm index d1a370f2..f9acdd57 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -427,7 +427,7 @@ DisplayChangeBoxMenu: ld [wMaxMenuItem], a ld a, 1 ld [wTopMenuItemY], a - ld a, 12 + ld a, 10 ld [wTopMenuItemX], a xor a ld [wMenuWatchMovingOutOfBounds], a @@ -437,18 +437,18 @@ DisplayChangeBoxMenu: ld [wLastMenuItem], a coord hl, 0, 0 ld b, 2 - ld c, 9 + ld c, 7 call TextBoxBorder ld hl, ChooseABoxText call PrintText - coord hl, 11, 0 + coord hl, 9, 0 ld b, 12 - ld c, 7 + ld c, 9 call TextBoxBorder ld hl, hFlags_0xFFF6 set 2, [hl] ld de, BoxNames - coord hl, 13, 1 + coord hl, 11, 1 call PlaceString ld hl, hFlags_0xFFF6 res 2, [hl] @@ -457,14 +457,14 @@ DisplayChangeBoxMenu: cp 9 jr c, .singleDigitBoxNum sub 9 - coord hl, 8, 2 + coord hl, 6, 2 ld [hl], "1" add "0" jr .next .singleDigitBoxNum add "1" .next - Coorda 9, 2 + Coorda 7, 2 coord hl, 1, 2 ld de, BoxNoText call PlaceString diff --git a/engine/status_ailments.asm b/engine/status_ailments.asm index 787533c4..d0ff95cb 100755 --- a/engine/status_ailments.asm +++ b/engine/status_ailments.asm @@ -12,9 +12,9 @@ PrintStatusAilment: ret z ld a, "S" ld [hli], a - ld a, "L" + ld a, "O" ld [hli], a - ld [hl], "P" + ld [hl], "M" ret .psn ld a, "P" @@ -28,14 +28,14 @@ PrintStatusAilment: ld [hli], a ld a, "R" ld [hli], a - ld [hl], "N" + ld [hl], "U" ret .frz - ld a, "F" + ld a, "G" ld [hli], a - ld a, "R" + ld a, "E" ld [hli], a - ld [hl], "Z" + ld [hl], "L" ret .par ld a, "P" diff --git a/engine/town_map.asm b/engine/town_map.asm index 7cdc1867..7c4654aa 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -118,9 +118,9 @@ LoadTownMap_Nest: push hl call DisplayWildLocations call GetMonName - coord hl, 1, 0 + coord hl, 8, 0 call PlaceString - ld hl, $C381 + coord hl, 1, 0 ld de, MonsNestText call PlaceString call WaitForTextScrollButtonPress @@ -243,7 +243,7 @@ LoadTownMap_Fly: jr .pressedDown ToText: - db "To@" + db " ‘@" BuildFlyLocationsList: ld hl, wFlyLocationsList - 1 diff --git a/gfx/tilesets/overworld.t2.png b/gfx/tilesets/overworld.t2.png Binary files differindex c7533e40..8c6ad621 100644 --- a/gfx/tilesets/overworld.t2.png +++ b/gfx/tilesets/overworld.t2.png @@ -1265,14 +1265,14 @@ DisplayPlayerBlackedOutText:: ld a,[wd732] res 5,a ; reset forced to use bike bit ld [wd732],a - ld a,[wd732] + ld a,[wd795] bit 7,a jr z,.didnotblackoutinsafari xor a ld [wNumSafariBalls],a ld [wSafariSteps],a ld [wSafariSteps+1],a - ld [wd732],a + ld [wd795],a ld [wcf0d],a ld [wSafariZoneEntranceCurScript],a .didnotblackoutinsafari @@ -1671,7 +1671,7 @@ DisplayChooseQuantityMenu:: ld de,SpacesBetweenQuantityAndPriceText call PlaceString ld de,hMoney ; total price - ld c,$a3 + ld c,$83 call PrintBCDNumber coord hl, 9, 10 .printQuantity @@ -1796,7 +1796,7 @@ PrintListMenuEntries:: pop hl ld bc, SCREEN_WIDTH + 5 ; 1 row down and 5 columns right add hl,bc - ld c,$a3 ; no leading zeroes, right-aligned, print currency symbol, 3 bytes + ld c,$83 ; no leading zeroes, right-aligned, print currency symbol, 3 bytes call PrintBCDNumber ld [hl], $F0 .skipPrintingItemPrice @@ -4774,7 +4774,8 @@ Unk9Graphic: INCBIN "gfx/unk_9.2bpp" Unk9GraphicEnd: TextBoxGraphics: INCBIN "gfx/text_box.2bpp" TextBoxGraphicsEnd: -PokedexTileGraphics: INCBIN "gfx/pokedex.2bpp" +PokedexTileGraphics: INCBIN "gfx/pokedex.2bpp",$10,$110 + db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 PokedexTileGraphicsEnd: WorldMapTileGraphics: INCBIN "gfx/town_map.2bpp" WorldMapTileGraphicsEnd: @@ -1403,7 +1403,7 @@ _ExclamationPoint5Text:: _AttackMissedText:: text "L'attaque de" - text "<USER>" + line "<USER>" cont "a échoué!" prompt @@ -1474,7 +1474,7 @@ _SubstituteBrokeText:: _BuildingRageText:: text "La FRENESIE de" - text "<USER>" + line "<USER>" cont "s'intensifie!" prompt @@ -1319,6 +1319,8 @@ wAIItem:: ; cf05 wUsedItemOnWhichPokemon:: ; cf05 ds 1 + ds 5 + wAnimSoundID:: ; cf07 ; sound ID during battle animations ds 1 @@ -1608,10 +1610,11 @@ wEnemyMonLevel:: db wEnemyMonMaxHP:: dw wEnemyMonAttack:: dw wEnemyMonDefense:: dw -wEnemyMonSpeed:: dw +wEnemyMonSpeed:: ds 1 +SECTION "WRAM Bank 1", WRAMX, BANK[1] + ds 1 wEnemyMonSpecial:: dw wEnemyMonPP:: ds 2 ; NUM_MOVES - 2 -SECTION "WRAM Bank 1", WRAMX, BANK[1] ds 2 ; NUM_MOVES - 2 wEnemyMonBaseStats:: ds 5 @@ -3118,7 +3121,9 @@ wSecondLockTrashCanIndex:: ; d743 ds 2 wEventFlags:: ; d747 - ds 320 + ds 73 +wd795:: + ds 247 wLinkEnemyTrainerName:: ; d887 ; linked game's trainer name |
