event/ → events/, and move some appropriate engine/ files there

This commit is contained in:
Remy Oukaour 2017-12-26 21:55:57 -05:00
parent 2a565f747c
commit dae16acd6f
66 changed files with 104 additions and 103 deletions

View File

@ -250,6 +250,7 @@ const_value SET 1
const FRUITTREE_FUCHSIA_CITY ; 1e
NUM_FRUIT_TREES EQU const_value +- 1
; elevator floors
; used by `elevfloor`
const_def

View File

@ -1,4 +1,4 @@
; StdScripts indexes (see engine/std_scripts.asm)
; StdScripts indexes (see events/std_scripts.asm)
; also used in TileCollisionStdScripts (see data/collision_stdscripts.asm)
enum_start
enum pokecenternurse

39
data/default_names.asm Normal file
View File

@ -0,0 +1,39 @@
ChrisNameMenuHeader: ; 882b5
db $40 ; flags
db 00, 00 ; start coords
db 11, 10 ; end coords
dw .MaleNames
db 1 ; ????
db 0 ; default option
.MaleNames: ; 882be
db $91 ; flags
db 5 ; items
db "NEW NAME@"
MalePlayerNameArray: ; 882c9
db "CHRIS@"
db "MAT@"
db "ALLAN@"
db "JON@"
db 2 ; displacement
db " NAME @" ; title
KrisNameMenuHeader: ; 882e5
db $40 ; flags
db 00, 00 ; start coords
db 11, 10 ; end coords
dw .FemaleNames
db 1 ; ????
db 0 ; default option
.FemaleNames: ; 882ee
db $91 ; flags
db 5 ; items
db "NEW NAME@"
FemalePlayerNameArray: ; 882f9
db "KRIS@"
db "AMANDA@"
db "JUANA@"
db "JODI@"
db 2 ; displacement
db " NAME @" ; title

View File

@ -1,5 +1,5 @@
BuenaPrizeItems: ; 8b15e
; there are NUM_BUENA_PRIZES items (see event/buena.asm)
; there are NUM_BUENA_PRIZES items (see events/buena.asm)
db ULTRA_BALL, 2
db FULL_RESTORE, 2
db NUGGET, 3

View File

@ -678,7 +678,7 @@ This is a bug with `ItemAttributes` in [items/item_attributes.asm](/items/item_a
## Daisy's grooming doesn't always increase happiness
This is a bug with `MassageOrHaircut` in [event/special.asm](/event/special.asm):
This is a bug with `MassageOrHaircut` in [events/special.asm](/events/special.asm):
```asm
; Bug: Subtracting $ff from $ff fails to set c.
@ -753,7 +753,7 @@ This is a bug with `LoadEnemyMon.CheckMagikarpArea` in [engine/battle/core.asm](
## Magikarp lengths can be miscalculated
This is a bug with `CalcMagikarpLength.BCLessThanDE` in [event/magikarp.asm](/event/magikarp.asm):
This is a bug with `CalcMagikarpLength.BCLessThanDE` in [events/magikarp.asm](/events/magikarp.asm):
```asm
.BCLessThanDE: ; fbc9a
@ -1348,7 +1348,7 @@ In [engine/events.asm](/engine/events.asm):
## `Special_CheckBugContestContestantFlag` can read beyond its data table
In [event/bug_contest_2.asm](/event/bug_contest_2.asm):
In [events/bug_contest/contest_2.asm](/events/bug_contest/contest_2.asm):
```asm
Special_CheckBugContestContestantFlag: ; 139ed

View File

@ -71,45 +71,7 @@ ShowPlayerNamingChoices: ; 88297
call CloseWindow
ret
ChrisNameMenuHeader: ; 882b5
db $40 ; flags
db 00, 00 ; start coords
db 11, 10 ; end coords
dw .MaleNames
db 1 ; ????
db 0 ; default option
.MaleNames: ; 882be
db $91 ; flags
db 5 ; items
db "NEW NAME@"
MalePlayerNameArray: ; 882c9
db "CHRIS@"
db "MAT@"
db "ALLAN@"
db "JON@"
db 2 ; displacement
db " NAME @" ; title
KrisNameMenuHeader: ; 882e5
db $40 ; flags
db 00, 00 ; start coords
db 11, 10 ; end coords
dw .FemaleNames
db 1 ; ????
db 0 ; default option
.FemaleNames: ; 882ee
db $91 ; flags
db 5 ; items
db "NEW NAME@"
FemalePlayerNameArray: ; 882f9
db "KRIS@"
db "AMANDA@"
db "JUANA@"
db "JODI@"
db 2 ; displacement
db " NAME @" ; title
INCLUDE "data/default_names.asm"
GetPlayerNameArray: ; 88318 This Function is never called
ld hl, PlayerName

View File

@ -1,4 +1,3 @@
Special:: ; c01b
; Run script special de.
ld hl, SpecialsPointers

Some files were not shown because too many files have changed in this diff Show More