diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-15 17:22:52 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-15 17:22:52 -0500 |
| commit | 59fe4078124f0fa8d1613a3f715861d9c6f2d449 (patch) | |
| tree | 5b54cb5abb2955509e63f6ef0c202c6cbae5fed8 /event | |
| parent | dc76bf804f86f884933e9d5a8820e3122b2771ae (diff) | |
Copy pokered's organization some more, with further constant and data files
Diffstat (limited to 'event')
| -rw-r--r-- | event/buena.asm | 22 | ||||
| -rwxr-xr-x | event/mom_phone.asm | 2 |
2 files changed, 9 insertions, 15 deletions
diff --git a/event/buena.asm b/event/buena.asm index 4802943f9..fa54cc3de 100644 --- a/event/buena.asm +++ b/event/buena.asm @@ -289,8 +289,12 @@ Buena_PrizeMenu: ; 8b0e2 ; 8b129 .indices ; 8b129 - db 9 - db 1, 2, 3, 4, 5, 6, 7, 8, 9 + db NUM_BUENA_PRIZES +x = 1 +rept NUM_BUENA_PRIZES + db x +x = x + 1 +endr db -1 ; 8b134 @@ -319,7 +323,7 @@ Buena_PrizeMenu: ; 8b0e2 Buena_getprize: ; 8b154 dec a - ld hl, .prizes + ld hl, BuenaPrizeItems ld b, 0 ld c, a add hl, bc @@ -327,14 +331,4 @@ Buena_getprize: ; 8b154 ret ; 8b15e -.prizes ; 8b15e - db ULTRA_BALL, 2 - db FULL_RESTORE, 2 - db NUGGET, 3 - db RARE_CANDY, 3 - db PROTEIN, 5 - db IRON, 5 - db CARBOS, 5 - db CALCIUM, 5 - db HP_UP, 5 -; 8b170 +INCLUDE "data/items/buena_prizes.asm" diff --git a/event/mom_phone.asm b/event/mom_phone.asm index 0d7a2366f..58ecad02a 100755 --- a/event/mom_phone.asm +++ b/event/mom_phone.asm @@ -212,7 +212,7 @@ endr ret ; fd136 -INCLUDE "data/mom_phone_items.asm" +INCLUDE "data/items/mom_phone.asm" db 0, 0, 0 ; XXX |