diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-28 22:17:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 22:17:13 -0500 |
| commit | b97a1acf3d676ca1c776e37ff4cfa48164ffc92b (patch) | |
| tree | 59b5db70690a9f9041e4964adae1722b4d178a1b /engine/events | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
| parent | b9a68fec2589eb6969be63e6ed1eb3fca312c307 (diff) | |
Merge pull request #445 from roukaour/master
Rename Pokémon animation files; consistent (x, y) coords; document design flaws
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/battle_tower.asm | 6 | ||||
| -rw-r--r-- | engine/events/crystal_unown.asm | 25 |
2 files changed, 14 insertions, 17 deletions
diff --git a/engine/events/battle_tower.asm b/engine/events/battle_tower.asm index b880a099b..a0de6ee84 100644 --- a/engine/events/battle_tower.asm +++ b/engine/events/battle_tower.asm @@ -26,13 +26,13 @@ Function_LoadOpponentTrainerAndPokemons: ; 1f8000 ld a, [hRandomAdd] add b ld b, a ; b contains the nr of the trainer -IF DEF(CRYSTAL11) +if DEF(CRYSTAL11) and (1 << 7) - 1 cp 70 -ELSE +else and (1 << 5) - 1 cp 21 -ENDC +endc jr nc, .resample ld b, a diff --git a/engine/events/crystal_unown.asm b/engine/events/crystal_unown.asm index 352306055..09d44bb9a 100644 --- a/engine/events/crystal_unown.asm +++ b/engine/events/crystal_unown.asm @@ -105,7 +105,7 @@ SpecialKabutoChamber: ; 8ae4e Special_DisplayUnownWords: ; 8ae68 ld a, [ScriptVar] - ld hl, .MenuDataHeader_Escape + ld hl, .MenuDataHeaders_UnownWalls and a jr z, .load @@ -153,8 +153,6 @@ Special_DisplayUnownWords: ; 8ae68 ret ; 8aebc -.UnownText: ; 8aebc - unownwall: MACRO rept _NARG if \1 == "-" @@ -180,36 +178,35 @@ endr db $ff ENDM -.UnownText_Escape: +.UnownText: ; 8aebc +;.UnownText_Escape: ; db $08, $44, $04, $00, $2e, $08, $ff unownwall "E", "S", "C", "A", "P", "E" -.UnownText_Light: +;.UnownText_Light: ; db $26, $20, $0c, $0e, $46, $ff unownwall "L", "I", "G", "H", "T" -.UnownText_Water: +;.UnownText_Water: ; db $4c, $00, $46, $08, $42, $ff unownwall "W", "A", "T", "E", "R" -.UnownText_Ho_Oh: +;.UnownText_Ho_Oh: ; db $0e, $2c, $64, $2c, $0e, $ff unownwall "H", "O", "-", "O", "H" ; 8aed5 -.MenuDataHeader_Escape: ; 0x8aed5 +.MenuDataHeaders_UnownWalls: ; 0x8aed5 +;.MenuDataHeader_Escape: db $40 ; flags db 04, 03 ; start coords db 09, 16 ; end coords - -.MenuDataHeader_Light: ; 0x8aeda +;.MenuDataHeader_Light: db $40 ; flags db 04, 04 ; start coords db 09, 15 ; end coords - -.MenuDataHeader_Water: ; 0x8aedf +;.MenuDataHeader_Water: db $40 ; flags db 04, 04 ; start coords db 09, 15 ; end coords - -.MenuDataHeader_Ho_Oh: ; 0x8aee4 +;.MenuDataHeader_Ho_Oh: db $40 ; flags db 04, 04 ; start coords db 09, 15 ; end coords |