From 6ebe45e41fa4d939f5a9f44e05eaf64512b59018 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 25 Jan 2018 22:19:24 -0500 Subject: Move event data to data/events/ --- constants/item_data_constants.asm | 36 +-- constants/menu_constants.asm | 26 +++ constants/pokemon_constants.asm | 7 + data/bug_contest_flags.asm | 13 -- data/bug_contest_winners.asm | 81 ------- data/collision_stdscripts.asm | 13 -- data/elevator_floors.asm | 35 --- data/events/bug_contest_flags.asm | 13 ++ data/events/bug_contest_winners.asm | 81 +++++++ data/events/collision_stdscripts.asm | 13 ++ data/events/elevator_floors.asm | 35 +++ data/events/field_move_blocks.asm | 53 +++++ data/events/happiness_chances.asm | 12 + data/events/happiness_changes.asm | 22 ++ data/events/magikarp_lengths.asm | 21 ++ data/events/npc_trades.asm | 18 ++ data/events/odd_eggs.asm | 398 ++++++++++++++++++++++++++++++++ data/events/pokedex_ratings.asm | 24 ++ data/events/unown_walls.asm | 54 +++++ data/field_move_blocks.asm | 53 ----- data/happiness_changes.asm | 22 -- data/items/pocket_names.asm | 11 + data/npc_trades.asm | 18 -- data/odd_eggs.asm | 398 -------------------------------- data/phone/non_trainer_names.asm | 16 ++ data/phone/special_calls.asm | 16 +- data/pokemon/unown_words.asm | 67 ++++++ data/sprites/player_sprites.asm | 13 ++ data/unown_walls.asm | 54 ----- data/unown_words.asm | 67 ------ engine/events/bug_contest/contest_2.asm | 2 +- engine/events/bug_contest/judging.asm | 2 +- engine/events/elevator.asm | 2 +- engine/events/happiness_egg.asm | 2 +- engine/events/magikarp.asm | 23 +- engine/events/odd_egg.asm | 2 +- engine/events/overworld.asm | 2 +- engine/events/prof_oaks_pc.asm | 22 +- engine/events/special.asm | 19 +- engine/events/std_collision.asm | 2 +- engine/events/unown_walls.asm | 2 +- engine/items.asm | 7 +- engine/npctrade.asm | 2 +- engine/overworld.asm | 19 +- engine/party_menu.asm | 1 + engine/phone/phone.asm | 16 +- engine/pokedex/unown_dex.asm | 2 +- engine/select_menu.asm | 2 + engine/variables.asm | 2 +- 49 files changed, 929 insertions(+), 892 deletions(-) delete mode 100644 data/bug_contest_flags.asm delete mode 100644 data/bug_contest_winners.asm delete mode 100644 data/collision_stdscripts.asm delete mode 100644 data/elevator_floors.asm create mode 100644 data/events/bug_contest_flags.asm create mode 100644 data/events/bug_contest_winners.asm create mode 100644 data/events/collision_stdscripts.asm create mode 100644 data/events/elevator_floors.asm create mode 100644 data/events/field_move_blocks.asm create mode 100644 data/events/happiness_chances.asm create mode 100644 data/events/happiness_changes.asm create mode 100644 data/events/magikarp_lengths.asm create mode 100644 data/events/npc_trades.asm create mode 100644 data/events/odd_eggs.asm create mode 100644 data/events/pokedex_ratings.asm create mode 100644 data/events/unown_walls.asm delete mode 100644 data/field_move_blocks.asm delete mode 100644 data/happiness_changes.asm create mode 100644 data/items/pocket_names.asm delete mode 100644 data/npc_trades.asm delete mode 100644 data/odd_eggs.asm create mode 100644 data/phone/non_trainer_names.asm create mode 100644 data/pokemon/unown_words.asm create mode 100644 data/sprites/player_sprites.asm delete mode 100644 data/unown_walls.asm delete mode 100644 data/unown_words.asm diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm index b3a35d72b..495469e02 100644 --- a/constants/item_data_constants.asm +++ b/constants/item_data_constants.asm @@ -18,14 +18,18 @@ const_value set 1 ; item menu types ; UseItem.dw indexes (see engine/pack.asm) +; UseRegisteredItem.SwitchTo indexes (see engine/select_menu.asm) ITEMMENU_NOUSE EQU 0 ITEMMENU_CURRENT EQU 4 ITEMMENU_PARTY EQU 5 ITEMMENU_CLOSE EQU 6 ; item actions -CANT_SELECT EQU 1 << 6 -CANT_TOSS EQU 1 << 7 +CANT_SELECT_F EQU 6 +CANT_TOSS_F EQU 7 + +CANT_SELECT EQU 1 << CANT_SELECT_F +CANT_TOSS EQU 1 << CANT_TOSS_F ; pack pockets @@ -34,7 +38,7 @@ CANT_TOSS EQU 1 << 7 const BALL_POCKET ; 1 const KEY_ITEM_POCKET ; 2 const TM_HM_POCKET ; 3 -NUM_POCKETS EQU const_value +- 1 +NUM_POCKETS EQU const_value MAX_ITEMS EQU 20 MAX_BALLS EQU 12 @@ -170,29 +174,3 @@ const_value set 70 const MART_MT_MOON const MART_INDIGO_PLATEAU const MART_UNDERGROUND - - -; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm) - const_def - const PARTYMENUACTION_CHOOSE_POKEMON - const PARTYMENUACTION_HEALING_ITEM - const PARTYMENUACTION_SWITCH - const PARTYMENUACTION_TEACH_TMHM - const PARTYMENUACTION_MOVE - const PARTYMENUACTION_EVO_STONE - const PARTYMENUACTION_GIVE_MON - const PARTYMENUACTION_GIVE_MON_FEMALE ; unused - const PARTYMENUACTION_GIVE_ITEM - const PARTYMENUACTION_MOBILE ; mobile -; PrintPartyMenuActionText arguments (see engine/party_menu.asm) -const_value set $f0 - const PARTYMENUTEXT_HEAL_PSN - const PARTYMENUTEXT_HEAL_BRN - const PARTYMENUTEXT_HEAL_FRZ - const PARTYMENUTEXT_HEAL_SLP - const PARTYMENUTEXT_HEAL_PAR - const PARTYMENUTEXT_HEAL_HP - const PARTYMENUTEXT_HEAL_ALL - const PARTYMENUTEXT_REVIVE - const PARTYMENUTEXT_LEVEL_UP - const PARTYMENUTEXT_HEAL_CONFUSION diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index 8f1257593..08f584ff1 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -69,3 +69,29 @@ NUM_MONMENU_ITEMS EQU 8 ; start/select menu return values HMENURETURN_SCRIPT EQU %10000000 HMENURETURN_ASM EQU %11111111 + + +; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm) + const_def + const PARTYMENUACTION_CHOOSE_POKEMON + const PARTYMENUACTION_HEALING_ITEM + const PARTYMENUACTION_SWITCH + const PARTYMENUACTION_TEACH_TMHM + const PARTYMENUACTION_MOVE + const PARTYMENUACTION_EVO_STONE + const PARTYMENUACTION_GIVE_MON + const PARTYMENUACTION_GIVE_MON_FEMALE ; unused + const PARTYMENUACTION_GIVE_ITEM + const PARTYMENUACTION_MOBILE ; mobile +; PrintPartyMenuActionText arguments (see engine/party_menu.asm) +const_value set $f0 + const PARTYMENUTEXT_HEAL_PSN + const PARTYMENUTEXT_HEAL_BRN + const PARTYMENUTEXT_HEAL_FRZ + const PARTYMENUTEXT_HEAL_SLP + const PARTYMENUTEXT_HEAL_PAR + const PARTYMENUTEXT_HEAL_HP + const PARTYMENUTEXT_HEAL_ALL + const PARTYMENUTEXT_REVIVE + const PARTYMENUTEXT_LEVEL_UP + const PARTYMENUTEXT_HEAL_CONFUSION diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index f3d03b3a0..8b3b45100 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -277,6 +277,13 @@ NUM_POKEMON EQU const_value +- 1 const MON_FE ; fe ; Unown forms +; indexes for: +; - UnownWords (see data/pokemon/unown_words.asm) +; - UnownPicPointers (see data/pokemon/unown_pic_pointers.asm) +; - UnownAnimationPointers (see gfx/pokemon/unown_anim_pointers.asm) +; - UnownAnimationIdlePointers (see gfx/pokemon/unown_idle_pointers.asm) +; - UnownBitmasksPointers (see gfx/pokemon/unown_bitmask_pointers.asm) +; - UnownFramesPointers (see gfx/pokemon/unown_frame_pointers.asm) const_value set 1 const UNOWN_A ; 1 const UNOWN_B ; 2 diff --git a/data/bug_contest_flags.asm b/data/bug_contest_flags.asm deleted file mode 100644 index 04d748270..000000000 --- a/data/bug_contest_flags.asm +++ /dev/null @@ -1,13 +0,0 @@ -BugCatchingContestantEventFlagTable: ; 139fe -; there are NUM_BUG_CONTESTANTS entries - dw EVENT_BUG_CATCHING_CONTESTANT_1A - dw EVENT_BUG_CATCHING_CONTESTANT_2A - dw EVENT_BUG_CATCHING_CONTESTANT_3A - dw EVENT_BUG_CATCHING_CONTESTANT_4A - dw EVENT_BUG_CATCHING_CONTESTANT_5A - dw EVENT_BUG_CATCHING_CONTESTANT_6A - dw EVENT_BUG_CATCHING_CONTESTANT_7A - dw EVENT_BUG_CATCHING_CONTESTANT_8A - dw EVENT_BUG_CATCHING_CONTESTANT_9A - dw EVENT_BUG_CATCHING_CONTESTANT_10A -; 13a12 diff --git a/data/bug_contest_winners.asm b/data/bug_contest_winners.asm deleted file mode 100644 index 7a465edf5..000000000 --- a/data/bug_contest_winners.asm +++ /dev/null @@ -1,81 +0,0 @@ -BugContestantPointers: ; 13783 -; there are NUM_BUG_CONTESTANTS + 1 entries - dw BugContestant_BugCatcherDon ; this reverts back to the player - dw BugContestant_BugCatcherDon - dw BugContestant_BugCatcherEd - dw BugContestant_CooltrainerMNick - dw BugContestant_PokefanMWilliam - dw BugContestant_BugCatcherBenny - dw BugContestant_CamperBarry - dw BugContestant_PicnickerCindy - dw BugContestant_BugCatcherJosh - dw BugContestant_YoungsterSamuel - dw BugContestant_SchoolboyKipp -; 13799 - -; contestant format: -; db class, id -; dbw 1st-place mon, score -; dbw 2nd-place mon, score -; dbw 3rd-place mon, score - -BugContestant_BugCatcherDon: - db BUG_CATCHER, DON - dbw KAKUNA, 300 - dbw METAPOD, 285 - dbw CATERPIE, 226 - -BugContestant_BugCatcherEd: - db BUG_CATCHER, ED - dbw BUTTERFREE, 286 - dbw BUTTERFREE, 251 - dbw CATERPIE, 237 - -BugContestant_CooltrainerMNick: - db COOLTRAINERM, NICK - dbw SCYTHER, 357 - dbw BUTTERFREE, 349 - dbw PINSIR, 368 - -BugContestant_PokefanMWilliam: - db POKEFANM, WILLIAM - dbw PINSIR, 332 - dbw BUTTERFREE, 324 - dbw VENONAT, 321 - -BugContestant_BugCatcherBenny: - db BUG_CATCHER, BUG_CATCHER_BENNY - dbw BUTTERFREE, 318 - dbw WEEDLE, 295 - dbw CATERPIE, 285 - -BugContestant_CamperBarry: - db CAMPER, BARRY - dbw PINSIR, 366 - dbw VENONAT, 329 - dbw KAKUNA, 314 - -BugContestant_PicnickerCindy: - db PICNICKER, CINDY - dbw BUTTERFREE, 341 - dbw METAPOD, 301 - dbw CATERPIE, 264 - -BugContestant_BugCatcherJosh: - db BUG_CATCHER, JOSH - dbw SCYTHER, 326 - dbw BUTTERFREE, 292 - dbw METAPOD, 282 - -BugContestant_YoungsterSamuel: - db YOUNGSTER, SAMUEL - dbw WEEDLE, 270 - dbw PINSIR, 282 - dbw CATERPIE, 251 - -BugContestant_SchoolboyKipp: - db SCHOOLBOY, KIPP - dbw VENONAT, 267 - dbw PARAS, 254 - dbw KAKUNA, 259 -; 13807 diff --git a/data/collision_stdscripts.asm b/data/collision_stdscripts.asm deleted file mode 100644 index 8156d039d..000000000 --- a/data/collision_stdscripts.asm +++ /dev/null @@ -1,13 +0,0 @@ -; stdscripts associated with tile collisions - -TileCollisionStdScripts: - ; collision type, stdscript - dbw COLL_BOOKSHELF, magazinebookshelf - dbw COLL_PC, pcscript - dbw COLL_RADIO, radio1 - dbw COLL_TOWN_MAP, townmap - dbw COLL_MART_SHELF, merchandiseshelf - dbw COLL_TV, tv - dbw COLL_WINDOW, window - dbw COLL_INCENSE_BURNER, incenseburner - db -1 ; end diff --git a/data/elevator_floors.asm b/data/elevator_floors.asm deleted file mode 100644 index abc793cf2..000000000 --- a/data/elevator_floors.asm +++ /dev/null @@ -1,35 +0,0 @@ -ElevatorFloorNames: -; entries correspond to FLOOR_* constants - dw .B4F - dw .B3F - dw .B2F - dw .B1F - dw ._1F - dw ._2F - dw ._3F - dw ._4F - dw ._5F - dw ._6F - dw ._7F - dw ._8F - dw ._9F - dw ._10F - dw ._11F - dw .ROOF - -.B4F: db "B4F@" -.B3F: db "B3F@" -.B2F: db "B2F@" -.B1F: db "B1F@" -._1F: db "1F@" -._2F: db "2F@" -._3F: db "3F@" -._4F: db "4F@" -._5F: db "5F@" -._6F: db "6F@" -._7F: db "7F@" -._8F: db "8F@" -._9F: db "9F@" -._10F: db "10F@" -._11F: db "11F@" -.ROOF: db "ROOF@" diff --git a/data/events/bug_contest_flags.asm b/data/events/bug_contest_flags.asm new file mode 100644 index 000000000..04d748270 --- /dev/null +++ b/data/events/bug_contest_flags.asm @@ -0,0 +1,13 @@ +BugCatchingContestantEventFlagTable: ; 139fe +; there are NUM_BUG_CONTESTANTS entries + dw EVENT_BUG_CATCHING_CONTESTANT_1A + dw EVENT_BUG_CATCHING_CONTESTANT_2A + dw EVENT_BUG_CATCHING_CONTESTANT_3A + dw EVENT_BUG_CATCHING_CONTESTANT_4A + dw EVENT_BUG_CATCHING_CONTESTANT_5A + dw EVENT_BUG_CATCHING_CONTESTANT_6A + dw EVENT_BUG_CATCHING_CONTESTANT_7A + dw EVENT_BUG_CATCHING_CONTESTANT_8A + dw EVENT_BUG_CATCHING_CONTESTANT_9A + dw EVENT_BUG_CATCHING_CONTESTANT_10A +; 13a12 diff --git a/data/events/bug_contest_winners.asm b/data/events/bug_contest_winners.asm new file mode 100644 index 000000000..7a465edf5 --- /dev/null +++ b/data/events/bug_contest_winners.asm @@ -0,0 +1,81 @@ +BugContestantPointers: ; 13783 +; there are NUM_BUG_CONTESTANTS + 1 entries + dw BugContestant_BugCatcherDon ; this reverts back to the player + dw BugContestant_BugCatcherDon + dw BugContestant_BugCatcherEd + dw BugContestant_CooltrainerMNick + dw BugContestant_PokefanMWilliam + dw BugContestant_BugCatcherBenny + dw BugContestant_CamperBarry + dw BugContestant_PicnickerCindy + dw BugContestant_BugCatcherJosh + dw BugContestant_YoungsterSamuel + dw BugContestant_SchoolboyKipp +; 13799 + +; contestant format: +; db class, id +; dbw 1st-place mon, score +; dbw 2nd-place mon, score +; dbw 3rd-place mon, score + +BugContestant_BugCatcherDon: + db BUG_CATCHER, DON + dbw KAKUNA, 300 + dbw METAPOD, 285 + dbw CATERPIE, 226 + +BugContestant_BugCatcherEd: + db BUG_CATCHER, ED + dbw BUTTERFREE, 286 + dbw BUTTERFREE, 251 + dbw CATERPIE, 237 + +BugContestant_CooltrainerMNick: + db COOLTRAINERM, NICK + dbw SCYTHER, 357 + dbw BUTTERFREE, 349 + dbw PINSIR, 368 + +BugContestant_PokefanMWilliam: + db POKEFANM, WILLIAM + dbw PINSIR, 332 + dbw BUTTERFREE, 324 + dbw VENONAT, 321 + +BugContestant_BugCatcherBenny: + db BUG_CATCHER, BUG_CATCHER_BENNY + dbw BUTTERFREE, 318 + dbw WEEDLE, 295 + dbw CATERPIE, 285 + +BugContestant_CamperBarry: + db CAMPER, BARRY + dbw PINSIR, 366 + dbw VENONAT, 329 + dbw KAKUNA, 314 + +BugContestant_PicnickerCindy: + db PICNICKER, CINDY + dbw BUTTERFREE, 341 + dbw METAPOD, 301 + dbw CATERPIE, 264 + +BugContestant_BugCatcherJosh: + db BUG_CATCHER, JOSH + dbw SCYTHER, 326 + dbw BUTTERFREE, 292 + dbw METAPOD, 282 + +BugContestant_YoungsterSamuel: + db YOUNGSTER, SAMUEL + dbw WEEDLE, 270 + dbw PINSIR, 282 + dbw CATERPIE, 251 + +BugContestant_SchoolboyKipp: + db SCHOOLBOY, KIPP + dbw VENONAT, 267 + dbw PARAS, 254 + dbw KAKUNA, 259 +; 13807 diff --git a/data/events/collision_stdscripts.asm b/data/events/collision_stdscripts.asm new file mode 100644 index 000000000..8156d039d --- /dev/null +++ b/data/events/collision_stdscripts.asm @@ -0,0 +1,13 @@ +; stdscripts associated with tile collisions + +TileCollisionStdScripts: + ; collision type, stdscript + dbw COLL_BOOKSHELF, magazinebookshelf + dbw COLL_PC, pcscript + dbw COLL_RADIO, radio1 + dbw COLL_TOWN_MAP, townmap + dbw COLL_MART_SHELF, merchandiseshelf + dbw COLL_TV, tv + dbw COLL_WINDOW, window + dbw COLL_INCENSE_BURNER, incenseburner + db -1 ; end diff --git a/data/events/elevator_floors.asm b/data/events/elevator_floors.asm new file mode 100644 index 000000000..abc793cf2 --- /dev/null +++ b/data/events/elevator_floors.asm @@ -0,0 +1,35 @@ +ElevatorFloorNames: +; entries correspond to FLOOR_* constants + dw .B4F + dw .B3F + dw .B2F + dw .B1F + dw ._1F + dw ._2F + dw ._3F + dw ._4F + dw ._5F + dw ._6F + dw ._7F + dw ._8F + dw ._9F + dw ._10F + dw ._11F + dw .ROOF + +.B4F: db "B4F@" +.B3F: db "B3F@" +.B2F: db "B2F@" +.B1F: db "B1F@" +._1F: db "1F@" +._2F: db "2F@" +._3F: db "3F@" +._4F: db "4F@" +._5F: db "5F@" +._6F: db "6F@" +._7F: db "7F@" +._8F: db "8F@" +._9F: db "9F@" +._10F: db "10F@" +._11F: db "11F@" +.ROOF: db "ROOF@" diff --git a/data/events/field_move_blocks.asm b/data/events/field_move_blocks.asm new file mode 100644 index 000000000..d97fdc995 --- /dev/null +++ b/data/events/field_move_blocks.asm @@ -0,0 +1,53 @@ +CutTreeBlockPointers: ; c862 +; tileset, block list pointer + dbw TILESET_JOHTO, .johto + dbw TILESET_JOHTO_MODERN, .johto_modern + dbw TILESET_KANTO, .kanto + dbw TILESET_PARK, .park + dbw TILESET_FOREST, .forest + db -1 ; end + +.johto: +; facing block, replacement block, animation + db $03, $02, 1 ; grass + db $5b, $3c, 0 ; tree + db $5f, $3d, 0 ; tree + db $63, $3f, 0 ; tree + db $67, $3e, 0 ; tree + db -1 ; end + +.johto_modern: +; facing block, replacement block, animation + db $03, $02, $01 ; grass + db -1 ; end + +.kanto: +; facing block, replacement block, animation + db $0b, $0a, 1 ; grass + db $32, $6d, 0 ; tree + db $33, $6c, 0 ; tree + db $34, $6f, 0 ; tree + db $35, $4c, 0 ; tree + db $60, $6e, 0 ; tree + db -1 ; end + +.park: +; facing block, replacement block, animation + db $13, $03, 1 ; grass + db $03, $04, 1 ; grass + db -1 ; end + +.forest: +; facing block, replacement block, animation + db $0f, $17, 0 + db -1 ; end + + +WhirlpoolBlockPointers: ; c8a4 + dbw TILESET_JOHTO, .johto + db -1 ; end + +.johto: +; facing block, replacement block, animation + db $07, $36, 0 + db -1 ; end diff --git a/data/events/happiness_chances.asm b/data/events/happiness_chances.asm new file mode 100644 index 000000000..22a7395d9 --- /dev/null +++ b/data/events/happiness_chances.asm @@ -0,0 +1,12 @@ +HappinessData_YoungerHaircutBrother: ; 7459 + db $4c, 2, HAPPINESS_YOUNGCUT1 ; 30% chance + db $80, 3, HAPPINESS_YOUNGCUT2 ; 20% chance + db $ff, 4, HAPPINESS_YOUNGCUT3 ; 50% chance + +HappinessData_OlderHaircutBrother: ; 7462 + db $9a, 2, HAPPINESS_OLDERCUT1 ; 60% chance + db $4c, 3, HAPPINESS_OLDERCUT2 ; 10% chance + db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance + +HappinessData_DaisysGrooming: ; 746b + db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance diff --git a/data/events/happiness_changes.asm b/data/events/happiness_changes.asm new file mode 100644 index 000000000..de60ea32d --- /dev/null +++ b/data/events/happiness_changes.asm @@ -0,0 +1,22 @@ +HappinessChanges: +; entries correspond to HAPPINESS_* constants +; change if happiness < 100, change if happiness < 200, change otherwise + db +5, +3, +2 ; Gained a level + db +5, +3, +2 ; Vitamin + db +1, +1, +0 ; X Item + db +3, +2, +1 ; Battled a Gym Leader + db +1, +1, +0 ; Learned a move + db -1, -1, -1 ; Lost to an enemy + db -5, -5, -10 ; Fainted due to poison + db -5, -5, -10 ; Lost to a much stronger enemy + db +1, +1, +1 ; Haircut (Y1) + db +3, +3, +1 ; Haircut (Y2) + db +5, +5, +2 ; Haircut (Y3) + db +1, +1, +1 ; Haircut (O1) + db +3, +3, +1 ; Haircut (O2) + db +10, +10, +4 ; Haircut (O3) + db -5, -5, -10 ; Used Heal Powder or Energypowder (bitter) + db -10, -10, -15 ; Used Energy Root (bitter) + db -15, -15, -20 ; Used Revival Herb (bitter) + db +3, +3, +1 ; Grooming + db +10, +6, +4 ; Gained a level in the place where it was caught diff --git a/data/events/magikarp_lengths.asm b/data/events/magikarp_lengths.asm new file mode 100644 index 000000000..a631ef719 --- /dev/null +++ b/data/events/magikarp_lengths.asm @@ -0,0 +1,21 @@ +MagikarpLengths: ; fbca8 +; [wMagikarpLength] = z * 100 + (bc - x) / y +; First argument is the bc threshold as well as x. +; Second argument is y. +; In reality, due to the bug at .BCLessThanDE, +; the threshold is determined by only register b. + dwb 110, 1 ; not used unless the bug is fixed + dwb 310, 2 + dwb 710, 4 + dwb 2710, 20 + dwb 7710, 50 + dwb 17710, 100 + dwb 32710, 150 + dwb 47710, 150 + dwb 57710, 100 + dwb 62710, 50 + dwb 64710, 20 + dwb 65210, 5 + dwb 65410, 2 + dwb 65510, 1 ; not used +; fbcd2 diff --git a/data/events/npc_trades.asm b/data/events/npc_trades.asm new file mode 100644 index 000000000..d16670984 --- /dev/null +++ b/data/events/npc_trades.asm @@ -0,0 +1,18 @@ +npctrade: MACRO +; dialog set, requested mon, offered mon, nickname, dvs, item, OT ID, OT name, gender requested + db \1, \2, \3, \4, \5, \6, \7 + shift + dw \7 + db \8, \9, 0 +ENDM + +NPCTrades: ; fce58 +; entries correspond to NPCTRADE_* constants + npctrade TRADE_DIALOG_COLLECTOR, ABRA, MACHOP, "MUSCLE@@@@@", $37, $66, GOLD_BERRY, 37460, "MIKE@@@@@@@", TRADE_EITHER_GENDER + npctrade TRADE_DIALOG_COLLECTOR, BELLSPROUT, ONIX, "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_EITHER_GENDER + npctrade TRADE_DIALOG_HAPPY, KRABBY, VOLTORB, "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_EITHER_GENDER + npctrade TRADE_DIALOG_GIRL, DRAGONAIR, DODRIO, "DORIS@@@@@@", $77, $66, SMOKE_BALL, 00283, "EMY@@@@@@@@", TRADE_FEMALE_ONLY + npctrade TRADE_DIALOG_NEWBIE, HAUNTER, XATU, "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_EITHER_GENDER + npctrade TRADE_DIALOG_GIRL, CHANSEY, AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY, 26491, "KIM@@@@@@@@", TRADE_EITHER_GENDER + npctrade TRADE_DIALOG_COLLECTOR, DUGTRIO, MAGNETON, "MAGGIE@@@@@", $96, $66, METAL_COAT, 50082, "FOREST@@@@@", TRADE_EITHER_GENDER +; fcf38 diff --git a/data/events/odd_eggs.asm b/data/events/odd_eggs.asm new file mode 100644 index 000000000..aa7e8176b --- /dev/null +++ b/data/events/odd_eggs.asm @@ -0,0 +1,398 @@ +prob: MACRO +prob_total = prob_total + (\1) + dw prob_total * $ffff / 100 +ENDM + +OddEggProbabilities: +prob_total = 0 +; Pichu + prob 8 + prob 1 +; Cleffa + prob 16 + prob 3 +; Igglybuff + prob 16 + prob 3 +; Smoochum + prob 14 + prob 2 +; Magby + prob 10 + prob 2 +; Elekid + prob 12 + prob 2 +; Tyrogue + prob 10 + prob 1 +; 1fb56e + + +OddEggs: ; 1fb56e + +OddEgg1: + db PICHU + db NO_ITEM + db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0 + dw 02048 ; OT ID + dt 125 ; Exp + ; Stat exp + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + db $0, $0 ; DVs + db 30, 20, 10, 0 ; PP + db 20 ; Happiness + db 0, 0, 0 ; Pokerus, Caught data + db 5 ; Level + db 0, 0 ; Status + bigdw 0 ; HP + bigdw 17 ; Max HP + bigdw 9 ; Atk + bigdw 6 ; Def + bigdw 11 ; Spd + bigdw 8 ; SAtk + bigdw 8 ; SDef + db "EGG@@@@@@@@" + +OddEgg2: + db PICHU + db NO_ITEM + db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0 + dw 00256 ; OT ID + dt 125 ; Exp + ; Stat exp + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + db $2a, $aa ; DVs + db 30, 20, 10, 0 ; PP + db 20 ; Happiness + db 0, 0, 0 ; Pokerus, Caught data + db 5 ; Level + db 0, 0 ; Status + bigdw 0 ; HP + bigdw 17 ; Max HP + bigdw 9 ; Atk + bigdw 7 ; Def + bigdw 12 ; Spd + bigdw 9 ; SAtk + bigdw 9 ; SDef + db "EGG@@@@@@@@" + + db CLEFFA + db NO_ITEM + db POUND, CHARM, DIZZY_PUNCH, 0 + dw 04096 ; OT ID + dt 125 ; Exp + ; Stat exp + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + db $0, $0 ; DVs + db 35, 20, 10, 0 ; PP + db 20 ; Happiness + db 0, 0, 0 ; Pokerus, Caught data + db 5 ; Level + db 0, 0 ; Status + bigdw 0 ; HP + bigdw 20 ; Max HP + bigdw 7 ; Atk + bigdw 7 ; Def + bigdw 6 ; Spd + bigdw 9 ; SAtk + bigdw 10 ; SDef + db "EGG@@@@@@@@" + + db CLEFFA + db NO_ITEM + db POUND, CHARM, DIZZY_PUNCH, 0 + dw 00768 ; OT ID + dt 125 ; Exp + ; Stat exp + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + db $2a, $aa ; DVs + db 35, 20, 10, 0 ; PP + db 20 ; Happiness + db 0, 0, 0 ; Pokerus, Caught data + db 5 ; Level + db 0, 0 ; Status + bigdw 0 ; HP + bigdw 20 ; Max HP + bigdw 7 ; Atk + bigdw 8 ; Def + bigdw 7 ; Spd + bigdw 10 ; SAtk + bigdw 11 ; SDef + db "EGG@@@@@@@@" + + db IGGLYBUFF + db NO_ITEM + db SING, CHARM, DIZZY_PUNCH, 0 + dw 04096 ; OT ID + dt 125 ; Exp + ; Stat exp + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + db $0, $0 ; DVs + db 15, 20, 10, 0 ; PP + db 20 ; Happiness + db 0, 0, 0 ; Pokerus, Caught data + db 5 ; Level + db 0, 0 ; Status + bigdw 0 ; HP + bigdw 24 ; Max HP + bigdw 8 ; Atk + bigdw 6 ; Def + bigdw 6 ; Spd + bigdw 9 ; SAtk + bigdw 7 ; SDef + db "EGG@@@@@@@@" + + db IGGLYBUFF + db NO_ITEM + db SING, CHARM, DIZZY_PUNCH, 0 + dw 00768 ; OT ID + dt 125 ; Exp + ; Stat exp + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + db $2a, $aa ; DVs + db 15, 20, 10, 0 ; PP + db 20 ; Happiness + db 0, 0, 0 ; Pokerus, Caught data + db 5 ; Level + db 0, 0 ; Status + bigdw 0 ; HP + bigdw 24 ; Max HP + bigdw 8 ; Atk + bigdw 7 ; Def + bigdw 7 ; Spd + bigdw 10 ; SAtk + bigdw 8 ; SDef + db "EGG@@@@@@@@" + + db SMOOCHUM + db NO_ITEM + db POUND, LICK, DIZZY_PUNCH, 0 + dw 03584 ; OT ID + dt 125 ; Exp + ; Stat exp + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + db $0, $0 ; DVs + db 35, 30, 10, 0 ; PP + db 20 ; Happiness + db 0, 0, 0 ; Pokerus, Caught data + db 5 ; Level + db 0, 0 ; Status + bigdw 0 ; HP + bigdw 19 ; Max HP + bigdw 8 ; Atk + bigdw 6 ; Def + bigdw 11 ; Spd + bigdw 13 ; SAtk + bigdw 11 ; SDef + db "EGG@@@@@@@@" + + db SMOOCHUM + db NO_ITEM + db POUND, LICK, DIZZY_PUNCH, 0 + dw 00512 ; OT ID + dt 125 ; Exp + ; Stat exp + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + db $2a, $aa ; DVs + db 35, 30, 10, 0 ; PP + db 20 ; Happiness + db 0, 0, 0 ; Pokerus, Caught data + db 5 ; Level + db 0, 0 ; Status + bigdw 0 ; HP + bigdw 19 ; Max HP + bigdw 8 ; Atk + bigdw 7 ; Def + bigdw 12 ; Spd + bigdw 14 ; SAtk + bigdw 12 ; SDef + db "EGG@@@@@@@@" + + db MAGBY + db NO_ITEM + db EMBER, DIZZY_PUNCH, 0, 0 + dw 02560 ; OT ID + dt 125 ; Exp + ; Stat exp + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + db $0, $0 ; DVs + db 25, 10, 0, 0 ; PP + db 20 ; Happiness + db 0, 0, 0 ; Pokerus, Caught data + db 5 ; Level + db 0, 0 ; Status + bigdw 0 ; HP + bigdw 19 ; Max HP + bigdw 12 ; Atk + bigdw 8 ; Def + bigdw 13 ; Spd + bigdw 12 ; SAtk + bigdw 10 ; SDef + db "EGG@@@@@@@@" + + db MAGBY + db NO_ITEM + db EMBER, DIZZY_PUNCH, 0, 0 + dw 00512 ; OT ID + dt 125 ; Exp + ; Stat exp + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + db $2a, $aa ; DVs + db 25, 10, 0, 0 ; PP + db 20 ; Happiness + db 0, 0, 0 ; Pokerus, Caught data + db 5 ; Level + db 0, 0 ; Status + bigdw 0 ; HP + bigdw 19 ; Max HP + bigdw 12 ; Atk + bigdw 9 ; Def + bigdw 14 ; Spd + bigdw 13 ; SAtk + bigdw 11 ; SDef + db "EGG@@@@@@@@" + + db ELEKID + db NO_ITEM + db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0 + dw 03072 ; OT ID + dt 125 ; Exp + ; Stat exp + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + db $0, $0 ; DVs + db 30, 30, 10, 0 ; PP + db 20 ; Happiness + db 0, 0, 0 ; Pokerus, Caught data + db 5 ; Level + db 0, 0 ; Status + bigdw 0 ; HP + bigdw 19 ; Max HP + bigdw 11 ; Atk + bigdw 8 ; Def + bigdw 14 ; Spd + bigdw 11 ; SAtk + bigdw 10 ; SDef + db "EGG@@@@@@@@" + + db ELEKID + db NO_ITEM + db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0 + dw 00512 ; OT ID + dt 125 ; Exp + ; Stat exp + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + db $2a, $aa ; DVs + db 30, 30, 10, 0 ; PP + db 20 ; Happiness + db 0, 0, 0 ; Pokerus, Caught data + db 5 ; Level + db 0, 0 ; Status + bigdw 0 ; HP + bigdw 19 ; Max HP + bigdw 11 ; Atk + bigdw 9 ; Def + bigdw 15 ; Spd + bigdw 12 ; SAtk + bigdw 11 ; SDef + db "EGG@@@@@@@@" + + db TYROGUE + db NO_ITEM + db TACKLE, DIZZY_PUNCH, 0, 0 + dw 02560 ; OT ID + dt 125 ; Exp + ; Stat exp + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + db $0, $0 ; DVs + db 35, 10, 0, 0 ; PP + db 20 ; Happiness + db 0, 0, 0 ; Pokerus, Caught data + db 5 ; Level + db 0, 0 ; Status + bigdw 0 ; HP + bigdw 18 ; Max HP + bigdw 8 ; Atk + bigdw 8 ; Def + bigdw 8 ; Spd + bigdw 8 ; SAtk + bigdw 8 ; SDef + db "EGG@@@@@@@@" + + db TYROGUE + db NO_ITEM + db TACKLE, DIZZY_PUNCH, 0, 0 + dw 00256 ; OT ID + dt 125 ; Exp + ; Stat exp + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + bigdw 0 + db $2a, $aa ; DVs + db 35, 10, 0, 0 ; PP + db 20 ; Happiness + db 0, 0, 0 ; Pokerus, Caught data + db 5 ; Level + db 0, 0 ; Status + bigdw 0 ; HP + bigdw 18 ; Max HP + bigdw 8 ; Atk + bigdw 9 ; Def + bigdw 9 ; Spd + bigdw 9 ; SAtk + bigdw 9 ; SDef + db "EGG@@@@@@@@" diff --git a/data/events/pokedex_ratings.asm b/data/events/pokedex_ratings.asm new file mode 100644 index 000000000..be23c401f --- /dev/null +++ b/data/events/pokedex_ratings.asm @@ -0,0 +1,24 @@ +OakRatings: ; 0x2667f +; if you caught at most this many, play this sound, load this text +; (text is defined in engine/events/prof_oaks_pc.asm) + dbww 9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01 + dbww 19, SFX_DEX_FANFARE_LESS_THAN_20, OakRating02 + dbww 34, SFX_DEX_FANFARE_20_49, OakRating03 + dbww 49, SFX_DEX_FANFARE_20_49, OakRating04 + dbww 64, SFX_DEX_FANFARE_50_79, OakRating05 + dbww 79, SFX_DEX_FANFARE_50_79, OakRating06 + dbww 94, SFX_DEX_FANFARE_80_109, OakRating07 + dbww 109, SFX_DEX_FANFARE_80_109, OakRating08 + dbww 124, SFX_CAUGHT_MON, OakRating09 + dbww 139, SFX_CAUGHT_MON, OakRating10 + dbww 154, SFX_DEX_FANFARE_140_169, OakRating11 + dbww 169, SFX_DEX_FANFARE_140_169, OakRating12 + dbww 184, SFX_DEX_FANFARE_170_199, OakRating13 + dbww 199, SFX_DEX_FANFARE_170_199, OakRating14 + dbww 214, SFX_DEX_FANFARE_200_229, OakRating15 + dbww 229, SFX_DEX_FANFARE_200_229, OakRating16 + dbww 239, SFX_DEX_FANFARE_230_PLUS, OakRating17 + dbww 248, SFX_DEX_FANFARE_230_PLUS, OakRating18 + dbww 255, SFX_DEX_FANFARE_230_PLUS, OakRating19 + ; 0x266de + \ No newline at end of file diff --git a/data/events/unown_walls.asm b/data/events/unown_walls.asm new file mode 100644 index 000000000..c05d37004 --- /dev/null +++ b/data/events/unown_walls.asm @@ -0,0 +1,54 @@ +unownwall: MACRO +rept _NARG +if \1 == "-" +x = $64 +else +if \1 >= "Y" +x = 2 * (\1 - "Y") + $60 +else +if \1 >= "Q" +x = 2 * (\1 - "Q") + $40 +else +if \1 >= "I" +x = 2 * (\1 - "I") + $20 +else +x = 2 * (\1 - "A") +endc +endc +endc +endc + db x +shift +endr + db -1 ; end +ENDM + +UnownWalls: ; 8aebc +; UNOWNWORDS_ESCAPE + ; db $08, $44, $04, $00, $2e, $08, $ff + unownwall "E", "S", "C", "A", "P", "E" +; UNOWNWORDS_LIGHT + ; db $26, $20, $0c, $0e, $46, $ff + unownwall "L", "I", "G", "H", "T" +; UNOWNWORDS_WATER + ; db $4c, $00, $46, $08, $42, $ff + unownwall "W", "A", "T", "E", "R" +; UNOWNWORDS_HO_OH + ; db $0e, $2c, $64, $2c, $0e, $ff + unownwall "H", "O", "-", "O", "H" +; 8aed5 + +MenuHeaders_UnownWalls: ; 0x8aed5 +; UNOWNWORDS_ESCAPE + db MENU_BACKUP_TILES ; flags + menu_coords 3, 4, 16, 9 +; UNOWNWORDS_LIGHT + db MENU_BACKUP_TILES ; flags + menu_coords 4, 4, 15, 9 +; UNOWNWORDS_WATER + db MENU_BACKUP_TILES ; flags + menu_coords 4, 4, 15, 9 +; UNOWNWORDS_HO_OH + db MENU_BACKUP_TILES ; flags + menu_coords 4, 4, 15, 9 +; 8aee9 diff --git a/data/field_move_blocks.asm b/data/field_move_blocks.asm deleted file mode 100644 index d97fdc995..000000000 --- a/data/field_move_blocks.asm +++ /dev/null @@ -1,53 +0,0 @@ -CutTreeBlockPointers: ; c862 -; tileset, block list pointer - dbw TILESET_JOHTO, .johto - dbw TILESET_JOHTO_MODERN, .johto_modern - dbw TILESET_KANTO, .kanto - dbw TILESET_PARK, .park - dbw TILESET_FOREST, .forest - db -1 ; end - -.johto: -; facing block, replacement block, animation - db $03, $02, 1 ; grass - db $5b, $3c, 0 ; tree - db $5f, $3d, 0 ; tree - db $63, $3f, 0 ; tree - db $67, $3e, 0 ; tree - db -1 ; end - -.johto_modern: -; facing block, replacement block, animation - db $03, $02, $01 ; grass - db -1 ; end - -.kanto: -; facing block, replacement block, animation - db $0b, $0a, 1 ; grass - db $32, $6d, 0 ; tree - db $33, $6c, 0 ; tree - db $34, $6f, 0 ; tree - db $35, $4c, 0 ; tree - db $60, $6e, 0 ; tree - db -1 ; end - -.park: -; facing block, replacement block, animation - db $13, $03, 1 ; grass - db $03, $04, 1 ; grass - db -1 ; end - -.forest: -; facing block, replacement block, animation - db $0f, $17, 0 - db -1 ; end - - -WhirlpoolBlockPointers: ; c8a4 - dbw TILESET_JOHTO, .johto - db -1 ; end - -.johto: -; facing block, replacement block, animation - db $07, $36, 0 - db -1 ; end diff --git a/data/happiness_changes.asm b/data/happiness_changes.asm deleted file mode 100644 index de60ea32d..000000000 --- a/data/happiness_changes.asm +++ /dev/null @@ -1,22 +0,0 @@ -HappinessChanges: -; entries correspond to HAPPINESS_* constants -; change if happiness < 100, change if happiness < 200, change otherwise - db +5, +3, +2 ; Gained a level - db +5, +3, +2 ; Vitamin - db +1, +1, +0 ; X Item - db +3, +2, +1 ; Battled a Gym Leader - db +1, +1, +0 ; Learned a move - db -1, -1, -1 ; Lost to an enemy - db -5, -5, -10 ; Fainted due to poison - db -5, -5, -10 ; Lost to a much stronger enemy - db +1, +1, +1 ; Haircut (Y1) - db +3, +3, +1 ; Haircut (Y2) - db +5, +5, +2 ; Haircut (Y3) - db +1, +1, +1 ; Haircut (O1) - db +3, +3, +1 ; Haircut (O2) - db +10, +10, +4 ; Haircut (O3) - db -5, -5, -10 ; Used Heal Powder or Energypowder (bitter) - db -10, -10, -15 ; Used Energy Root (bitter) - db -15, -15, -20 ; Used Revival Herb (bitter) - db +3, +3, +1 ; Grooming - db +10, +6, +4 ; Gained a level in the place where it was caught diff --git a/data/items/pocket_names.asm b/data/items/pocket_names.asm new file mode 100644 index 000000000..880e08fe3 --- /dev/null +++ b/data/items/pocket_names.asm @@ -0,0 +1,11 @@ +ItemPocketNames: +; entries correspond to item type constants + dw .Item + dw .Key + dw .Ball + dw .TM + +.Item: db "ITEM POCKET@" +.Key: db "KEY POCKET@" +.Ball: db "BALL POCKET@" +.TM: db "TM POCKET@" diff --git a/data/npc_trades.asm b/data/npc_trades.asm deleted file mode 100644 index d16670984..000000000 --- a/data/npc_trades.asm +++ /dev/null @@ -1,18 +0,0 @@ -npctrade: MACRO -; dialog set, requested mon, offered mon, nickname, dvs, item, OT ID, OT name, gender requested - db \1, \2, \3, \4, \5, \6, \7 - shift - dw \7 - db \8, \9, 0 -ENDM - -NPCTrades: ; fce58 -; entries correspond to NPCTRADE_* constants - npctrade TRADE_DIALOG_COLLECTOR, ABRA, MACHOP, "MUSCLE@@@@@", $37, $66, GOLD_BERRY, 37460, "MIKE@@@@@@@", TRADE_EITHER_GENDER - npctrade TRADE_DIALOG_COLLECTOR, BELLSPROUT, ONIX, "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_EITHER_GENDER - npctrade TRADE_DIALOG_HAPPY, KRABBY, VOLTORB, "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_EITHER_GENDER - npctrade TRADE_DIALOG_GIRL, DRAGONAIR, DODRIO, "DORIS@@@@@@", $77, $66, SMOKE_BALL, 00283, "EMY@@@@@@@@", TRADE_FEMALE_ONLY - npctrade TRADE_DIALOG_NEWBIE, HAUNTER, XATU, "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_EITHER_GENDER - npctrade TRADE_DIALOG_GIRL, CHANSEY, AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY, 26491, "KIM@@@@@@@@", TRADE_EITHER_GENDER - npctrade TRADE_DIALOG_COLLECTOR, DUGTRIO, MAGNETON, "MAGGIE@@@@@", $96, $66, METAL_COAT, 50082, "FOREST@@@@@", TRADE_EITHER_GENDER -; fcf38 diff --git a/data/odd_eggs.asm b/data/odd_eggs.asm deleted file mode 100644 index aa7e8176b..000000000 --- a/data/odd_eggs.asm +++ /dev/null @@ -1,398 +0,0 @@ -prob: MACRO -prob_total = prob_total + (\1) - dw prob_total * $ffff / 100 -ENDM - -OddEggProbabilities: -prob_total = 0 -; Pichu - prob 8 - prob 1 -; Cleffa - prob 16 - prob 3 -; Igglybuff - prob 16 - prob 3 -; Smoochum - prob 14 - prob 2 -; Magby - prob 10 - prob 2 -; Elekid - prob 12 - prob 2 -; Tyrogue - prob 10 - prob 1 -; 1fb56e - - -OddEggs: ; 1fb56e - -OddEgg1: - db PICHU - db NO_ITEM - db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0 - dw 02048 ; OT ID - dt 125 ; Exp - ; Stat exp - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - db $0, $0 ; DVs - db 30, 20, 10, 0 ; PP - db 20 ; Happiness - db 0, 0, 0 ; Pokerus, Caught data - db 5 ; Level - db 0, 0 ; Status - bigdw 0 ; HP - bigdw 17 ; Max HP - bigdw 9 ; Atk - bigdw 6 ; Def - bigdw 11 ; Spd - bigdw 8 ; SAtk - bigdw 8 ; SDef - db "EGG@@@@@@@@" - -OddEgg2: - db PICHU - db NO_ITEM - db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0 - dw 00256 ; OT ID - dt 125 ; Exp - ; Stat exp - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - db $2a, $aa ; DVs - db 30, 20, 10, 0 ; PP - db 20 ; Happiness - db 0, 0, 0 ; Pokerus, Caught data - db 5 ; Level - db 0, 0 ; Status - bigdw 0 ; HP - bigdw 17 ; Max HP - bigdw 9 ; Atk - bigdw 7 ; Def - bigdw 12 ; Spd - bigdw 9 ; SAtk - bigdw 9 ; SDef - db "EGG@@@@@@@@" - - db CLEFFA - db NO_ITEM - db POUND, CHARM, DIZZY_PUNCH, 0 - dw 04096 ; OT ID - dt 125 ; Exp - ; Stat exp - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - db $0, $0 ; DVs - db 35, 20, 10, 0 ; PP - db 20 ; Happiness - db 0, 0, 0 ; Pokerus, Caught data - db 5 ; Level - db 0, 0 ; Status - bigdw 0 ; HP - bigdw 20 ; Max HP - bigdw 7 ; Atk - bigdw 7 ; Def - bigdw 6 ; Spd - bigdw 9 ; SAtk - bigdw 10 ; SDef - db "EGG@@@@@@@@" - - db CLEFFA - db NO_ITEM - db POUND, CHARM, DIZZY_PUNCH, 0 - dw 00768 ; OT ID - dt 125 ; Exp - ; Stat exp - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - db $2a, $aa ; DVs - db 35, 20, 10, 0 ; PP - db 20 ; Happiness - db 0, 0, 0 ; Pokerus, Caught data - db 5 ; Level - db 0, 0 ; Status - bigdw 0 ; HP - bigdw 20 ; Max HP - bigdw 7 ; Atk - bigdw 8 ; Def - bigdw 7 ; Spd - bigdw 10 ; SAtk - bigdw 11 ; SDef - db "EGG@@@@@@@@" - - db IGGLYBUFF - db NO_ITEM - db SING, CHARM, DIZZY_PUNCH, 0 - dw 04096 ; OT ID - dt 125 ; Exp - ; Stat exp - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - db $0, $0 ; DVs - db 15, 20, 10, 0 ; PP - db 20 ; Happiness - db 0, 0, 0 ; Pokerus, Caught data - db 5 ; Level - db 0, 0 ; Status - bigdw 0 ; HP - bigdw 24 ; Max HP - bigdw 8 ; Atk - bigdw 6 ; Def - bigdw 6 ; Spd - bigdw 9 ; SAtk - bigdw 7 ; SDef - db "EGG@@@@@@@@" - - db IGGLYBUFF - db NO_ITEM - db SING, CHARM, DIZZY_PUNCH, 0 - dw 00768 ; OT ID - dt 125 ; Exp - ; Stat exp - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - db $2a, $aa ; DVs - db 15, 20, 10, 0 ; PP - db 20 ; Happiness - db 0, 0, 0 ; Pokerus, Caught data - db 5 ; Level - db 0, 0 ; Status - bigdw 0 ; HP - bigdw 24 ; Max HP - bigdw 8 ; Atk - bigdw 7 ; Def - bigdw 7 ; Spd - bigdw 10 ; SAtk - bigdw 8 ; SDef - db "EGG@@@@@@@@" - - db SMOOCHUM - db NO_ITEM - db POUND, LICK, DIZZY_PUNCH, 0 - dw 03584 ; OT ID - dt 125 ; Exp - ; Stat exp - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - db $0, $0 ; DVs - db 35, 30, 10, 0 ; PP - db 20 ; Happiness - db 0, 0, 0 ; Pokerus, Caught data - db 5 ; Level - db 0, 0 ; Status - bigdw 0 ; HP - bigdw 19 ; Max HP - bigdw 8 ; Atk - bigdw 6 ; Def - bigdw 11 ; Spd - bigdw 13 ; SAtk - bigdw 11 ; SDef - db "EGG@@@@@@@@" - - db SMOOCHUM - db NO_ITEM - db POUND, LICK, DIZZY_PUNCH, 0 - dw 00512 ; OT ID - dt 125 ; Exp - ; Stat exp - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - db $2a, $aa ; DVs - db 35, 30, 10, 0 ; PP - db 20 ; Happiness - db 0, 0, 0 ; Pokerus, Caught data - db 5 ; Level - db 0, 0 ; Status - bigdw 0 ; HP - bigdw 19 ; Max HP - bigdw 8 ; Atk - bigdw 7 ; Def - bigdw 12 ; Spd - bigdw 14 ; SAtk - bigdw 12 ; SDef - db "EGG@@@@@@@@" - - db MAGBY - db NO_ITEM - db EMBER, DIZZY_PUNCH, 0, 0 - dw 02560 ; OT ID - dt 125 ; Exp - ; Stat exp - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - db $0, $0 ; DVs - db 25, 10, 0, 0 ; PP - db 20 ; Happiness - db 0, 0, 0 ; Pokerus, Caught data - db 5 ; Level - db 0, 0 ; Status - bigdw 0 ; HP - bigdw 19 ; Max HP - bigdw 12 ; Atk - bigdw 8 ; Def - bigdw 13 ; Spd - bigdw 12 ; SAtk - bigdw 10 ; SDef - db "EGG@@@@@@@@" - - db MAGBY - db NO_ITEM - db EMBER, DIZZY_PUNCH, 0, 0 - dw 00512 ; OT ID - dt 125 ; Exp - ; Stat exp - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - db $2a, $aa ; DVs - db 25, 10, 0, 0 ; PP - db 20 ; Happiness - db 0, 0, 0 ; Pokerus, Caught data - db 5 ; Level - db 0, 0 ; Status - bigdw 0 ; HP - bigdw 19 ; Max HP - bigdw 12 ; Atk - bigdw 9 ; Def - bigdw 14 ; Spd - bigdw 13 ; SAtk - bigdw 11 ; SDef - db "EGG@@@@@@@@" - - db ELEKID - db NO_ITEM - db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0 - dw 03072 ; OT ID - dt 125 ; Exp - ; Stat exp - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - db $0, $0 ; DVs - db 30, 30, 10, 0 ; PP - db 20 ; Happiness - db 0, 0, 0 ; Pokerus, Caught data - db 5 ; Level - db 0, 0 ; Status - bigdw 0 ; HP - bigdw 19 ; Max HP - bigdw 11 ; Atk - bigdw 8 ; Def - bigdw 14 ; Spd - bigdw 11 ; SAtk - bigdw 10 ; SDef - db "EGG@@@@@@@@" - - db ELEKID - db NO_ITEM - db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0 - dw 00512 ; OT ID - dt 125 ; Exp - ; Stat exp - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - db $2a, $aa ; DVs - db 30, 30, 10, 0 ; PP - db 20 ; Happiness - db 0, 0, 0 ; Pokerus, Caught data - db 5 ; Level - db 0, 0 ; Status - bigdw 0 ; HP - bigdw 19 ; Max HP - bigdw 11 ; Atk - bigdw 9 ; Def - bigdw 15 ; Spd - bigdw 12 ; SAtk - bigdw 11 ; SDef - db "EGG@@@@@@@@" - - db TYROGUE - db NO_ITEM - db TACKLE, DIZZY_PUNCH, 0, 0 - dw 02560 ; OT ID - dt 125 ; Exp - ; Stat exp - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - db $0, $0 ; DVs - db 35, 10, 0, 0 ; PP - db 20 ; Happiness - db 0, 0, 0 ; Pokerus, Caught data - db 5 ; Level - db 0, 0 ; Status - bigdw 0 ; HP - bigdw 18 ; Max HP - bigdw 8 ; Atk - bigdw 8 ; Def - bigdw 8 ; Spd - bigdw 8 ; SAtk - bigdw 8 ; SDef - db "EGG@@@@@@@@" - - db TYROGUE - db NO_ITEM - db TACKLE, DIZZY_PUNCH, 0, 0 - dw 00256 ; OT ID - dt 125 ; Exp - ; Stat exp - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - bigdw 0 - db $2a, $aa ; DVs - db 35, 10, 0, 0 ; PP - db 20 ; Happiness - db 0, 0, 0 ; Pokerus, Caught data - db 5 ; Level - db 0, 0 ; Status - bigdw 0 ; HP - bigdw 18 ; Max HP - bigdw 8 ; Atk - bigdw 9 ; Def - bigdw 9 ; Spd - bigdw 9 ; SAtk - bigdw 9 ; SDef - db "EGG@@@@@@@@" diff --git a/data/phone/non_trainer_names.asm b/data/phone/non_trainer_names.asm new file mode 100644 index 000000000..184a93113 --- /dev/null +++ b/data/phone/non_trainer_names.asm @@ -0,0 +1,16 @@ +NonTrainerCallerNames: ; 903d6 +; entries correspond to PHONECONTACT_* constants + dw .none + dw .mom + dw .bikeshop + dw .bill + dw .elm + dw .buena + +.none: db "----------@" +.mom: db "MOM:@" +.bill: db "BILL:@" +.elm: db "PROF.ELM:@" +.bikeshop: db "BIKE SHOP:@" +.buena: db "BUENA: DISC JOCKEY@" +; 90423 diff --git a/data/phone/special_calls.asm b/data/phone/special_calls.asm index 03c27743a..5dba36fc9 100644 --- a/data/phone/special_calls.asm +++ b/data/phone/special_calls.asm @@ -7,12 +7,12 @@ ENDM SpecialPhoneCallList: ; 90627 ; entries correspond to SPECIALCALL_* constants - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallWhereverYouAre, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallWhereverYouAre, PHONE_OAK, BikeShopPhoneScript - specialcall SpecialCallWhereverYouAre, PHONE_MOM, MomPhoneLectureScript - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallWhereverYouAre, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallWhereverYouAre, PHONECONTACT_BIKESHOP, BikeShopPhoneScript + specialcall SpecialCallWhereverYouAre, PHONECONTACT_MOM, MomPhoneLectureScript + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 ; 90657 diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm new file mode 100644 index 000000000..4283d3708 --- /dev/null +++ b/data/pokemon/unown_words.asm @@ -0,0 +1,67 @@ +unownword: MACRO +x = 1 + rept STRLEN(\1) + db STRSUB(\1, x, 1) - $40 +x = x + 1 + endr + db -1 +ENDM + +UnownWords: ; fba5a +; entries correspond to UNOWN_* form constants + dw UnownWordA + dw UnownWordA + dw UnownWordB + dw UnownWordC + dw UnownWordD + dw UnownWordE + dw UnownWordF + dw UnownWordG + dw UnownWordH + dw UnownWordI + dw UnownWordJ + dw UnownWordK + dw UnownWordL + dw UnownWordM + dw UnownWordN + dw UnownWordO + dw UnownWordP + dw UnownWordQ + dw UnownWordR + dw UnownWordS + dw UnownWordT + dw UnownWordU + dw UnownWordV + dw UnownWordW + dw UnownWordX + dw UnownWordY + dw UnownWordZ +; fba90 + +UnownWordA: unownword "ANGRY" +UnownWordB: unownword "BEAR" +UnownWordC: unownword "CHASE" +UnownWordD: unownword "DIRECT" +UnownWordE: unownword "ENGAGE" +UnownWordF: unownword "FIND" +UnownWordG: unownword "GIVE" +UnownWordH: unownword "HELP" +UnownWordI: unownword "INCREASE" +UnownWordJ: unownword "JOIN" +UnownWordK: unownword "KEEP" +UnownWordL: unownword "LAUGH" +UnownWordM: unownword "MAKE" +UnownWordN: unownword "NUZZLE" +UnownWordO: unownword "OBSERVE" +UnownWordP: unownword "PERFORM" +UnownWordQ: unownword "QUICKEN" +UnownWordR: unownword "REASSURE" +UnownWordS: unownword "SEARCH" +UnownWordT: unownword "TELL" +UnownWordU: unownword "UNDO" +UnownWordV: unownword "VANISH" +UnownWordW: unownword "WANT" +UnownWordX: unownword "XXXXX" +UnownWordY: unownword "YIELD" +UnownWordZ: unownword "ZOOM" +; fbb32 diff --git a/data/sprites/player_sprites.asm b/data/sprites/player_sprites.asm new file mode 100644 index 000000000..89eb6e831 --- /dev/null +++ b/data/sprites/player_sprites.asm @@ -0,0 +1,13 @@ +ChrisStateSprites: + db PLAYER_NORMAL, SPRITE_CHRIS + db PLAYER_BIKE, SPRITE_CHRIS_BIKE + db PLAYER_SURF, SPRITE_SURF + db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU + db -1 ; end + +KrisStateSprites: + db PLAYER_NORMAL, SPRITE_KRIS + db PLAYER_BIKE, SPRITE_KRIS_BIKE + db PLAYER_SURF, SPRITE_SURF + db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU + db -1 ; end diff --git a/data/unown_walls.asm b/data/unown_walls.asm deleted file mode 100644 index c05d37004..000000000 --- a/data/unown_walls.asm +++ /dev/null @@ -1,54 +0,0 @@ -unownwall: MACRO -rept _NARG -if \1 == "-" -x = $64 -else -if \1 >= "Y" -x = 2 * (\1 - "Y") + $60 -else -if \1 >= "Q" -x = 2 * (\1 - "Q") + $40 -else -if \1 >= "I" -x = 2 * (\1 - "I") + $20 -else -x = 2 * (\1 - "A") -endc -endc -endc -endc - db x -shift -endr - db -1 ; end -ENDM - -UnownWalls: ; 8aebc -; UNOWNWORDS_ESCAPE - ; db $08, $44, $04, $00, $2e, $08, $ff - unownwall "E", "S", "C", "A", "P", "E" -; UNOWNWORDS_LIGHT - ; db $26, $20, $0c, $0e, $46, $ff - unownwall "L", "I", "G", "H", "T" -; UNOWNWORDS_WATER - ; db $4c, $00, $46, $08, $42, $ff - unownwall "W", "A", "T", "E", "R" -; UNOWNWORDS_HO_OH - ; db $0e, $2c, $64, $2c, $0e, $ff - unownwall "H", "O", "-", "O", "H" -; 8aed5 - -MenuHeaders_UnownWalls: ; 0x8aed5 -; UNOWNWORDS_ESCAPE - db MENU_BACKUP_TILES ; flags - menu_coords 3, 4, 16, 9 -; UNOWNWORDS_LIGHT - db MENU_BACKUP_TILES ; flags - menu_coords 4, 4, 15, 9 -; UNOWNWORDS_WATER - db MENU_BACKUP_TILES ; flags - menu_coords 4, 4, 15, 9 -; UNOWNWORDS_HO_OH - db MENU_BACKUP_TILES ; flags - menu_coords 4, 4, 15, 9 -; 8aee9 diff --git a/data/unown_words.asm b/data/unown_words.asm deleted file mode 100644 index ea8c4b2a8..000000000 --- a/data/unown_words.asm +++ /dev/null @@ -1,67 +0,0 @@ -unownword: MACRO -x = 1 - rept STRLEN(\1) - db STRSUB(\1, x, 1) - $40 -x = x + 1 - endr - db -1 -ENDM - -UnownWords: ; fba5a -; entries correspond to Unown forms - dw UnownWord1 - dw UnownWord1 - dw UnownWord2 - dw UnownWord3 - dw UnownWord4 - dw UnownWord5 - dw UnownWord6 - dw UnownWord7 - dw UnownWord8 - dw UnownWord9 - dw UnownWord10 - dw UnownWord11 - dw UnownWord12 - dw UnownWord13 - dw UnownWord14 - dw UnownWord15 - dw UnownWord16 - dw UnownWord17 - dw UnownWord18 - dw UnownWord19 - dw UnownWord20 - dw UnownWord21 - dw UnownWord22 - dw UnownWord23 - dw UnownWord24 - dw UnownWord25 - dw UnownWord26 -; fba90 - -UnownWord1: unownword "ANGRY" -UnownWord2: unownword "BEAR" -UnownWord3: unownword "CHASE" -UnownWord4: unownword "DIRECT" -UnownWord5: unownword "ENGAGE" -UnownWord6: unownword "FIND" -UnownWord7: unownword "GIVE" -UnownWord8: unownword "HELP" -UnownWord9: unownword "INCREASE" -UnownWord10: unownword "JOIN" -UnownWord11: unownword "KEEP" -UnownWord12: unownword "LAUGH" -UnownWord13: unownword "MAKE" -UnownWord14: unownword "NUZZLE" -UnownWord15: unownword "OBSERVE" -UnownWord16: unownword "PERFORM" -UnownWord17: unownword "QUICKEN" -UnownWord18: unownword "REASSURE" -UnownWord19: unownword "SEARCH" -UnownWord20: unownword "TELL" -UnownWord21: unownword "UNDO" -UnownWord22: unownword "VANISH" -UnownWord23: unownword "WANT" -UnownWord24: unownword "XXXXX" -UnownWord25: unownword "YIELD" -UnownWord26: unownword "ZOOM" -; fbb32 diff --git a/engine/events/bug_contest/contest_2.asm b/engine/events/bug_contest/contest_2.asm index 80f0bda97..56afefb72 100755 --- a/engine/events/bug_contest/contest_2.asm +++ b/engine/events/bug_contest/contest_2.asm @@ -74,7 +74,7 @@ CheckBugContestContestantFlag: ; 139ed ret ; 139fe -INCLUDE "data/bug_contest_flags.asm" +INCLUDE "data/events/bug_contest_flags.asm" ContestDropOffMons: ; 13a12 ld hl, PartyMon1HP diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index e9659707b..6c8d7e82d 100755 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -134,7 +134,7 @@ LoadContestantName: ; 13730 ; 13783 -INCLUDE "data/bug_contest_winners.asm" +INCLUDE "data/events/bug_contest_winners.asm" ; 13807 diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index fba2cb0ef..6138ca6bd 100755 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm @@ -229,4 +229,4 @@ FloorToString: ; 13575 ret ; 13583 -INCLUDE "data/elevator_floors.asm" +INCLUDE "data/events/elevator_floors.asm" diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm index f5055f512..7300d0938 100755 --- a/engine/events/happiness_egg.asm +++ b/engine/events/happiness_egg.asm @@ -103,7 +103,7 @@ ChangeHappiness: ; 71c2 ret -INCLUDE "data/happiness_changes.asm" +INCLUDE "data/events/happiness_changes.asm" StepHappiness:: ; 725a diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index bb86a98ab..b0f327d07 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -189,7 +189,7 @@ CalcMagikarpLength: ; fbbfc .no - ld hl, .Lengths + ld hl, MagikarpLengths ld a, 2 ld [wd265], a @@ -308,26 +308,7 @@ CalcMagikarpLength: ; fbbfc ret ; fbca8 -.Lengths: ; fbca8 -; [wMagikarpLength] = z * 100 + (bc - x) / y -; First argument is the bc threshold as well as x. -; Second argument is y. -; In reality, due to the bug at .BCLessThanDE, the threshold is determined by only register b. - dwb 110, 1 ; not used unless the bug is fixed - dwb 310, 2 - dwb 710, 4 - dwb 2710, 20 - dwb 7710, 50 - dwb 17710, 100 - dwb 32710, 150 - dwb 47710, 150 - dwb 57710, 100 - dwb 62710, 50 - dwb 64710, 20 - dwb 65210, 5 - dwb 65410, 2 - dwb 65510, 1 ; not used -; fbcd2 +INCLUDE "data/events/magikarp_lengths.asm" diff --git a/engine/events/odd_egg.asm b/engine/events/odd_egg.asm index da8d21d60..004165289 100644 --- a/engine/events/odd_egg.asm +++ b/engine/events/odd_egg.asm @@ -93,4 +93,4 @@ _GiveOddEgg: ; 1fb4b6 .Odd: db "ODD@@@@@@@@@" -INCLUDE "data/odd_eggs.asm" +INCLUDE "data/events/odd_eggs.asm" diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 576c6eebf..713457b68 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -277,7 +277,7 @@ CheckOverworldTileArrays: ; c840 ret -INCLUDE "data/field_move_blocks.asm" +INCLUDE "data/events/field_move_blocks.asm" OWFlash: ; c8ac diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm index 69949940b..4104279a2 100755 --- a/engine/events/prof_oaks_pc.asm +++ b/engine/events/prof_oaks_pc.asm @@ -98,27 +98,7 @@ endr ld l, a ret -OakRatings: ; 0x2667f -; if you caught at most this many, play this sound, load this text - dbww 9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01 - dbww 19, SFX_DEX_FANFARE_LESS_THAN_20, OakRating02 - dbww 34, SFX_DEX_FANFARE_20_49, OakRating03 - dbww 49, SFX_DEX_FANFARE_20_49, OakRating04 - dbww 64, SFX_DEX_FANFARE_50_79, OakRating05 - dbww 79, SFX_DEX_FANFARE_50_79, OakRating06 - dbww 94, SFX_DEX_FANFARE_80_109, OakRating07 - dbww 109, SFX_DEX_FANFARE_80_109, OakRating08 - dbww 124, SFX_CAUGHT_MON, OakRating09 - dbww 139, SFX_CAUGHT_MON, OakRating10 - dbww 154, SFX_DEX_FANFARE_140_169, OakRating11 - dbww 169, SFX_DEX_FANFARE_140_169, OakRating12 - dbww 184, SFX_DEX_FANFARE_170_199, OakRating13 - dbww 199, SFX_DEX_FANFARE_170_199, OakRating14 - dbww 214, SFX_DEX_FANFARE_200_229, OakRating15 - dbww 229, SFX_DEX_FANFARE_200_229, OakRating16 - dbww 239, SFX_DEX_FANFARE_230_PLUS, OakRating17 - dbww 248, SFX_DEX_FANFARE_230_PLUS, OakRating18 - dbww 255, SFX_DEX_FANFARE_230_PLUS, OakRating19 +INCLUDE "data/events/pokedex_ratings.asm" OakPCText1: ; 0x266de text_jump _OakPCText1 diff --git a/engine/events/special.asm b/engine/events/special.asm index ecb75c8ea..08231f9ac 100755 --- a/engine/events/special.asm +++ b/engine/events/special.asm @@ -156,15 +156,15 @@ BillsGrandfather: ; 73f7 ret YoungerHaircutBrother: ; 7413 - ld hl, Data_YoungerHaircutBrother + ld hl, HappinessData_YoungerHaircutBrother jr HaircutOrGrooming OlderHaircutBrother: ; 7418 - ld hl, Data_OlderHaircutBrother + ld hl, HappinessData_OlderHaircutBrother jr HaircutOrGrooming DaisysGrooming: ; 741d - ld hl, Data_DaisysGrooming + ld hl, HappinessData_DaisysGrooming ; fallthrough HaircutOrGrooming: ; 7420 @@ -213,18 +213,7 @@ HaircutOrGrooming: ; 7420 ld [ScriptVar], a ret -Data_YoungerHaircutBrother: ; 7459 - db $4c, 2, HAPPINESS_YOUNGCUT1 ; 30% chance - db $80, 3, HAPPINESS_YOUNGCUT2 ; 20% chance - db $ff, 4, HAPPINESS_YOUNGCUT3 ; 50% chance - -Data_OlderHaircutBrother: ; 7462 - db $9a, 2, HAPPINESS_OLDERCUT1 ; 60% chance - db $4c, 3, HAPPINESS_OLDERCUT2 ; 10% chance - db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance - -Data_DaisysGrooming: ; 746b - db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance +INCLUDE "data/events/happiness_chances.asm" CopyPokemonName_Buffer1_Buffer3: ; 746e ld hl, StringBuffer1 diff --git a/engine/events/std_collision.asm b/engine/events/std_collision.asm index 79dbc71f1..775f7c10c 100644 --- a/engine/events/std_collision.asm +++ b/engine/events/std_collision.asm @@ -23,7 +23,7 @@ CheckFacingTileForStdScript:: ; 1365b xor a ret -INCLUDE "data/collision_stdscripts.asm" +INCLUDE "data/events/collision_stdscripts.asm" Script_JumpStdFromRAM: ; 0x1369a jump wJumpStdScriptBuffer diff --git a/engine/events/unown_walls.asm b/engine/events/unown_walls.asm index e09d18fe8..91b1d11f3 100644 --- a/engine/events/unown_walls.asm +++ b/engine/events/unown_walls.asm @@ -153,7 +153,7 @@ DisplayUnownWords: ; 8ae68 ret ; 8aebc -INCLUDE "data/unown_walls.asm" +INCLUDE "data/events/unown_walls.asm" _DisplayUnownWords_FillAttr: ; 8aee9 ld a, [de] diff --git a/engine/items.asm b/engine/items.asm index 503a76c6b..120756764 100755 --- a/engine/items.asm +++ b/engine/items.asm @@ -11,6 +11,7 @@ _ReceiveItem:: ; d1d5 ret .Pockets: ; d1e9 +; entries correspond to item types dw .Item dw .KeyItem dw .Ball @@ -51,6 +52,7 @@ _TossItem:: ; d20d ret .Pockets: +; entries correspond to item types dw .Item dw .KeyItem dw .Ball @@ -93,6 +95,7 @@ _CheckItem:: ; d244 ret .Pockets: +; entries correspond to item types dw .Item dw .KeyItem dw .Ball @@ -492,7 +495,7 @@ _CheckTossableItem:: ; d427 ; Return 1 in wItemAttributeParamBuffer and carry if CurItem can't be removed from the bag. ld a, ITEMATTR_PERMISSIONS call GetItemAttr - bit 7, a + bit CANT_TOSS_F, a jr nz, ItemAttr_ReturnCarry and a ret @@ -501,7 +504,7 @@ CheckSelectableItem: ; d432 ; Return 1 in wItemAttributeParamBuffer and carry if CurItem can't be selected. ld a, ITEMATTR_PERMISSIONS call GetItemAttr - bit 6, a + bit CANT_SELECT_F, a jr nz, ItemAttr_ReturnCarry and a ret diff --git a/engine/npctrade.asm b/engine/npctrade.asm index 40f6dd638..fa2792934 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -401,7 +401,7 @@ GetTradeMonNames: ; fce1b ; fce58 -INCLUDE "data/npc_trades.asm" +INCLUDE "data/events/npc_trades.asm" PrintTradeText: ; fcf38 diff --git a/engine/overworld.asm b/engine/overworld.asm index 32ef356e5..88356877c 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -60,14 +60,14 @@ RefreshSprites:: ; 14168 GetPlayerSprite: ; 14183 ; Get Chris or Kris's sprite. - ld hl, .Chris + ld hl, ChrisStateSprites ld a, [wPlayerSpriteSetupFlags] bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a jr nz, .go ld a, [wPlayerGender] bit PLAYERGENDER_FEMALE_F, a jr z, .go - ld hl, .Kris + ld hl, KrisStateSprites .go ld a, [PlayerState] @@ -95,20 +95,7 @@ GetPlayerSprite: ; 14183 ld [PlayerObjectSprite], a ret -.Chris: - db PLAYER_NORMAL, SPRITE_CHRIS - db PLAYER_BIKE, SPRITE_CHRIS_BIKE - db PLAYER_SURF, SPRITE_SURF - db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU - db -1 ; end - -.Kris: - db PLAYER_NORMAL, SPRITE_KRIS - db PLAYER_BIKE, SPRITE_KRIS_BIKE - db PLAYER_SURF, SPRITE_SURF - db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU - db -1 ; end -; 141c9 +INCLUDE "data/sprites/player_sprites.asm" AddMapSprites: ; 141c9 diff --git a/engine/party_menu.asm b/engine/party_menu.asm index 5ef9b50de..a048eb5b7 100644 --- a/engine/party_menu.asm +++ b/engine/party_menu.asm @@ -839,6 +839,7 @@ PrintPartyMenuActionText: ; 50566 ; 5057b .MenuActionTexts: ; 5057b +; entries correspond to PARTYMENUTEXT_* constants dw .Text_CuredOfPoison dw .Text_BurnWasHealed dw .Text_Defrosted diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index f402e9102..54ec224d7 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -704,21 +704,7 @@ GetCallerName: ; 903a9 (24:43a9) ret ; 903d6 (24:43d6) -NonTrainerCallerNames: ; 903d6 - dw .none - dw .mom - dw .bikeshop - dw .bill - dw .elm - dw .buena - -.none db "----------@" -.mom db "MOM:@" -.bill db "BILL:@" -.elm db "PROF.ELM:@" -.bikeshop db "BIKE SHOP:@" -.buena db "BUENA: DISC JOCKEY@" -; 90423 +INCLUDE "data/phone/non_trainer_names.asm" Phone_GetTrainerName: ; 90423 (24:4423) push hl diff --git a/engine/pokedex/unown_dex.asm b/engine/pokedex/unown_dex.asm index dc6db9dc6..40138735d 100755 --- a/engine/pokedex/unown_dex.asm +++ b/engine/pokedex/unown_dex.asm @@ -49,4 +49,4 @@ PrintUnownWord: ; fba2e (3e:7a2e) ; fba5a (3e:7a5a) -INCLUDE "data/unown_words.asm" +INCLUDE "data/pokemon/unown_words.asm" diff --git a/engine/select_menu.asm b/engine/select_menu.asm index e92c3ee50..114c16e06 100755 --- a/engine/select_menu.asm +++ b/engine/select_menu.asm @@ -33,6 +33,7 @@ CheckRegisteredItem: ; 13345 ret .Pockets: +; entries correspond to *_POCKET constants dw .CheckItem dw .CheckBall dw .CheckKeyItem @@ -127,6 +128,7 @@ UseRegisteredItem: ; 133c3 ret .SwitchTo: +; entries correspond to ITEMMENU_* constants dw .CantUse dw .NoFunction dw .NoFunction diff --git a/engine/variables.asm b/engine/variables.asm index 56c49f085..2897cc986 100755 --- a/engine/variables.asm +++ b/engine/variables.asm @@ -54,7 +54,7 @@ _GetVarAction:: ; 80648 (20:4648) dwb MapGroup, RETVAR_STRBUF2 dwb MapNumber, RETVAR_STRBUF2 dwb .UnownCaught, RETVAR_EXECUTE - dwb wEnvironment, RETVAR_STRBUF2 + dwb wEnvironment, RETVAR_STRBUF2 dwb .BoxFreeSpace, RETVAR_EXECUTE dwb wBugContestMinsRemaining, RETVAR_STRBUF2 dwb XCoord, RETVAR_STRBUF2 -- cgit v1.2.3